yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

browser(webkit): fix windows compilation (#6011)

Browse Source
This commit is contained in:
Yury Semikhatsky 2021-03-30 14:42:23 -07:00 committed by GitHub
parent 97955247a2
commit 93d532b5e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser_patches/webkit/BUILD_NUMBER
View File

@ -1,2 +1,2 @@
1454 1455
Changed: yurys@chromium.org Tue 30 Mar 2021 10:39:35 AM PDT Changed: yurys@chromium.org Tue 30 Mar 2021 02:36:32 PM PDT

20
browser_patches/webkit/patches/bootstrap.diff
View File

@ -3199,7 +3199,7 @@ index 933601761667417ebe5de301586869ccc64fc3da..f63a95c3c45980d5606971b83881e824
// InspectorInstrumentation // InspectorInstrumentation
void willRecalculateStyle(); void willRecalculateStyle();
diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
index af0a051bdae52b2daf70b1fee76eee0866b7b046..18d22ad1469daccfccdf8b8dcf957cf41d7229a2 100644 index af0a051bdae52b2daf70b1fee76eee0866b7b046..e11ae6eca2615d7364370c036d8aadb00ef51dc5 100644
--- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp --- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
+++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
@@ -32,19 +32,25 @@ @@ -32,19 +32,25 @@
@ -4065,7 +4065,7 @@ index af0a051bdae52b2daf70b1fee76eee0866b7b046..18d22ad1469daccfccdf8b8dcf957cf4
+ Optional<double> bottom = insets->getDouble("bottom"); + Optional<double> bottom = insets->getDouble("bottom");
+ Optional<double> left = insets->getDouble("left"); + Optional<double> left = insets->getDouble("left");
+ if (top && right && bottom && left) + if (top && right && bottom && left)
+ return FloatBoxExtent(*top, *right, *bottom, *left); + return FloatBoxExtent(static_cast<float>(*top), static_cast<float>(*right), static_cast<float>(*bottom), static_cast<float>(*left));
+ return Optional<FloatBoxExtent>(); + return Optional<FloatBoxExtent>();
+} +}
+ +
@ -4076,7 +4076,7 @@ index af0a051bdae52b2daf70b1fee76eee0866b7b046..18d22ad1469daccfccdf8b8dcf957cf4
+ Optional<double> width = insets->getDouble("width"); + Optional<double> width = insets->getDouble("width");
+ Optional<double> height = insets->getDouble("height"); + Optional<double> height = insets->getDouble("height");
+ if (x && y && width && height) + if (x && y && width && height)
+ return FloatRect(*x, *y, *width, *height); + return FloatRect(static_cast<float>(*x), static_cast<float>(*y), static_cast<float>(*width), static_cast<float>(*height));
+ return Optional<FloatRect>(); + return Optional<FloatRect>();
+} +}
+ +
@ -4117,7 +4117,7 @@ index af0a051bdae52b2daf70b1fee76eee0866b7b046..18d22ad1469daccfccdf8b8dcf957cf4
+ +
+ m_inspectedPage.setUnobscuredSafeAreaInsets(*ui); + m_inspectedPage.setUnobscuredSafeAreaInsets(*ui);
+ } + }
+ return { }; + return {};
+} +}
} // namespace WebCore } // namespace WebCore
@ -6288,18 +6288,6 @@ index 4a4f6c72b54a2e6c5462aa4366b71b67d82e3582..9b15f8992bc32892e24e27025870c09b
#endif #endif
#endif #endif
diff --git a/Source/WebCore/platform/RectEdges.h b/Source/WebCore/platform/RectEdges.h
index 883ecae9e15822034f217a5701473853a0b05468..65dfd324ddbf54e74f637f7b3b991a18db805207 100644
--- a/Source/WebCore/platform/RectEdges.h
+++ b/Source/WebCore/platform/RectEdges.h
@@ -27,6 +27,7 @@
#include "WritingMode.h"
#include <array>
+#include <utility>
#include <wtf/OptionSet.h>
#include <wtf/text/TextStream.h>
diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h
index 7eb7b540282840ab7b5f31fdfa6b2bfd58eb19dc..4937254dc71d6eb0d6213e645b92199af354096e 100644 index 7eb7b540282840ab7b5f31fdfa6b2bfd58eb19dc..4937254dc71d6eb0d6213e645b92199af354096e 100644
--- a/Source/WebCore/platform/ScrollableArea.h --- a/Source/WebCore/platform/ScrollableArea.h