Changeset 153112 in webkit

Timestamp:

Jul 24, 2013 8:16:00 PM (11 years ago)

Author:

Simon Fraser

Message:

[iOS] Captions are clipped in documents using pagination
​https://bugs.webkit.org/show_bug.cgi?id=119072

Reviewed by Beth Dakin.

MediaControlTextTrackContainerElement::createTextTrackRepresentationImage() is called
to paint captions into a layer used for fullscreen video. It did the painting using
a subtree paint, but starting at the root RenderView's layer. This is problematic,
because the caption painting is subject to clipping for columns, and any enclosing
overflow:hidden container.

Fix this by starting the paint at the MediaControlTextTrackContainerElement's
renderer's layer. By doing this we don't have to worry about an offset, so no
translation is required.

Also make sure we update layer before grabbing the renderer (in case layout
destroys it).

• html/shadow/MediaControlElements.cpp:

(WebCore::MediaControlTextTrackContainerElement::createTextTrackRepresentationImage):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/shadow/MediaControlElements.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-24  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS] Captions are clipped in documents using pagination
+        https://bugs.webkit.org/show_bug.cgi?id=119072
+
+        Reviewed by Beth Dakin.
+
+        MediaControlTextTrackContainerElement::createTextTrackRepresentationImage() is called
+        to paint captions into a layer used for fullscreen video. It did the painting using
+        a subtree paint, but starting at the root RenderView's layer. This is problematic,
+        because the caption painting is subject to clipping for columns, and any enclosing
+        overflow:hidden container.
+        
+        Fix this by starting the paint at the MediaControlTextTrackContainerElement's
+        renderer's layer. By doing this we don't have to worry about an offset, so no
+        translation is required.
+        
+        Also make sure we update layer before grabbing the renderer (in case layout
+        destroys it).
+
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::MediaControlTextTrackContainerElement::createTextTrackRepresentationImage):
+
 2013-07-24  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

@@ -1398 +1398 @@
         return 0;
 
+    Frame* frame = document()->frame();
+    if (!frame)
+        return 0;
+
+    document()->updateLayout();
+
     RenderObject* renderer = this->renderer();
     if (!renderer)
         return 0;
 
-    Frame* frame = document()->frame();
-    if (!frame)
+    if (!renderer->hasLayer())
         return 0;
 
-    document()->updateLayout();
-
-    LayoutRect topLevelRect;
-    IntRect paintingRect = pixelSnappedIntRect(renderer->paintingRootRect(topLevelRect));
+    RenderLayer* layer = toRenderLayerModelObject(renderer)->layer();
 
     float deviceScaleFactor = 1;
@@ -1415 +1417 @@
         deviceScaleFactor = page->deviceScaleFactor();
 
+    IntRect paintingRect = IntRect(IntPoint(), layer->size());
     OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size(), deviceScaleFactor, ColorSpaceDeviceRGB));
     if (!buffer)
         return 0;
 
-    // Translate the renderer painting rect into graphics context coordinates.
-    FloatSize translation(-paintingRect.x(), -paintingRect.y());
-
-    buffer->context()->translate(translation);
-
-    RenderLayer* layer = frame->contentRenderer()->layer();
-    layer->paint(buffer->context(), paintingRect, PaintBehaviorFlattenCompositingLayers, renderer, 0, RenderLayer::PaintLayerPaintingCompositingAllPhases);
+    layer->paint(buffer->context(), paintingRect, PaintBehaviorFlattenCompositingLayers, 0, 0, RenderLayer::PaintLayerPaintingCompositingAllPhases);
 
     return buffer->copyImage();