Changeset 40878 in webkit

Timestamp:

Feb 11, 2009, 4:35:18 PM (17 years ago)

Author:

Simon Fraser

Message:

2009-02-11 Simon Fraser <Simon Fraser>

No review.

Fix ACCELERATED_COMPOSITING build.

• rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::createGraphicsLayer): (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
• rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::updateLayerCompositingState):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (2 diffs)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ -42 +42 @@
         (WebCore::StyleTransformData::operator==):
         * rendering/style/StyleTransformData.h:
+
+2009-02-11  Simon Fraser  <simon.fraser@apple.com>
+
+        No review.
+
+        Fix ACCELERATED_COMPOSITING build.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::createGraphicsLayer):
+        (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::updateLayerCompositingState):
 
 2009-02-11  Simon Fraser  <simon.fraser@apple.com>

trunk/WebCore/rendering/RenderLayerBacking.cpp

@@ -79 +79 @@
     else {
         if (renderer()->node()->isHTMLElement() && renderer()->node()->hasID())
-            m_graphicsLayer->setName(renderer()->renderName() + String(" ") + static_cast<HTMLElement*>(renderer()->element())->id());
+            m_graphicsLayer->setName(renderer()->renderName() + String(" ") + static_cast<HTMLElement*>(renderer()->node())->id());
         else
             m_graphicsLayer->setName(renderer()->renderName());
@@ -241 +241 @@
         const IntRect borderBox = toRenderBox(renderer())->borderBoxRect();
 
-        IntRect layerBounds = IntRect(m_owningLayer->xPos(), m_owningLayer->yPos(), borderBox.width(), borderBox.height());
+        IntRect layerBounds = IntRect(m_owningLayer->x(), m_owningLayer->y(), borderBox.width(), borderBox.height());
         // Convert to absolute coords to match bbox.
         int x = 0, y = 0;
         m_owningLayer->convertToLayerCoords(compAncestor, x, y);
-        layerBounds.move(x - m_owningLayer->xPos(), y - m_owningLayer->yPos());
+        layerBounds.move(x - m_owningLayer->x(), y - m_owningLayer->y());
 
         // Update properties that depend on layer dimensions

trunk/WebCore/rendering/RenderLayerCompositor.cpp

@@ -184 +184 @@
             m_renderView->frameView()->setNeedsOneShotDrawingSynchronization();
         }
-
-        layer->renderer()->compositingStateChanged();
     }