Changeset 107787 in webkit

Timestamp:

Feb 15, 2012 12:26:30 AM (12 years ago)

Author:

noam.rosenthal@nokia.com

Message:

[Texmap] Divide TextureMapperNode.cpp to 3 files.
​https://bugs.webkit.org/show_bug.cgi?id=76660

Source/WebCore:

Rename TextureMapperNode to TextureMapperLayer.

Reviewed by Kenneth Rohde Christiansen.

No new tests.

• GNUmakefile.list.am:
• Target.pri:
• WebCore.gypi:
• platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:

(WebCore::GraphicsLayerTextureMapper::GraphicsLayerTextureMapper):
(WebCore::GraphicsLayerTextureMapper::notifyChange):
(WebCore::GraphicsLayerTextureMapper::setNeedsDisplay):
(WebCore::GraphicsLayerTextureMapper::setContentsNeedsDisplay):
(WebCore::GraphicsLayerTextureMapper::setNeedsDisplayInRect):
(WebCore::GraphicsLayerTextureMapper::setParent):
(WebCore::GraphicsLayerTextureMapper::setChildren):
(WebCore::GraphicsLayerTextureMapper::addChild):
(WebCore::GraphicsLayerTextureMapper::addChildAtIndex):
(WebCore::GraphicsLayerTextureMapper::addChildAbove):
(WebCore::GraphicsLayerTextureMapper::addChildBelow):
(WebCore::GraphicsLayerTextureMapper::replaceChild):
(WebCore::GraphicsLayerTextureMapper::removeFromParent):
(WebCore::GraphicsLayerTextureMapper::setMaskLayer):
(WebCore::GraphicsLayerTextureMapper::setReplicatedByLayer):
(WebCore::GraphicsLayerTextureMapper::setPosition):
(WebCore::GraphicsLayerTextureMapper::setAnchorPoint):
(WebCore::GraphicsLayerTextureMapper::setSize):
(WebCore::GraphicsLayerTextureMapper::setTransform):
(WebCore::GraphicsLayerTextureMapper::setChildrenTransform):
(WebCore::GraphicsLayerTextureMapper::setPreserves3D):
(WebCore::GraphicsLayerTextureMapper::setMasksToBounds):
(WebCore::GraphicsLayerTextureMapper::setDrawsContent):
(WebCore::GraphicsLayerTextureMapper::setContentsOpaque):
(WebCore::GraphicsLayerTextureMapper::setBackfaceVisibility):
(WebCore::GraphicsLayerTextureMapper::setOpacity):
(WebCore::GraphicsLayerTextureMapper::setContentsRect):
(WebCore::GraphicsLayerTextureMapper::setContentsToImage):
(WebCore::GraphicsLayerTextureMapper::setContentsToMedia):
(WebCore::GraphicsLayerTextureMapper::syncCompositingStateForThisLayerOnly):
(WebCore::GraphicsLayerTextureMapper::syncCompositingState):
(WebCore::GraphicsLayerTextureMapper::addAnimation):

• platform/graphics/texmap/GraphicsLayerTextureMapper.h:

(WebCore):
(GraphicsLayerTextureMapper):
(WebCore::GraphicsLayerTextureMapper::layer):

• platform/graphics/texmap/TextureMapperLayer.cpp: Renamed from Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp.

(WebCore):
(WebCore::toTextureMapperLayer):
(WebCore::TextureMapperLayer::rootLayer):
(WebCore::TextureMapperLayer::setTransform):
(WebCore::TextureMapperLayer::clearBackingStoresRecursive):
(WebCore::TextureMapperLayer::computeTransformsRecursive):
(WebCore::TextureMapperLayer::updateBackingStore):
(WebCore::TextureMapperLayer::paint):
(WebCore::TextureMapperLayer::paintSelf):
(WebCore::TextureMapperLayer::compareGraphicsLayersZValue):
(WebCore::TextureMapperLayer::sortByZOrder):
(WebCore::TextureMapperLayer::paintSelfAndChildren):
(WebCore::TextureMapperLayer::intermediateSurfaceRect):
(WebCore::TextureMapperLayer::shouldPaintToIntermediateSurface):
(WebCore::TextureMapperLayer::isVisible):
(WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica):
(WebCore::TextureMapperLayer::paintRecursive):
(WebCore::TextureMapperLayer::~TextureMapperLayer):
(WebCore::TextureMapperLayer::syncCompositingState):
(WebCore::TextureMapperLayer::syncCompositingStateSelf):
(WebCore::TextureMapperLayer::descendantsOrSelfHaveRunningAnimations):
(WebCore::TextureMapperLayer::syncAnimations):
(WebCore::TextureMapperLayer::syncAnimationsRecursively):

• platform/graphics/texmap/TextureMapperLayer.h: Renamed from Source/WebCore/platform/graphics/texmap/TextureMapperNode.h.

(WebCore):
(TextureMapperPaintOptions):
(WebCore::TextureMapperPaintOptions::TextureMapperPaintOptions):
(TextureMapperLayer):
(WebCore::TextureMapperLayer::TextureMapperLayer):
(WebCore::TextureMapperLayer::size):
(WebCore::TextureMapperLayer::setOpacity):
(WebCore::TextureMapperLayer::setTextureMapper):
(WebCore::TextureMapperLayer::setShouldUpdateBackingStoreFromLayer):
(WebCore::TextureMapperLayer::setBackingStore):
(WebCore::TextureMapperLayer::backingStore):
(WebCore::TextureMapperLayer::texture):
(WebCore::TextureMapperLayer::layerRect):
(State):
(WebCore::TextureMapperLayer::State::State):

Source/WebKit/gtk:

Rename TextureMapperNode to TextureMapperLayer.

Reviewed by Kenneth Rohde Christiansen.

• WebCoreSupport/AcceleratedCompositingContext.h:

(AcceleratedCompositingContext):

• WebCoreSupport/AcceleratedCompositingContextGL.cpp:

(WebKit::AcceleratedCompositingContext::AcceleratedCompositingContext):
(WebKit::AcceleratedCompositingContext::enabled):
(WebKit::AcceleratedCompositingContext::renderLayersToWindow):
(WebKit::AcceleratedCompositingContext::attachRootGraphicsLayer):
(WebKit::AcceleratedCompositingContext::syncLayersTimeout):

Source/WebKit/qt:

Rename TextureMapperNode to TextureMapperLayer.

Reviewed by Kenneth Rohde Christiansen.

• Api/qwebframe.cpp:

(QWebFramePrivate::renderCompositedLayers):

• Api/qwebframe.h:

(WebCore):

• Api/qwebframe_p.h:

(WebCore):
(QWebFramePrivate::QWebFramePrivate):
(QWebFramePrivate):

• WebCoreSupport/PageClientQt.cpp:

(WebCore::TextureMapperLayerClientQt::TextureMapperLayerClientQt):
(WebCore::TextureMapperLayerClientQt::setTextureMapper):
(WebCore::TextureMapperLayerClientQt::~TextureMapperLayerClientQt):
(WebCore::TextureMapperLayerClientQt::syncRootLayer):
(WebCore::TextureMapperLayerClientQt::rootLayer):
(WebCore::PageClientQWidget::setRootGraphicsLayer):
(WebCore::PageClientQWidget::syncLayers):
(WebCore::PageClientQGraphicsWidget::syncLayers):
(WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):

• WebCoreSupport/PageClientQt.h:

(TextureMapperLayerClientQt):
(PageClientQWidget):
(PageClientQGraphicsWidget):

Source/WebKit2:

Rename TextureMapperNode to TextureMapperLayer.

Reviewed by Kenneth Rohde Christiansen.

• UIProcess/qt/LayerTreeHostProxyQt.cpp:

(WebKit::LayerTreeHostProxy::createLayer):
(WebKit::LayerTreeHostProxy::paintToCurrentGLContext):
(WebKit::LayerTreeHostProxy::paintToGraphicsContext):
(WebKit::LayerTreeHostProxy::getBackingStore):
(WebKit::LayerTreeHostProxy::ensureRootLayer):
(WebKit::LayerTreeHostProxy::purgeGLResources):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.list.am (modified) (1 diff)
• WebCore/Target.pri (modified) (2 diffs)
• WebCore/WebCore.gypi (modified) (1 diff)
• WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (modified) (33 diffs)
• WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (modified) (5 diffs)
• WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (moved) (moved from trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp) (27 diffs)
• WebCore/platform/graphics/texmap/TextureMapperLayer.h (moved) (moved from trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h) (10 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h (modified) (2 diffs)
• WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp (modified) (7 diffs)
• WebKit/qt/Api/qwebframe.cpp (modified) (3 diffs)
• WebKit/qt/Api/qwebframe.h (modified) (2 diffs)
• WebKit/qt/Api/qwebframe_p.h (modified) (3 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/PageClientQt.cpp (modified) (8 diffs)
• WebKit/qt/WebCoreSupport/PageClientQt.h (modified) (3 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/qt/LayerTreeHostProxyQt.cpp (modified) (9 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-15  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Texmap] Divide TextureMapperNode.cpp to 3 files.
+        https://bugs.webkit.org/show_bug.cgi?id=76660
+
+        Rename TextureMapperNode to TextureMapperLayer.
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        No new tests.
+
+        * GNUmakefile.list.am:
+        * Target.pri:
+        * WebCore.gypi:
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+        (WebCore::GraphicsLayerTextureMapper::GraphicsLayerTextureMapper):
+        (WebCore::GraphicsLayerTextureMapper::notifyChange):
+        (WebCore::GraphicsLayerTextureMapper::setNeedsDisplay):
+        (WebCore::GraphicsLayerTextureMapper::setContentsNeedsDisplay):
+        (WebCore::GraphicsLayerTextureMapper::setNeedsDisplayInRect):
+        (WebCore::GraphicsLayerTextureMapper::setParent):
+        (WebCore::GraphicsLayerTextureMapper::setChildren):
+        (WebCore::GraphicsLayerTextureMapper::addChild):
+        (WebCore::GraphicsLayerTextureMapper::addChildAtIndex):
+        (WebCore::GraphicsLayerTextureMapper::addChildAbove):
+        (WebCore::GraphicsLayerTextureMapper::addChildBelow):
+        (WebCore::GraphicsLayerTextureMapper::replaceChild):
+        (WebCore::GraphicsLayerTextureMapper::removeFromParent):
+        (WebCore::GraphicsLayerTextureMapper::setMaskLayer):
+        (WebCore::GraphicsLayerTextureMapper::setReplicatedByLayer):
+        (WebCore::GraphicsLayerTextureMapper::setPosition):
+        (WebCore::GraphicsLayerTextureMapper::setAnchorPoint):
+        (WebCore::GraphicsLayerTextureMapper::setSize):
+        (WebCore::GraphicsLayerTextureMapper::setTransform):
+        (WebCore::GraphicsLayerTextureMapper::setChildrenTransform):
+        (WebCore::GraphicsLayerTextureMapper::setPreserves3D):
+        (WebCore::GraphicsLayerTextureMapper::setMasksToBounds):
+        (WebCore::GraphicsLayerTextureMapper::setDrawsContent):
+        (WebCore::GraphicsLayerTextureMapper::setContentsOpaque):
+        (WebCore::GraphicsLayerTextureMapper::setBackfaceVisibility):
+        (WebCore::GraphicsLayerTextureMapper::setOpacity):
+        (WebCore::GraphicsLayerTextureMapper::setContentsRect):
+        (WebCore::GraphicsLayerTextureMapper::setContentsToImage):
+        (WebCore::GraphicsLayerTextureMapper::setContentsToMedia):
+        (WebCore::GraphicsLayerTextureMapper::syncCompositingStateForThisLayerOnly):
+        (WebCore::GraphicsLayerTextureMapper::syncCompositingState):
+        (WebCore::GraphicsLayerTextureMapper::addAnimation):
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
+        (WebCore):
+        (GraphicsLayerTextureMapper):
+        (WebCore::GraphicsLayerTextureMapper::layer):
+        * platform/graphics/texmap/TextureMapperLayer.cpp: Renamed from Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp.
+        (WebCore):
+        (WebCore::toTextureMapperLayer):
+        (WebCore::TextureMapperLayer::rootLayer):
+        (WebCore::TextureMapperLayer::setTransform):
+        (WebCore::TextureMapperLayer::clearBackingStoresRecursive):
+        (WebCore::TextureMapperLayer::computeTransformsRecursive):
+        (WebCore::TextureMapperLayer::updateBackingStore):
+        (WebCore::TextureMapperLayer::paint):
+        (WebCore::TextureMapperLayer::paintSelf):
+        (WebCore::TextureMapperLayer::compareGraphicsLayersZValue):
+        (WebCore::TextureMapperLayer::sortByZOrder):
+        (WebCore::TextureMapperLayer::paintSelfAndChildren):
+        (WebCore::TextureMapperLayer::intermediateSurfaceRect):
+        (WebCore::TextureMapperLayer::shouldPaintToIntermediateSurface):
+        (WebCore::TextureMapperLayer::isVisible):
+        (WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica):
+        (WebCore::TextureMapperLayer::paintRecursive):
+        (WebCore::TextureMapperLayer::~TextureMapperLayer):
+        (WebCore::TextureMapperLayer::syncCompositingState):
+        (WebCore::TextureMapperLayer::syncCompositingStateSelf):
+        (WebCore::TextureMapperLayer::descendantsOrSelfHaveRunningAnimations):
+        (WebCore::TextureMapperLayer::syncAnimations):
+        (WebCore::TextureMapperLayer::syncAnimationsRecursively):
+        * platform/graphics/texmap/TextureMapperLayer.h: Renamed from Source/WebCore/platform/graphics/texmap/TextureMapperNode.h.
+        (WebCore):
+        (TextureMapperPaintOptions):
+        (WebCore::TextureMapperPaintOptions::TextureMapperPaintOptions):
+        (TextureMapperLayer):
+        (WebCore::TextureMapperLayer::TextureMapperLayer):
+        (WebCore::TextureMapperLayer::size):
+        (WebCore::TextureMapperLayer::setOpacity):
+        (WebCore::TextureMapperLayer::setTextureMapper):
+        (WebCore::TextureMapperLayer::setShouldUpdateBackingStoreFromLayer):
+        (WebCore::TextureMapperLayer::setBackingStore):
+        (WebCore::TextureMapperLayer::backingStore):
+        (WebCore::TextureMapperLayer::texture):
+        (WebCore::TextureMapperLayer::layerRect):
+        (State):
+        (WebCore::TextureMapperLayer::State::State):
+
 2012-02-15  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -5754 +5754 @@
         Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp \
         Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h \
-        Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp \
-        Source/WebCore/platform/graphics/texmap/TextureMapperNode.h \
+        Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp \
+        Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h \
         Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h
 webcoregtk_sources += \

trunk/Source/WebCore/Target.pri

@@ -3958 +3958 @@
         platform/graphics/texmap/TextureMapperBackingStore.h \
         platform/graphics/texmap/TextureMapperImageBuffer.h \
-        platform/graphics/texmap/TextureMapperNode.h \
+        platform/graphics/texmap/TextureMapperLayer.h \
         platform/graphics/texmap/TextureMapperPlatformLayer.h
 
@@ -3967 +3967 @@
         platform/graphics/texmap/TextureMapperBackingStore.cpp \
         platform/graphics/texmap/TextureMapperImageBuffer.cpp \
-        platform/graphics/texmap/TextureMapperNode.cpp \
+        platform/graphics/texmap/TextureMapperLayer.cpp \
         platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
 

trunk/Source/WebCore/WebCore.gypi

@@ -3591 +3591 @@
             'platform/graphics/texmap/TextureMapperImageBuffer.cpp',
             'platform/graphics/texmap/TextureMapperImageBuffer.h',
-            'platform/graphics/texmap/TextureMapperNode.cpp',
-            'platform/graphics/texmap/TextureMapperNode.h',
+            'platform/graphics/texmap/TextureMapperLayer.cpp',
+            'platform/graphics/texmap/TextureMapperLayer.h',
             'platform/graphics/texmap/TextureMapperPlatformLayer.h',
             'platform/graphics/transforms/AffineTransform.cpp',

trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp

@@ -21 +21 @@
 #include "GraphicsLayerTextureMapper.h"
 
-#include "TextureMapperNode.h"
+#include "TextureMapperLayer.h"
 
 namespace WebCore {
@@ -27 +27 @@
 GraphicsLayerTextureMapper::GraphicsLayerTextureMapper(GraphicsLayerClient* client)
     : GraphicsLayer(client)
-    , m_node(adoptPtr(new TextureMapperNode()))
+    , m_layer(adoptPtr(new TextureMapperLayer()))
     , m_changeMask(0)
     , m_needsDisplay(false)
@@ -35 +35 @@
 }
 
-void GraphicsLayerTextureMapper::notifyChange(TextureMapperNode::ChangeMask changeMask)
+void GraphicsLayerTextureMapper::notifyChange(TextureMapperLayer::ChangeMask changeMask)
 {
     m_changeMask |= changeMask;
@@ -65 +65 @@
 {
     m_needsDisplay = true;
-    notifyChange(TextureMapperNode::DisplayChange);
+    notifyChange(TextureMapperLayer::DisplayChange);
 }
 
@@ -74 +74 @@
     if (m_image)
         setContentsToImage(m_image.get());
-    notifyChange(TextureMapperNode::DisplayChange);
+    notifyChange(TextureMapperLayer::DisplayChange);
 }
 
@@ -84 +84 @@
         return;
     m_needsDisplayRect.unite(rect);
-    notifyChange(TextureMapperNode::DisplayChange);
+    notifyChange(TextureMapperLayer::DisplayChange);
 }
 
@@ -91 +91 @@
 void GraphicsLayerTextureMapper::setParent(GraphicsLayer* layer)
 {
-    notifyChange(TextureMapperNode::ParentChange);
+    notifyChange(TextureMapperLayer::ParentChange);
     GraphicsLayer::setParent(layer);
 }
@@ -99 +99 @@
 bool GraphicsLayerTextureMapper::setChildren(const Vector<GraphicsLayer*>& children)
 {
-    notifyChange(TextureMapperNode::ChildrenChange);
+    notifyChange(TextureMapperLayer::ChildrenChange);
     return GraphicsLayer::setChildren(children);
 }
@@ -107 +107 @@
 void GraphicsLayerTextureMapper::addChild(GraphicsLayer* layer)
 {
-    notifyChange(TextureMapperNode::ChildrenChange);
+    notifyChange(TextureMapperLayer::ChildrenChange);
     GraphicsLayer::addChild(layer);
 }
@@ -116 +116 @@
 {
     GraphicsLayer::addChildAtIndex(layer, index);
-    notifyChange(TextureMapperNode::ChildrenChange);
+    notifyChange(TextureMapperLayer::ChildrenChange);
 }
 
@@ -124 +124 @@
 {
      GraphicsLayer::addChildAbove(layer, sibling);
-     notifyChange(TextureMapperNode::ChildrenChange);
+     notifyChange(TextureMapperLayer::ChildrenChange);
 }
 
@@ -132 +132 @@
 {
     GraphicsLayer::addChildBelow(layer, sibling);
-    notifyChange(TextureMapperNode::ChildrenChange);
+    notifyChange(TextureMapperLayer::ChildrenChange);
 }
 
@@ -140 +140 @@
 {
     if (GraphicsLayer::replaceChild(oldChild, newChild)) {
-        notifyChange(TextureMapperNode::ChildrenChange);
+        notifyChange(TextureMapperLayer::ChildrenChange);
         return true;
     }
@@ -152 +152 @@
     if (!parent())
         return;
-    notifyChange(TextureMapperNode::ParentChange);
+    notifyChange(TextureMapperLayer::ParentChange);
     GraphicsLayer::removeFromParent();
 }
@@ -163 +163 @@
         return;
     GraphicsLayer::setMaskLayer(value);
-    notifyChange(TextureMapperNode::MaskLayerChange);
+    notifyChange(TextureMapperLayer::MaskLayerChange);
 }
 
@@ -174 +174 @@
         return;
     GraphicsLayer::setReplicatedByLayer(value);
-    notifyChange(TextureMapperNode::ReplicaLayerChange);
+    notifyChange(TextureMapperLayer::ReplicaLayerChange);
 }
 
@@ -184 +184 @@
         return;
     GraphicsLayer::setPosition(value);
-    notifyChange(TextureMapperNode::PositionChange);
+    notifyChange(TextureMapperLayer::PositionChange);
 }
 
@@ -194 +194 @@
         return;
     GraphicsLayer::setAnchorPoint(value);
-    notifyChange(TextureMapperNode::AnchorPointChange);
+    notifyChange(TextureMapperLayer::AnchorPointChange);
 }
 
@@ -205 +205 @@
 
     GraphicsLayer::setSize(value);
-    notifyChange(TextureMapperNode::SizeChange);
+    notifyChange(TextureMapperLayer::SizeChange);
 }
 
@@ -216 +216 @@
 
     GraphicsLayer::setTransform(value);
-    notifyChange(TextureMapperNode::TransformChange);
+    notifyChange(TextureMapperLayer::TransformChange);
 }
 
@@ -226 +226 @@
         return;
     GraphicsLayer::setChildrenTransform(value);
-    notifyChange(TextureMapperNode::ChildrenTransformChange);
+    notifyChange(TextureMapperLayer::ChildrenTransformChange);
 }
 
@@ -236 +236 @@
         return;
     GraphicsLayer::setPreserves3D(value);
-    notifyChange(TextureMapperNode::Preserves3DChange);
+    notifyChange(TextureMapperLayer::Preserves3DChange);
 }
 
@@ -246 +246 @@
         return;
     GraphicsLayer::setMasksToBounds(value);
-    notifyChange(TextureMapperNode::MasksToBoundsChange);
+    notifyChange(TextureMapperLayer::MasksToBoundsChange);
 }
 
@@ -255 +255 @@
     if (value == drawsContent())
         return;
-    notifyChange(TextureMapperNode::DrawsContentChange);
+    notifyChange(TextureMapperLayer::DrawsContentChange);
     GraphicsLayer::setDrawsContent(value);
 }
@@ -265 +265 @@
     if (value == contentsOpaque())
         return;
-    notifyChange(TextureMapperNode::ContentsOpaqueChange);
+    notifyChange(TextureMapperLayer::ContentsOpaqueChange);
     GraphicsLayer::setContentsOpaque(value);
 }
@@ -276 +276 @@
         return;
     GraphicsLayer::setBackfaceVisibility(value);
-    notifyChange(TextureMapperNode::BackfaceVisibilityChange);
+    notifyChange(TextureMapperLayer::BackfaceVisibilityChange);
 }
 
@@ -286 +286 @@
         return;
     GraphicsLayer::setOpacity(value);
-    notifyChange(TextureMapperNode::OpacityChange);
+    notifyChange(TextureMapperLayer::OpacityChange);
 }
 
@@ -296 +296 @@
         return;
     GraphicsLayer::setContentsRect(value);
-    notifyChange(TextureMapperNode::ContentsRectChange);
+    notifyChange(TextureMapperLayer::ContentsRectChange);
 }
 
@@ -315 +315 @@
 
     setContentsToMedia(m_compositedImage.get());
-    notifyChange(TextureMapperNode::ContentChange);
+    notifyChange(TextureMapperLayer::ContentChange);
     GraphicsLayer::setContentsToImage(image);
 }
@@ -325 +325 @@
 
     GraphicsLayer::setContentsToMedia(media);
-    notifyChange(TextureMapperNode::ContentChange);
+    notifyChange(TextureMapperLayer::ContentChange);
     m_contentsLayer = media;
 }
@@ -333 +333 @@
 void GraphicsLayerTextureMapper::syncCompositingStateForThisLayerOnly()
 {
-    m_node->syncCompositingState(this);
+    m_layer->syncCompositingState(this);
 }
 
@@ -340 +340 @@
 void GraphicsLayerTextureMapper::syncCompositingState(const FloatRect&)
 {
-    m_node->syncCompositingState(this, TextureMapperNode::TraverseDescendants);
+    m_layer->syncCompositingState(this, TextureMapperLayer::TraverseDescendants);
 }
 
@@ -357 +357 @@
 
     m_animations.add(keyframesName, TextureMapperAnimation(valueList, boxSize, anim, timeOffset, listsMatch));
-    notifyChange(TextureMapperNode::AnimationChange);
+    notifyChange(TextureMapperLayer::AnimationChange);
     m_animationStartedTimer.startOneShot(0);
     return true;

trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h

@@ -25 +25 @@
 #include "GraphicsLayerClient.h"
 #include "Image.h"
-#include "TextureMapperNode.h"
+#include "TextureMapperLayer.h"
 
 #if ENABLE(WEBGL)
@@ -33 +33 @@
 namespace WebCore {
 
-class TextureMapperNode;
+class TextureMapperLayer;
 class BitmapTexture;
 class TextureMapper;
 
 class GraphicsLayerTextureMapper : public GraphicsLayer {
-    friend class TextureMapperNode;
+    friend class TextureMapperLayer;
 
 public:
@@ -78 +78 @@
     virtual PlatformLayer* platformLayer() const { return 0; }
 
-    void notifyChange(TextureMapperNode::ChangeMask changeMask);
+    void notifyChange(TextureMapperLayer::ChangeMask);
     inline int changeMask() const { return m_changeMask; }
     void didSynchronize();
@@ -86 +86 @@
     virtual void removeAnimation(const String&);
 
-    TextureMapperNode* node() const { return m_node.get(); }
+    TextureMapperLayer* layer() const { return m_layer.get(); }
     TextureMapperPlatformLayer* contentsLayer() const { return m_contentsLayer; }
     bool needsDisplay() const { return m_needsDisplay; }
@@ -92 +92 @@
 
 private:
-    OwnPtr<TextureMapperNode> m_node;
+    OwnPtr<TextureMapperLayer> m_layer;
     RefPtr<TextureMapperBackingStore> m_compositedImage;
     RefPtr<Image> m_image;

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp

@@ -19 +19 @@
 
 #include "config.h"
-#include "TextureMapperNode.h"
+#include "TextureMapperLayer.h"
 
 #include "stdio.h"
@@ -31 +31 @@
 namespace WebCore {
 
-TextureMapperNode* toTextureMapperNode(GraphicsLayer* layer)
-{
-    return layer ? toGraphicsLayerTextureMapper(layer)->node() : 0;
-}
-
-TextureMapperNode* TextureMapperNode::rootLayer()
+TextureMapperLayer* toTextureMapperLayer(GraphicsLayer* layer)
+{
+    return layer ? toGraphicsLayerTextureMapper(layer)->layer() : 0;
+}
+
+TextureMapperLayer* TextureMapperLayer::rootLayer()
 {
     if (m_effectTarget)
@@ -45 +45 @@
 }
 
-void TextureMapperNode::setTransform(const TransformationMatrix& matrix)
+void TextureMapperLayer::setTransform(const TransformationMatrix& matrix)
 {
     m_transform.setLocalTransform(matrix);
 }
 
-void TextureMapperNode::clearBackingStoresRecursive()
+void TextureMapperLayer::clearBackingStoresRecursive()
 {
     m_backingStore.clear();
@@ -60 +60 @@
 }
 
-void TextureMapperNode::computeTransformsRecursive()
+void TextureMapperLayer::computeTransformsRecursive()
 {
     if (m_size.isEmpty() && m_state.masksToBounds)
@@ -90 +90 @@
 }
 
-void TextureMapperNode::updateBackingStore(TextureMapper* textureMapper, GraphicsLayer* layer)
+void TextureMapperLayer::updateBackingStore(TextureMapper* textureMapper, GraphicsLayer* layer)
 {
     if (!layer || !textureMapper)
@@ -132 +132 @@
 }
 
-void TextureMapperNode::paint()
+void TextureMapperLayer::paint()
 {
     computeTransformsRecursive();
@@ -142 +142 @@
 }
 
-void TextureMapperNode::paintSelf(const TextureMapperPaintOptions& options)
+void TextureMapperLayer::paintSelf(const TextureMapperPaintOptions& options)
 {
     // We apply the following transform to compensate for painting into a surface, and then apply the offset so that the painting fits in the target rect.
@@ -160 +160 @@
 }
 
-int TextureMapperNode::compareGraphicsLayersZValue(const void* a, const void* b)
-{
-    TextureMapperNode* const* nodeA = static_cast<TextureMapperNode* const*>(a);
-    TextureMapperNode* const* nodeB = static_cast<TextureMapperNode* const*>(b);
-    return int(((*nodeA)->m_centerZ - (*nodeB)->m_centerZ) * 1000);
-}
-
-void TextureMapperNode::sortByZOrder(Vector<TextureMapperNode* >& array, int first, int last)
-{
-    qsort(array.data(), array.size(), sizeof(TextureMapperNode*), compareGraphicsLayersZValue);
-}
-
-void TextureMapperNode::paintSelfAndChildren(const TextureMapperPaintOptions& options)
+int TextureMapperLayer::compareGraphicsLayersZValue(const void* a, const void* b)
+{
+    TextureMapperLayer* const* layerA = static_cast<TextureMapperLayer* const*>(a);
+    TextureMapperLayer* const* layerB = static_cast<TextureMapperLayer* const*>(b);
+    return int(((*layerA)->m_centerZ - (*layerB)->m_centerZ) * 1000);
+}
+
+void TextureMapperLayer::sortByZOrder(Vector<TextureMapperLayer* >& array, int first, int last)
+{
+    qsort(array.data(), array.size(), sizeof(TextureMapperLayer*), compareGraphicsLayersZValue);
+}
+
+void TextureMapperLayer::paintSelfAndChildren(const TextureMapperPaintOptions& options)
 {
     bool hasClip = m_state.masksToBounds && !m_children.isEmpty();
@@ -187 +187 @@
 }
 
-IntRect TextureMapperNode::intermediateSurfaceRect()
+IntRect TextureMapperLayer::intermediateSurfaceRect()
 {
     // FIXME: Add an inverse transform to LayerTransform.
@@ -193 +193 @@
 }
 
-IntRect TextureMapperNode::intermediateSurfaceRect(const TransformationMatrix& matrix)
+IntRect TextureMapperLayer::intermediateSurfaceRect(const TransformationMatrix& matrix)
 {
     IntRect rect;
@@ -209 +209 @@
 }
 
-bool TextureMapperNode::shouldPaintToIntermediateSurface() const
+bool TextureMapperLayer::shouldPaintToIntermediateSurface() const
 {
     bool hasOpacity = m_opacity < 0.99;
@@ -234 +234 @@
 }
 
-bool TextureMapperNode::isVisible() const
+bool TextureMapperLayer::isVisible() const
 {
     if (m_size.isEmpty() && (m_state.masksToBounds || m_state.maskLayer || m_children.isEmpty()))
@@ -243 +243 @@
 }
 
-void TextureMapperNode::paintSelfAndChildrenWithReplica(const TextureMapperPaintOptions& options)
+void TextureMapperLayer::paintSelfAndChildrenWithReplica(const TextureMapperPaintOptions& options)
 {
     if (m_state.replicaLayer) {
@@ -261 +261 @@
 }
 
-void TextureMapperNode::paintRecursive(const TextureMapperPaintOptions& options)
+void TextureMapperLayer::paintRecursive(const TextureMapperPaintOptions& options)
 {
     if (!isVisible())
@@ -306 +306 @@
 }
 
-TextureMapperNode::~TextureMapperNode()
+TextureMapperLayer::~TextureMapperLayer()
 {
     for (int i = m_children.size() - 1; i >= 0; --i)
@@ -315 +315 @@
 }
 
-void TextureMapperNode::syncCompositingState(GraphicsLayerTextureMapper* graphicsLayer, int options)
+void TextureMapperLayer::syncCompositingState(GraphicsLayerTextureMapper* graphicsLayer, int options)
 {
     syncCompositingState(graphicsLayer, rootLayer()->m_textureMapper, options);
 }
 
-void TextureMapperNode::syncCompositingStateSelf(GraphicsLayerTextureMapper* graphicsLayer, TextureMapper* textureMapper)
+void TextureMapperLayer::syncCompositingStateSelf(GraphicsLayerTextureMapper* graphicsLayer, TextureMapper* textureMapper)
 {
     int changeMask = graphicsLayer->changeMask();
@@ -328 +328 @@
 
     if (changeMask & ParentChange) {
-        TextureMapperNode* newParent = toTextureMapperNode(graphicsLayer->parent());
+        TextureMapperLayer* newParent = toTextureMapperLayer(graphicsLayer->parent());
         if (newParent != m_parent) {
-            // Remove node from current from child list first.
+            // Remove layer from current from child list first.
             if (m_parent) {
                 size_t index = m_parent->m_children.find(this);
@@ -336 +336 @@
                 m_parent = 0;
             }
-            // Set new node parent and add node to the parents child list.
+            // Set new layer parent and add layer to the parents child list.
             if (newParent) {
                 m_parent = newParent;
@@ -345 +345 @@
 
     if (changeMask & ChildrenChange) {
-        // Clear children parent pointer to avoid unsync and crash on node delete.
+        // Clear children parent pointer to avoid unsync and crash on layer delete.
         for (size_t i = 0; i < m_children.size(); i++)
             m_children[i]->m_parent = 0;
@@ -351 +351 @@
         m_children.clear();
         for (size_t i = 0; i < graphicsLayer->children().size(); ++i) {
-            TextureMapperNode* child = toTextureMapperNode(graphicsLayer->children()[i]);
+            TextureMapperLayer* child = toTextureMapperLayer(graphicsLayer->children()[i]);
             if (!child)
                 continue;
@@ -362 +362 @@
 
     if (changeMask & MaskLayerChange) {
-       if (TextureMapperNode* layer = toTextureMapperNode(graphicsLayer->maskLayer()))
+       if (TextureMapperLayer* layer = toTextureMapperLayer(graphicsLayer->maskLayer()))
            layer->m_effectTarget = this;
     }
 
     if (changeMask & ReplicaLayerChange) {
-       if (TextureMapperNode* layer = toTextureMapperNode(graphicsLayer->replicaLayer()))
+       if (TextureMapperLayer* layer = toTextureMapperLayer(graphicsLayer->replicaLayer()))
            layer->m_effectTarget = this;
     }
@@ -374 +374 @@
         m_animations = graphicsLayer->m_animations;
 
-    m_state.maskLayer = toTextureMapperNode(graphicsLayer->maskLayer());
-    m_state.replicaLayer = toTextureMapperNode(graphicsLayer->replicaLayer());
+    m_state.maskLayer = toTextureMapperLayer(graphicsLayer->maskLayer());
+    m_state.replicaLayer = toTextureMapperLayer(graphicsLayer->replicaLayer());
     m_state.pos = graphicsLayer->position();
     m_state.anchorPoint = graphicsLayer->anchorPoint();
@@ -401 +401 @@
 }
 
-bool TextureMapperNode::descendantsOrSelfHaveRunningAnimations() const
+bool TextureMapperLayer::descendantsOrSelfHaveRunningAnimations() const
 {
     if (m_animations.hasRunningAnimations())
@@ -414 +414 @@
 }
 
-void TextureMapperNode::syncAnimations()
+void TextureMapperLayer::syncAnimations()
 {
     m_animations.apply(this);
@@ -423 +423 @@
 }
 
-void TextureMapperNode::syncAnimationsRecursively()
+void TextureMapperLayer::syncAnimationsRecursively()
 {
     syncAnimations();
@@ -431 +431 @@
 }
 
-void TextureMapperNode::syncCompositingState(GraphicsLayerTextureMapper* graphicsLayer, TextureMapper* textureMapper, int options)
+void TextureMapperLayer::syncCompositingState(GraphicsLayerTextureMapper* graphicsLayer, TextureMapper* textureMapper, int options)
 {
     if (!textureMapper)
@@ -461 +461 @@
         Vector<GraphicsLayer*> children = graphicsLayer->children();
         for (int i = children.size() - 1; i >= 0; --i) {
-            TextureMapperNode* node = toTextureMapperNode(children[i]);
-            if (!node)
+            TextureMapperLayer* layer = toTextureMapperLayer(children[i]);
+            if (!layer)
                 continue;
-            node->syncCompositingState(toGraphicsLayerTextureMapper(children[i]), textureMapper, options);
+            layer->syncCompositingState(toGraphicsLayerTextureMapper(children[i]), textureMapper, options);
         }
     } else {

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h

@@ -18 +18 @@
  */
 
-#ifndef TextureMapperNode_h
-#define TextureMapperNode_h
+#ifndef TextureMapperLayer_h
+#define TextureMapperLayer_h
 
 #include "FloatRect.h"
@@ -39 +39 @@
 
 class TextureMapperPlatformLayer;
-class TextureMapperNode;
+class TextureMapperLayer;
 class GraphicsLayerTextureMapper;
 
@@ -56 +56 @@
 };
 
-class TextureMapperNode : public TextureMapperAnimationClient {
+class TextureMapperLayer : public TextureMapperAnimationClient {
 
 public:
@@ -97 +97 @@
     };
 
-    TextureMapperNode()
+    TextureMapperLayer()
         : m_parent(0)
         , m_effectTarget(0)
@@ -107 +107 @@
     { }
 
-    virtual ~TextureMapperNode();
+    virtual ~TextureMapperLayer();
 
     void syncCompositingState(GraphicsLayerTextureMapper*, int syncOptions = 0);
@@ -126 +126 @@
 
 private:
-    TextureMapperNode* rootLayer();
+    TextureMapperLayer* rootLayer();
     void computeTransformsRecursive();
     void computeOverlapsIfNeeded();
@@ -136 +136 @@
     void invalidateViewport(const FloatRect&);
     void notifyChange(ChangeMask);
-    void syncCompositingStateSelf(GraphicsLayerTextureMapper* graphicsLayer, TextureMapper* textureMapper);
+    void syncCompositingStateSelf(GraphicsLayerTextureMapper*, TextureMapper*);
 
     static int compareGraphicsLayersZValue(const void* a, const void* b);
-    static void sortByZOrder(Vector<TextureMapperNode* >& array, int first, int last);
+    static void sortByZOrder(Vector<TextureMapperLayer* >& array, int first, int last);
 
     PassRefPtr<BitmapTexture> texture() { return m_backingStore ? m_backingStore->texture() : 0; }
@@ -160 +160 @@
     }
 
-    Vector<TextureMapperNode*> m_children;
-    TextureMapperNode* m_parent;
-    TextureMapperNode* m_effectTarget;
+    Vector<TextureMapperLayer*> m_children;
+    TextureMapperLayer* m_parent;
+    TextureMapperLayer* m_effectTarget;
     RefPtr<TextureMapperBackingStore> m_backingStore;
     TextureMapperPlatformLayer* m_contentsLayer;
@@ -181 +181 @@
         FloatRect needsDisplayRect;
         int descendantsWithContent;
-        TextureMapperNode* maskLayer;
-        TextureMapperNode* replicaLayer;
+        TextureMapperLayer* maskLayer;
+        TextureMapperLayer* replicaLayer;
         bool preserves3D : 1;
         bool masksToBounds : 1;
@@ -215 +215 @@
 
 
-TextureMapperNode* toTextureMapperNode(GraphicsLayer*);
+TextureMapperLayer* toTextureMapperLayer(GraphicsLayer*);
 
 }
-#endif // TextureMapperNode_h
+#endif // TextureMapperLayer_h

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-02-15  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Texmap] Divide TextureMapperNode.cpp to 3 files.
+        https://bugs.webkit.org/show_bug.cgi?id=76660
+
+        Rename TextureMapperNode to TextureMapperLayer.        
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * WebCoreSupport/AcceleratedCompositingContext.h:
+        (AcceleratedCompositingContext):
+        * WebCoreSupport/AcceleratedCompositingContextGL.cpp:
+        (WebKit::AcceleratedCompositingContext::AcceleratedCompositingContext):
+        (WebKit::AcceleratedCompositingContext::enabled):
+        (WebKit::AcceleratedCompositingContext::renderLayersToWindow):
+        (WebKit::AcceleratedCompositingContext::attachRootGraphicsLayer):
+        (WebKit::AcceleratedCompositingContext::syncLayersTimeout):
+
 2012-02-11  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h

@@ -29 +29 @@
 
 #if USE(TEXTURE_MAPPER_GL)
-#include "TextureMapperNode.h"
+#include "TextureMapperLayer.h"
 #include "WindowGLContext.h"
 #endif
@@ -73 +73 @@
 
     bool m_initialized;
-    WebCore::TextureMapperNode* m_rootTextureMapperNode;
+    WebCore::TextureMapperLayer* m_rootTextureMapperLayer;
     OwnPtr<WebCore::WindowGLContext> m_context;
     OwnPtr<WebCore::TextureMapper> m_textureMapper;

trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp

@@ -29 +29 @@
 #include "PlatformContextCairo.h"
 #include "TextureMapperGL.h"
-#include "TextureMapperNode.h"
+#include "TextureMapperLayer.h"
 #include "webkitwebviewprivate.h"
 #include <GL/gl.h>
@@ -44 +44 @@
     , m_syncTimer(this, &AcceleratedCompositingContext::syncLayersTimeout)
     , m_initialized(false)
-    , m_rootTextureMapperNode(0)
+    , m_rootTextureMapperLayer(0)
 {
 }
@@ -70 +70 @@
 bool AcceleratedCompositingContext::enabled()
 {
-    return m_rootTextureMapperNode && m_textureMapper;
+    return m_rootTextureMapperLayer && m_textureMapper;
 }
 
@@ -91 +91 @@
 
     m_textureMapper->beginPainting();
-    m_rootTextureMapperNode->paint();
+    m_rootTextureMapperLayer->paint();
     m_textureMapper->endPainting();
 
@@ -102 +102 @@
     if (!graphicsLayer) {
         m_rootGraphicsLayer.clear();
-        m_rootTextureMapperNode = 0;
+        m_rootTextureMapperLayer = 0;
         return;
     }
 
     m_rootGraphicsLayer = GraphicsLayer::create(this);
-    m_rootTextureMapperNode = toTextureMapperNode(m_rootGraphicsLayer.get());
+    m_rootTextureMapperLayer = toTextureMapperLayer(m_rootGraphicsLayer.get());
     m_rootGraphicsLayer->addChild(graphicsLayer);
     m_rootGraphicsLayer->setDrawsContent(true);
@@ -128 +128 @@
 
     m_textureMapper = TextureMapperGL::create();
-    m_rootTextureMapperNode->setTextureMapper(m_textureMapper.get());
+    m_rootTextureMapperLayer->setTextureMapper(m_textureMapper.get());
     m_rootGraphicsLayer->syncCompositingStateForThisLayerOnly();
 }
@@ -174 +174 @@
     renderLayersToWindow(IntRect());
 
-    if (toTextureMapperNode(m_rootGraphicsLayer.get())->descendantsOrSelfHaveRunningAnimations())
+    if (toTextureMapperLayer(m_rootGraphicsLayer.get())->descendantsOrSelfHaveRunningAnimations())
         m_syncTimer.startOneShot(1.0 / 60.0);
 }

trunk/Source/WebKit/qt/Api/qwebframe.cpp

@@ -105 +105 @@
 #if USE(TEXTURE_MAPPER)
 #include "texmap/TextureMapper.h"
-#include "texmap/TextureMapperNode.h"
+#include "texmap/TextureMapperLayer.h"
 #endif
 #include "wtf/HashMap.h"
@@ -332 +332 @@
 void QWebFramePrivate::renderCompositedLayers(GraphicsContext* context, const IntRect& clip)
 {
-    if (!rootTextureMapperNode || !textureMapper)
+    if (!rootTextureMapperLayer || !textureMapper)
         return;
 
@@ -346 +346 @@
                 transform.m31(), transform.m32(), 0, transform.m33()
                 );
-    rootTextureMapperNode->setTransform(matrix);
-    rootTextureMapperNode->setOpacity(painter->opacity());
+    rootTextureMapperLayer->setTransform(matrix);
+    rootTextureMapperLayer->setOpacity(painter->opacity());
     textureMapper->beginPainting();
     textureMapper->beginClip(matrix, clip);
-    rootTextureMapperNode->paint();
+    rootTextureMapperLayer->paint();
     textureMapper->endClip();
     textureMapper->endPainting();

trunk/Source/WebKit/qt/Api/qwebframe.h

@@ -61 +61 @@
     class FrameLoaderClientQt;
     class ChromeClientQt;
-    class TextureMapperNodeClientQt;
+    class TextureMapperLayerClientQt;
 }
 class QWebFrameData;
@@ -235 +235 @@
     friend class WebCore::FrameLoaderClientQt;
     friend class WebCore::ChromeClientQt;
-    friend class WebCore::TextureMapperNodeClientQt;
+    friend class WebCore::TextureMapperLayerClientQt;
     QWebFramePrivate *d;
     Q_PRIVATE_SLOT(d, void _q_orientationChanged())

trunk/Source/WebKit/qt/Api/qwebframe_p.h

@@ -50 +50 @@
     class HTMLFrameOwnerElement;
     class Scrollbar;
-    class TextureMapperNode;
+    class TextureMapperLayer;
 }
 class QWebPage;
@@ -86 +86 @@
         , marginHeight(-1)
 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
-        , rootTextureMapperNode(0)
+        , rootTextureMapperLayer(0)
 #endif
         {}
@@ -126 +126 @@
     int marginHeight;
 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
-    WebCore::TextureMapperNode* rootTextureMapperNode;
+    WebCore::TextureMapperLayer* rootTextureMapperLayer;
     OwnPtr<WebCore::TextureMapper> textureMapper;
 #endif

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2012-02-15  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Texmap] Divide TextureMapperNode.cpp to 3 files.
+        https://bugs.webkit.org/show_bug.cgi?id=76660
+
+        Rename TextureMapperNode to TextureMapperLayer.
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * Api/qwebframe.cpp:
+        (QWebFramePrivate::renderCompositedLayers):
+        * Api/qwebframe.h:
+        (WebCore):
+        * Api/qwebframe_p.h:
+        (WebCore):
+        (QWebFramePrivate::QWebFramePrivate):
+        (QWebFramePrivate):
+        * WebCoreSupport/PageClientQt.cpp:
+        (WebCore::TextureMapperLayerClientQt::TextureMapperLayerClientQt):
+        (WebCore::TextureMapperLayerClientQt::setTextureMapper):
+        (WebCore::TextureMapperLayerClientQt::~TextureMapperLayerClientQt):
+        (WebCore::TextureMapperLayerClientQt::syncRootLayer):
+        (WebCore::TextureMapperLayerClientQt::rootLayer):
+        (WebCore::PageClientQWidget::setRootGraphicsLayer):
+        (WebCore::PageClientQWidget::syncLayers):
+        (WebCore::PageClientQGraphicsWidget::syncLayers):
+        (WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):
+        * WebCoreSupport/PageClientQt.h:
+        (TextureMapperLayerClientQt):
+        (PageClientQWidget):
+        (PageClientQGraphicsWidget):
+
 2012-02-11  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp

@@ -30 +30 @@
 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
 #include "TextureMapper.h"
-#include "texmap/TextureMapperNode.h"
+#include "texmap/TextureMapperLayer.h"
 #endif
 
@@ -36 +36 @@
 
 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
-TextureMapperNodeClientQt::TextureMapperNodeClientQt(QWebFrame* frame, GraphicsLayer* layer)
+TextureMapperLayerClientQt::TextureMapperLayerClientQt(QWebFrame* frame, GraphicsLayer* layer)
     : m_frame(frame)
     , m_rootGraphicsLayer(GraphicsLayer::create(0))
 {
-    m_frame->d->rootTextureMapperNode = rootNode();
+    m_frame->d->rootTextureMapperLayer = rootLayer();
     m_rootGraphicsLayer->addChild(layer);
     m_rootGraphicsLayer->setDrawsContent(false);
@@ -47 +47 @@
 }
 
-void TextureMapperNodeClientQt::setTextureMapper(const PassOwnPtr<TextureMapper>& textureMapper)
+void TextureMapperLayerClientQt::setTextureMapper(const PassOwnPtr<TextureMapper>& textureMapper)
 {
     m_frame->d->textureMapper = textureMapper;
-    m_frame->d->rootTextureMapperNode->setTextureMapper(m_frame->d->textureMapper.get());
-}
-
-TextureMapperNodeClientQt::~TextureMapperNodeClientQt()
-{
-    m_frame->d->rootTextureMapperNode = 0;
-}
-
-void TextureMapperNodeClientQt::syncRootLayer()
+    m_frame->d->rootTextureMapperLayer->setTextureMapper(m_frame->d->textureMapper.get());
+}
+
+TextureMapperLayerClientQt::~TextureMapperLayerClientQt()
+{
+    m_frame->d->rootTextureMapperLayer = 0;
+}
+
+void TextureMapperLayerClientQt::syncRootLayer()
 {
     m_rootGraphicsLayer->syncCompositingStateForThisLayerOnly();
 }
 
-TextureMapperNode* TextureMapperNodeClientQt::rootNode()
-{
-    return toTextureMapperNode(m_rootGraphicsLayer.get());
+TextureMapperLayer* TextureMapperLayerClientQt::rootLayer()
+{
+    return toTextureMapperLayer(m_rootGraphicsLayer.get());
 }
 
@@ -72 +72 @@
 {
     if (layer) {
-        textureMapperNodeClient = adoptPtr(new TextureMapperNodeClientQt(page->mainFrame(), layer));
-        textureMapperNodeClient->setTextureMapper(TextureMapper::create());
-        textureMapperNodeClient->syncRootLayer();
-        return;
-    }
-    textureMapperNodeClient.clear();
+        TextureMapperLayerClient = adoptPtr(new TextureMapperLayerClientQt(page->mainFrame(), layer));
+        TextureMapperLayerClient->setTextureMapper(TextureMapper::create());
+        TextureMapperLayerClient->syncRootLayer();
+        return;
+    }
+    TextureMapperLayerClient.clear();
 }
 
@@ -89 +89 @@
 void PageClientQWidget::syncLayers(Timer<PageClientQWidget>*)
 {
-    if (textureMapperNodeClient)
-        textureMapperNodeClient->syncRootLayer();
+    if (TextureMapperLayerClient)
+        TextureMapperLayerClient->syncRootLayer();
     QWebFramePrivate::core(page->mainFrame())->view()->syncCompositingStateIncludingSubframes();
-    if (!textureMapperNodeClient)
-        return;
-    if (textureMapperNodeClient->rootNode()->descendantsOrSelfHaveRunningAnimations() && !syncTimer.isActive())
+    if (!TextureMapperLayerClient)
+        return;
+    if (TextureMapperLayerClient->rootLayer()->descendantsOrSelfHaveRunningAnimations() && !syncTimer.isActive())
         syncTimer.startOneShot(1.0 / 60.0);
     update(view->rect());
@@ -240 +240 @@
 {
 #if USE(TEXTURE_MAPPER)
-    if (textureMapperNodeClient)
-        textureMapperNodeClient->syncRootLayer();
+    if (TextureMapperLayerClient)
+        TextureMapperLayerClient->syncRootLayer();
 #endif
 
@@ -247 +247 @@
 
 #if USE(TEXTURE_MAPPER)
-    if (!textureMapperNodeClient)
-        return;
-
-    if (textureMapperNodeClient->rootNode()->descendantsOrSelfHaveRunningAnimations() && !syncTimer.isActive())
+    if (!TextureMapperLayerClient)
+        return;
+
+    if (TextureMapperLayerClient->rootLayer()->descendantsOrSelfHaveRunningAnimations() && !syncTimer.isActive())
         syncTimer.startOneShot(1.0 / 60.0);
     update(view->boundingRect().toAlignedRect());
@@ -260 +260 @@
 {
     if (layer) {
-        textureMapperNodeClient = adoptPtr(new TextureMapperNodeClientQt(page->mainFrame(), layer));
+        TextureMapperLayerClient = adoptPtr(new TextureMapperLayerClientQt(page->mainFrame(), layer));
 #if USE(TEXTURE_MAPPER_GL)
         QGraphicsView* graphicsView = view->scene()->views()[0];
         if (graphicsView && graphicsView->viewport() && graphicsView->viewport()->inherits("QGLWidget")) {
-            textureMapperNodeClient->setTextureMapper(TextureMapper::create(TextureMapper::OpenGLMode));
+            TextureMapperLayerClient->setTextureMapper(TextureMapper::create(TextureMapper::OpenGLMode));
             return;
         }
 #endif
-        textureMapperNodeClient->setTextureMapper(TextureMapper::create());
-        return;
-    }
-    textureMapperNodeClient.clear();
+        TextureMapperLayerClient->setTextureMapper(TextureMapper::create());
+        return;
+    }
+    TextureMapperLayerClient.clear();
 }
 #else

trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.h

@@ -45 +45 @@
 
 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
-class TextureMapperNodeClientQt {
+class TextureMapperLayerClientQt {
 public:
-    TextureMapperNodeClientQt(QWebFrame*, GraphicsLayer*);
-    virtual ~TextureMapperNodeClientQt();
+    TextureMapperLayerClientQt(QWebFrame*, GraphicsLayer*);
+    virtual ~TextureMapperLayerClientQt();
     void setTextureMapper(const PassOwnPtr<TextureMapper>&);
     void syncRootLayer();
-    TextureMapperNode* rootNode();
+    TextureMapperLayer* rootLayer();
 
 private:
@@ -115 +115 @@
 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     Timer<PageClientQWidget> syncTimer;
-    OwnPtr<TextureMapperNodeClientQt> textureMapperNodeClient;
+    OwnPtr<TextureMapperLayerClientQt> TextureMapperLayerClient;
 #endif
 };
@@ -224 +224 @@
 #if USE(ACCELERATED_COMPOSITING)
 #if USE(TEXTURE_MAPPER)
-    OwnPtr<TextureMapperNodeClientQt> textureMapperNodeClient;
+    OwnPtr<TextureMapperLayerClientQt> TextureMapperLayerClient;
 #else
     QWeakPointer<QGraphicsObject> rootGraphicsLayer;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-02-15  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Texmap] Divide TextureMapperNode.cpp to 3 files.
+        https://bugs.webkit.org/show_bug.cgi?id=76660
+
+        Rename TextureMapperNode to TextureMapperLayer.
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * UIProcess/qt/LayerTreeHostProxyQt.cpp:
+        (WebKit::LayerTreeHostProxy::createLayer):
+        (WebKit::LayerTreeHostProxy::paintToCurrentGLContext):
+        (WebKit::LayerTreeHostProxy::paintToGraphicsContext):
+        (WebKit::LayerTreeHostProxy::getBackingStore):
+        (WebKit::LayerTreeHostProxy::ensureRootLayer):
+        (WebKit::LayerTreeHostProxy::purgeGLResources):
+
 2012-02-14  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/qt/LayerTreeHostProxyQt.cpp

@@ -31 +31 @@
 #include "TextureMapper.h"
 #include "TextureMapperBackingStore.h"
-#include "TextureMapperNode.h"
+#include "TextureMapperLayer.h"
 #include "UpdateInfo.h"
 #include "WebCoreArgumentCoders.h"
@@ -150 +150 @@
 {
     GraphicsLayer* newLayer = new GraphicsLayerTextureMapper(this);
-    TextureMapperNode* node = toTextureMapperNode(newLayer);
-    node->setShouldUpdateBackingStoreFromLayer(false);
+    TextureMapperLayer* layer = toTextureMapperLayer(newLayer);
+    layer->setShouldUpdateBackingStoreFromLayer(false);
     return adoptPtr(newLayer);
 }
@@ -179 +179 @@
         return;
 
-    TextureMapperNode* node = toTextureMapperNode(currentRootLayer);
-
-    if (!node)
-        return;
-
-    node->setTextureMapper(m_textureMapper.get());
+    TextureMapperLayer* layer = toTextureMapperLayer(currentRootLayer);
+
+    if (!layer)
+        return;
+
+    layer->setTextureMapper(m_textureMapper.get());
     m_textureMapper->beginPainting();
     m_textureMapper->bindSurface(0);
@@ -195 +195 @@
     }
 
-    node->paint();
+    layer->paint();
     m_textureMapper->endClip();
     m_textureMapper->endPainting();
 
-    if (node->descendantsOrSelfHaveRunningAnimations()) {
-        node->syncAnimationsRecursively();
+    if (layer->descendantsOrSelfHaveRunningAnimations()) {
+        layer->syncAnimationsRecursively();
         m_viewportUpdateTimer.startOneShot(0);
     }
@@ -211 +211 @@
     ASSERT(m_textureMapper->accelerationMode() == TextureMapper::SoftwareMode);
     syncRemoteContent();
-    TextureMapperNode* node = toTextureMapperNode(rootLayer());
-
-    if (!node)
+    TextureMapperLayer* layer = toTextureMapperLayer(rootLayer());
+
+    if (!layer)
         return;
 
@@ -220 +220 @@
     m_textureMapper->beginPainting();
     m_textureMapper->bindSurface(0);
-    node->paint();
+    layer->paint();
     m_textureMapper->endPainting();
     m_textureMapper->setGraphicsContext(0);
@@ -344 +344 @@
 {
     ensureLayer(id);
-    TextureMapperNode* node = toTextureMapperNode(layerByID(id));
-    RefPtr<LayerBackingStore> backingStore = static_cast<LayerBackingStore*>(node->backingStore().get());
+    TextureMapperLayer* layer = toTextureMapperLayer(layerByID(id));
+    RefPtr<LayerBackingStore> backingStore = static_cast<LayerBackingStore*>(layer->backingStore().get());
     if (!backingStore) {
         backingStore = LayerBackingStore::create();
-        node->setBackingStore(backingStore.get());
+        layer->setBackingStore(backingStore.get());
     }
     ASSERT(backingStore);
@@ -421 +421 @@
     if (!m_textureMapper)
         m_textureMapper = TextureMapper::create(TextureMapper::OpenGLMode);
-    toTextureMapperNode(m_rootLayer.get())->setTextureMapper(m_textureMapper.get());
+    toTextureMapperLayer(m_rootLayer.get())->setTextureMapper(m_textureMapper.get());
 }
 
@@ -578 +578 @@
 void LayerTreeHostProxy::purgeGLResources()
 {
-    TextureMapperNode* node = toTextureMapperNode(rootLayer());
-
-    if (node)
-        node->clearBackingStoresRecursive();
+    TextureMapperLayer* layer = toTextureMapperLayer(rootLayer());
+
+    if (layer)
+        layer->clearBackingStoresRecursive();
 
     m_directlyCompositedImages.clear();