[webkit-changes] [112471] branches/subpixellayout/Source

[eae]

Title: [112471] branches/subpixellayout/Source

Revision

112471

Author

e...@chromium.org

Date

2012-03-28 16:29:05 -0700 (Wed, 28 Mar 2012)

Log Message

Add Node::pixelSnappedRenderRect on subpixel branch.

Modified Paths

• branches/subpixellayout/Source/WebCore/dom/Node.h
• branches/subpixellayout/Source/WebKit/mac/DOM/WebDOMOperations.mm
• branches/subpixellayout/Source/WebKit/win/AccessibleBase.cpp
• branches/subpixellayout/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp

Diff

Modified: branches/subpixellayout/Source/WebCore/dom/Node.h (112470 => 112471)

--- branches/subpixellayout/Source/WebCore/dom/Node.h	2012-03-28 23:26:32 UTC (rev 112470)
+++ branches/subpixellayout/Source/WebCore/dom/Node.h	2012-03-28 23:29:05 UTC (rev 112471)
@@ -377,6 +377,7 @@
     virtual LayoutRect getRect() const;
     IntRect getPixelSnappedRect() const { return pixelSnappedIntRect(getRect()); }
     LayoutRect renderRect(bool* isReplaced);
+    IntRect pixelSnappedRenderRect(bool* isReplaced) { return pixelSnappedIntRect(renderRect(isReplaced)); }
 
     // Returns true if the node has a non-empty bounding box in layout.
     // This does not 100% guarantee the user can see it, but is pretty close.

Modified: branches/subpixellayout/Source/WebKit/mac/DOM/WebDOMOperations.mm (112470 => 112471)

--- branches/subpixellayout/Source/WebKit/mac/DOM/WebDOMOperations.mm	2012-03-28 23:26:32 UTC (rev 112470)
+++ branches/subpixellayout/Source/WebKit/mac/DOM/WebDOMOperations.mm	2012-03-28 23:29:05 UTC (rev 112471)
@@ -131,7 +131,7 @@
 
 - (NSRect)_renderRect:(bool *)isReplaced
 {
-    return NSRect(FloatRect(core(self)->renderRect(isReplaced)));
+    return NSRect(core(self)->pixelSnappedRenderRect(isReplaced));
 }
 
 @end

Modified: branches/subpixellayout/Source/WebKit/win/AccessibleBase.cpp (112470 => 112471)

--- branches/subpixellayout/Source/WebKit/win/AccessibleBase.cpp	2012-03-28 23:26:32 UTC (rev 112470)
+++ branches/subpixellayout/Source/WebKit/win/AccessibleBase.cpp	2012-03-28 23:29:05 UTC (rev 112471)
@@ -498,8 +498,7 @@
     if (!childObj->documentFrameView())
         return E_FAIL;
 
-    IntRect rect = pixelSnappedIntRect(childObj->elementRect());
-    IntRect screenRect(childObj->documentFrameView()->contentsToScreen(rect));
+    IntRect screenRect(childObj->documentFrameView()->contentsToScreen(pixelSnappedIntRect(childObj->elementRect())));
     *left = screenRect.x();
     *top = screenRect.y();
     *width = screenRect.width();

Modified: branches/subpixellayout/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp (112470 => 112471)

--- branches/subpixellayout/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp	2012-03-28 23:26:32 UTC (rev 112470)
+++ branches/subpixellayout/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp	2012-03-28 23:29:05 UTC (rev 112471)
@@ -114,7 +114,7 @@
     
 IntRect InjectedBundleNodeHandle::renderRect(bool* isReplaced) const
 {
-    return pixelSnappedIntRect(m_node.get()->renderRect(isReplaced));
+    return m_node.get()->pixelSnappedRenderRect(isReplaced);
 }
 
 void InjectedBundleNodeHandle::setHTMLInputElementValueForUser(const String& value)

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