diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 644dc12a7e..c8098b9362 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1346 -Changed: yurys@chromium.org Mon Sep 21 17:56:58 PDT 2020 +1347 +Changed: yurys@chromium.org Mon Sep 21 19:01:22 PDT 2020 diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 384532658c..9ab1523506 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -2655,7 +2655,7 @@ index f6c83ea43b81e59816130269a28b1a6623b99854..69d4f43dc676e6c1fa08146ca704cf36 + } // namespace WebCore diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.h b/Source/WebCore/inspector/agents/InspectorDOMAgent.h -index 7f2872df49e0d40ab020cd9884ded00308f1a2a6..d29615ad8f2dedcadd4ee2dd422f53ff3858f9e1 100644 +index 7f2872df49e0d40ab020cd9884ded00308f1a2a6..a2512f35fdea0d0f6ea9393354461e022c2576f3 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.h +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.h @@ -55,6 +55,7 @@ namespace WebCore { @@ -2679,7 +2679,7 @@ index 7f2872df49e0d40ab020cd9884ded00308f1a2a6..d29615ad8f2dedcadd4ee2dd422f53ff Inspector::Protocol::ErrorStringOr>> getSearchResults(const String& searchId, int fromIndex, int toIndex); Inspector::Protocol::ErrorStringOr discardSearchResults(const String& searchId); - Inspector::Protocol::ErrorStringOr> resolveNode(Inspector::Protocol::DOM::NodeId, const String& objectGroup); -+ Inspector::Protocol::ErrorStringOr> resolveNode(Optional&& nodeId, const String& objectId, Optional&& contextId, const String& objectGroup) override; ++ Inspector::Protocol::ErrorStringOr> resolveNode(Optional&& nodeId, const String& objectId, Optional&& contextId, const String& objectGroup); Inspector::Protocol::ErrorStringOr>> getAttributes(Inspector::Protocol::DOM::NodeId); #if PLATFORM(IOS_FAMILY) Inspector::Protocol::ErrorStringOr setInspectModeEnabled(bool, RefPtr&& highlightConfig); @@ -2687,10 +2687,10 @@ index 7f2872df49e0d40ab020cd9884ded00308f1a2a6..d29615ad8f2dedcadd4ee2dd422f53ff Inspector::Protocol::ErrorStringOr focus(Inspector::Protocol::DOM::NodeId); Inspector::Protocol::ErrorStringOr setInspectedNode(Inspector::Protocol::DOM::NodeId); Inspector::Protocol::ErrorStringOr setAllowEditingUserAgentShadowTrees(bool); -+ Inspector::Protocol::ErrorStringOr> describeNode(const String& objectId) override; -+ Inspector::Protocol::ErrorStringOr scrollIntoViewIfNeeded(const String& objectId, RefPtr&& rect) override; -+ Inspector::Protocol::ErrorStringOr>> getContentQuads(const String& objectId) override; -+ Inspector::Protocol::ErrorStringOr setInputFiles(const String& objectId, Ref&& files) override; ++ Inspector::Protocol::ErrorStringOr> describeNode(const String& objectId); ++ Inspector::Protocol::ErrorStringOr scrollIntoViewIfNeeded(const String& objectId, RefPtr&& rect); ++ Inspector::Protocol::ErrorStringOr>> getContentQuads(const String& objectId); ++ Inspector::Protocol::ErrorStringOr setInputFiles(const String& objectId, Ref&& files); // InspectorInstrumentation Inspector::Protocol::DOM::NodeId identifierForNode(Node&); @@ -3713,7 +3713,7 @@ index ae25fcebc93d504bb0abf17b61bbe1d73efcc1e3..9d0cc967efe17c6fc94e694d8806e1c4 + } // namespace WebCore diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.h b/Source/WebCore/inspector/agents/InspectorPageAgent.h -index d2b065e13651fafe747325f02e7701fbf1e8e45e..9076ff5fa9b746f9f13823146504829593f11bef 100644 +index d2b065e13651fafe747325f02e7701fbf1e8e45e..3b5db3e7404fc890acab9864d23bbbc6b54b27fd 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.h +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.h @@ -34,17 +34,23 @@ @@ -3759,8 +3759,8 @@ index d2b065e13651fafe747325f02e7701fbf1e8e45e..9076ff5fa9b746f9f138231465048295 Inspector::Protocol::ErrorStringOr enable(); Inspector::Protocol::ErrorStringOr disable(); Inspector::Protocol::ErrorStringOr reload(Optional&& ignoreCache, Optional&& revalidateAllResources); -+ Inspector::Protocol::ErrorStringOr goBack() override; -+ Inspector::Protocol::ErrorStringOr goForward() override; ++ Inspector::Protocol::ErrorStringOr goBack(); ++ Inspector::Protocol::ErrorStringOr goForward(); Inspector::Protocol::ErrorStringOr navigate(const String& url); Inspector::Protocol::ErrorStringOr overrideUserAgent(const String&); Inspector::Protocol::ErrorStringOr overrideSetting(Inspector::Protocol::Page::Setting, Optional&& value); @@ -3768,23 +3768,23 @@ index d2b065e13651fafe747325f02e7701fbf1e8e45e..9076ff5fa9b746f9f138231465048295 #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT) Inspector::Protocol::ErrorStringOr setForcedAppearance(Optional&&); #endif -+ Inspector::Protocol::ErrorStringOr setTimeZone(const String&) override; -+ Inspector::Protocol::ErrorStringOr setTouchEmulationEnabled(bool) override; ++ Inspector::Protocol::ErrorStringOr setTimeZone(const String&); ++ Inspector::Protocol::ErrorStringOr setTouchEmulationEnabled(bool); Inspector::Protocol::ErrorStringOr snapshotNode(Inspector::Protocol::DOM::NodeId); Inspector::Protocol::ErrorStringOr snapshotRect(int x, int y, int width, int height, Inspector::Protocol::Page::CoordinateSystem); #if ENABLE(WEB_ARCHIVE) && USE(CF) Inspector::Protocol::ErrorStringOr archive(); #endif -+ Inspector::Protocol::ErrorStringOr insertText(const String& text) override; -+ Inspector::Protocol::ErrorStringOr> accessibilitySnapshot(const String& objectId) override; -+ Inspector::Protocol::ErrorStringOr setInterceptFileChooserDialog(bool enabled) override; -+ Inspector::Protocol::ErrorStringOr setDefaultBackgroundColorOverride(RefPtr&&) override; -+ Inspector::Protocol::ErrorStringOr createUserWorld(const String&) override; -+ Inspector::Protocol::ErrorStringOr setBypassCSP(bool) override; -+ Inspector::Protocol::ErrorStringOr crash()override; -+ Inspector::Protocol::ErrorStringOr setScreenSizeOverride(int width, int height) override; -+ Inspector::Protocol::ErrorStringOr setOrientationOverride(Optional&& angle) override; ++ Inspector::Protocol::ErrorStringOr insertText(const String& text); ++ Inspector::Protocol::ErrorStringOr> accessibilitySnapshot(const String& objectId); ++ Inspector::Protocol::ErrorStringOr setInterceptFileChooserDialog(bool enabled); ++ Inspector::Protocol::ErrorStringOr setDefaultBackgroundColorOverride(RefPtr&&); ++ Inspector::Protocol::ErrorStringOr createUserWorld(const String&); ++ Inspector::Protocol::ErrorStringOr setBypassCSP(bool); ++ Inspector::Protocol::ErrorStringOr crash(); ++ Inspector::Protocol::ErrorStringOr setScreenSizeOverride(int width, int height); ++ Inspector::Protocol::ErrorStringOr setOrientationOverride(Optional&& angle); + // InspectorInstrumentation - void domContentEventFired(); @@ -11548,7 +11548,7 @@ index 04f3227cd55c992a42cd96a3f25d697aed7965a2..f0d36935f47bab03ea2ec50b70509206 diff --git a/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.cpp b/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..c09db72a276875db36077bb49f8c7d6ff7b4eb8f +index 0000000000000000000000000000000000000000..e6e700e846ea091a190b6b1f5c5636fed4389909 --- /dev/null +++ b/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.cpp @@ -0,0 +1,146 @@ @@ -11645,7 +11645,7 @@ index 0000000000000000000000000000000000000000..c09db72a276875db36077bb49f8c7d6f + }); +} + -+Protocol::ErrorStringOr WebPageInspectorEmulationAgent::setJavaScriptEnabled(bool enabled) ++Inspector::Protocol::ErrorStringOr WebPageInspectorEmulationAgent::setJavaScriptEnabled(bool enabled) +{ + auto copy = m_page.preferences().copy(); + copy->setJavaScriptEnabled(enabled); @@ -11653,7 +11653,7 @@ index 0000000000000000000000000000000000000000..c09db72a276875db36077bb49f8c7d6f + return { }; +} + -+Protocol::ErrorStringOr WebPageInspectorEmulationAgent::setAuthCredentials(const String& username, const String& password) ++Inspector::Protocol::ErrorStringOr WebPageInspectorEmulationAgent::setAuthCredentials(const String& username, const String& password) +{ + if (!!username && !!password) + m_page.setAuthCredentialsForAutomation(WebCore::Credential(username, password, CredentialPersistencePermanent)); @@ -11662,13 +11662,13 @@ index 0000000000000000000000000000000000000000..c09db72a276875db36077bb49f8c7d6f + return { }; +} + -+Protocol::ErrorStringOr WebPageInspectorEmulationAgent::setActiveAndFocused(Optional&& active) ++Inspector::Protocol::ErrorStringOr WebPageInspectorEmulationAgent::setActiveAndFocused(Optional&& active) +{ + m_page.setActiveForAutomation(WTFMove(active)); + return { }; +} + -+Protocol::ErrorStringOr WebPageInspectorEmulationAgent::grantPermissions(const String& origin, Ref&& values) ++Inspector::Protocol::ErrorStringOr WebPageInspectorEmulationAgent::grantPermissions(const String& origin, Ref&& values) +{ + HashSet set; + for (const auto& value : values.get()) { @@ -11683,7 +11683,7 @@ index 0000000000000000000000000000000000000000..c09db72a276875db36077bb49f8c7d6f + return { }; +} + -+Protocol::ErrorStringOr WebPageInspectorEmulationAgent::resetPermissions() ++Inspector::Protocol::ErrorStringOr WebPageInspectorEmulationAgent::resetPermissions() +{ + m_permissions.clear(); + m_page.setPermissionsForAutomation(m_permissions);