Changeset 148742 in webkit

Timestamp:

Apr 19, 2013 6:51:10 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][AC] Support masksToBounds for clutter AC backend.
​https://bugs.webkit.org/show_bug.cgi?id=114113

Patch by ChangSeok Oh <ChangSeok Oh> on 2013-04-19
Reviewed by Gustavo Noronha Silva.

We can support the masksToBounds property by using clutter_actor_set_clip simply.

Covered by existing AC tests.

• platform/graphics/clutter/GraphicsLayerActor.cpp:

(graphicsLayerActorSetMasksToBounds):

• platform/graphics/clutter/GraphicsLayerActor.h:
• platform/graphics/clutter/GraphicsLayerClutter.cpp:

(WebCore::GraphicsLayerClutter::setMasksToBounds):
(WebCore):
(WebCore::GraphicsLayerClutter::commitLayerChangesBeforeSublayers):
(WebCore::GraphicsLayerClutter::setupContentsLayer):
(WebCore::GraphicsLayerClutter::updateMasksToBounds):

• platform/graphics/clutter/GraphicsLayerClutter.h:

(GraphicsLayerClutter):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/clutter/GraphicsLayerActor.cpp (modified) (1 diff)
• platform/graphics/clutter/GraphicsLayerActor.h (modified) (1 diff)
• platform/graphics/clutter/GraphicsLayerClutter.cpp (modified) (4 diffs)
• platform/graphics/clutter/GraphicsLayerClutter.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-19  ChangSeok Oh  <changseok.oh@collabora.com>
+
+        [GTK][AC] Support masksToBounds for clutter AC backend.
+        https://bugs.webkit.org/show_bug.cgi?id=114113
+
+        Reviewed by Gustavo Noronha Silva.
+
+        We can support the masksToBounds property by using clutter_actor_set_clip simply.
+
+        Covered by existing AC tests.
+
+        * platform/graphics/clutter/GraphicsLayerActor.cpp:
+        (graphicsLayerActorSetMasksToBounds):
+        * platform/graphics/clutter/GraphicsLayerActor.h:
+        * platform/graphics/clutter/GraphicsLayerClutter.cpp:
+        (WebCore::GraphicsLayerClutter::setMasksToBounds):
+        (WebCore):
+        (WebCore::GraphicsLayerClutter::commitLayerChangesBeforeSublayers):
+        (WebCore::GraphicsLayerClutter::setupContentsLayer):
+        (WebCore::GraphicsLayerClutter::updateMasksToBounds):
+        * platform/graphics/clutter/GraphicsLayerClutter.h:
+        (GraphicsLayerClutter):
+
 2013-04-19  Dan Beam  <dbeam@chromium.org>
 

trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.cpp

@@ -525 +525 @@
 }
 
+void graphicsLayerActorSetMasksToBounds(GraphicsLayerActor* layer, bool masksToBounds)
+{
+    ClutterActor* actor = CLUTTER_ACTOR(layer);
+    if (masksToBounds)
+        clutter_actor_set_clip(actor, 0, 0, clutter_actor_get_width(actor), clutter_actor_get_height(actor));
+    else
+        clutter_actor_remove_clip(actor);
+}
+
 WebCore::PlatformClutterAnimation* graphicsLayerActorGetAnimationForKey(GraphicsLayerActor* layer, const String key)
 {

trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.h

@@ -98 +98 @@
 void graphicsLayerActorSetDrawsContent(GraphicsLayerActor*, bool drawsContent);
 void graphicsLayerActorSetFlatten(GraphicsLayerActor*, bool flatten);
+void graphicsLayerActorSetMasksToBounds(GraphicsLayerActor*, bool masksToBounds);
 
 WebCore::PlatformClutterAnimation* graphicsLayerActorGetAnimationForKey(GraphicsLayerActor*, const String);

trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp

@@ -445 +445 @@
 }
 
+void GraphicsLayerClutter::setMasksToBounds(bool masksToBounds)
+{
+    if (masksToBounds == m_masksToBounds)
+        return;
+
+    GraphicsLayer::setMasksToBounds(masksToBounds);
+    noteLayerPropertyChanged(MasksToBoundsChanged);
+}
+
 void GraphicsLayerClutter::setDrawsContent(bool drawsContent)
 {
@@ -737 +746 @@
         updateTransform();
 
+    if (m_uncommittedChanges & MasksToBoundsChanged)
+        updateMasksToBounds();
+
     if (m_uncommittedChanges & OpacityChanged)
         updateOpacityOnLayer();
@@ -761 +773 @@
 void GraphicsLayerClutter::setupContentsLayer(GraphicsLayerActor* contentsLayer)
 {
+    graphicsLayerActorSetMasksToBounds(contentsLayer, true);
     graphicsLayerActorSetAnchorPoint(contentsLayer, 0.0, 0.0, 0.0);
 }
@@ -859 +872 @@
     CoglMatrix matrix = m_transform;
     clutter_actor_set_transform(CLUTTER_ACTOR(primaryLayer()), &matrix);
+}
+
+void GraphicsLayerClutter::updateMasksToBounds()
+{
+    graphicsLayerActorSetMasksToBounds(m_layer.get(), m_masksToBounds);
 }
 

trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.h

@@ -64 +64 @@
     virtual void addChildAbove(GraphicsLayer*, GraphicsLayer* sibling);
     virtual void addChildBelow(GraphicsLayer*, GraphicsLayer* sibling);
+
     virtual void removeFromParent();
+
     virtual bool replaceChild(GraphicsLayer* oldChild, GraphicsLayer* newChild);
     virtual bool setChildren(const Vector<GraphicsLayer*>&);
@@ -87 +89 @@
 
     virtual void setPreserves3D(bool);
+    virtual void setMasksToBounds(bool);
 
     virtual bool addAnimation(const KeyframeValueList&, const IntSize& boxSize, const Animation*, const String& animationName, double timeOffset);
@@ -191 +194 @@
     void updateGeometry(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase);
     void updateTransform();
+    void updateMasksToBounds();
     void updateLayerDrawsContent(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase);
     void updateContentsImage();