Title: [140704] trunk/Source/WebCore
Revision
140704
Author
[email protected]
Date
2013-01-24 12:14:58 -0800 (Thu, 24 Jan 2013)

Log Message

Mac: Video appears in wrong place during pinch operations
https://bugs.webkit.org/show_bug.cgi?id=107730

Reviewed by Eric Carlson.

Send the correct input and output rects, post translation and scaling,
to the CIContext for drawing.

* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (140703 => 140704)


--- trunk/Source/WebCore/ChangeLog	2013-01-24 20:10:38 UTC (rev 140703)
+++ trunk/Source/WebCore/ChangeLog	2013-01-24 20:14:58 UTC (rev 140704)
@@ -1,3 +1,16 @@
+2013-01-23  Jer Noble  <[email protected]>
+
+        Mac: Video appears in wrong place during pinch operations
+        https://bugs.webkit.org/show_bug.cgi?id=107730
+
+        Reviewed by Eric Carlson.
+
+        Send the correct input and output rects, post translation and scaling,
+        to the CIContext for drawing.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput):
+
 2013-01-24  Max Vujovic  <[email protected]>
 
         [CSS Filters] CSS opacity property clips filter outsets

Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (140703 => 140704)


--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2013-01-24 20:10:38 UTC (rev 140703)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2013-01-24 20:14:58 UTC (rev 140704)
@@ -1061,7 +1061,9 @@
         // ciContext does not use a RetainPtr for results of contextWithCGContext:, as the returned value
         // is autoreleased, and there is no non-autoreleased version of that function.
         CIContext* ciContext = [CIContext contextWithCGContext:context->platformContext() options:nil];
-        [ciContext drawImage:image.get() inRect:rect fromRect:rect];
+        CGRect outputRect = { CGPointZero, rect.size() };
+        CGRect imageRect = CGRectMake(0, 0, CVPixelBufferGetWidth(m_lastImage.get()), CVPixelBufferGetHeight(m_lastImage.get()));
+        [ciContext drawImage:image.get() inRect:outputRect fromRect:imageRect];
     }
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to