diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
commit | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch) | |
tree | 8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp | |
parent | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff) | |
download | qtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz |
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp')
-rw-r--r-- | Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp b/Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp index ca83846c2..1557a7d93 100644 --- a/Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp +++ b/Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp @@ -83,7 +83,7 @@ public: } private: MockLayerChromium(Vector<int>* ccLayerDestructionList) - : LayerChromium(0) + : LayerChromium() , m_ccLayerDestructionList(ccLayerDestructionList) { } @@ -119,9 +119,9 @@ void expectTreesAreIdentical(LayerChromium* layer, CCLayerImpl* ccLayer) TEST(TreeSynchronizerTest, syncSimpleTreeFromEmpty) { DebugScopedSetImplThread impl; - RefPtr<LayerChromium> layerTreeRoot = LayerChromium::create(0); - layerTreeRoot->addChild(LayerChromium::create(0)); - layerTreeRoot->addChild(LayerChromium::create(0)); + RefPtr<LayerChromium> layerTreeRoot = LayerChromium::create(); + layerTreeRoot->addChild(LayerChromium::create()); + layerTreeRoot->addChild(LayerChromium::create()); RefPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), 0); @@ -158,9 +158,9 @@ TEST(TreeSynchronizerTest, syncSimpleTreeReusingLayers) TEST(TreeSynchronizerTest, syncSimpleTreeAndProperties) { DebugScopedSetImplThread impl; - RefPtr<LayerChromium> layerTreeRoot = LayerChromium::create(0); - layerTreeRoot->addChild(LayerChromium::create(0)); - layerTreeRoot->addChild(LayerChromium::create(0)); + RefPtr<LayerChromium> layerTreeRoot = LayerChromium::create(); + layerTreeRoot->addChild(LayerChromium::create()); + layerTreeRoot->addChild(LayerChromium::create()); // Pick some random properties to set. The values are not important, we're just testing that at least some properties are making it through. FloatPoint rootPosition = FloatPoint(2.3, 7.4); @@ -254,7 +254,7 @@ TEST(TreeSynchronizerTest, syncSimpleTreeThenDestroy) oldLayerTreeRoot->removeAllChildren(); // Synchronize again. After the sync all CCLayerImpls from the old tree should be deleted. - RefPtr<LayerChromium> newLayerTreeRoot = LayerChromium::create(0); + RefPtr<LayerChromium> newLayerTreeRoot = LayerChromium::create(); ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(newLayerTreeRoot.get(), ccLayerTreeRoot.release()); expectTreesAreIdentical(newLayerTreeRoot.get(), ccLayerTreeRoot.get()); @@ -268,22 +268,22 @@ TEST(TreeSynchronizerTest, syncSimpleTreeThenDestroy) TEST(TreeSynchronizerTest, syncMaskReplicaAndReplicaMaskLayers) { DebugScopedSetImplThread impl; - RefPtr<LayerChromium> layerTreeRoot = LayerChromium::create(0); - layerTreeRoot->addChild(LayerChromium::create(0)); - layerTreeRoot->addChild(LayerChromium::create(0)); - layerTreeRoot->addChild(LayerChromium::create(0)); + RefPtr<LayerChromium> layerTreeRoot = LayerChromium::create(); + layerTreeRoot->addChild(LayerChromium::create()); + layerTreeRoot->addChild(LayerChromium::create()); + layerTreeRoot->addChild(LayerChromium::create()); // First child gets a mask layer. - RefPtr<LayerChromium> maskLayer = LayerChromium::create(0); + RefPtr<LayerChromium> maskLayer = LayerChromium::create(); layerTreeRoot->children()[0]->setMaskLayer(maskLayer.get()); // Second child gets a replica layer. - RefPtr<LayerChromium> replicaLayer = LayerChromium::create(0); + RefPtr<LayerChromium> replicaLayer = LayerChromium::create(); layerTreeRoot->children()[1]->setReplicaLayer(replicaLayer.get()); // Third child gets a replica layer with a mask layer. - RefPtr<LayerChromium> replicaLayerWithMask = LayerChromium::create(0); - RefPtr<LayerChromium> replicaMaskLayer = LayerChromium::create(0); + RefPtr<LayerChromium> replicaLayerWithMask = LayerChromium::create(); + RefPtr<LayerChromium> replicaMaskLayer = LayerChromium::create(); replicaLayerWithMask->setMaskLayer(replicaMaskLayer.get()); layerTreeRoot->children()[2]->setReplicaLayer(replicaLayerWithMask.get()); |