Changeset 194210 in webkit

Timestamp:

Dec 16, 2015 10:56:55 PM (8 years ago)

Author:

Simon Fraser

Message:

Fix the debug region overlays for RTL documents
​https://bugs.webkit.org/show_bug.cgi?id=152372

Reviewed by Darin Adler.

Fix document overlays to use document coordinates when painting, which requires
translating the CTM, and counter-translating the dirtyRect by the scroll origin.
This is only non-zero for RTL documents.

While doing this, I noticed that the scroll origin was misplaced by the scrollbar
width when using overlay scrollbars. Fix by using occupiedWidth/Height() in
ScrollView::updateScrollbars(). I was not able to make a test for this change.

• page/FrameView.cpp:

(WebCore::FrameView::adjustViewSize):

• page/PageOverlay.cpp:

(WebCore::PageOverlay::drawRect):

• platform/ScrollView.cpp:

(WebCore::ScrollView::updateScrollbars):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• page/PageOverlay.cpp (modified) (1 diff)
• platform/ScrollView.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix the debug region overlays for RTL documents
+        https://bugs.webkit.org/show_bug.cgi?id=152372
+
+        Reviewed by Darin Adler.
+        
+        Fix document overlays to use document coordinates when painting, which requires
+        translating the CTM, and counter-translating the dirtyRect by the scroll origin.
+        This is only non-zero for RTL documents.
+        
+        While doing this, I noticed that the scroll origin was misplaced by the scrollbar
+        width when using overlay scrollbars. Fix by using occupiedWidth/Height() in
+        ScrollView::updateScrollbars(). I was not able to make a test for this change.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::adjustViewSize):
+        * page/PageOverlay.cpp:
+        (WebCore::PageOverlay::drawRect):
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::updateScrollbars):
+
 2015-12-16  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -642 +642 @@
     ScrollView::setScrollOrigin(IntPoint(-rect.x(), -rect.y()), !frame().document()->printing(), size == contentsSize());
 
-    LOG(Layout, "FrameView %p adjustViewSize: unscaled document size changed to %dx%d (scaled to %dx%d)", this, renderView->unscaledDocumentRect().width(), renderView->unscaledDocumentRect().height(), size.width(), size.height());
+    LOG_WITH_STREAM(Layout, stream << "FrameView " << this << " adjustViewSize: unscaled document rect changed to " << renderView->unscaledDocumentRect() << " (scaled to " << size << ")");
 
     setContentsSize(size);

trunk/Source/WebCore/page/PageOverlay.cpp

@@ -179 +179 @@
 
     GraphicsContextStateSaver stateSaver(graphicsContext);
+
+    if (m_overlayType == PageOverlay::OverlayType::Document) {
+        if (FrameView* frameView = m_page->mainFrame().view()) {
+            auto offset = frameView->scrollOrigin();
+            graphicsContext.translate(toFloatSize(offset));
+            paintRect.moveBy(-offset);
+        }
+    }
+
     m_client.drawRect(*this, graphicsContext, paintRect);
 }

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -660 +660 @@
         if (hasHorizontalScrollbar != newHasHorizontalScrollbar && (hasHorizontalScrollbar || !avoidScrollbarCreation())) {
             if (scrollOrigin().y() && !newHasHorizontalScrollbar)
-                ScrollableArea::setScrollOrigin(IntPoint(scrollOrigin().x(), scrollOrigin().y() - m_horizontalScrollbar->height()));
+                ScrollableArea::setScrollOrigin(IntPoint(scrollOrigin().x(), scrollOrigin().y() - m_horizontalScrollbar->occupiedHeight()));
             if (m_horizontalScrollbar)
                 m_horizontalScrollbar->invalidate();
@@ -673 +673 @@
         if (hasVerticalScrollbar != newHasVerticalScrollbar && (hasVerticalScrollbar || !avoidScrollbarCreation())) {
             if (scrollOrigin().x() && !newHasVerticalScrollbar)
-                ScrollableArea::setScrollOrigin(IntPoint(scrollOrigin().x() - m_verticalScrollbar->width(), scrollOrigin().y()));
+                ScrollableArea::setScrollOrigin(IntPoint(scrollOrigin().x() - m_verticalScrollbar->occupiedWidth(), scrollOrigin().y()));
             if (m_verticalScrollbar)
                 m_verticalScrollbar->invalidate();