[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

Wed Mar 17 18:09:38 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit bbf36b31f103051f7a1516bfd7e5467aaf7c1ae2
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 17:52:58 2010 +0000

    2010-03-02  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Dan Bernstein.
    
            https://bugs.webkit.org/show_bug.cgi?id=35555
            QuickTime plugin content can spill outside the <object> tag
    
            Set -masksToBounds on the layer that is handed to us by plug-ins, to ensure that sublayers
            of that layer don't spill outside the <object> contents rect.
    
            Manual test because it relies on QuickTime, and pixel results depend on movie loading timing.
    
            * manual-tests/plugins/object-clipping.html: Added.
            * platform/graphics/mac/GraphicsLayerCA.mm:
            (WebCore::GraphicsLayerCA::setupContentsLayer):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55412 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a7a3112..9261c4c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-03-02  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35555
+        QuickTime plugin content can spill outside the <object> tag
+
+        Set -masksToBounds on the layer that is handed to us by plug-ins, to ensure that sublayers
+        of that layer don't spill outside the <object> contents rect.
+        
+        Manual test because it relies on QuickTime, and pixel results depend on movie loading timing.
+
+        * manual-tests/plugins/object-clipping.html: Added.
+        * platform/graphics/mac/GraphicsLayerCA.mm:
+        (WebCore::GraphicsLayerCA::setupContentsLayer):
+
 2010-03-02  Adam Roben  <aroben at apple.com>
 
         Export SecurityOrigin::registerURLSchemeAsSecure
diff --git a/WebCore/manual-tests/plugins/object-clipping.html b/WebCore/manual-tests/plugins/object-clipping.html
new file mode 100644
index 0000000..23fd630
--- /dev/null
+++ b/WebCore/manual-tests/plugins/object-clipping.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+    <title>clipping objects</title>
+    <style type="text/css" media="screen">
+        object {
+            margin: 30px;
+            border: 20px solid green;
+        }
+    </style>
+</head>
+<body>
+    <p>You should see a clipped video surrounded by a thick green border.</p>
+    <p><a href="https://bugs.webkit.org/show_bug.cgi?id=35555">https://bugs.webkit.org/show_bug.cgi?id=35555</a></p>
+    <object type="video/quicktime" data="../../../LayoutTests/media/content/test.mp4" width="200" height="150">
+        <param value="false" name="autoplay">
+        <param value="false" name="controller">
+    </object>
+
+</body>
+</html>
diff --git a/WebCore/platform/graphics/mac/GraphicsLayerCA.mm b/WebCore/platform/graphics/mac/GraphicsLayerCA.mm
index 22e39f5..1362b99 100644
--- a/WebCore/platform/graphics/mac/GraphicsLayerCA.mm
+++ b/WebCore/platform/graphics/mac/GraphicsLayerCA.mm
@@ -2226,6 +2226,7 @@ void GraphicsLayerCA::setupContentsLayer(CALayer* contentsLayer)
 {
     // Turn off implicit animations on the inner layer.
     [contentsLayer setStyle:[NSDictionary dictionaryWithObject:nullActionsDictionary() forKey:@"actions"]];
+    [contentsLayer setMasksToBounds:YES];
 
     if (defaultContentsOrientation() == CompositingCoordinatesBottomUp) {
         CATransform3D flipper = {

-- 
WebKit Debian packaging

