Log Message
Unreviewed, rolling out r102091. http://trac.webkit.org/changeset/102091 https://bugs.webkit.org/show_bug.cgi?id=73711
Caused Clang Linux compile failure. Source/WebCore: * platform/graphics/chromium/GraphicsLayerChromium.cpp: (WebCore::GraphicsLayerChromium::setAnchorPoint): (WebCore::GraphicsLayerChromium::setTransform): (WebCore::GraphicsLayerChromium::setChildrenTransform): (WebCore::GraphicsLayerChromium::setMasksToBounds): (WebCore::GraphicsLayerChromium::setBackgroundColor): (WebCore::GraphicsLayerChromium::clearBackgroundColor): (WebCore::GraphicsLayerChromium::setContentsOpaque): (WebCore::GraphicsLayerChromium::setBackfaceVisibility): (WebCore::GraphicsLayerChromium::setOpacity): * platform/graphics/chromium/LayerChromium.cpp: (WebCore::LayerChromium::setNeedsCommit): * platform/graphics/chromium/LayerChromium.h: (WebCore::LayerChromium::setAnchorPoint): (WebCore::LayerChromium::setAnchorPointZ): (WebCore::LayerChromium::setBackgroundColor): (WebCore::LayerChromium::setMasksToBounds): (WebCore::LayerChromium::setMaskLayer): (WebCore::LayerChromium::setOpacity): (WebCore::LayerChromium::setOpaque): (WebCore::LayerChromium::setPosition): (WebCore::LayerChromium::setSublayerTransform): (WebCore::LayerChromium::setTransform): (WebCore::LayerChromium::setScrollPosition): (WebCore::LayerChromium::setScrollable): (WebCore::LayerChromium::setDoubleSided): (WebCore::LayerChromium::setReplicaLayer): * platform/graphics/chromium/NonCompositedContentHost.cpp: (WebCore::NonCompositedContentHost::notifySyncRequired): * platform/graphics/chromium/NonCompositedContentHost.h: Source/WebKit/chromium: * tests/LayerChromiumTest.cpp:
Modified Paths
- trunk/Source/WebCore/ChangeLog
- trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp
- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h
- trunk/Source/WebCore/platform/graphics/chromium/NonCompositedContentHost.cpp
- trunk/Source/WebCore/platform/graphics/chromium/NonCompositedContentHost.h
- trunk/Source/WebKit/chromium/ChangeLog
- trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (102164 => 102165)
--- trunk/Source/WebCore/ChangeLog 2011-12-06 20:17:02 UTC (rev 102164)
+++ trunk/Source/WebCore/ChangeLog 2011-12-06 20:27:57 UTC (rev 102165)
@@ -1,3 +1,42 @@
+2011-12-06 Dimitri Glazkov <[email protected]>
+
+ Unreviewed, rolling out r102091.
+ http://trac.webkit.org/changeset/102091
+ https://bugs.webkit.org/show_bug.cgi?id=73711
+
+ Caused Clang Linux compile failure.
+
+ * platform/graphics/chromium/GraphicsLayerChromium.cpp:
+ (WebCore::GraphicsLayerChromium::setAnchorPoint):
+ (WebCore::GraphicsLayerChromium::setTransform):
+ (WebCore::GraphicsLayerChromium::setChildrenTransform):
+ (WebCore::GraphicsLayerChromium::setMasksToBounds):
+ (WebCore::GraphicsLayerChromium::setBackgroundColor):
+ (WebCore::GraphicsLayerChromium::clearBackgroundColor):
+ (WebCore::GraphicsLayerChromium::setContentsOpaque):
+ (WebCore::GraphicsLayerChromium::setBackfaceVisibility):
+ (WebCore::GraphicsLayerChromium::setOpacity):
+ * platform/graphics/chromium/LayerChromium.cpp:
+ (WebCore::LayerChromium::setNeedsCommit):
+ * platform/graphics/chromium/LayerChromium.h:
+ (WebCore::LayerChromium::setAnchorPoint):
+ (WebCore::LayerChromium::setAnchorPointZ):
+ (WebCore::LayerChromium::setBackgroundColor):
+ (WebCore::LayerChromium::setMasksToBounds):
+ (WebCore::LayerChromium::setMaskLayer):
+ (WebCore::LayerChromium::setOpacity):
+ (WebCore::LayerChromium::setOpaque):
+ (WebCore::LayerChromium::setPosition):
+ (WebCore::LayerChromium::setSublayerTransform):
+ (WebCore::LayerChromium::setTransform):
+ (WebCore::LayerChromium::setScrollPosition):
+ (WebCore::LayerChromium::setScrollable):
+ (WebCore::LayerChromium::setDoubleSided):
+ (WebCore::LayerChromium::setReplicaLayer):
+ * platform/graphics/chromium/NonCompositedContentHost.cpp:
+ (WebCore::NonCompositedContentHost::notifySyncRequired):
+ * platform/graphics/chromium/NonCompositedContentHost.h:
+
2011-12-06 Dana Jansens <[email protected]>
[Chromium] Make root layer always opaque
Modified: trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp (102164 => 102165)
--- trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp 2011-12-06 20:17:02 UTC (rev 102164)
+++ trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp 2011-12-06 20:27:57 UTC (rev 102165)
@@ -173,6 +173,9 @@
void GraphicsLayerChromium::setAnchorPoint(const FloatPoint3D& point)
{
+ if (point == m_anchorPoint)
+ return;
+
GraphicsLayer::setAnchorPoint(point);
updateAnchorPoint();
}
@@ -191,12 +194,18 @@
// Call this method first to assign contents scale to LayerChromium so the painter can apply the scale transform.
updateContentsScale();
+ if (transform == m_transform)
+ return;
+
GraphicsLayer::setTransform(transform);
updateTransform();
}
void GraphicsLayerChromium::setChildrenTransform(const TransformationMatrix& transform)
{
+ if (transform == m_childrenTransform)
+ return;
+
GraphicsLayer::setChildrenTransform(transform);
updateChildrenTransform();
}
@@ -212,6 +221,9 @@
void GraphicsLayerChromium::setMasksToBounds(bool masksToBounds)
{
+ if (masksToBounds == m_masksToBounds)
+ return;
+
GraphicsLayer::setMasksToBounds(masksToBounds);
updateMasksToBounds();
}
@@ -227,6 +239,9 @@
void GraphicsLayerChromium::setBackgroundColor(const Color& color)
{
+ if (m_backgroundColorSet && m_backgroundColor == color)
+ return;
+
GraphicsLayer::setBackgroundColor(color);
m_contentsLayerHasBackgroundColor = true;
@@ -235,12 +250,18 @@
void GraphicsLayerChromium::clearBackgroundColor()
{
+ if (!m_backgroundColorSet)
+ return;
+
GraphicsLayer::clearBackgroundColor();
m_contentsLayer->setBackgroundColor(static_cast<RGBA32>(0));
}
void GraphicsLayerChromium::setContentsOpaque(bool opaque)
{
+ if (m_contentsOpaque == opaque)
+ return;
+
GraphicsLayer::setContentsOpaque(opaque);
updateContentsOpaque();
}
@@ -260,6 +281,9 @@
void GraphicsLayerChromium::setBackfaceVisibility(bool visible)
{
+ if (m_backfaceVisibility == visible)
+ return;
+
GraphicsLayer::setBackfaceVisibility(visible);
updateBackfaceVisibility();
}
@@ -267,6 +291,10 @@
void GraphicsLayerChromium::setOpacity(float opacity)
{
float clampedOpacity = max(min(opacity, 1.0f), 0.0f);
+
+ if (m_opacity == clampedOpacity)
+ return;
+
GraphicsLayer::setOpacity(clampedOpacity);
primaryLayer()->setOpacity(opacity);
}
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp (102164 => 102165)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2011-12-06 20:17:02 UTC (rev 102164)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2011-12-06 20:27:57 UTC (rev 102165)
@@ -120,6 +120,10 @@
void LayerChromium::setNeedsCommit()
{
+ // Call notifySyncRequired(), which for non-root layers plumbs through to
+ // call setRootLayerNeedsDisplay() on the WebView, which will cause LayerRendererChromium
+ // to render a frame.
+ // This function has no effect on root layers.
if (m_delegate)
m_delegate->notifySyncRequired();
}
@@ -245,110 +249,6 @@
addChild(children[i]);
}
-void LayerChromium::setAnchorPoint(const FloatPoint& anchorPoint)
-{
- if (m_anchorPoint == anchorPoint)
- return;
- m_anchorPoint = anchorPoint;
- setNeedsCommit();
-}
-
-void LayerChromium::setAnchorPointZ(float anchorPointZ)
-{
- if (m_anchorPointZ == anchorPointZ)
- return;
- m_anchorPointZ = anchorPointZ;
- setNeedsCommit();
-}
-
-void LayerChromium::setBackgroundColor(const Color& backgroundColor)
-{
- if (m_backgroundColor == backgroundColor)
- return;
- m_backgroundColor = backgroundColor;
- setNeedsCommit();
-}
-
-void LayerChromium::setMasksToBounds(bool masksToBounds)
-{
- if (m_masksToBounds == masksToBounds)
- return;
- m_masksToBounds = masksToBounds;
- setNeedsCommit();
-}
-
-void LayerChromium::setMaskLayer(LayerChromium* maskLayer)
-{
- if (m_maskLayer == maskLayer)
- return;
- m_maskLayer = maskLayer;
- setNeedsCommit();
-}
-
-void LayerChromium::setOpacity(float opacity)
-{
- if (m_opacity == opacity)
- return;
- m_opacity = opacity;
- setNeedsCommit();
-}
-
-void LayerChromium::setOpaque(bool opaque)
-{
- if (m_opaque == opaque)
- return;
- m_opaque = opaque;
- setNeedsCommit();
-}
-
-void LayerChromium::setPosition(const FloatPoint& position)
-{
- if (m_position == position)
- return;
- m_position = position;
- setNeedsCommit();
-}
-
-void LayerChromium::setSublayerTransform(const TransformationMatrix& sublayerTransform)
-{
- if (m_sublayerTransform == sublayerTransform)
- return;
- m_sublayerTransform = sublayerTransform;
- setNeedsCommit();
-}
-
-void LayerChromium::setTransform(const TransformationMatrix& transform)
-{
- if (m_transform == transform)
- return;
- m_transform = transform;
- setNeedsCommit();
-}
-
-void LayerChromium::setScrollPosition(const IntPoint& scrollPosition)
-{
- if (m_scrollPosition == scrollPosition)
- return;
- m_scrollPosition = scrollPosition;
- setNeedsCommit();
-}
-
-void LayerChromium::setScrollable(bool scrollable)
-{
- if (m_scrollable == scrollable)
- return;
- m_scrollable = scrollable;
- setNeedsCommit();
-}
-
-void LayerChromium::setDoubleSided(bool doubleSided)
-{
- if (m_doubleSided == doubleSided)
- return;
- m_doubleSided = doubleSided;
- setNeedsCommit();
-}
-
LayerChromium* LayerChromium::parent() const
{
return m_parent;
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h (102164 => 102165)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2011-12-06 20:17:02 UTC (rev 102164)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2011-12-06 20:27:57 UTC (rev 102165)
@@ -83,64 +83,64 @@
void setChildren(const Vector<RefPtr<LayerChromium> >&);
const Vector<RefPtr<LayerChromium> >& children() const { return m_children; }
- void setAnchorPoint(const FloatPoint&);
+ void setAnchorPoint(const FloatPoint& anchorPoint) { m_anchorPoint = anchorPoint; setNeedsCommit(); }
FloatPoint anchorPoint() const { return m_anchorPoint; }
- void setAnchorPointZ(float);
+ void setAnchorPointZ(float anchorPointZ) { m_anchorPointZ = anchorPointZ; setNeedsCommit(); }
float anchorPointZ() const { return m_anchorPointZ; }
- void setBackgroundColor(const Color&);
+ void setBackgroundColor(const Color& color) { m_backgroundColor = color; setNeedsCommit(); }
Color backgroundColor() const { return m_backgroundColor; }
void setBounds(const IntSize&);
const IntSize& bounds() const { return m_bounds; }
virtual IntSize contentBounds() const { return bounds(); }
- void setMasksToBounds(bool);
+ void setMasksToBounds(bool masksToBounds) { m_masksToBounds = masksToBounds; setNeedsCommit(); }
bool masksToBounds() const { return m_masksToBounds; }
void setName(const String&);
const String& name() const { return m_name; }
- void setMaskLayer(LayerChromium*);
+ void setMaskLayer(LayerChromium* maskLayer) { m_maskLayer = maskLayer; setNeedsCommit(); }
LayerChromium* maskLayer() const { return m_maskLayer.get(); }
virtual void setNeedsDisplayRect(const FloatRect& dirtyRect);
void setNeedsDisplay() { setNeedsDisplayRect(FloatRect(FloatPoint(), contentBounds())); }
virtual bool needsDisplay() const { return m_needsDisplay; }
- void setOpacity(float);
+ void setOpacity(float opacity) { m_opacity = opacity; setNeedsCommit(); }
float opacity() const { return m_opacity; }
- void setOpaque(bool);
+ void setOpaque(bool opaque) { m_opaque = opaque; setNeedsCommit(); }
bool opaque() const { return m_opaque; }
- void setPosition(const FloatPoint&);
+ void setPosition(const FloatPoint& position) { m_position = position; setNeedsCommit(); }
FloatPoint position() const { return m_position; }
- void setSublayerTransform(const TransformationMatrix&);
+ void setSublayerTransform(const TransformationMatrix& transform) { m_sublayerTransform = transform; setNeedsCommit(); }
const TransformationMatrix& sublayerTransform() const { return m_sublayerTransform; }
TransformationMatrix zoomAnimatorTransform() const { return TransformationMatrix(); }
- void setTransform(const TransformationMatrix&);
+ void setTransform(const TransformationMatrix& transform) { m_transform = transform; setNeedsCommit(); }
const TransformationMatrix& transform() const { return m_transform; }
const IntRect& visibleLayerRect() const { return m_visibleLayerRect; }
void setVisibleLayerRect(const IntRect& visibleLayerRect) { m_visibleLayerRect = visibleLayerRect; }
- void setScrollPosition(const IntPoint&);
const IntPoint& scrollPosition() const { return m_scrollPosition; }
+ void setScrollPosition(const IntPoint& scrollPosition) { m_scrollPosition = scrollPosition; }
- void setScrollable(bool);
bool scrollable() const { return m_scrollable; }
+ void setScrollable(bool scrollable) { m_scrollable = true; setNeedsCommit(); }
IntSize scrollDelta() const { return IntSize(); }
float pageScaleDelta() const { return 1; }
- void setDoubleSided(bool);
bool doubleSided() const { return m_doubleSided; }
+ void setDoubleSided(bool doubleSided) { m_doubleSided = doubleSided; setNeedsCommit(); }
void setPreserves3D(bool preserve3D) { m_preserves3D = preserve3D; }
bool preserves3D() const { return m_preserves3D; }
@@ -155,7 +155,7 @@
void setDelegate(CCLayerDelegate* delegate) { m_delegate = delegate; }
- void setReplicaLayer(LayerChromium* layer) { m_replicaLayer = layer; setNeedsCommit(); }
+ void setReplicaLayer(LayerChromium* layer) { m_replicaLayer = layer; }
LayerChromium* replicaLayer() const { return m_replicaLayer.get(); }
// These methods typically need to be overwritten by derived classes.
Modified: trunk/Source/WebCore/platform/graphics/chromium/NonCompositedContentHost.cpp (102164 => 102165)
--- trunk/Source/WebCore/platform/graphics/chromium/NonCompositedContentHost.cpp 2011-12-06 20:17:02 UTC (rev 102164)
+++ trunk/Source/WebCore/platform/graphics/chromium/NonCompositedContentHost.cpp 2011-12-06 20:27:57 UTC (rev 102165)
@@ -31,7 +31,6 @@
#include "GraphicsLayer.h"
#include "LayerChromium.h"
#include "LayerPainterChromium.h"
-#include "cc/CCLayerTreeHost.h"
namespace WebCore {
@@ -121,9 +120,6 @@
void NonCompositedContentHost::notifySyncRequired(const GraphicsLayer*)
{
- CCLayerTreeHost* layerTreeHost = m_graphicsLayer->platformLayer()->layerTreeHost();
- if (layerTreeHost)
- layerTreeHost->setNeedsCommit();
}
void NonCompositedContentHost::paintContents(const GraphicsLayer*, GraphicsContext& context, GraphicsLayerPaintingPhase, const IntRect& clipRect)
Modified: trunk/Source/WebCore/platform/graphics/chromium/NonCompositedContentHost.h (102164 => 102165)
--- trunk/Source/WebCore/platform/graphics/chromium/NonCompositedContentHost.h 2011-12-06 20:17:02 UTC (rev 102164)
+++ trunk/Source/WebCore/platform/graphics/chromium/NonCompositedContentHost.h 2011-12-06 20:27:57 UTC (rev 102165)
@@ -59,10 +59,9 @@
void protectVisibleTileTextures();
GraphicsLayer* topLevelRootLayer() const { return m_graphicsLayer.get(); }
-protected:
+private:
explicit NonCompositedContentHost(PassOwnPtr<LayerPainterChromium> contentPaint);
-private:
// GraphicsLayerClient
virtual void notifyAnimationStarted(const GraphicsLayer*, double time);
virtual void notifySyncRequired(const GraphicsLayer*);
Modified: trunk/Source/WebKit/chromium/ChangeLog (102164 => 102165)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-06 20:17:02 UTC (rev 102164)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-06 20:27:57 UTC (rev 102165)
@@ -1,3 +1,13 @@
+2011-12-06 Dimitri Glazkov <[email protected]>
+
+ Unreviewed, rolling out r102091.
+ http://trac.webkit.org/changeset/102091
+ https://bugs.webkit.org/show_bug.cgi?id=73711
+
+ Caused Clang Linux compile failure.
+
+ * tests/LayerChromiumTest.cpp:
+
2011-12-06 Sheriff Bot <[email protected]>
Unreviewed, rolling out r102102.
Modified: trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp (102164 => 102165)
--- trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp 2011-12-06 20:17:02 UTC (rev 102164)
+++ trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp 2011-12-06 20:27:57 UTC (rev 102165)
@@ -27,8 +27,6 @@
#include "LayerChromium.h"
#include "CCLayerTreeTestCommon.h"
-#include "LayerPainterChromium.h"
-#include "NonCompositedContentHost.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@@ -54,30 +52,6 @@
MOCK_METHOD0(notifySyncRequired, void());
};
-class MockLayerPainterChromium : public LayerPainterChromium {
-public:
- virtual void paint(GraphicsContext&, const IntRect&) { }
-};
-
-class MockNonCompositedContentHost : public NonCompositedContentHost {
-public:
- static PassOwnPtr<MockNonCompositedContentHost> create()
- {
- return adoptPtr(new MockNonCompositedContentHost);
- }
-
- MOCK_METHOD1(notifySyncRequired, void(const GraphicsLayer*));
-
-private:
- MockNonCompositedContentHost()
- : NonCompositedContentHost(adoptPtr(new MockLayerPainterChromium()))
- {
- m_scrollLayer = GraphicsLayer::create(0);
- setScrollLayer(m_scrollLayer.get());
- }
- OwnPtr<GraphicsLayer> m_scrollLayer;
-};
-
class LayerChromiumWithInstrumentedDestructor : public LayerChromium {
public:
explicit LayerChromiumWithInstrumentedDestructor(CCLayerDelegate* delegate)
@@ -646,8 +620,10 @@
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setDelegate(&mockDelegate));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setName("Test Layer"));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setVisibleLayerRect(IntRect(0, 0, 40, 50)));
+ EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setScrollPosition(IntPoint(10, 10)));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setUsesLayerClipping(true));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setIsNonCompositedContent(true));
+ EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setReplicaLayer(dummyLayer.get()));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setDrawOpacity(0.5f));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setClipRect(IntRect(3, 3, 8, 8)));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 0, testLayer->setTargetRenderSurface(0));
@@ -658,21 +634,19 @@
// Next, test properties that should call setNeedsCommit (but not setNeedsDisplay)
// These properties should indirectly call notifySyncRequired, but the needsDisplay flag should not change.
- // All properties need to be set to new values in order for setNeedsCommit
- // to be called.
+ // Note that for many of these properties it is important to test setting the property to a value that
+ // is different than what the constructor initializes it to.
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setAnchorPoint(FloatPoint(1.23f, 4.56f)));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setAnchorPointZ(0.7f));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setBackgroundColor(Color(0.4f, 0.4f, 0.4f)));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setMasksToBounds(true));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setMaskLayer(dummyLayer.get()));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setOpacity(0.5f));
- EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setOpaque(true));
+ EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setOpaque(false));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setPosition(FloatPoint(4.0f, 9.0f)));
- EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setReplicaLayer(dummyLayer.get()));
- EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setSublayerTransform(TransformationMatrix(0, 0, 0, 0, 0, 0)));
+ EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setSublayerTransform(TransformationMatrix()));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setScrollable(true));
- EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setScrollPosition(IntPoint(10, 10)));
- EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setTransform(TransformationMatrix(0, 0, 0, 0, 0, 0)));
+ EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setTransform(TransformationMatrix()));
EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(mockDelegate, 1, testLayer->setDoubleSided(false));
// The above tests should not have caused a change to the needsDisplay flag.
@@ -686,18 +660,4 @@
// FIXME: need to add a test for setLayerTreeHost with a non-null stubbed CCLayerTreeHost.
}
-TEST_F(LayerChromiumTest, checkNonCompositedContentPropertyChangeCausesCommit)
-{
- OwnPtr<MockNonCompositedContentHost> nonCompositedContentHost = MockNonCompositedContentHost::create();
-
- GraphicsLayer* rootLayer = nonCompositedContentHost->topLevelRootLayer();
-
- EXPECT_CALL(*nonCompositedContentHost, notifySyncRequired(_)).Times(1);
- rootLayer->platformLayer()->setScrollPosition(IntPoint(1, 1));
- Mock::VerifyAndClearExpectations(nonCompositedContentHost.get());
-
- EXPECT_CALL(*nonCompositedContentHost, notifySyncRequired(_)).Times(AtLeast(1));
- nonCompositedContentHost->setViewport(IntSize(30, 30), IntSize(20, 20), IntPoint(10, 10), 1);
-}
-
} // namespace
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
