Changeset 150764 in webkit

Timestamp:

May 27, 2013 9:52:10 AM (11 years ago)

Author:

marcelo.lira@openbossa.org

Message:

[WK2][CoordinatedGraphics] Misuse of DrawingAreaProxy::setVisibleContentsRect() in WebView::updateViewportSize()
​https://bugs.webkit.org/show_bug.cgi?id=116688

Reviewed by Noam Rosenthal.

Visible contents area passed to DrawingAreaProxy::setVisibleContentsRect()
must be calculated including the page scale factor and avoid crossing the
boundaries of the page contents size. In other words the DrawingArea
must know the actual dimensions of what it being drawn. If the
DrawingArea thinks the visible rectangle is bigger than it is, the
contents will be drawn pixelated and blurry.

• UIProcess/CoordinatedGraphics/WebView.cpp:

(WebKit::WebView::didChangeContentsSize):
(WebKit::WebView::updateViewportSize):
(WebKit::WebView::visibleContentsSize):
(WebKit):

• UIProcess/CoordinatedGraphics/WebView.h:

(WebKit::WebView::contentsSize):
(WebView):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/CoordinatedGraphics/WebView.cpp (modified) (3 diffs)
• UIProcess/CoordinatedGraphics/WebView.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-05-27  Marcelo Lira  <marcelo.lira@openbossa.org>
+
+        [WK2][CoordinatedGraphics] Misuse of DrawingAreaProxy::setVisibleContentsRect() in WebView::updateViewportSize()
+        https://bugs.webkit.org/show_bug.cgi?id=116688
+
+        Reviewed by Noam Rosenthal.
+
+        Visible contents area passed to DrawingAreaProxy::setVisibleContentsRect()
+        must be calculated including the page scale factor and avoid crossing the
+        boundaries of the page contents size. In other words the DrawingArea
+        must know the actual dimensions of what it being drawn. If the
+        DrawingArea thinks the visible rectangle is bigger than it is, the
+        contents will be drawn pixelated and blurry.
+
+        * UIProcess/CoordinatedGraphics/WebView.cpp:
+        (WebKit::WebView::didChangeContentsSize):
+        (WebKit::WebView::updateViewportSize):
+        (WebKit::WebView::visibleContentsSize):
+        (WebKit):
+        * UIProcess/CoordinatedGraphics/WebView.h:
+        (WebKit::WebView::contentsSize):
+        (WebView):
+
 2013-05-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp

@@ -187 +187 @@
 void WebView::didChangeContentsSize(const WebCore::IntSize& size)
 {
+    m_contentsSize = size;
     m_client.didChangeContentsSize(this, size);
 }
@@ -225 +226 @@
         // Web Process expects sizes in UI units, and not raw device units.
         drawingArea->setSize(roundedIntSize(dipSize()), IntSize(), IntSize());
-        drawingArea->setVisibleContentsRect(FloatRect(contentPosition(), dipSize()), FloatPoint());
+        FloatRect visibleContentsRect(contentPosition(), visibleContentsSize());
+        visibleContentsRect.intersect(FloatRect(FloatPoint(), contentsSize()));
+        drawingArea->setVisibleContentsRect(visibleContentsRect, FloatPoint());
     }
 }
@@ -235 +238 @@
 
     return dipSize;
+}
+
+WebCore::FloatSize WebView::visibleContentsSize() const
+{
+    FloatSize visibleContentsSize(dipSize());
+    visibleContentsSize.scale(1 / m_contentScaleFactor);
+
+    return visibleContentsSize;
 }
 

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h

@@ -98 +98 @@
 
     void didChangeContentsSize(const WebCore::IntSize&);
+    const WebCore::IntSize& contentsSize() const { return m_contentsSize; }
+    WebCore::FloatSize visibleContentsSize() const;
 
     // FIXME: Should become private when Web Events creation is moved to WebView.
@@ -196 +198 @@
     double m_opacity;
     WebCore::FloatPoint m_contentPosition; // Position in UI units.
+    WebCore::IntSize m_contentsSize;
 };