Changeset 126498 in webkit

Timestamp:

Aug 23, 2012 4:14:21 PM (12 years ago)

Author:

jamesr@google.com

Message:

[chromium] Remove WebLayer::setChildren API
​https://bugs.webkit.org/show_bug.cgi?id=94749

Reviewed by Adrienne Walker.

Source/Platform:

This is redundant with removeAllChildren() / addChild() and less efficient.

• chromium/public/WebLayer.h:

(WebLayer):

Source/WebCore:

Sets up the child list directly instead of building an intermediate buffer. Covered by compositing/*

• platform/graphics/chromium/GraphicsLayerChromium.cpp:

(WebCore::GraphicsLayerChromium::updateChildList):

Source/WebKit/chromium:

• src/WebLayer.cpp:

Location:

trunk/Source

Files:

• Platform/ChangeLog (modified) (1 diff)
• Platform/chromium/public/WebLayer.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebLayerImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebLayerImpl.h (modified) (1 diff)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2012-08-22  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove WebLayer::setChildren API
+        https://bugs.webkit.org/show_bug.cgi?id=94749
+
+        Reviewed by Adrienne Walker.
+
+        This is redundant with removeAllChildren() / addChild() and less efficient.
+
+        * chromium/public/WebLayer.h:
+        (WebLayer):
+
 2012-08-22  James Robinson  <jamesr@chromium.org>
 

trunk/Source/Platform/chromium/public/WebLayer.h

@@ -68 +68 @@
     virtual void insertChild(WebLayer*, size_t index) = 0;
     virtual void replaceChild(WebLayer* reference, WebLayer* newLayer) = 0;
-    virtual void setChildren(const WebVector<WebLayer*>&) = 0;
     virtual void removeFromParent() = 0;
     virtual void removeAllChildren() = 0;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-22  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove WebLayer::setChildren API
+        https://bugs.webkit.org/show_bug.cgi?id=94749
+
+        Reviewed by Adrienne Walker.
+
+        Sets up the child list directly instead of building an intermediate buffer. Covered by compositing/*
+
+        * platform/graphics/chromium/GraphicsLayerChromium.cpp:
+        (WebCore::GraphicsLayerChromium::updateChildList):
+
 2012-08-23  Dominic Mazzoni  <dmazzoni@google.com>
 

trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp

@@ -598 +598 @@
 void GraphicsLayerChromium::updateChildList()
 {
-    Vector<WebLayer*> newChildren;
+    WebLayer* childHost = m_transformLayer ? m_transformLayer.get() : m_layer->layer();
+    childHost->removeAllChildren();
 
     if (m_transformLayer) {
         // Add the primary layer first. Even if we have negative z-order children, the primary layer always comes behind.
-        newChildren.append(m_layer->layer());
+        childHost->addChild(m_layer->layer());
     } else if (m_contentsLayer) {
         // FIXME: add the contents layer in the correct order with negative z-order children.
         // This does not cause visible rendering issues because currently contents layers are only used
         // for replaced elements that don't have children.
-        newChildren.append(m_contentsLayer);
+        childHost->addChild(m_contentsLayer);
     }
 
@@ -615 +616 @@
         GraphicsLayerChromium* curChild = static_cast<GraphicsLayerChromium*>(childLayers[i]);
 
-        newChildren.append(curChild->platformLayer());
+        childHost->addChild(curChild->platformLayer());
     }
 
     if (m_linkHighlight)
-        newChildren.append(m_linkHighlight->layer());
-
-    for (size_t i = 0; i < newChildren.size(); ++i)
-        newChildren[i]->removeFromParent();
-
-    WebVector<WebLayer*> newWebChildren;
-    newWebChildren.assign(newChildren.data(), newChildren.size());
-
-    if (m_transformLayer) {
-        m_transformLayer->setChildren(newWebChildren);
-
-        if (m_contentsLayer) {
-            // If we have a transform layer, then the contents layer is parented in the
-            // primary layer (which is itself a child of the transform layer).
-            m_layer->layer()->removeAllChildren();
-            m_layer->layer()->addChild(m_contentsLayer);
-        }
-    } else
-        m_layer->layer()->setChildren(newWebChildren);
+        childHost->addChild(m_linkHighlight->layer());
+
+    if (m_transformLayer && m_contentsLayer) {
+        // If we have a transform layer, then the contents layer is parented in the
+        // primary layer (which is itself a child of the transform layer).
+        m_layer->layer()->removeAllChildren();
+        m_layer->layer()->addChild(m_contentsLayer);
+    }
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-08-22  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove WebLayer::setChildren API
+        https://bugs.webkit.org/show_bug.cgi?id=94749
+
+        Reviewed by Adrienne Walker.
+
+        * src/WebLayer.cpp:
+
 2012-08-23  Dana Jansens  <danakj@chromium.org>
 

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

@@ -124 +124 @@
 }
 
-void WebLayerImpl::setChildren(const WebVector<WebLayer*>& webChildren)
-{
-    Vector<RefPtr<LayerChromium> > children(webChildren.size());
-    for (size_t i = 0; i < webChildren.size(); ++i)
-        children[i] = static_cast<WebLayerImpl*>(webChildren[i])->layer();
-    m_layer->setChildren(children);
-}
-
 void WebLayerImpl::removeFromParent()
 {

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

@@ -48 +48 @@
     virtual void insertChild(WebLayer*, size_t index) OVERRIDE;
     virtual void replaceChild(WebLayer* reference, WebLayer* newLayer) OVERRIDE;
-    virtual void setChildren(const WebVector<WebLayer*>&) OVERRIDE;
     virtual void removeFromParent() OVERRIDE;
     virtual void removeAllChildren() OVERRIDE;