Changeset 87949 in webkit

Timestamp:

Jun 2, 2011 1:20:34 PM (13 years ago)

Author:

alokp@chromium.org

Message:

2011-06-02 Alok Priyadarshi <​alokp@chromium.org>

Reviewed by James Robinson.

[chromium] Things jump around when selecting anything on the page
​https://bugs.webkit.org/show_bug.cgi?id=61639

WebCore::LayerTextureUpdaterSkPicture::updateTextureRect was not updating a tile sub-region properly.
It did not consider dest-rect when selecting the clip and translation required to draw the content-rect into dest-rect.
Also removed clearing of framebuffer because it used to clear the whole tile not just dest-rect.
An appropriate viewport could be set to just clear the dest-rect, but it was debug only code and I did not want to mess
with the viewport set by skia.

No new tests. This case should be covered by most of the layout tests (pixel) targeting selection or hovering when chromium is run in compositing mode.
Here is a non-exhaustive list of existing tests covering this case.
Test: editing/selection/14971.html (existing)

editing/selection/3690703-2.html (existing)
editing/selection/4402375.html (existing)
editing/selection/4818145.html (existing)

• platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp: (WebCore::LayerTextureUpdaterSkPicture::updateTextureRect): (WebCore::LayerTextureUpdaterSkPicture::createFrameBuffer):
• platform/graphics/chromium/LayerTextureUpdaterCanvas.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp (modified) (3 diffs)
• platform/graphics/chromium/LayerTextureUpdaterCanvas.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-02  Alok Priyadarshi  <alokp@chromium.org>
+
+        Reviewed by James Robinson.
+
+        [chromium] Things jump around when selecting anything on the page
+        https://bugs.webkit.org/show_bug.cgi?id=61639
+
+        WebCore::LayerTextureUpdaterSkPicture::updateTextureRect was not updating a tile sub-region properly.
+        It did not consider dest-rect when selecting the clip and translation required to draw the content-rect into dest-rect.
+        Also removed clearing of framebuffer because it used to clear the whole tile not just dest-rect.
+        An appropriate viewport could be set to just clear the dest-rect, but it was debug only code and I did not want to mess
+        with the viewport set by skia.
+
+        No new tests. This case should be covered by most of the layout tests (pixel) targeting selection or hovering when chromium is run in compositing mode.
+        Here is a non-exhaustive list of existing tests covering this case.
+        Test: editing/selection/14971.html (existing)
+              editing/selection/3690703-2.html (existing)
+              editing/selection/4402375.html (existing)
+              editing/selection/4818145.html (existing)
+
+        * platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp:
+        (WebCore::LayerTextureUpdaterSkPicture::updateTextureRect):
+        (WebCore::LayerTextureUpdaterSkPicture::createFrameBuffer):
+        * platform/graphics/chromium/LayerTextureUpdaterCanvas.h:
+
 2011-06-02  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp

@@ -138 +138 @@
     ASSERT(context()->checkFramebufferStatus(GraphicsContext3D::FRAMEBUFFER) == GraphicsContext3D::FRAMEBUFFER_COMPLETE);
 
-    context()->viewport(0, 0, m_bufferSize.width(), m_bufferSize.height());
-    clearFrameBuffer();
-
     // Notify SKIA to sync its internal GL state.
     m_skiaContext->resetContext();
-    // Offset from source rectangle to this destination rectangle.
-    IntPoint offset(sourceRect.x() - contentRect().x(), sourceRect.y() - contentRect().y());
     m_canvas->save();
-    m_canvas->translate(-offset.x(), -offset.y());
+    m_canvas->clipRect(SkRect(destRect));
+    // Translate the origin of contentRect to that of destRect.
+    // Note that destRect is defined relative to sourceRect.
+    m_canvas->translate(contentRect().x() - sourceRect.x() + destRect.x(),
+                        contentRect().y() - sourceRect.y() + destRect.y());
     m_canvas->drawPicture(m_picture);
     m_canvas->restore();
@@ -211 +210 @@
     context()->bindRenderbuffer(GraphicsContext3D::RENDERBUFFER, m_depthStencilBuffer);
     context()->renderbufferStorage(GraphicsContext3D::RENDERBUFFER, Extensions3D::DEPTH24_STENCIL8, m_bufferSize.width(), m_bufferSize.height());
-    context()->framebufferRenderbuffer(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::STENCIL_ATTACHMENT, GraphicsContext3D::RENDERBUFFER, m_depthStencilBuffer);
-    context()->framebufferRenderbuffer(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::DEPTH_ATTACHMENT, GraphicsContext3D::RENDERBUFFER, m_depthStencilBuffer);
+    context()->framebufferRenderbuffer(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT, GraphicsContext3D::RENDERBUFFER, m_depthStencilBuffer);
 
     // Create a skia gpu canvas.
@@ -233 +231 @@
     return true;
 }
-
-void LayerTextureUpdaterSkPicture::clearFrameBuffer()
-{
-#ifndef NDEBUG
-    // Clear to green to make it easier to spot unrendered regions.
-    context()->clearColor(0, 1, 0, 1);
-    context()->clear(GraphicsContext3D::COLOR_BUFFER_BIT | GraphicsContext3D::STENCIL_BUFFER_BIT);
-#endif
-}
 #endif // SKIA
 

trunk/Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.h

@@ -92 +92 @@
     void deleteFrameBuffer();
     bool createFrameBuffer();
-    void clearFrameBuffer();
 
     GrContext* m_skiaContext; // SKIA graphics context.