[webkit-changes] [135785] branches/safari-536.28-branch/Source

Mon, 26 Nov 2012 15:56:01 -0800

Title: [135785] branches/safari-536.28-branch/Source

Diff

Modified: branches/safari-536.28-branch/Source/WebCore/ChangeLog (135784 => 135785)


--- branches/safari-536.28-branch/Source/WebCore/ChangeLog	2012-11-26 23:57:29 UTC (rev 135784)
+++ branches/safari-536.28-branch/Source/WebCore/ChangeLog	2012-11-26 23:57:43 UTC (rev 135785)
@@ -1,3 +1,23 @@
+2012-11-26  Lucas Forschler  <lforsch...@apple.com>
+
+        Merge r134327
+
+    2012-11-12  Roger Fong  <roger_f...@apple.com>
+
+            Web Inspector: Fix docking behaviour on Windows.
+            https://bugs.webkit.org/show_bug.cgi?id=101978
+
+            Reviewed by Brian Weinstein.
+
+            There are a number of problems with docking behaviour on Windows.
+            For starters, it does not ever constrain the inspector's size properly while docked.
+            It also does not properly set the whether or not the inspector can be docked/undocked.
+            This patch fixes both issues.
+
+            * inspector/InspectorFrontendClientLocal.cpp:
+            (WebCore::InspectorFrontendClientLocal::frontendLoaded):
+            Switch order of calling bringToFront and setDockingUnavailable.
+
 2012-11-26  Simon Fraser  <simon.fra...@apple.com>
 
         <rdar://problem/12751360>

Modified: branches/safari-536.28-branch/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp (135784 => 135785)


--- branches/safari-536.28-branch/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp	2012-11-26 23:57:29 UTC (rev 135784)
+++ branches/safari-536.28-branch/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp	2012-11-26 23:57:43 UTC (rev 135785)
@@ -140,8 +140,11 @@
 
 void InspectorFrontendClientLocal::frontendLoaded()
 {
+    // Call setDockingUnavailable before bringToFront. If we display the inspector window via bringToFront first it causes the call to canAttachWindow to return the wrong result on Windows.
+    // Calling bringToFront first causes the visibleHeight of the inspected page to always return 0 immediately after. 
+    // Thus if we call canAttachWindow first we can avoid this problem. This change does not cause any regressions on Mac.
+    setDockingUnavailable(!canAttachWindow());
     bringToFront();
-    setDockingUnavailable(!canAttachWindow());
     m_frontendLoaded = true;
     for (Vector<String>::iterator it = m_evaluateOnLoad.begin(); it != m_evaluateOnLoad.end(); ++it)
         evaluateOnLoad(*it);

Modified: branches/safari-536.28-branch/Source/WebKit/win/ChangeLog (135784 => 135785)


--- branches/safari-536.28-branch/Source/WebKit/win/ChangeLog	2012-11-26 23:57:29 UTC (rev 135784)
+++ branches/safari-536.28-branch/Source/WebKit/win/ChangeLog	2012-11-26 23:57:43 UTC (rev 135785)
@@ -1,3 +1,25 @@
+2012-11-26  Lucas Forschler  <lforsch...@apple.com>
+
+        Merge r134327
+
+    2012-11-12  Roger Fong  <roger_f...@apple.com>
+
+            Web Inspector: Fix docking behaviour on Windows.
+            https://bugs.webkit.org/show_bug.cgi?id=101978
+
+            Reviewed by Brian Weinstein.
+
+            There are a number of problems with docking behaviour on Windows.
+            For starters, it does not ever constrain the inspector's size properly while docked.
+            It also does not properly set the whether or not the inspector can be docked/undocked.
+            This patch fixes both issues.
+
+            * WebCoreSupport/WebInspectorClient.cpp:
+            (WebInspectorFrontendClient::frontendLoaded): 
+            (WebInspectorFrontendClient::attachWindow):
+            Call restoreAttachedWindowHeight so that when first loading or reattaching the inspector,
+            we resize the inspector window properly.
+
 2012-08-02  Lucas Forschler  <lforsch...@apple.com>
 
     Merge 122676

Modified: branches/safari-536.28-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp (135784 => 135785)


--- branches/safari-536.28-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp	2012-11-26 23:57:29 UTC (rev 135784)
+++ branches/safari-536.28-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp	2012-11-26 23:57:43 UTC (rev 135785)
@@ -253,6 +253,9 @@
 {
     InspectorFrontendClientLocal::frontendLoaded();
 
+    if (m_attached)
+        restoreAttachedWindowHeight();
+
     setAttachedWindow(m_attached);
 }
 
@@ -289,6 +292,13 @@
     m_inspectorClient->setInspectorStartsAttached(true);
 
     closeWindowWithoutNotifications();
+    // We need to set the attached window's height before we actually attach the window.
+    // Make sure that m_attached is true so that calling setAttachedWindowHeight from restoreAttachedWindowHeight doesn't return early. 
+    m_attached = true;
+    // Immediately after calling showWindowWithoutNotifications(), the parent frameview's visibleHeight incorrectly returns 0 always (Windows only).
+    // We are expecting this value to be just the height of the parent window when we call restoreAttachedWindowHeight, which it is before
+    // calling showWindowWithoutNotifications().
+    restoreAttachedWindowHeight();
     showWindowWithoutNotifications();
 }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to