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

Side by Side Diff: cc/layers/content_layer.cc

Issue 590313004: Revert of Fix bad scaling in TiledLayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | cc/layers/tiled_layer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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/layers/content_layer.h" 5 #include "cc/layers/content_layer.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "cc/layers/content_layer_client.h" 10 #include "cc/layers/content_layer_client.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 id()); 108 id());
109 } else { 109 } else {
110 updater_ = BitmapContentLayerUpdater::Create( 110 updater_ = BitmapContentLayerUpdater::Create(
111 painter.Pass(), 111 painter.Pass(),
112 rendering_stats_instrumentation(), 112 rendering_stats_instrumentation(),
113 id()); 113 id());
114 } 114 }
115 updater_->SetOpaque(contents_opaque()); 115 updater_->SetOpaque(contents_opaque());
116 if (client_) 116 if (client_)
117 updater_->SetFillsBoundsCompletely(client_->FillsBoundsCompletely()); 117 updater_->SetFillsBoundsCompletely(client_->FillsBoundsCompletely());
118 updater_->SetBackgroundColor(background_color());
119 118
120 SetTextureFormat( 119 SetTextureFormat(
121 layer_tree_host()->GetRendererCapabilities().best_texture_format); 120 layer_tree_host()->GetRendererCapabilities().best_texture_format);
122 } 121 }
123 122
124 void ContentLayer::SetContentsOpaque(bool opaque) { 123 void ContentLayer::SetContentsOpaque(bool opaque) {
125 Layer::SetContentsOpaque(opaque); 124 Layer::SetContentsOpaque(opaque);
126 if (updater_.get()) 125 if (updater_.get())
127 updater_->SetOpaque(opaque); 126 updater_->SetOpaque(opaque);
128 } 127 }
(...skipping 27 matching lines...) Expand all
156 return picture; 155 return picture;
157 } 156 }
158 157
159 void ContentLayer::OnOutputSurfaceCreated() { 158 void ContentLayer::OnOutputSurfaceCreated() {
160 SetTextureFormat( 159 SetTextureFormat(
161 layer_tree_host()->GetRendererCapabilities().best_texture_format); 160 layer_tree_host()->GetRendererCapabilities().best_texture_format);
162 TiledLayer::OnOutputSurfaceCreated(); 161 TiledLayer::OnOutputSurfaceCreated();
163 } 162 }
164 163
165 } // namespace cc 164 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/layers/tiled_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698