chrome/browser/android/tab_android.cc - Issue 1747783002: CC Animation: Erase old animation system in Android Compositor.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/android/tab_android.cc

Issue 1747783002: CC Animation: Erase old animation system in Android Compositor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 4 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

« no previous file with comments | « chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc ('k') | content/browser/android/composited_touch_handle_drawable.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/tab_android.cc

diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc

index b59190544074027de34cc0edc463f8f5711aa332..82648466af66d60cb46afa58a70c71b12a35da49 100644

--- a/chrome/browser/android/tab_android.cc

+++ b/chrome/browser/android/tab_android.cc

@@ -12,6 +12,7 @@

#include "base/metrics/histogram.h"

#include "base/trace_event/trace_event.h"

#include "cc/layers/layer.h"

+#include "cc/layers/layer_settings.h"

#include "chrome/browser/android/compositor/tab_content_manager.h"

#include "chrome/browser/android/metrics/uma_utils.h"

#include "chrome/browser/android/offline_pages/offline_page_model_factory.h"

@@ -121,7 +122,7 @@ void TabAndroid::AttachTabHelpers(content::WebContents* web_contents) {

TabAndroid::TabAndroid(JNIEnv* env, jobject obj)

: weak_java_tab_(env, obj),

- content_layer_(cc::Layer::Create(content::Compositor::LayerSettings())),

+ content_layer_(cc::Layer::Create(cc::LayerSettings())),

tab_content_manager_(NULL),

synced_tab_delegate_(new browser_sync::SyncedTabDelegateAndroid(this)) {

Java_Tab_setNativePtr(env, obj, reinterpret_cast<intptr_t>(this));