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

Unified Diff: chrome/browser/android/compositor/layer/toolbar_layer.cc

Issue 1706293005: StaticTabSceneLayer owns ToolbarLayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix findbugs issue Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/compositor/layer/toolbar_layer.cc
diff --git a/chrome/browser/android/compositor/layer/toolbar_layer.cc b/chrome/browser/android/compositor/layer/toolbar_layer.cc
index e90b052a9b48e9e2a31107e41f8fc8c1ca43f116..a98ddbe59107ccfca56fcb40e6d2cfa9b5f45e77 100644
--- a/chrome/browser/android/compositor/layer/toolbar_layer.cc
+++ b/chrome/browser/android/compositor/layer/toolbar_layer.cc
@@ -33,7 +33,6 @@ void ToolbarLayer::PushResource(
int url_bar_background_resource_id,
float url_bar_alpha,
bool show_debug,
- float brightness,
bool clip_shadow) {
ui::ResourceManager::Resource* resource =
resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_DYNAMIC,
@@ -102,14 +101,6 @@ void ToolbarLayer::PushResource(
layer_->AddChild(debug_layer_);
else if (!show_debug && debug_layer_->parent())
debug_layer_->RemoveFromParent();
-
- if (brightness != brightness_) {
- brightness_ = brightness;
- cc::FilterOperations filters;
- if (brightness_ < 1.f)
- filters.Append(cc::FilterOperation::CreateBrightnessFilter(brightness_));
- layer_->SetFilters(filters);
- }
}
void ToolbarLayer::UpdateProgressBar(int progress_bar_x,
@@ -156,8 +147,7 @@ ToolbarLayer::ToolbarLayer(ui::ResourceManager* resource_manager)
progress_bar_layer_(cc::SolidColorLayer::Create()),
progress_bar_background_layer_(cc::SolidColorLayer::Create()),
anonymize_layer_(cc::SolidColorLayer::Create()),
- debug_layer_(cc::SolidColorLayer::Create()),
- brightness_(1.f) {
+ debug_layer_(cc::SolidColorLayer::Create()) {
toolbar_background_layer_->SetIsDrawable(true);
layer_->AddChild(toolbar_background_layer_);

Powered by Google App Engine
This is Rietveld 408576698