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

Side by Side Diff: android_webview/native/aw_contents.h

Issue 11428091: Migrate the Android compositor to cc::Layer classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 5 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 10
11 #include "android_webview/browser/find_helper.h" 11 #include "android_webview/browser/find_helper.h"
12 #include "android_webview/public/browser/draw_gl.h" 12 #include "android_webview/public/browser/draw_gl.h"
13 #include "base/android/scoped_java_ref.h" 13 #include "base/android/scoped_java_ref.h"
14 #include "base/android/jni_helper.h" 14 #include "base/android/jni_helper.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "content/public/browser/android/compositor.h" 16 #include "content/public/browser/android/compositor.h"
17 #include "content/public/browser/javascript_dialogs.h" 17 #include "content/public/browser/javascript_dialogs.h"
18 18
19 class TabContents; 19 class TabContents;
20 20
21 namespace cc {
22 class Layer;
23 }
24
21 namespace content { 25 namespace content {
22 class Compositor; 26 class Compositor;
23 class WebContents; 27 class WebContents;
24 } 28 }
25 29
26 namespace android_webview { 30 namespace android_webview {
27 31
28 class AwContentsContainer; 32 class AwContentsContainer;
29 class AwRenderViewHostExt; 33 class AwRenderViewHostExt;
30 class AwWebContentsDelegate; 34 class AwWebContentsDelegate;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 bool compositor_visible_; 123 bool compositor_visible_;
120 124
121 DISALLOW_COPY_AND_ASSIGN(AwContents); 125 DISALLOW_COPY_AND_ASSIGN(AwContents);
122 }; 126 };
123 127
124 bool RegisterAwContents(JNIEnv* env); 128 bool RegisterAwContents(JNIEnv* env);
125 129
126 } // namespace android_webview 130 } // namespace android_webview
127 131
128 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 132 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698