Changeset 239247 in webkit

Timestamp:

Dec 14, 2018 8:30:41 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Avoid creating and evaluating in the InspectorOverlay page on iOS as it is unused
​https://bugs.webkit.org/show_bug.cgi?id=192724
<rdar://problem/46745911>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2018-12-14
Reviewed by Devin Rousso.

iOS never installs the InspectorOverlay page as a page overlay.
It also uses its own node highlighting painting. Avoid any work
and resources associated with the overlay page for iOS.

• inspector/InspectorOverlay.cpp:

(WebCore::InspectorOverlay::paint):
(WebCore::InspectorOverlay::update):
(WebCore::InspectorOverlay::overlayPage):
(WebCore::evaluateCommandInOverlay):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorOverlay.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-14  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Avoid creating and evaluating in the InspectorOverlay page on iOS as it is unused
+        https://bugs.webkit.org/show_bug.cgi?id=192724
+        <rdar://problem/46745911>
+
+        Reviewed by Devin Rousso.
+
+        iOS never installs the InspectorOverlay page as a page overlay.
+        It also uses its own node highlighting painting. Avoid any work
+        and resources associated with the overlay page for iOS.
+
+        * inspector/InspectorOverlay.cpp:
+        (WebCore::InspectorOverlay::paint):
+        (WebCore::InspectorOverlay::update):
+        (WebCore::InspectorOverlay::overlayPage):
+        (WebCore::evaluateCommandInOverlay):
+
 2018-12-14  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/inspector/InspectorOverlay.cpp

@@ -181 +181 @@
         return;
 
+    Page* overlayPage = this->overlayPage();
+    if (!overlayPage)
+        return;
+
     GraphicsContextStateSaver stateSaver(context);
-    FrameView* view = overlayPage()->mainFrame().view();
+    FrameView* view = overlayPage->mainFrame().view();
 
 #if PLATFORM(MAC)
@@ -291 +295 @@
         return;
 
-    FrameView* overlayView = overlayPage()->mainFrame().view();
-    IntSize frameViewFullSize = view->sizeForVisibleContent(ScrollableArea::IncludeScrollbars);
-    overlayView->resize(frameViewFullSize);
+    Page* overlayPage = this->overlayPage();
+    if (overlayPage) {
+        FrameView* overlayView = overlayPage->mainFrame().view();
+        IntSize frameViewFullSize = view->sizeForVisibleContent(ScrollableArea::IncludeScrollbars);
+        overlayView->resize(frameViewFullSize);
+    }
 
     // Clear canvas and paint things.
@@ -310 +317 @@
 
     // Position DOM elements.
-    overlayPage()->mainFrame().document()->resolveStyle(Document::ResolveStyleType::Rebuild);
-    if (overlayView->needsLayout())
-        overlayView->layoutContext().layout();
+    if (overlayPage) {
+        overlayPage->mainFrame().document()->resolveStyle(Document::ResolveStyleType::Rebuild);
+        FrameView* overlayView = overlayPage->mainFrame().view();
+        if (overlayView->needsLayout())
+            overlayView->layoutContext().layout();
+    }
 
     forcePaint();
@@ -703 +713 @@
 Page* InspectorOverlay::overlayPage()
 {
+#if PLATFORM(IOS_FAMILY)
+    return nullptr;
+#else
     if (m_overlayPage)
         return m_overlayPage.get();
@@ -747 +760 @@
 
     return m_overlayPage.get();
+#endif
 }
 
@@ -771 +785 @@
 static void evaluateCommandInOverlay(Page* page, Ref<JSON::Array>&& command)
 {
+    if (!page)
+        return;
+
     page->mainFrame().script().evaluate(ScriptSourceCode(makeString("dispatch(", command->toJSONString(), ')')));
 }