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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 size_t max_partial_texture_updates = 0; | 170 size_t max_partial_texture_updates = 0; |
171 if (proxy_->GetRendererCapabilities().allow_partial_texture_updates && | 171 if (proxy_->GetRendererCapabilities().allow_partial_texture_updates && |
172 !settings_.impl_side_painting) { | 172 !settings_.impl_side_painting) { |
173 max_partial_texture_updates = std::min( | 173 max_partial_texture_updates = std::min( |
174 settings_.max_partial_texture_updates, | 174 settings_.max_partial_texture_updates, |
175 proxy_->MaxPartialTextureUpdates()); | 175 proxy_->MaxPartialTextureUpdates()); |
176 } | 176 } |
177 settings_.max_partial_texture_updates = max_partial_texture_updates; | 177 settings_.max_partial_texture_updates = max_partial_texture_updates; |
178 | 178 |
179 if (!contents_texture_manager_ && | 179 if (!contents_texture_manager_ && |
180 (!settings_.impl_side_painting || !settings_.solid_color_scrollbars)) { | 180 (!settings_.impl_side_painting || |
| 181 !settings_.force_solid_color_scrollbars)) { |
181 contents_texture_manager_ = | 182 contents_texture_manager_ = |
182 PrioritizedResourceManager::Create(proxy_.get()); | 183 PrioritizedResourceManager::Create(proxy_.get()); |
183 surface_memory_placeholder_ = | 184 surface_memory_placeholder_ = |
184 contents_texture_manager_->CreateTexture(gfx::Size(), GL_RGBA); | 185 contents_texture_manager_->CreateTexture(gfx::Size(), GL_RGBA); |
185 } | 186 } |
186 | 187 |
187 client_->DidInitializeOutputSurface(true); | 188 client_->DidInitializeOutputSurface(true); |
188 return CreateSucceeded; | 189 return CreateSucceeded; |
189 } | 190 } |
190 | 191 |
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1048 bool start_ready_animations = true; | 1049 bool start_ready_animations = true; |
1049 (*iter).second->UpdateState(start_ready_animations, NULL); | 1050 (*iter).second->UpdateState(start_ready_animations, NULL); |
1050 } | 1051 } |
1051 } | 1052 } |
1052 | 1053 |
1053 skia::RefPtr<SkPicture> LayerTreeHost::CapturePicture() { | 1054 skia::RefPtr<SkPicture> LayerTreeHost::CapturePicture() { |
1054 return proxy_->CapturePicture(); | 1055 return proxy_->CapturePicture(); |
1055 } | 1056 } |
1056 | 1057 |
1057 } // namespace cc | 1058 } // namespace cc |
OLD | NEW |