aw: Move java classes to gfx

No DEPS file this time to prevent importing browser since there are
actually two violations.

Change-Id: Id62a279009965101ee4c417c10dd09e6c93b9e18
Reviewed-on: https://chromium-review.googlesource.com/c/1487141Reviewed-by: Tobias Sargeant <tobiasjs@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635502}

android_webview/BUILD.gn

@@ -48,15 +48,12 @@ generate_jni("native_jni") {
     "java/src/org/chromium/android_webview/AwCookieManager.java",
     "java/src/org/chromium/android_webview/AwDebug.java",
     "java/src/org/chromium/android_webview/AwDevToolsServer.java",
-    "java/src/org/chromium/android_webview/AwDrawFnImpl.java",
     "java/src/org/chromium/android_webview/AwFeatureList.java",
     "java/src/org/chromium/android_webview/AwFormDatabase.java",
-    "java/src/org/chromium/android_webview/AwGLFunctor.java",
     "java/src/org/chromium/android_webview/AwHttpAuthHandler.java",
     "java/src/org/chromium/android_webview/AwMetricsLogUploader.java",
     "java/src/org/chromium/android_webview/AwMetricsServiceClient.java",
     "java/src/org/chromium/android_webview/AwPdfExporter.java",
-    "java/src/org/chromium/android_webview/AwPicture.java",
     "java/src/org/chromium/android_webview/AwProxyController.java",
     "java/src/org/chromium/android_webview/AwQuotaManagerBridge.java",
     "java/src/org/chromium/android_webview/AwRenderProcess.java",
@@ -67,8 +64,11 @@ generate_jni("native_jni") {
     "java/src/org/chromium/android_webview/AwWebContentsDelegate.java",
     "java/src/org/chromium/android_webview/AwWebResourceResponse.java",
     "java/src/org/chromium/android_webview/InputStreamUtil.java",
-    "java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java",
     "java/src/org/chromium/android_webview/PopupTouchHandleDrawable.java",
+    "java/src/org/chromium/android_webview/gfx/AwDrawFnImpl.java",
+    "java/src/org/chromium/android_webview/gfx/AwGLFunctor.java",
+    "java/src/org/chromium/android_webview/gfx/AwPicture.java",
+    "java/src/org/chromium/android_webview/gfx/JavaBrowserViewRendererHelper.java",
     "java/src/org/chromium/android_webview/permission/AwPermissionRequest.java",
   ]
   jni_package = "android_webview"
@@ -853,11 +853,8 @@ android_library("android_webview_java") {
     "java/src/org/chromium/android_webview/AwCookieManager.java",
     "java/src/org/chromium/android_webview/AwDebug.java",
     "java/src/org/chromium/android_webview/AwDevToolsServer.java",
-    "java/src/org/chromium/android_webview/AwDrawFnImpl.java",
     "java/src/org/chromium/android_webview/AwFeatureList.java",
     "java/src/org/chromium/android_webview/AwFormDatabase.java",
-    "java/src/org/chromium/android_webview/AwFunctor.java",
-    "java/src/org/chromium/android_webview/AwGLFunctor.java",
     "java/src/org/chromium/android_webview/AwGeolocationPermissions.java",
     "java/src/org/chromium/android_webview/AwHttpAuthHandler.java",
     "java/src/org/chromium/android_webview/AwLayoutSizer.java",
@@ -865,7 +862,6 @@ android_library("android_webview_java") {
     "java/src/org/chromium/android_webview/AwMetricsServiceClient.java",
     "java/src/org/chromium/android_webview/AwNetworkChangeNotifierRegistrationPolicy.java",
     "java/src/org/chromium/android_webview/AwPdfExporter.java",
-    "java/src/org/chromium/android_webview/AwPicture.java",
     "java/src/org/chromium/android_webview/AwPrintDocumentAdapter.java",
     "java/src/org/chromium/android_webview/AwProxyController.java",
     "java/src/org/chromium/android_webview/AwQuotaManagerBridge.java",
@@ -899,7 +895,6 @@ android_library("android_webview_java") {
     "java/src/org/chromium/android_webview/FullScreenView.java",
     "java/src/org/chromium/android_webview/HttpAuthDatabase.java",
     "java/src/org/chromium/android_webview/InputStreamUtil.java",
-    "java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java",
     "java/src/org/chromium/android_webview/JsPromptResultReceiver.java",
     "java/src/org/chromium/android_webview/JsResultHandler.java",
     "java/src/org/chromium/android_webview/JsResultReceiver.java",
@@ -913,6 +908,11 @@ android_library("android_webview_java") {
     "java/src/org/chromium/android_webview/VariationsSeedLoader.java",
     "java/src/org/chromium/android_webview/ViewPositionObserver.java",
     "java/src/org/chromium/android_webview/WebViewChromiumRunQueue.java",
+    "java/src/org/chromium/android_webview/gfx/AwDrawFnImpl.java",
+    "java/src/org/chromium/android_webview/gfx/AwFunctor.java",
+    "java/src/org/chromium/android_webview/gfx/AwGLFunctor.java",
+    "java/src/org/chromium/android_webview/gfx/AwPicture.java",
+    "java/src/org/chromium/android_webview/gfx/JavaBrowserViewRendererHelper.java",
     "java/src/org/chromium/android_webview/permission/AwGeolocationCallback.java",
     "java/src/org/chromium/android_webview/permission/AwPermissionRequest.java",
     "java/src/org/chromium/android_webview/policy/AwPolicyProvider.java",

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

@@ -57,11 +57,11 @@ import android.widget.TextView;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwContentsStatics;
-import org.chromium.android_webview.AwDrawFnImpl;
 import org.chromium.android_webview.AwPrintDocumentAdapter;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.ResourcesContextWrapperFactory;
 import org.chromium.android_webview.ScopedSysTraceEvent;
+import org.chromium.android_webview.gfx.AwDrawFnImpl;
 import org.chromium.android_webview.renderer_priority.RendererPriority;
 import org.chromium.base.BuildInfo;
 import org.chromium.base.ThreadUtils;

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java

@@ -24,7 +24,6 @@ import org.chromium.android_webview.AwBrowserProcess;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwContentsStatics;
 import org.chromium.android_webview.AwCookieManager;
-import org.chromium.android_webview.AwDrawFnImpl;
 import org.chromium.android_webview.AwNetworkChangeNotifierRegistrationPolicy;
 import org.chromium.android_webview.AwProxyController;
 import org.chromium.android_webview.AwQuotaManagerBridge;
@@ -35,6 +34,7 @@ import org.chromium.android_webview.HttpAuthDatabase;
 import org.chromium.android_webview.ScopedSysTraceEvent;
 import org.chromium.android_webview.VariationsSeedLoader;
 import org.chromium.android_webview.WebViewChromiumRunQueue;
+import org.chromium.android_webview.gfx.AwDrawFnImpl;
 import org.chromium.base.BuildConfig;
 import org.chromium.base.BuildInfo;
 import org.chromium.base.ContextUtils;

android_webview/glue/java/src/com/android/webview/chromium/WebViewDelegateFactory.java

@@ -15,7 +15,7 @@ import android.os.Trace;
 import android.util.SparseArray;
 import android.view.View;
 
-import org.chromium.android_webview.AwDrawFnImpl;
+import org.chromium.android_webview.gfx.AwDrawFnImpl;
 
 import java.lang.reflect.Method;
 

android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -45,6 +45,10 @@ import android.view.inputmethod.InputConnection;
 import android.view.textclassifier.TextClassifier;
 import android.webkit.JavascriptInterface;
 
+import org.chromium.android_webview.gfx.AwDrawFnImpl;
+import org.chromium.android_webview.gfx.AwFunctor;
+import org.chromium.android_webview.gfx.AwGLFunctor;
+import org.chromium.android_webview.gfx.AwPicture;
 import org.chromium.android_webview.permission.AwGeolocationCallback;
 import org.chromium.android_webview.permission.AwPermissionRequest;
 import org.chromium.android_webview.renderer_priority.RendererPriority;

android_webview/java/src/org/chromium/android_webview/AwDrawFnImpl.java → android_webview/java/src/org/chromium/android_webview/gfx/AwDrawFnImpl.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.android_webview;
+package org.chromium.android_webview.gfx;
 
 import android.graphics.Canvas;
 

android_webview/java/src/org/chromium/android_webview/AwFunctor.java → android_webview/java/src/org/chromium/android_webview/gfx/AwFunctor.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.android_webview;
+package org.chromium.android_webview.gfx;
 
 import android.graphics.Canvas;
 

android_webview/java/src/org/chromium/android_webview/AwGLFunctor.java → android_webview/java/src/org/chromium/android_webview/gfx/AwGLFunctor.java

@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.android_webview;
+package org.chromium.android_webview.gfx;
 
 import android.graphics.Canvas;
 import android.view.ViewGroup;
 
+import org.chromium.android_webview.AwContents;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;

android_webview/java/src/org/chromium/android_webview/AwPicture.java → android_webview/java/src/org/chromium/android_webview/gfx/AwPicture.java

@@ -2,20 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.android_webview;
+package org.chromium.android_webview.gfx;
 
 import android.graphics.Canvas;
 import android.graphics.Picture;
 
+import org.chromium.android_webview.CleanupReference;
 import org.chromium.base.annotations.JNINamespace;
 
 import java.io.OutputStream;
 
-// A simple wrapper around a SkPicture, that allows final rendering to be performed using the
-// chromium skia library.
+/**
+ * A simple wrapper around a SkPicture, that allows final rendering to be performed using the
+ * chromium skia library.
+ */
 @JNINamespace("android_webview")
-class AwPicture extends Picture {
-
+public class AwPicture extends Picture {
     private long mNativeAwPicture;
 
     // There is no explicit destroy method on Picture base-class, so cleanup is always
@@ -37,7 +39,7 @@ class AwPicture extends Picture {
      * @param nativeAwPicture is an instance of the AwPicture native class. Ownership is
      *                        taken by this java instance.
      */
-    AwPicture(long nativeAwPicture) {
+    public AwPicture(long nativeAwPicture) {
         mNativeAwPicture = nativeAwPicture;
         mCleanupReference = new CleanupReference(this, new DestroyRunnable(nativeAwPicture));
     }
@@ -82,4 +84,3 @@ class AwPicture extends Picture {
     private native int nativeGetHeight(long nativeAwPicture);
     private native void nativeDraw(long nativeAwPicture, Canvas canvas);
 }
-

android_webview/java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java → android_webview/java/src/org/chromium/android_webview/gfx/JavaBrowserViewRendererHelper.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.android_webview;
+package org.chromium.android_webview.gfx;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -51,6 +51,5 @@ public class JavaBrowserViewRendererHelper {
     }
 
     // Should never be instantiated.
-    private JavaBrowserViewRendererHelper() {
-    }
+    private JavaBrowserViewRendererHelper() {}
 }

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java

@@ -22,7 +22,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.android_webview.AwContents;
-import org.chromium.android_webview.AwGLFunctor;
+import org.chromium.android_webview.gfx.AwGLFunctor;
 import org.chromium.android_webview.test.AwActivityTestRule.TestDependencyFactory;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;

android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java

@@ -26,7 +26,7 @@ import android.view.inputmethod.InputConnection;
 import android.widget.FrameLayout;
 
 import org.chromium.android_webview.AwContents;
-import org.chromium.android_webview.AwDrawFnImpl;
+import org.chromium.android_webview.gfx.AwDrawFnImpl;
 import org.chromium.android_webview.shell.DrawFn;
 import org.chromium.base.Callback;
 import org.chromium.content_public.browser.WebContents;