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

Unified Diff: chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h

Issue 1706293005: StaticTabSceneLayer owns ToolbarLayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add toolbar layer when content tree set Created 4 years, 10 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/scene_layer/static_tab_scene_layer.h
diff --git a/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h b/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
index c81efe047f06458a8fa2dbdf7d0a916afab84ac5..3163e89b4c8f8b7ae9ab8ce8bc46195f5f22f82c 100644
--- a/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
@@ -26,6 +26,7 @@ namespace chrome {
namespace android {
class ContentLayer;
+class ToolbarLayer;
// A SceneLayer to render a static tab.
class StaticTabSceneLayer : public SceneLayer {
@@ -57,6 +58,33 @@ class StaticTabSceneLayer : public SceneLayer {
jfloat static_to_view_blend,
jfloat saturation,
jfloat brightness);
+ // Update the compositor version of the toolbar.
+ void UpdateToolbarLayer(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& object,
+ const base::android::JavaParamRef<jobject>& jresource_manager,
+ jint toolbar_resource_id,
+ jint toolbar_background_color,
+ jint url_bar_resource_id,
+ jfloat url_bar_alpha,
+ jfloat top_offset,
+ jfloat brightness,
+ bool visible,
+ bool show_shadow);
+ // Update the progress bar.
+ void UpdateProgressBar(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& object,
+ jint progress_bar_x,
+ jint progress_bar_y,
+ jint progress_bar_width,
+ jint progress_bar_height,
+ jint progress_bar_color,
+ jint progress_bar_background_x,
+ jint progress_bar_background_y,
+ jint progress_bar_background_width,
+ jint progress_bar_background_height,
+ jint progress_bar_background_color);
// Set the given |jscene_layer| as content of this SceneLayer, along with its
// own content.
@@ -68,6 +96,7 @@ class StaticTabSceneLayer : public SceneLayer {
private:
scoped_refptr<chrome::android::ContentLayer> content_layer_;
scoped_refptr<cc::Layer> content_scene_layer_;
+ scoped_refptr<ToolbarLayer> toolbar_layer_;
int last_set_tab_id_;
int background_color_;

Powered by Google App Engine
This is Rietveld 408576698