Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

browser(webkit): fix compilation on Mac (#2253)

Browse source
This commit is contained in:
Yury Semikhatsky 2020-05-14 16:45:39 -07:00 committed by GitHub
parent 8fb2c7e8fa
commit 4d27aadb13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser_patches/webkit/BUILD_NUMBER
View file

@ -1 +1 @@
1233 1234

18
browser_patches/webkit/patches/bootstrap.diff
View file

@ -1983,7 +1983,7 @@ index 3fae9951d703f83d0de805a71dfe0f7260feac58..b128a43568db28c399b7c86bc4f32ed5
} // namespace WebCore } // namespace WebCore
diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp
index 0c442ee908877d2067d65e87441652a8cf00c88e..edc00897f886f540db097000fe1e870f296c980c 100644 index 0c442ee908877d2067d65e87441652a8cf00c88e..6fb448784e0d97fe60eb233853905138992c6bb6 100644
--- a/Source/WebCore/inspector/InspectorInstrumentation.cpp --- a/Source/WebCore/inspector/InspectorInstrumentation.cpp
+++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp +++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp
@@ -81,6 +81,12 @@ @@ -81,6 +81,12 @@
@ -1999,7 +1999,7 @@ index 0c442ee908877d2067d65e87441652a8cf00c88e..edc00897f886f540db097000fe1e870f
#if ENABLE(WEBGPU) #if ENABLE(WEBGPU)
#include "WebGPUSwapChain.h" #include "WebGPUSwapChain.h"
#endif #endif
@@ -502,6 +508,17 @@ void InspectorInstrumentation::didLayoutImpl(InstrumentingAgents& instrumentingA @@ -502,6 +508,19 @@ void InspectorInstrumentation::didLayoutImpl(InstrumentingAgents& instrumentingA
pageAgent->didLayout(); pageAgent->didLayout();
} }
@ -2010,6 +2010,8 @@ index 0c442ee908877d2067d65e87441652a8cf00c88e..edc00897f886f540db097000fe1e870f
+ +
+ if (auto* screencastAgent = instrumentingAgents.inspectorScreencastAgent()) + if (auto* screencastAgent = instrumentingAgents.inspectorScreencastAgent())
+ screencastAgent->willDisplay(); + screencastAgent->willDisplay();
+#else
+ UNUSED_PARAM(instrumentingAgents);
+#endif +#endif
+} +}
+// Playwright end +// Playwright end
@ -2017,7 +2019,7 @@ index 0c442ee908877d2067d65e87441652a8cf00c88e..edc00897f886f540db097000fe1e870f
void InspectorInstrumentation::willCompositeImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) void InspectorInstrumentation::willCompositeImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
{ {
if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.trackingInspectorTimelineAgent()) if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.trackingInspectorTimelineAgent())
@@ -628,6 +645,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen @@ -628,6 +647,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen
consoleAgent->didFailLoading(identifier, error); // This should come AFTER resource notification, front-end relies on this. consoleAgent->didFailLoading(identifier, error); // This should come AFTER resource notification, front-end relies on this.
} }
@ -2030,7 +2032,7 @@ index 0c442ee908877d2067d65e87441652a8cf00c88e..edc00897f886f540db097000fe1e870f
void InspectorInstrumentation::willLoadXHRSynchronouslyImpl(InstrumentingAgents& instrumentingAgents) void InspectorInstrumentation::willLoadXHRSynchronouslyImpl(InstrumentingAgents& instrumentingAgents)
{ {
if (InspectorNetworkAgent* networkAgent = instrumentingAgents.inspectorNetworkAgent()) if (InspectorNetworkAgent* networkAgent = instrumentingAgents.inspectorNetworkAgent())
@@ -660,20 +683,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents& @@ -660,20 +685,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents&
void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
{ {
@ -2054,7 +2056,7 @@ index 0c442ee908877d2067d65e87441652a8cf00c88e..edc00897f886f540db097000fe1e870f
} }
void InspectorInstrumentation::frameDetachedFromParentImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) void InspectorInstrumentation::frameDetachedFromParentImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
@@ -751,12 +771,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins @@ -751,12 +773,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins
pageDOMDebuggerAgent->frameDocumentUpdated(frame); pageDOMDebuggerAgent->frameDocumentUpdated(frame);
} }
@ -2067,7 +2069,7 @@ index 0c442ee908877d2067d65e87441652a8cf00c88e..edc00897f886f540db097000fe1e870f
void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
{ {
if (frame.isMainFrame()) { if (frame.isMainFrame()) {
@@ -793,6 +807,12 @@ void InspectorInstrumentation::frameClearedScheduledNavigationImpl(Instrumenting @@ -793,6 +809,12 @@ void InspectorInstrumentation::frameClearedScheduledNavigationImpl(Instrumenting
inspectorPageAgent->frameClearedScheduledNavigation(frame); inspectorPageAgent->frameClearedScheduledNavigation(frame);
} }
@ -2080,7 +2082,7 @@ index 0c442ee908877d2067d65e87441652a8cf00c88e..edc00897f886f540db097000fe1e870f
void InspectorInstrumentation::defaultAppearanceDidChangeImpl(InstrumentingAgents& instrumentingAgents, bool useDarkAppearance) void InspectorInstrumentation::defaultAppearanceDidChangeImpl(InstrumentingAgents& instrumentingAgents, bool useDarkAppearance)
{ {
if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents.inspectorPageAgent()) if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents.inspectorPageAgent())
@@ -1295,6 +1315,43 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins @@ -1295,6 +1317,43 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins
layerTreeAgent->renderLayerDestroyed(renderLayer); layerTreeAgent->renderLayerDestroyed(renderLayer);
} }
@ -2124,7 +2126,7 @@ index 0c442ee908877d2067d65e87441652a8cf00c88e..edc00897f886f540db097000fe1e870f
InstrumentingAgents& InspectorInstrumentation::instrumentingAgentsForWorkerGlobalScope(WorkerGlobalScope& workerGlobalScope) InstrumentingAgents& InspectorInstrumentation::instrumentingAgentsForWorkerGlobalScope(WorkerGlobalScope& workerGlobalScope)
{ {
return workerGlobalScope.inspectorController().m_instrumentingAgents; return workerGlobalScope.inspectorController().m_instrumentingAgents;
@@ -1306,6 +1363,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgentsForPage(Page& @@ -1306,6 +1365,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgentsForPage(Page&
return page.inspectorController().m_instrumentingAgents.get(); return page.inspectorController().m_instrumentingAgents.get();
} }