Changeset 111243 in webkit

Timestamp:

Mar 19, 2012 2:05:07 PM (12 years ago)

Author:

eae@chromium.org

Message:

Correct usage of LayoutUnits in page code in preparation for turning on subpixel layout
​https://bugs.webkit.org/show_bug.cgi?id=81538

Reviewed by Eric Seidel.

Fix usage of LayoutUnits and conversions between types in page code.

No new tests.

• page/DOMWindow.cpp:

(WebCore::DOMWindow::innerHeight):
(WebCore::DOMWindow::innerWidth):
Explicitly cast long to int. InspectorInstrumentation requires a long and
FractionalLayoutUnit has no constructor that takes long.

• page/EventHandler.cpp:

(WebCore::EventHandler::sendContextMenuEventForKey):
Pixel snap overflow rect as selection rects are integer based.

• page/FrameView.cpp:

(WebCore::FrameView::scrollContentsFastPath):
Pixel snap repaint rects when computing update rect as all scrolling is
done on integer bounds.

• page/GestureTapHighlighter.cpp:

Change rects vector to IntRect as addFocusRingRects operates on IntRects.

• page/Page.cpp:

(WebCore::Page::addRelevantRepaintedObject):
(WebCore::Page::addRelevantUnpaintedObject):
Change paint methods to take a LayoutRect paint rect.

• page/SpatialNavigation.cpp:

(WebCore::distanceDataForNode):
Change distance calculation to use floats instead of converting to float
at the end.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DOMWindow.cpp (modified) (2 diffs)
• page/EventHandler.cpp (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• page/GestureTapHighlighter.cpp (modified) (1 diff)
• page/Page.cpp (modified) (4 diffs)
• page/Page.h (modified) (1 diff)
• page/SpatialNavigation.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-19  Emil A Eklund  <eae@chromium.org>
+
+        Correct usage of LayoutUnits in page code in preparation for turning on subpixel layout
+        https://bugs.webkit.org/show_bug.cgi?id=81538
+
+        Reviewed by Eric Seidel.
+
+        Fix usage of LayoutUnits and conversions between types in page code.
+
+        No new tests.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::innerHeight):
+        (WebCore::DOMWindow::innerWidth):
+        Explicitly cast long to int. InspectorInstrumentation requires a long and
+        FractionalLayoutUnit has no constructor that takes long.
+        
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::sendContextMenuEventForKey):
+        Pixel snap overflow rect as selection rects are integer based.
+        
+        * page/FrameView.cpp:
+        (WebCore::FrameView::scrollContentsFastPath):
+        Pixel snap repaint rects when computing update rect as all scrolling is
+        done on integer bounds.
+        
+        * page/GestureTapHighlighter.cpp:
+        Change rects vector to IntRect as addFocusRingRects operates on IntRects.
+        
+        * page/Page.cpp:
+        (WebCore::Page::addRelevantRepaintedObject):
+        (WebCore::Page::addRelevantUnpaintedObject):
+        Change paint methods to take a LayoutRect paint rect.
+        
+        * page/SpatialNavigation.cpp:
+        (WebCore::distanceDataForNode):
+        Change distance calculation to use floats instead of converting to float
+        at the end.
+
 2012-03-19  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1136 +1136 @@
     long height = view->visibleContentRect(/* includeScrollbars */ true).height();
     InspectorInstrumentation::applyScreenHeightOverride(m_frame, &height);
-    return view->mapFromLayoutToCSSUnits(height);
+    return view->mapFromLayoutToCSSUnits(static_cast<int>(height));
 }
 
@@ -1150 +1150 @@
     long width = view->visibleContentRect(/* includeScrollbars */ true).width();
     InspectorInstrumentation::applyScreenWidthOverride(m_frame, &width);
-    return view->mapFromLayoutToCSSUnits(width);
+    return view->mapFromLayoutToCSSUnits(static_cast<int>(width));
 }
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2536 +2536 @@
         if (!box)
             return false;
-        IntRect clippedRect = box->absoluteClippedOverflowRect();
+        IntRect clippedRect = box->pixelSnappedAbsoluteClippedOverflowRect();
         location = IntPoint(clippedRect.x(), clippedRect.maxY() - 1);
     } else {

trunk/Source/WebCore/page/FrameView.cpp

@@ -1457 +1457 @@
             continue;
 #endif
-        IntRect updateRect = renderBox->layer()->repaintRectIncludingDescendants();
+        IntRect updateRect = pixelSnappedIntRect(renderBox->layer()->repaintRectIncludingDescendants());
         updateRect = contentsToRootView(updateRect);
         if (!isCompositedContentLayer && clipsRepaints())

trunk/Source/WebCore/page/GestureTapHighlighter.cpp

@@ -139 +139 @@
     Path path;
 
-    Vector<LayoutRect> rects;
+    Vector<IntRect> rects;
     o->addFocusRingRects(rects, /* acc. offset */ ownerFrameToMainFrameOffset(o));
 

trunk/Source/WebCore/page/Page.cpp

@@ -1042 +1042 @@
 }
 
-void Page::addRelevantRepaintedObject(RenderObject* object, const IntRect& objectPaintRect)
+void Page::addRelevantRepaintedObject(RenderObject* object, const LayoutRect& objectPaintRect)
 {
     if (!isCountingRelevantRepaintedObjects())
@@ -1053 +1053 @@
     }
 
+    IntRect snappedPaintRect = pixelSnappedIntRect(objectPaintRect);
+
     // If this object was previously counted as an unpainted object, remove it from that HashSet
     // and corresponding Region. FIXME: This doesn't do the right thing if the objects overlap.
     if (m_relevantUnpaintedRenderObjects.contains(object)) {
         m_relevantUnpaintedRenderObjects.remove(object);
-        m_relevantUnpaintedRegion.subtract(objectPaintRect);
-    }
-
-    m_relevantPaintedRegion.unite(objectPaintRect);
+        m_relevantUnpaintedRegion.subtract(snappedPaintRect);
+    }
+
+    m_relevantPaintedRegion.unite(snappedPaintRect);
 
     RenderView* view = object->view();
@@ -1078 +1080 @@
 }
 
-void Page::addRelevantUnpaintedObject(RenderObject* object, const IntRect& objectPaintRect)
+void Page::addRelevantUnpaintedObject(RenderObject* object, const LayoutRect& objectPaintRect)
 {
     if (!isCountingRelevantRepaintedObjects())
@@ -1090 +1092 @@
 
     m_relevantUnpaintedRenderObjects.add(object);
-    m_relevantUnpaintedRegion.unite(objectPaintRect);
+    m_relevantUnpaintedRegion.unite(pixelSnappedIntRect(objectPaintRect));
 }
 

trunk/Source/WebCore/page/Page.h

@@ -326 +326 @@
         void startCountingRelevantRepaintedObjects();
         void resetRelevantPaintedObjectCounter();
-        void addRelevantRepaintedObject(RenderObject*, const IntRect& objectPaintRect);
-        void addRelevantUnpaintedObject(RenderObject*, const IntRect& objectPaintRect);
+        void addRelevantRepaintedObject(RenderObject*, const LayoutRect& objectPaintRect);
+        void addRelevantUnpaintedObject(RenderObject*, const LayoutRect& objectPaintRect);
 
         void suspendActiveDOMObjectsAndAnimations();

trunk/Source/WebCore/page/SpatialNavigation.cpp

@@ -665 +665 @@
     }
 
-    LayoutUnit x = (entryPoint.x() - exitPoint.x()) * (entryPoint.x() - exitPoint.x());
-    LayoutUnit y = (entryPoint.y() - exitPoint.y()) * (entryPoint.y() - exitPoint.y());
-
-    float euclidianDistance = sqrt((x + y) * 1.0f);
+    float x = (entryPoint.x() - exitPoint.x()) * (entryPoint.x() - exitPoint.x());
+    float y = (entryPoint.y() - exitPoint.y()) * (entryPoint.y() - exitPoint.y());
+
+    float euclidianDistance = sqrt(x + y);
 
     // Loosely based on http://www.w3.org/TR/WICD/#focus-handling