Changeset 107366 in webkit

Timestamp:

Feb 9, 2012, 11:07:21 PM (15 years ago)

Author:

eae@chromium.org

Message:

Convert Frame/FrameView to LayoutUnits in preparation for turning on subpixel layout
​https://bugs.webkit.org/show_bug.cgi?id=78311

Reviewed by Eric Seidel.

No new tests, no new functionality.

• page/Frame.cpp:

(WebCore::Frame::nodeImage):
Pixel snap painting rect for image to ensure that it is painted aligned
to device pixels. This avoids avoid unwanted anti-aliasing.

• page/FrameView.cpp:

(WebCore::FrameView::windowClipRectForLayer):
Pixel snap clip rects as all window coordinates and sizes are exposed as
integers.

• page/GestureTapHighlighter.cpp:
• page/Page.cpp:

(WebCore::Page::addRelevantRepaintedObject):
As the painting is done aligned on pixel boundaries we need to pixel snap
the view rect when checking if it intersects the objects paint rect.

• page/mac/FrameMac.mm:

(WebCore::Frame::snapshotDragImage):
(WebCore::Frame::nodeImage):
Pixel snap painting rect for image to ensure that it is painted aligned
to device pixels. This avoids avoid unwanted anti-aliasing.

• page/win/FrameCGWin.cpp:

(WebCore::Frame::nodeImage):
Pixel snap painting rect for image to ensure that it is painted aligned
to device pixels. This avoids avoid unwanted anti-aliasing.

• rendering/LayoutTypes.h:

(WebCore::pixelSnappedIntRect):
(WebCore):
No-op implementation of pixelSnappedIntRect for now.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Frame.cpp (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• page/GestureTapHighlighter.cpp (modified) (2 diffs)
• page/Page.cpp (modified) (1 diff)
• page/mac/FrameMac.mm (modified) (3 diffs)
• page/win/FrameCGWin.cpp (modified) (1 diff)
• rendering/LayoutTypes.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-09  Emil A Eklund  <eae@chromium.org>
+
+        Convert Frame/FrameView to LayoutUnits in preparation for turning on subpixel layout
+        https://bugs.webkit.org/show_bug.cgi?id=78311
+
+        Reviewed by Eric Seidel.
+
+        No new tests, no new functionality.
+
+        * page/Frame.cpp:
+        (WebCore::Frame::nodeImage):
+        Pixel snap painting rect for image to ensure that it is painted aligned
+        to device pixels. This avoids avoid unwanted anti-aliasing.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::windowClipRectForLayer):
+        Pixel snap clip rects as all window coordinates and sizes are exposed as
+        integers.
+
+        * page/GestureTapHighlighter.cpp:
+        * page/Page.cpp:
+        (WebCore::Page::addRelevantRepaintedObject):
+        As the painting is done aligned on pixel boundaries we need to pixel snap
+        the view rect when checking if it intersects the objects paint rect.
+
+        * page/mac/FrameMac.mm:
+        (WebCore::Frame::snapshotDragImage):
+        (WebCore::Frame::nodeImage):
+        Pixel snap painting rect for image to ensure that it is painted aligned
+        to device pixels. This avoids avoid unwanted anti-aliasing.
+
+        * page/win/FrameCGWin.cpp:
+        (WebCore::Frame::nodeImage):
+        Pixel snap painting rect for image to ensure that it is painted aligned
+        to device pixels. This avoids avoid unwanted anti-aliasing.
+
+        * rendering/LayoutTypes.h:
+        (WebCore::pixelSnappedIntRect):
+        (WebCore):
+        No-op implementation of pixelSnappedIntRect for now.
+
 2012-02-09  Kenichi Ishibashi  <bashi@chromium.org>
 

trunk/Source/WebCore/page/Frame.cpp

@@ -1073 +1073 @@
 
     LayoutRect topLevelRect;
-    IntRect paintingRect = renderer->paintingRootRect(topLevelRect);
+    IntRect paintingRect = pixelSnappedIntRect(renderer->paintingRootRect(topLevelRect));
 
     OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size()));

trunk/Source/WebCore/page/FrameView.cpp

@@ -2484 +2484 @@
     IntRect clipRect;
     if (clipToLayerContents)
-        clipRect = layer->childrenClipRect();
+        clipRect = pixelSnappedIntRect(layer->childrenClipRect());
     else
-        clipRect = layer->selfClipRect();
+        clipRect = pixelSnappedIntRect(layer->selfClipRect());
     clipRect = contentsToWindow(clipRect); 
     return intersection(clipRect, windowClipRect());

trunk/Source/WebCore/page/GestureTapHighlighter.cpp

@@ -56 +56 @@
     Frame* mainFrame = containingFrame->page()->mainFrame();
 
-    LayoutPoint mainFramePoint = mainFrame->view()->rootViewToContents(containingFrame->view()->contentsToRootView(LayoutPoint()));
+    LayoutPoint mainFramePoint = mainFrame->view()->rootViewToContents(containingFrame->view()->contentsToRootView(IntPoint()));
     return mainFramePoint;
 }
@@ -96 +96 @@
 inline void shiftXEdgesToContainIfStrikes(LayoutRect& rect, const LayoutRect& other)
 {
-    int leftSide = rect.x();
-    int rightSide = rect.maxX();
+    LayoutUnit leftSide = rect.x();
+    LayoutUnit rightSide = rect.maxX();
 
     if (!other.isEmpty() && strikes(rect, other)) {

trunk/Source/WebCore/page/Page.cpp

@@ -1077 +1077 @@
     // The objects are only relevant if they are being painted within the viewRect().
     if (RenderView* view = object->view()) {
-        if (!objectPaintRect.intersects(view->viewRect()))
+        if (!objectPaintRect.intersects(pixelSnappedIntRect(view->viewRect())))
             return;
     }

trunk/Source/WebCore/page/mac/FrameMac.mm

@@ -159 +159 @@
                                         // imply new styles, plus JS could have changed other things
     LayoutRect topLevelRect;
-    NSRect paintingRect = renderer->paintingRootRect(topLevelRect);
+    NSRect paintingRect = pixelSnappedIntRect(renderer->paintingRootRect(topLevelRect));
 
     m_view->setNodeToDraw(node);              // invoke special sub-tree drawing mode
@@ -168 +168 @@
 
     if (elementRect)
-        *elementRect = topLevelRect;
+        *elementRect = pixelSnappedIntRect(topLevelRect);
     if (imageRect)
         *imageRect = paintingRect;
@@ -183 +183 @@
 
     LayoutRect topLevelRect;
-    NSRect paintingRect = renderer->paintingRootRect(topLevelRect);
+    NSRect paintingRect = pixelSnappedIntRect(renderer->paintingRootRect(topLevelRect));
 
     m_view->setNodeToDraw(node); // invoke special sub-tree drawing mode

trunk/Source/WebCore/page/win/FrameCGWin.cpp

@@ -99 +99 @@
 
     LayoutRect topLevelRect;
-    IntRect paintingRect = renderer->paintingRootRect(topLevelRect);
+    IntRect paintingRect = pixelSnappedIntRect(renderer->paintingRootRect(topLevelRect));
 
     document()->updateLayout();

trunk/Source/WebCore/rendering/LayoutTypes.h

@@ -50 +50 @@
 {
     return enclosingIntRect(rect);
+}
+
+inline IntRect pixelSnappedIntRect(const LayoutRect& rect)
+{
+    return rect;
 }