Merge "Delay sending Plugin Draw event until the surface is ready."

core/java/android/webkit/WebView.java

@@ -7416,6 +7416,10 @@ public class WebView extends AbsoluteLayout
         }
     }
 
+    void sendPluginDrawMsg() {
+        mWebViewCore.sendMessage(EventHub.PLUGIN_SURFACE_READY);
+    }
+
     /**
      * Returns plugin bounds if x/y in content coordinates corresponds to a
      * plugin. Otherwise a NULL rectangle is returned.

core/java/android/webkit/WebViewCore.java

@@ -1032,6 +1032,8 @@ public final class WebViewCore {
 
         static final int EXECUTE_JS = 194;
 
+        static final int PLUGIN_SURFACE_READY = 195;
+
         // private message ids
         private static final int DESTROY =     200;
 
@@ -1587,6 +1589,10 @@ public final class WebViewCore {
                             nativeFullScreenPluginHidden(msg.arg1);
                             break;
 
+                        case PLUGIN_SURFACE_READY:
+                            nativePluginSurfaceReady();
+                            break;
+
                         case ADD_PACKAGE_NAMES:
                             if (BrowserFrame.sJavaBridge == null) {
                                 throw new IllegalStateException("No WebView " +
@@ -2826,6 +2832,7 @@ public final class WebViewCore {
     private native void nativeResume();
     private native void nativeFreeMemory();
     private native void nativeFullScreenPluginHidden(int npp);
+    private native void nativePluginSurfaceReady();
     private native boolean nativeValidNodeAndBounds(int frame, int node,
             Rect bounds);