summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2011-01-04 13:42:41 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-04 13:42:41 -0800
commit1451862b0af3a2d7df5f0eb2878863a583922177 (patch)
treea6ef68a6f95ce3c071a1db4724d84febaca272fe /core
parenta8691c9c4e332dd57db1c39a1e219bcb5da28173 (diff)
parent36a4f232c6afeeb43d5561ff27dae9ac2e1303fc (diff)
downloadframeworks_base-1451862b0af3a2d7df5f0eb2878863a583922177.zip
frameworks_base-1451862b0af3a2d7df5f0eb2878863a583922177.tar.gz
frameworks_base-1451862b0af3a2d7df5f0eb2878863a583922177.tar.bz2
Merge "Add full-screen support for OpenGL based plugins."
Diffstat (limited to 'core')
-rw-r--r--core/java/android/webkit/WebViewCore.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 45927f9..43ec378 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -2577,10 +2577,7 @@ final class WebViewCore {
.sendToTarget();
}
- // called by JNI. PluginWidget functions for creating an embedded View for
- // the surface drawing model.
- private ViewManager.ChildView addSurface(View pluginView, int x, int y,
- int width, int height) {
+ private ViewManager.ChildView createSurface(View pluginView) {
if (mWebView == null) {
return null;
}
@@ -2598,6 +2595,14 @@ final class WebViewCore {
ViewManager.ChildView view = mWebView.mViewManager.createView();
view.mView = pluginView;
+ return view;
+ }
+
+ // called by JNI. PluginWidget functions for creating an embedded View for
+ // the surface drawing model.
+ private ViewManager.ChildView addSurface(View pluginView, int x, int y,
+ int width, int height) {
+ ViewManager.ChildView view = createSurface(pluginView);
view.attachView(x, y, width, height);
return view;
}