[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

apavlov at chromium.org apavlov at chromium.org
Fri Jan 21 14:45:45 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit a7e9f758ad816e667ac243a09d969be20a24db8b
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 29 18:01:39 2010 +0000

    2010-12-29  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: Element highlight tooltip displays wrong element size when zoomed in
            https://bugs.webkit.org/show_bug.cgi?id=51703
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::drawElementTitle):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74745 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 90317e2..fef3b45 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-29  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Element highlight tooltip displays wrong element size when zoomed in
+        https://bugs.webkit.org/show_bug.cgi?id=51703
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::drawElementTitle):
+
 2010-12-29  Yael Aharon  <yael.aharon at nokia.com>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 8355cdf..8b08598 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -1716,10 +1716,12 @@ void InspectorController::drawElementTitle(GraphicsContext& context, const IntRe
             }
         }
     }
+
+    Element* highlightedElement = m_highlightedNode->isElementNode() ? static_cast<Element*>(m_highlightedNode.get()) : 0;
     nodeTitle += " [";
-    nodeTitle += String::number(boundingBox.width());
+    nodeTitle += String::number(highlightedElement ? highlightedElement->offsetWidth() : boundingBox.width());
     nodeTitle.append(static_cast<UChar>(0x00D7)); // &times;
-    nodeTitle += String::number(boundingBox.height());
+    nodeTitle += String::number(highlightedElement ? highlightedElement->offsetHeight() : boundingBox.height());
     nodeTitle += "]";
 
     FontDescription desc;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list