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

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

Issue 986683002: [Android] Allow specifying the progress component of the toolbar as a separate texture. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Javadoc fix Created 5 years, 9 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.h
diff --git a/chrome/browser/android/compositor/layer/toolbar_layer.h b/chrome/browser/android/compositor/layer/toolbar_layer.h
index 7440ef85d3532cffe4ccb50970e9c6a2596fdac3..cb468944455ac9b634f9cba868bb988f6006b1e5 100644
--- a/chrome/browser/android/compositor/layer/toolbar_layer.h
+++ b/chrome/browser/android/compositor/layer/toolbar_layer.h
@@ -28,6 +28,14 @@ class ToolbarLayer : public Layer {
scoped_refptr<cc::Layer> layer() override;
void PushResource(ui::ResourceManager::Resource* resource,
+ ui::ResourceManager::Resource* progress_resource,
+ bool anonymize,
+ bool anonymize_component_is_incognito,
+ bool show_debug);
+
+ // TODO(tedchoc): Remove after migrating downstream to signature that takes
+ // the progress_resource.
+ void PushResource(ui::ResourceManager::Resource* resource,
bool anonymize,
bool anonymize_component_is_incognito,
bool show_debug);
@@ -39,6 +47,7 @@ class ToolbarLayer : public Layer {
private:
scoped_refptr<cc::Layer> layer_;
scoped_refptr<cc::UIResourceLayer> bitmap_layer_;
+ scoped_refptr<cc::UIResourceLayer> progress_layer_;
scoped_refptr<cc::SolidColorLayer> anonymize_layer_;
scoped_refptr<cc::SolidColorLayer> debug_layer_;
« no previous file with comments | « chrome/browser/android/compositor/layer/tab_layer.cc ('k') | chrome/browser/android/compositor/layer/toolbar_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698