Title: [192809] trunk/Source/WebKit2
Revision
192809
Author
bb...@apple.com
Date
2015-11-30 11:25:12 -0800 (Mon, 30 Nov 2015)

Log Message

Web Inspector: using "Reload Web Inspector" when docked breaks dock-specific styles
https://bugs.webkit.org/show_bug.cgi?id=151642

Reviewed by Timothy Hatcher.

After a frontend loads, explicitly tell it about the current dock
state. This is necessary for force-reloading the inspector, since
the dock state isn't sent from UIProcess in this case.

* WebProcess/WebPage/WebInspectorUI.cpp:
(WebKit::WebInspectorUI::frontendLoaded):
(WebKit::WebInspectorUI::setDockingUnavailable):
* WebProcess/WebPage/WebInspectorUI.h:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (192808 => 192809)


--- trunk/Source/WebKit2/ChangeLog	2015-11-30 19:11:09 UTC (rev 192808)
+++ trunk/Source/WebKit2/ChangeLog	2015-11-30 19:25:12 UTC (rev 192809)
@@ -1,3 +1,19 @@
+2015-11-30  Brian Burg  <bb...@apple.com>
+
+        Web Inspector: using "Reload Web Inspector" when docked breaks dock-specific styles
+        https://bugs.webkit.org/show_bug.cgi?id=151642
+
+        Reviewed by Timothy Hatcher.
+
+        After a frontend loads, explicitly tell it about the current dock
+        state. This is necessary for force-reloading the inspector, since
+        the dock state isn't sent from UIProcess in this case.
+
+        * WebProcess/WebPage/WebInspectorUI.cpp:
+        (WebKit::WebInspectorUI::frontendLoaded):
+        (WebKit::WebInspectorUI::setDockingUnavailable):
+        * WebProcess/WebPage/WebInspectorUI.h:
+
 2015-11-30  Alex Christensen  <achristen...@webkit.org>
 
         Make ProcessModel always MultipleSecondaryProcesses

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp (192808 => 192809)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp	2015-11-30 19:11:09 UTC (rev 192808)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp	2015-11-30 19:25:12 UTC (rev 192809)
@@ -91,6 +91,11 @@
 {
     m_frontendAPIDispatcher.frontendLoaded();
 
+    // Tell the new frontend about the current dock state. If the window object
+    // cleared due to a reload, the dock state won't be resent from UIProcess.
+    setDockingUnavailable(m_dockingUnavailable);
+    setDockSide(m_dockSide);
+
     bringToFront();
 }
 
@@ -169,6 +174,7 @@
 void WebInspectorUI::setDockingUnavailable(bool unavailable)
 {
     m_frontendAPIDispatcher.dispatchCommand(ASCIILiteral("setDockingUnavailable"), unavailable);
+    m_dockingUnavailable = unavailable;
 }
 
 void WebInspectorUI::changeAttachedWindowHeight(unsigned height)

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h (192808 => 192809)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h	2015-11-30 19:11:09 UTC (rev 192808)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h	2015-11-30 19:25:12 UTC (rev 192809)
@@ -120,6 +120,7 @@
 
     uint64_t m_inspectedPageIdentifier { 0 };
     bool m_underTest { false };
+    bool m_dockingUnavailable { false };
     DockSide m_dockSide { DockSide::Undocked };
     unsigned m_inspectionLevel { 1 };
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to