[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 13:17:18 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 0e881294fa1aba4a75ffe861696dd21fa46f54a6
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 10:18:08 2010 +0000

    2010-09-09  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Joseph Pecoraro.
    
            WebInspector: Selecting 'inspect element' always shows body in inspector instead of clicked element.
    
            1. Open any page
            2. Right-click on any element, select "Inspect Element"
            3. Web Inspector is opened but the <body> element (for HTML) is focused rather than the selected element
            4. Inspect the Web Inspector. An error message is logged in the console.
    
            The regression was introduced in http://trac.webkit.org/changeset/66012 - focusNode() is invoked in
            InspectorController::populateScriptObjects() before the main document is set for the InspectorDOMAgent
            instance (which makes focusNode() bail out prematurely).
    
            https://bugs.webkit.org/show_bug.cgi?id=45374
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::populateScriptObjects):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67185 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 728e553..603d42c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-09-09  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Joseph Pecoraro.
+
+        WebInspector: Selecting 'inspect element' always shows body in inspector instead of clicked element.
+
+        1. Open any page
+        2. Right-click on any element, select "Inspect Element"
+        3. Web Inspector is opened but the <body> element (for HTML) is focused rather than the selected element
+        4. Inspect the Web Inspector. An error message is logged in the console.
+
+        The regression was introduced in http://trac.webkit.org/changeset/66012 - focusNode() is invoked in
+        InspectorController::populateScriptObjects() before the main document is set for the InspectorDOMAgent
+        instance (which makes focusNode() bail out prematurely).
+
+        https://bugs.webkit.org/show_bug.cgi?id=45374
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::populateScriptObjects):
+
 2010-09-10  Cris Neckar  <cdn at chromium.org>
 
         Reviewed by Chris Fleizach.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 1e131f7..8695758 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -604,8 +604,7 @@ void InspectorController::populateScriptObjects()
 
     if (m_showAfterVisible == lastActivePanel)
         m_showAfterVisible = setting(lastActivePanel);
-    if (m_nodeToFocus)
-        focusNode();
+
     showPanel(m_showAfterVisible);
 
     if (m_resourceTrackingEnabled)
@@ -628,6 +627,9 @@ void InspectorController::populateScriptObjects()
 
     m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
 
+    if (m_nodeToFocus)
+        focusNode();
+
     if (m_expiredConsoleMessageCount)
         m_frontend->updateConsoleMessageExpiredCount(m_expiredConsoleMessageCount);
     unsigned messageCount = m_consoleMessages.size();

-- 
WebKit Debian packaging

