Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(383)

Side by Side Diff: cc/blink/web_layer_impl_fixed_bounds_unittest.cc

Issue 606113003: Revert of Make cc output surface creation async (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <vector> 5 #include <vector>
6 #include "cc/blink/web_layer_impl_fixed_bounds.h" 6 #include "cc/blink/web_layer_impl_fixed_bounds.h"
7 #include "cc/layers/picture_image_layer.h" 7 #include "cc/layers/picture_image_layer.h"
8 #include "cc/test/fake_layer_tree_host.h" 8 #include "cc/test/fake_layer_tree_host.h"
9 #include "cc/test/geometry_test_utils.h" 9 #include "cc/test/geometry_test_utils.h"
10 #include "cc/trees/layer_tree_host_common.h" 10 #include "cc/trees/layer_tree_host_common.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 fixed_bounds_layer->setPosition(position); 97 fixed_bounds_layer->setPosition(position);
98 root_layer->addChild(fixed_bounds_layer); 98 root_layer->addChild(fixed_bounds_layer);
99 99
100 WebLayerImpl* normal_layer(new WebLayerImpl(cc::PictureImageLayer::Create())); 100 WebLayerImpl* normal_layer(new WebLayerImpl(cc::PictureImageLayer::Create()));
101 101
102 normal_layer->setBounds(bounds); 102 normal_layer->setBounds(bounds);
103 normal_layer->setTransform(transform.matrix()); 103 normal_layer->setTransform(transform.matrix());
104 normal_layer->setPosition(position); 104 normal_layer->setPosition(position);
105 root_layer->addChild(normal_layer); 105 root_layer->addChild(normal_layer);
106 106
107 cc::FakeLayerTreeHostClient client(cc::FakeLayerTreeHostClient::DIRECT_3D); 107 scoped_ptr<cc::FakeLayerTreeHost> host = cc::FakeLayerTreeHost::Create();
108 scoped_ptr<cc::FakeLayerTreeHost> host =
109 cc::FakeLayerTreeHost::Create(&client);
110 host->SetRootLayer(root_layer->layer()); 108 host->SetRootLayer(root_layer->layer());
111 109
112 { 110 {
113 cc::RenderSurfaceLayerList render_surface_layer_list; 111 cc::RenderSurfaceLayerList render_surface_layer_list;
114 cc::LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs( 112 cc::LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
115 root_layer->layer(), kDeviceViewportSize, &render_surface_layer_list); 113 root_layer->layer(), kDeviceViewportSize, &render_surface_layer_list);
116 inputs.device_scale_factor = kDeviceScaleFactor; 114 inputs.device_scale_factor = kDeviceScaleFactor;
117 inputs.page_scale_factor = kPageScaleFactor; 115 inputs.page_scale_factor = kPageScaleFactor;
118 inputs.page_scale_application_layer = root_layer->layer(), 116 inputs.page_scale_application_layer = root_layer->layer(),
119 cc::LayerTreeHostCommon::CalculateDrawProperties(&inputs); 117 cc::LayerTreeHostCommon::CalculateDrawProperties(&inputs);
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 168
171 CompareFixedBoundsLayerAndNormalLayer(WebFloatPoint(0, 0), transform); 169 CompareFixedBoundsLayerAndNormalLayer(WebFloatPoint(0, 0), transform);
172 170
173 // With non-zero anchor point, WebLayerImplFixedBounds will fall back to 171 // With non-zero anchor point, WebLayerImplFixedBounds will fall back to
174 // WebLayerImpl. 172 // WebLayerImpl.
175 CompareFixedBoundsLayerAndNormalLayer(WebFloatPoint(0.4f, 0.6f), transform); 173 CompareFixedBoundsLayerAndNormalLayer(WebFloatPoint(0.4f, 0.6f), transform);
176 } 174 }
177 175
178 } // namespace 176 } // namespace
179 } // namespace cc_blink 177 } // namespace cc_blink
OLDNEW
« no previous file with comments | « android_webview/browser/hardware_renderer.cc ('k') | cc/debug/micro_benchmark_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698