Changeset 98393 in webkit

Timestamp:

Oct 25, 2011, 2:10:12 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

Fix teardown in Web*LayerImpl, and add tests for Web*Layer
​https://bugs.webkit.org/show_bug.cgi?id=70431

Patch by Antoine Labour <​piman@chromium.org> on 2011-10-25
Reviewed by James Robinson.

• src/WebContentLayerImpl.cpp:

(WebKit::WebContentLayerImpl::~WebContentLayerImpl):

• src/WebExternalTextureLayerImpl.cpp:

(WebKit::WebExternalTextureLayerImpl::~WebExternalTextureLayerImpl):

• src/WebLayerImpl.cpp:

(WebKit::WebLayerImpl::~WebLayerImpl):

Location:

trunk/Source

Files:

• WebCore/platform/graphics/chromium/LayerChromium.h (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/WebKit.gypi (modified) (1 diff)
• WebKit/chromium/src/WebContentLayerImpl.cpp (modified) (2 diffs)
• WebKit/chromium/src/WebExternalTextureLayerImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebLayerImpl.cpp (modified) (1 diff)
• WebKit/chromium/tests/LayerChromiumTest.cpp (modified) (2 diffs)
• WebKit/chromium/tests/WebLayerTest.cpp (added)

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

@@ -97 +97 @@
     virtual IntSize contentBounds() const { return bounds(); }
 
-    void setMasksToBounds(bool masksToBounds) { m_masksToBounds = masksToBounds; }
+    void setMasksToBounds(bool masksToBounds) { m_masksToBounds = masksToBounds; setNeedsCommit(); }
     bool masksToBounds() const { return m_masksToBounds; }
 
@@ -103 +103 @@
     const String& name() const { return m_name; }
 
-    void setMaskLayer(LayerChromium* maskLayer) { m_maskLayer = maskLayer; }
+    void setMaskLayer(LayerChromium* maskLayer) { m_maskLayer = maskLayer; setNeedsCommit(); }
     LayerChromium* maskLayer() const { return m_maskLayer.get(); }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-10-25  Antoine Labour  <piman@chromium.org>
+
+        Fix teardown in Web*LayerImpl, and add tests for Web*Layer
+        https://bugs.webkit.org/show_bug.cgi?id=70431
+
+        Reviewed by James Robinson.
+
+        * src/WebContentLayerImpl.cpp:
+        (WebKit::WebContentLayerImpl::~WebContentLayerImpl):
+        * src/WebExternalTextureLayerImpl.cpp:
+        (WebKit::WebExternalTextureLayerImpl::~WebExternalTextureLayerImpl):
+        * src/WebLayerImpl.cpp:
+        (WebKit::WebLayerImpl::~WebLayerImpl):
+
 2011-10-25  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/chromium/WebKit.gypi

@@ -82 +82 @@
             'tests/WebCompositorImplTest.cpp',
             'tests/WebFrameTest.cpp',
+            'tests/WebLayerTest.cpp',
             'tests/WebURLRequestTest.cpp',
             'tests/WebViewTest.cpp',

trunk/Source/WebKit/chromium/src/WebContentLayerImpl.cpp

@@ -55 +55 @@
 WebContentLayerImpl::~WebContentLayerImpl()
 {
+    setDelegate(0);
 }
 
@@ -60 +61 @@
 {
     m_drawsContent = drawsContent;
+    setNeedsCommit();
 }
 

trunk/Source/WebKit/chromium/src/WebExternalTextureLayerImpl.cpp

@@ -49 +49 @@
 WebExternalTextureLayerImpl::~WebExternalTextureLayerImpl()
 {
+    setDelegate(0);
 }
 

trunk/Source/WebKit/chromium/src/WebLayerImpl.cpp

@@ -44 +44 @@
 WebLayerImpl::~WebLayerImpl()
 {
+    setDelegate(0);
 }
 

trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp

@@ -620 +620 @@
     EXPECT_CALL(initialDelegate, notifySyncRequired()).Times(0); // old delegate should not be used when setDelegate gives a new delegate.
     EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setDelegate(&mockDelegate));
-    EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setMasksToBounds(true));
     EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setName("Test Layer"));
-    EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setMaskLayer(dummyLayer.get()));
     EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setVisibleLayerRect(IntRect(0, 0, 40, 50)));
     EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setScrollPosition(IntPoint(10, 10)));
@@ -643 +641 @@
     EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setAnchorPointZ(0.7f));
     EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setBackgroundColor(Color(0.4f, 0.4f, 0.4f)));
+    EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setMasksToBounds(true));
+    EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setMaskLayer(dummyLayer.get()));
     EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setOpacity(0.5f));
     EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setOpaque(false));