OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 "cc/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <stack> | 8 #include <stack> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 size_t max_partial_texture_updates = 0; | 171 size_t max_partial_texture_updates = 0; |
172 if (proxy_->GetRendererCapabilities().allow_partial_texture_updates && | 172 if (proxy_->GetRendererCapabilities().allow_partial_texture_updates && |
173 !settings_.impl_side_painting) { | 173 !settings_.impl_side_painting) { |
174 max_partial_texture_updates = std::min( | 174 max_partial_texture_updates = std::min( |
175 settings_.max_partial_texture_updates, | 175 settings_.max_partial_texture_updates, |
176 proxy_->MaxPartialTextureUpdates()); | 176 proxy_->MaxPartialTextureUpdates()); |
177 } | 177 } |
178 settings_.max_partial_texture_updates = max_partial_texture_updates; | 178 settings_.max_partial_texture_updates = max_partial_texture_updates; |
179 | 179 |
180 if (!contents_texture_manager_ && | 180 if (!contents_texture_manager_ && |
181 (!settings_.impl_side_painting || !settings_.solid_color_scrollbars)) { | 181 (!settings_.impl_side_painting || |
| 182 !settings_.force_solid_color_scrollbars)) { |
182 contents_texture_manager_ = | 183 contents_texture_manager_ = |
183 PrioritizedResourceManager::Create(proxy_.get()); | 184 PrioritizedResourceManager::Create(proxy_.get()); |
184 surface_memory_placeholder_ = | 185 surface_memory_placeholder_ = |
185 contents_texture_manager_->CreateTexture(gfx::Size(), GL_RGBA); | 186 contents_texture_manager_->CreateTexture(gfx::Size(), GL_RGBA); |
186 } | 187 } |
187 | 188 |
188 client_->DidInitializeOutputSurface(true); | 189 client_->DidInitializeOutputSurface(true); |
189 return CreateSucceeded; | 190 return CreateSucceeded; |
190 } | 191 } |
191 | 192 |
(...skipping 888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1080 bool start_ready_animations = true; | 1081 bool start_ready_animations = true; |
1081 (*iter).second->UpdateState(start_ready_animations, NULL); | 1082 (*iter).second->UpdateState(start_ready_animations, NULL); |
1082 } | 1083 } |
1083 } | 1084 } |
1084 | 1085 |
1085 skia::RefPtr<SkPicture> LayerTreeHost::CapturePicture() { | 1086 skia::RefPtr<SkPicture> LayerTreeHost::CapturePicture() { |
1086 return proxy_->CapturePicture(); | 1087 return proxy_->CapturePicture(); |
1087 } | 1088 } |
1088 | 1089 |
1089 } // namespace cc | 1090 } // namespace cc |
OLD | NEW |