Merge "Rename several classes"

3 files changed, 11 insertions, 7 deletions

diff --git a/Source/WebKit/android/jni/ViewStateSerializer.cpp b/Source/WebKit/android/jni/ViewStateSerializer.cpp
index bfce349..3fdc3e6 100644
--- a/Source/WebKit/android/jni/ViewStateSerializer.cpp
+++ b/Source/WebKit/android/jni/ViewStateSerializer.cpp
@@ -40,6 +40,7 @@
 #include "PictureLayerContent.h"
 #include "PictureSet.h"
 #include "ScrollableLayerAndroid.h"
+#include "SkFlattenable.h"
 #include "SkPicture.h"
 #include "TilesManager.h"
 
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 9907e6f..a4381e6 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -30,8 +30,10 @@
 #include "AndroidAnimation.h"
 #include "AndroidLog.h"
 #include "BaseLayerAndroid.h"
+#include "BaseRenderer.h"
 #include "DrawExtra.h"
 #include "Frame.h"
+#include "GLWebViewState.h"
 #include "GraphicsJNI.h"
 #include "HTMLInputElement.h"
 #include "IntPoint.h"
@@ -51,6 +53,7 @@
 #include "SkRect.h"
 #include "SkTime.h"
 #include "TilesManager.h"
+#include "TransferQueue.h"
 #include "WebCoreJni.h"
 #include "WebRequestContext.h"
 #include "WebViewCore.h"
diff --git a/Source/WebKit/android/plugins/ANPSurfaceInterface.cpp b/Source/WebKit/android/plugins/ANPSurfaceInterface.cpp
index 513d251..92dbbcd 100644
--- a/Source/WebKit/android/plugins/ANPSurfaceInterface.cpp
+++ b/Source/WebKit/android/plugins/ANPSurfaceInterface.cpp
@@ -47,7 +47,7 @@ static struct ANPSurfaceInterfaceJavaGlue {
     jfieldID    surfacePointer;
 } gSurfaceJavaGlue;
 
-static inline sp<Surface> getSurface(JNIEnv* env, jobject view) {
+static inline sp<android::Surface> getSurface(JNIEnv* env, jobject view) {
     if (!env || !view) {
         return NULL;
     }
@@ -80,7 +80,7 @@ static inline sp<Surface> getSurface(JNIEnv* env, jobject view) {
     env->DeleteLocalRef(holder);
     env->DeleteLocalRef(surface);
 
-    return sp<Surface>((Surface*) surfacePointer);
+    return sp<android::Surface>((android::Surface*) surfacePointer);
 }
 
 static inline ANPBitmapFormat convertPixelFormat(PixelFormat format) {
@@ -96,9 +96,9 @@ static bool anp_lock(JNIEnv* env, jobject surfaceView, ANPBitmap* bitmap, ANPRec
         return false;
     }
 
-    sp<Surface> surface = getSurface(env, surfaceView);
+    sp<android::Surface> surface = getSurface(env, surfaceView);
 
-    if (!bitmap || !Surface::isValid(surface)) {
+    if (!bitmap || !android::Surface::isValid(surface)) {
             return false;
     }
 
@@ -112,7 +112,7 @@ static bool anp_lock(JNIEnv* env, jobject surfaceView, ANPBitmap* bitmap, ANPRec
         dirtyRegion.set(Rect(0x3FFF, 0x3FFF));
     }
 
-    Surface::SurfaceInfo info;
+    android::Surface::SurfaceInfo info;
     status_t err = surface->lock(&info, &dirtyRegion);
     if (err < 0) {
         return false;
@@ -150,9 +150,9 @@ static void anp_unlock(JNIEnv* env, jobject surfaceView) {
         return;
     }
 
-    sp<Surface> surface = getSurface(env, surfaceView);
+    sp<android::Surface> surface = getSurface(env, surfaceView);
 
-    if (!Surface::isValid(surface)) {
+    if (!android::Surface::isValid(surface)) {
         return;
     }