microsoft/playwright
1
1
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2024-12-15 06:02:57 +03:00
Code Issues Projects Releases Wiki Activity

feat(webkit): instrument frameAttached (#226)

Browse Source
This commit is contained in:
Dmitry Gozman 2019-12-12 10:14:04 -08:00 committed by Pavel Feldman
parent 58fd7c5c45
commit 4474369dac
2 changed files with 71 additions and 21 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 @@
1028 1029

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

@ -740,7 +740,7 @@ index 00000000000..60515155c22
+ ] + ]
+} +}
diff --git a/Source/JavaScriptCore/inspector/protocol/Page.json b/Source/JavaScriptCore/inspector/protocol/Page.json diff --git a/Source/JavaScriptCore/inspector/protocol/Page.json b/Source/JavaScriptCore/inspector/protocol/Page.json
index 367d1f235a8..b75d0c7c362 100644 index 367d1f235a8..f5bdf41aad8 100644
--- a/Source/JavaScriptCore/inspector/protocol/Page.json --- a/Source/JavaScriptCore/inspector/protocol/Page.json
+++ b/Source/JavaScriptCore/inspector/protocol/Page.json +++ b/Source/JavaScriptCore/inspector/protocol/Page.json
@@ -108,6 +108,40 @@ @@ -108,6 +108,40 @@
@ -873,7 +873,22 @@ index 367d1f235a8..b75d0c7c362 100644
] ]
}, },
{ {
@@ -346,12 +434,36 @@ @@ -310,6 +398,14 @@
{ "name": "frame", "$ref": "Frame", "description": "Frame object." }
]
},
+ {
+ "name": "frameAttached",
+ "description": "Fired when frame has been attached to its parent.",
+ "parameters": [
+ { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has been detached." },
+ { "name": "parentFrameId", "$ref": "Network.FrameId", "optional": true, "description": "Parent frame id if non-root." }
+ ]
+ },
{
"name": "frameDetached",
"description": "Fired when frame has been detached from its parent.",
@@ -346,12 +442,36 @@
{ "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has cleared its scheduled navigation." } { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has cleared its scheduled navigation." }
] ]
}, },
@ -975,7 +990,7 @@ index 4e41fd3f807..1f7be602cb2 100644
return; return;
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 cb6ed9f6c84..22001135c88 100644 index cb6ed9f6c84..fcbd312e217 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
@@ -121,7 +121,7 @@ static Frame* frameForScriptExecutionContext(ScriptExecutionContext& context) @@ -121,7 +121,7 @@ static Frame* frameForScriptExecutionContext(ScriptExecutionContext& context)
@ -1024,7 +1039,7 @@ index cb6ed9f6c84..22001135c88 100644
void InspectorInstrumentation::defaultAppearanceDidChangeImpl(InstrumentingAgents& instrumentingAgents, bool useDarkAppearance) void InspectorInstrumentation::defaultAppearanceDidChangeImpl(InstrumentingAgents& instrumentingAgents, bool useDarkAppearance)
{ {
if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents.inspectorPageAgent()) if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents.inspectorPageAgent())
@@ -1251,6 +1254,19 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins @@ -1251,6 +1254,24 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins
layerTreeAgent->renderLayerDestroyed(renderLayer); layerTreeAgent->renderLayerDestroyed(renderLayer);
} }
@ -1034,6 +1049,11 @@ index cb6ed9f6c84..22001135c88 100644
+ pageAgent->runOpenPanel(element, intercept); + pageAgent->runOpenPanel(element, intercept);
+} +}
+ +
+void InspectorInstrumentation::frameAttachedImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) {
+ if (InspectorPageAgent* pageAgent = instrumentingAgents.inspectorPageAgent())
+ pageAgent->frameAttached(frame);
+}
+
+bool InspectorInstrumentation::shouldBypassCSPImpl(InstrumentingAgents& instrumentingAgents) +bool InspectorInstrumentation::shouldBypassCSPImpl(InstrumentingAgents& instrumentingAgents)
+{ +{
+ if (InspectorPageAgent* pageAgent = instrumentingAgents.inspectorPageAgent()) + if (InspectorPageAgent* pageAgent = instrumentingAgents.inspectorPageAgent())
@ -1045,7 +1065,7 @@ index cb6ed9f6c84..22001135c88 100644
{ {
return workerGlobalScope.inspectorController().m_instrumentingAgents; return workerGlobalScope.inspectorController().m_instrumentingAgents;
diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h
index 6698431f316..787ab1c35a2 100644 index 6698431f316..2e0e67b35b3 100644
--- a/Source/WebCore/inspector/InspectorInstrumentation.h --- a/Source/WebCore/inspector/InspectorInstrumentation.h
+++ b/Source/WebCore/inspector/InspectorInstrumentation.h +++ b/Source/WebCore/inspector/InspectorInstrumentation.h
@@ -77,6 +77,7 @@ class DOMWrapperWorld; @@ -77,6 +77,7 @@ class DOMWrapperWorld;
@ -1064,17 +1084,18 @@ index 6698431f316..787ab1c35a2 100644
static void defaultAppearanceDidChange(Page&, bool useDarkAppearance); static void defaultAppearanceDidChange(Page&, bool useDarkAppearance);
static void willDestroyCachedResource(CachedResource&); static void willDestroyCachedResource(CachedResource&);
@@ -313,6 +315,9 @@ public: @@ -313,6 +315,10 @@ public:
static void layerTreeDidChange(Page*); static void layerTreeDidChange(Page*);
static void renderLayerDestroyed(Page*, const RenderLayer&); static void renderLayerDestroyed(Page*, const RenderLayer&);
+ static void runOpenPanel(Frame*, HTMLInputElement*, bool*); + static void runOpenPanel(Frame*, HTMLInputElement*, bool*);
+ static void frameAttached(Frame*);
+ static bool shouldBypassCSP(ScriptExecutionContext*); + static bool shouldBypassCSP(ScriptExecutionContext*);
+ +
static void frontendCreated(); static void frontendCreated();
static void frontendDeleted(); static void frontendDeleted();
static bool hasFrontends() { return InspectorInstrumentationPublic::hasFrontends(); } static bool hasFrontends() { return InspectorInstrumentationPublic::hasFrontends(); }
@@ -428,6 +433,7 @@ private: @@ -428,6 +434,7 @@ private:
static void frameStoppedLoadingImpl(InstrumentingAgents&, Frame&); static void frameStoppedLoadingImpl(InstrumentingAgents&, Frame&);
static void frameScheduledNavigationImpl(InstrumentingAgents&, Frame&, Seconds delay); static void frameScheduledNavigationImpl(InstrumentingAgents&, Frame&, Seconds delay);
static void frameClearedScheduledNavigationImpl(InstrumentingAgents&, Frame&); static void frameClearedScheduledNavigationImpl(InstrumentingAgents&, Frame&);
@ -1082,17 +1103,18 @@ index 6698431f316..787ab1c35a2 100644
static void defaultAppearanceDidChangeImpl(InstrumentingAgents&, bool useDarkAppearance); static void defaultAppearanceDidChangeImpl(InstrumentingAgents&, bool useDarkAppearance);
static void willDestroyCachedResourceImpl(CachedResource&); static void willDestroyCachedResourceImpl(CachedResource&);
@@ -509,6 +515,9 @@ private: @@ -509,6 +516,10 @@ private:
static void layerTreeDidChangeImpl(InstrumentingAgents&); static void layerTreeDidChangeImpl(InstrumentingAgents&);
static void renderLayerDestroyedImpl(InstrumentingAgents&, const RenderLayer&); static void renderLayerDestroyedImpl(InstrumentingAgents&, const RenderLayer&);
+ static void runOpenPanelImpl(InstrumentingAgents&, HTMLInputElement*, bool*); + static void runOpenPanelImpl(InstrumentingAgents&, HTMLInputElement*, bool*);
+ static void frameAttachedImpl(InstrumentingAgents&, Frame&);
+ static bool shouldBypassCSPImpl(InstrumentingAgents&); + static bool shouldBypassCSPImpl(InstrumentingAgents&);
+ +
static InstrumentingAgents& instrumentingAgentsForPage(Page&); static InstrumentingAgents& instrumentingAgentsForPage(Page&);
static InstrumentingAgents& instrumentingAgentsForWorkerGlobalScope(WorkerGlobalScope&); static InstrumentingAgents& instrumentingAgentsForWorkerGlobalScope(WorkerGlobalScope&);
@@ -1219,6 +1228,13 @@ inline void InspectorInstrumentation::frameClearedScheduledNavigation(Frame& fra @@ -1219,6 +1230,13 @@ inline void InspectorInstrumentation::frameClearedScheduledNavigation(Frame& fra
frameClearedScheduledNavigationImpl(*instrumentingAgents, frame); frameClearedScheduledNavigationImpl(*instrumentingAgents, frame);
} }
@ -1106,7 +1128,7 @@ index 6698431f316..787ab1c35a2 100644
inline void InspectorInstrumentation::defaultAppearanceDidChange(Page& page, bool useDarkAppearance) inline void InspectorInstrumentation::defaultAppearanceDidChange(Page& page, bool useDarkAppearance)
{ {
FAST_RETURN_IF_NO_FRONTENDS(void()); FAST_RETURN_IF_NO_FRONTENDS(void());
@@ -1643,6 +1659,21 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren @@ -1643,6 +1661,28 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren
renderLayerDestroyedImpl(*instrumentingAgents, renderLayer); renderLayerDestroyedImpl(*instrumentingAgents, renderLayer);
} }
@ -1117,6 +1139,13 @@ index 6698431f316..787ab1c35a2 100644
+ runOpenPanelImpl(*instrumentingAgents, element, intercept); + runOpenPanelImpl(*instrumentingAgents, element, intercept);
+} +}
+ +
+inline void InspectorInstrumentation::frameAttached(Frame* frame)
+{
+ FAST_RETURN_IF_NO_FRONTENDS(void());
+ if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
+ frameAttachedImpl(*instrumentingAgents, *frame);
+}
+
+inline bool InspectorInstrumentation::shouldBypassCSP(ScriptExecutionContext* context) +inline bool InspectorInstrumentation::shouldBypassCSP(ScriptExecutionContext* context)
+{ +{
+ FAST_RETURN_IF_NO_FRONTENDS(false); + FAST_RETURN_IF_NO_FRONTENDS(false);
@ -1449,7 +1478,7 @@ index b578660fbb3..a7c968bc9f8 100644
class Page; class Page;
class SecurityOrigin; class SecurityOrigin;
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 f2e228b7f74..a91297f7306 100644 index f2e228b7f74..ed738d56ce2 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,6 +32,8 @@ @@ -32,6 +32,8 @@
@ -1597,11 +1626,12 @@ index f2e228b7f74..a91297f7306 100644
void InspectorPageAgent::defaultAppearanceDidChange(bool useDarkAppearance) void InspectorPageAgent::defaultAppearanceDidChange(bool useDarkAppearance)
{ {
m_frontendDispatcher->defaultAppearanceDidChange(useDarkAppearance ? Inspector::Protocol::Page::Appearance::Dark : Inspector::Protocol::Page::Appearance::Light); m_frontendDispatcher->defaultAppearanceDidChange(useDarkAppearance ? Inspector::Protocol::Page::Appearance::Dark : Inspector::Protocol::Page::Appearance::Light);
@@ -815,6 +849,30 @@ void InspectorPageAgent::didRecalculateStyle() @@ -815,6 +849,38 @@ void InspectorPageAgent::didRecalculateStyle()
m_overlay->update(); m_overlay->update();
} }
+void InspectorPageAgent::runOpenPanel(HTMLInputElement* element, bool* intercept) { +void InspectorPageAgent::runOpenPanel(HTMLInputElement* element, bool* intercept)
+{
+ if (m_interceptFileChooserDialog) { + if (m_interceptFileChooserDialog) {
+ *intercept = true; + *intercept = true;
+ } else { + } else {
@ -1620,15 +1650,22 @@ index f2e228b7f74..a91297f7306 100644
+ m_frontendDispatcher->fileChooserOpened(frameId(frame), injectedScript.wrapObject(InspectorDOMAgent::nodeAsScriptValue(state, element), WTF::String())); + m_frontendDispatcher->fileChooserOpened(frameId(frame), injectedScript.wrapObject(InspectorDOMAgent::nodeAsScriptValue(state, element), WTF::String()));
+} +}
+ +
+bool InspectorPageAgent::shouldBypassCSP() { +void InspectorPageAgent::frameAttached(Frame& frame)
+ return m_bypassCSP; +{
+ Frame* parent = frame.tree().parent();
+ String parentFrameId = frameId(parent);
+ m_frontendDispatcher->frameAttached(frameId(&frame), parent ? &parentFrameId : nullptr);
+} +}
+ +
+bool InspectorPageAgent::shouldBypassCSP()
+{
+ return m_bypassCSP;
+}
+ +
Ref<Inspector::Protocol::Page::Frame> InspectorPageAgent::buildObjectForFrame(Frame* frame) Ref<Inspector::Protocol::Page::Frame> InspectorPageAgent::buildObjectForFrame(Frame* frame)
{ {
ASSERT_ARG(frame, frame); ASSERT_ARG(frame, frame);
@@ -986,4 +1044,491 @@ void InspectorPageAgent::archive(ErrorString& errorString, String* data) @@ -986,4 +1052,491 @@ void InspectorPageAgent::archive(ErrorString& errorString, String* data)
#endif #endif
} }
@ -2121,7 +2158,7 @@ index f2e228b7f74..a91297f7306 100644
+ +
} // namespace WebCore } // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.h b/Source/WebCore/inspector/agents/InspectorPageAgent.h diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.h b/Source/WebCore/inspector/agents/InspectorPageAgent.h
index 4fd8c0b1016..33de324b533 100644 index 4fd8c0b1016..9954be9e35a 100644
--- a/Source/WebCore/inspector/agents/InspectorPageAgent.h --- a/Source/WebCore/inspector/agents/InspectorPageAgent.h
+++ b/Source/WebCore/inspector/agents/InspectorPageAgent.h +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.h
@@ -40,10 +40,15 @@ @@ -40,10 +40,15 @@
@ -2181,11 +2218,12 @@ index 4fd8c0b1016..33de324b533 100644
void defaultAppearanceDidChange(bool useDarkAppearance); void defaultAppearanceDidChange(bool useDarkAppearance);
void applyUserAgentOverride(String&); void applyUserAgentOverride(String&);
void applyEmulatedMedia(String&); void applyEmulatedMedia(String&);
@@ -134,11 +148,14 @@ public: @@ -134,11 +148,15 @@ public:
void didLayout(); void didLayout();
void didScroll(); void didScroll();
void didRecalculateStyle(); void didRecalculateStyle();
+ void runOpenPanel(HTMLInputElement* element, bool* intercept); + void runOpenPanel(HTMLInputElement* element, bool* intercept);
+ void frameAttached(Frame&);
+ bool shouldBypassCSP(); + bool shouldBypassCSP();
Frame* frameForId(const String& frameId); Frame* frameForId(const String& frameId);
@ -2196,7 +2234,7 @@ index 4fd8c0b1016..33de324b533 100644
private: private:
double timestamp(); double timestamp();
@@ -153,6 +170,7 @@ private: @@ -153,6 +171,7 @@ private:
RefPtr<Inspector::PageBackendDispatcher> m_backendDispatcher; RefPtr<Inspector::PageBackendDispatcher> m_backendDispatcher;
Page& m_inspectedPage; Page& m_inspectedPage;
@ -2204,7 +2242,7 @@ index 4fd8c0b1016..33de324b533 100644
InspectorClient* m_client { nullptr }; InspectorClient* m_client { nullptr };
InspectorOverlay* m_overlay { nullptr }; InspectorOverlay* m_overlay { nullptr };
@@ -163,8 +181,11 @@ private: @@ -163,8 +182,11 @@ private:
String m_emulatedMedia; String m_emulatedMedia;
String m_forcedAppearance; String m_forcedAppearance;
String m_bootstrapScript; String m_bootstrapScript;
@ -2363,6 +2401,18 @@ index e105be0ba92..2557eacc4b7 100644
m_frame.document()->statePopped(stateObject ? Ref<SerializedScriptValue> { *stateObject } : SerializedScriptValue::nullValue()); m_frame.document()->statePopped(stateObject ? Ref<SerializedScriptValue> { *stateObject } : SerializedScriptValue::nullValue());
m_client.dispatchDidPopStateWithinPage(); m_client.dispatchDidPopStateWithinPage();
diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp
index 22cc1fd15bc..4b0e232a19c 100644
--- a/Source/WebCore/page/Frame.cpp
+++ b/Source/WebCore/page/Frame.cpp
@@ -180,6 +180,7 @@ Frame::Frame(Page& page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient&
void Frame::init()
{
m_loader->init();
+ InspectorInstrumentation::frameAttached(this);
}
Ref<Frame> Frame::create(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* client)
diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp
index 9c58b06f4c4..3d624733c36 100644 index 9c58b06f4c4..3d624733c36 100644
--- a/Source/WebCore/page/History.cpp --- a/Source/WebCore/page/History.cpp