Changeset 113471 in webkit

Timestamp:

Apr 6, 2012 11:55:54 AM (12 years ago)

Author:

eae@chromium.org

Message:

Fix LayoutUnit usage and rounding in RenderBlock and RenderEmbeddedObject
​https://bugs.webkit.org/show_bug.cgi?id=83343

Reviewed by Eric Seidel.

Fix usage of LayoutUnits and rounding/pixel snapping in RenderBlock and
RenderEmbeddedObject in preparation for turing on subpixel support.

No new tests, no change in functionality.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::baselinePosition):

• rendering/RenderEmbeddedObject.cpp:

(WebCore::RenderEmbeddedObject::nodeAtPoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderEmbeddedObject.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-06  Emil A Eklund  <eae@chromium.org>
+
+        Fix LayoutUnit usage and rounding in RenderBlock and RenderEmbeddedObject
+        https://bugs.webkit.org/show_bug.cgi?id=83343
+
+        Reviewed by Eric Seidel.
+
+        Fix usage of LayoutUnits and rounding/pixel snapping in RenderBlock and
+        RenderEmbeddedObject in preparation for turing on subpixel support.
+
+        No new tests, no change in functionality.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::baselinePosition):
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::RenderEmbeddedObject::nodeAtPoint):
+
 2012-04-06  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -5917 +5917 @@
             : (layer()->horizontalScrollbar() || layer()->scrollXOffset() != 0)))) || (isWritingModeRoot() && !isRubyRun());
         
-        int baselinePos = ignoreBaseline ? LayoutUnit(-1) : lastLineBoxBaseline();
+        LayoutUnit baselinePos = ignoreBaseline ? static_cast<LayoutUnit>(-1) : lastLineBoxBaseline();
         
-        int bottomOfContent = direction == HorizontalLine ? borderTop() + paddingTop() + contentHeight() : borderRight() + paddingRight() + contentWidth();
+        LayoutUnit bottomOfContent = direction == HorizontalLine ? borderTop() + paddingTop() + contentHeight() : borderRight() + paddingRight() + contentWidth();
         if (baselinePos != -1 && baselinePos <= bottomOfContent)
             return direction == HorizontalLine ? marginTop() + baselinePos : marginRight() + baselinePos;

trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

@@ -262 +262 @@
 
     PluginViewBase* view = static_cast<PluginViewBase*>(widget());
+    IntPoint roundedPoint = roundedIntPoint(pointInContainer);
 
     if (Scrollbar* horizontalScrollbar = view->horizontalScrollbar()) {
-        if (horizontalScrollbar->shouldParticipateInHitTesting() && horizontalScrollbar->frameRect().contains(pointInContainer)) {
+        if (horizontalScrollbar->shouldParticipateInHitTesting() && horizontalScrollbar->frameRect().contains(roundedPoint)) {
             result.setScrollbar(horizontalScrollbar);
             return true;
@@ -271 +272 @@
 
     if (Scrollbar* verticalScrollbar = view->verticalScrollbar()) {
-        if (verticalScrollbar->shouldParticipateInHitTesting() && verticalScrollbar->frameRect().contains(pointInContainer)) {
+        if (verticalScrollbar->shouldParticipateInHitTesting() && verticalScrollbar->frameRect().contains(roundedPoint)) {
             result.setScrollbar(verticalScrollbar);
             return true;