Title: [181048] branches/safari-600.1.4.15-branch/Source/WebCore
Revision
181048
Author
[email protected]
Date
2015-03-04 16:09:19 -0800 (Wed, 04 Mar 2015)

Log Message

Merge r180910. rdar://problem/19395137

Modified Paths

Diff

Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (181047 => 181048)


--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog	2015-03-05 00:08:46 UTC (rev 181047)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog	2015-03-05 00:09:19 UTC (rev 181048)
@@ -1,3 +1,21 @@
+2015-03-04  Matthew Hanson  <[email protected]>
+
+        Merge r180910. rdar://problem/19395137
+
+    2015-03-02  Jeremy Jones  <[email protected]>
+
+            RenderVideo should not paint the video frame when video is fullscreen.
+            https://bugs.webkit.org/show_bug.cgi?id=142097
+
+            Reviewed by Eric Carlson.
+
+            For performance and correctness, RenderVideo should not paint the current video frame
+            inline when video is fullscreen. This happens when snapshots are taken and can have a
+            negative performance impact.
+
+            * rendering/RenderVideo.cpp:
+            (WebCore::RenderVideo::paintReplaced):
+
 2015-02-26  Babak Shafiei  <[email protected]>
 
         Merge r173806.

Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderVideo.cpp (181047 => 181048)


--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderVideo.cpp	2015-03-05 00:08:46 UTC (rev 181047)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderVideo.cpp	2015-03-05 00:09:19 UTC (rev 181048)
@@ -190,10 +190,12 @@
 
     if (displayingPoster)
         paintIntoRect(context, rect);
-    else if (view().frameView().paintBehavior() & PaintBehaviorFlattenCompositingLayers)
-        mediaPlayer->paintCurrentFrameInContext(context, pixelSnappedIntRect(rect));
-    else
-        mediaPlayer->paint(context, pixelSnappedIntRect(rect));
+    else if (!videoElement().isFullscreen()) {
+        else if (view().frameView().paintBehavior() & PaintBehaviorFlattenCompositingLayers)
+            mediaPlayer->paintCurrentFrameInContext(context, pixelSnappedIntRect(rect));
+        else
+            mediaPlayer->paint(context, pixelSnappedIntRect(rect));
+    }
 }
 
 void RenderVideo::layout()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to