Changeset 96120 in webkit

Timestamp:

Sep 27, 2011 9:38:19 AM (13 years ago)

Author:

noam.rosenthal@nokia.com

Message:

[Texmap] Code cleanup: remove unused boundingRect/visibleRect calculations
​https://bugs.webkit.org/show_bug.cgi?id=68897

Reviewed by Andreas Kling.

No new functionality so no new tests.

• platform/graphics/texmap/TextureMapperNode.cpp:

(WebCore::TextureMapperNode::computeAllTransforms):
(WebCore::TextureMapperNode::computeTiles):
(WebCore::TextureMapperNode::syncCompositingState):

• platform/graphics/texmap/TextureMapperNode.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapperNode.cpp (modified) (7 diffs)
• platform/graphics/texmap/TextureMapperNode.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-27  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Texmap] Code cleanup: remove unused boundingRect/visibleRect calculations
+        https://bugs.webkit.org/show_bug.cgi?id=68897
+
+        Reviewed by Andreas Kling.
+
+        No new functionality so no new tests.
+
+        * platform/graphics/texmap/TextureMapperNode.cpp:
+        (WebCore::TextureMapperNode::computeAllTransforms):
+        (WebCore::TextureMapperNode::computeTiles):
+        (WebCore::TextureMapperNode::syncCompositingState):
+        * platform/graphics/texmap/TextureMapperNode.h:
+
 2011-09-27  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

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

@@ -137 +137 @@
 }
 
-bool TextureMapperNode::needsToComputeBoundingRect() const
-{
-    if (m_size.width() > gTileDimension || m_size.height() > gTileDimension)
-        return true;
-    if (!m_state.masksToBounds)
-        return false;
-
-    for (size_t i = 0; i < m_children.size(); ++i)
-        if (m_children[i]->needsToComputeBoundingRect())
-            return true;
-
-    return false;
-}
-
 void TextureMapperNode::computeAllTransforms()
 {
@@ -161 +147 @@
 
     m_transforms.target = TransformationMatrix(m_parent ? m_parent->m_transforms.forDescendants : TransformationMatrix()).multiply(m_transforms.local);
-    m_transforms.targetBoundingRect = FloatRect(m_transforms.target.mapRect(targetRect()));
 
     m_state.visible = m_state.backfaceVisibility || m_transforms.target.inverse().m33() >= 0;
@@ -185 +170 @@
 
     m_transforms.forDescendants.multiply(m_transforms.perspective);
-}
-
-void TextureMapperNode::computeBoundingRectFromRootIfNeeded()
-{
-    if (!needsToComputeBoundingRect())
-        return;
-    if (!m_parent) {
-        m_transforms.boundingRectFromRoot = m_transforms.boundingRectFromRootForDescendants = IntRect(0, 0, -1, -1);
-        return;
-    }
-
-    const FloatRect targetRectInRootCoordinates = m_transforms.target.mapRect(targetRect());
-
-    const FloatRect parentBoundingRect = m_parent->m_transforms.boundingRectFromRootForDescendants;
-    if (parentBoundingRect.width() < 0)
-        m_transforms.boundingRectFromRoot = targetRectInRootCoordinates;
-    else {
-        m_transforms.boundingRectFromRootForDescendants = m_transforms.boundingRectFromRoot = parentBoundingRect;
-        m_transforms.boundingRectFromRoot.intersect(targetRectInRootCoordinates);
-    }
-    if (m_state.masksToBounds)
-        m_transforms.boundingRectFromRootForDescendants.intersect(m_transforms.boundingRectFromRoot);
 }
 
@@ -228 +191 @@
             tileRectInRootCoordinates.scale(1.0 / m_state.contentScale);
             tileRectInRootCoordinates = m_transforms.target.mapRect(tileRectInRootCoordinates);
-            static bool sDiscardHiddenTiles = false;
-            // FIXME: discard hidden tiles.
-            if (!sDiscardHiddenTiles || !needsToComputeBoundingRect() || tileRectInRootCoordinates.intersects(m_state.visibleRect))
-                tilesToAdd.append(tileRect);
+            tilesToAdd.append(tileRect);
         }
     }
@@ -270 +230 @@
     for (size_t i = 0; i < tilesToRemove.size() && m_tiles.size() > TileEraseThreshold; ++i)
         m_tiles.remove(tilesToRemove[i]);
-}
-
-void TextureMapperNode::computeVisibleRectIfNeeded()
-{
-    if (!needsToComputeBoundingRect())
-        return;
-    FloatRect rootVisibleRect;
-    if (!m_parent)
-        rootVisibleRect = m_state.rootVisibleRect;
-    else if (m_parent)
-        rootVisibleRect = m_parent->m_state.rootVisibleRect;
-
-    m_state.rootVisibleRect = rootVisibleRect;
-    m_state.visibleRect = m_state.rootVisibleRect;
-    m_state.visibleRect.intersect(m_transforms.boundingRectFromRoot);
 }
 
@@ -566 +511 @@
     if (m_parent)
         m_parent->m_children.remove(m_parent->m_children.find(this));
-}
-
-void TextureMapperNode::setVisibleRect(const IntRect& rect)
-{
-    m_state.rootVisibleRect = m_state.visibleRect = rect;
 }
 
@@ -896 +836 @@
 
     computeAllTransforms();
-    computeBoundingRectFromRootIfNeeded();
     computePerspectiveTransformIfNeeded();
     computeTiles();

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

@@ -136 +136 @@
     void setTransform(const TransformationMatrix&);
     void setOpacity(float value) { m_opacity = value; }
-    void setVisibleRect(const IntRect&);
     void setTextureMapper(TextureMapper* texmap) { m_textureMapper = texmap; }
     bool descendantsOrSelfHaveRunningAnimations() const;
@@ -149 +148 @@
     TextureMapperNode* rootLayer();
     void computeAllTransforms();
-    void computeVisibleRectIfNeeded();
     void computePerspectiveTransformIfNeeded();
     void computeReplicaTransformIfNeeded();