Revert 173406 - Crashes on Win & Mac

cc/layer_impl_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layer_impl.h"
 
 #include "cc/single_thread_proxy.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
-#include "cc/test/fake_output_surface.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 
 using namespace WebKit;
 
 namespace cc {
 namespace {
@@ skipping 26 matching lines @@
 #define EXECUTE_AND_VERIFY_ONLY_SURFACE_CHANGED(codeToTest)             \
     root->resetAllChangeTrackingForSubtree();                           \
     codeToTest;                                                         \
     EXPECT_FALSE(root->layerPropertyChanged());                         \
     EXPECT_FALSE(child->layerPropertyChanged());                        \
     EXPECT_FALSE(grandChild->layerPropertyChanged());                   \
     EXPECT_TRUE(root->layerSurfacePropertyChanged())
 
 #define VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(codeToTest)                 \
     root->resetAllChangeTrackingForSubtree();                           \
-    hostImpl.forcePrepareToDraw();                                      \
+    hostImpl.resetNeedsUpdateDrawPropertiesForTesting();                \
     codeToTest;                                                         \
     EXPECT_TRUE(hostImpl.needsUpdateDrawProperties());
 
 #define VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(codeToTest)              \
     root->resetAllChangeTrackingForSubtree();                           \
-    hostImpl.forcePrepareToDraw();                                      \
+    hostImpl.resetNeedsUpdateDrawPropertiesForTesting();                \
     codeToTest;                                                         \
     EXPECT_FALSE(hostImpl.needsUpdateDrawProperties());
 
 TEST(LayerImplTest, verifyLayerChangesAreTrackedProperly)
 {
     //
     // This test checks that layerPropertyChanged() has the correct behavior.
     //
 
     // The constructor on this will fake that we are on the correct thread.
     // Create a simple LayerImpl tree:
     FakeImplProxy proxy;
     FakeLayerTreeHostImpl hostImpl(&proxy);
-    EXPECT_TRUE(hostImpl.initializeRenderer(createFakeOutputSurface()));
     scoped_ptr<LayerImpl> root = LayerImpl::create(hostImpl.activeTree(), 1);
     root->addChild(LayerImpl::create(hostImpl.activeTree(), 2));
     LayerImpl* child = root->children()[0];
     child->addChild(LayerImpl::create(hostImpl.activeTree(), 3));
     LayerImpl* grandChild = child->children()[0];
 
     // Adding children is an internal operation and should not mark layers as changed.
     EXPECT_FALSE(root->layerPropertyChanged());
     EXPECT_FALSE(child->layerPropertyChanged());
     EXPECT_FALSE(grandChild->layerPropertyChanged());
@@ skipping 76 matching lines @@
     EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setOpacity(arbitraryNumber));
     EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setDrawsContent(true));
     EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setSublayerTransform(arbitraryTransform));
     EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setBounds(arbitrarySize));
 }
 
 TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties)
 {
     FakeImplProxy proxy;
     FakeLayerTreeHostImpl hostImpl(&proxy);
-    EXPECT_TRUE(hostImpl.initializeRenderer(createFakeOutputSurface()));
     scoped_ptr<LayerImpl> root = LayerImpl::create(hostImpl.activeTree(), 1);
 
     gfx::PointF arbitraryPointF = gfx::PointF(0.125f, 0.25f);
     float arbitraryNumber = 0.352f;
     gfx::Size arbitrarySize = gfx::Size(111, 222);
     gfx::Point arbitraryPoint = gfx::Point(333, 444);
     gfx::Vector2d arbitraryVector2d = gfx::Vector2d(111, 222);
     gfx::Vector2d largeVector2d = gfx::Vector2d(1000, 1000);
     gfx::Rect arbitraryRect = gfx::Rect(arbitraryPoint, arbitrarySize);
     gfx::RectF arbitraryRectF = gfx::RectF(arbitraryPointF, gfx::SizeF(1.234f, 5.678f));
@@ skipping 10 matching lines @@
     VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->setFilters(WebFilterOperations()));
     VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->setFilter(arbitraryFilter));
     VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->setFilter(arbitraryFilter));
 
     // Related scrolling functions.
     VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->setMaxScrollOffset(largeVector2d));
     VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->setMaxScrollOffset(largeVector2d));
     VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->scrollBy(arbitraryVector2d));
     VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->scrollBy(gfx::Vector2d()));
     root->setScrollDelta(gfx::Vector2d(0, 0));
-    hostImpl.forcePrepareToDraw();
+    hostImpl.resetNeedsUpdateDrawPropertiesForTesting();
     VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->setScrollDelta(arbitraryVector2d));
     VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->setScrollDelta(arbitraryVector2d));
     VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->setScrollOffset(arbitraryVector2d));
     VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->setScrollOffset(arbitraryVector2d));
 
     // Unrelated functions, always set to new values, always set needs update.
     VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->setAnchorPointZ(arbitraryNumber));
     VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->setMaskLayer(LayerImpl::create(hostImpl.activeTree(), 4)));
     VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->setMasksToBounds(true));
     VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->setContentsOpaque(true));
@@ skipping 27 matching lines @@
     VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->setBackgroundColor(SK_ColorGRAY));
     VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->setBackgroundFilters(arbitraryFilters));
     VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->setOpacity(arbitraryNumber));
     VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->setTransform(arbitraryTransform));
     VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->setSublayerTransform(arbitraryTransform));
     VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->setBounds(arbitrarySize));
 }
 
 }  // namespace
 }  // namespace cc