am de7e9124: am ec4b5ee4: As we are sharing the view between embedded and full screen, we should make sure to call the correct update when bounds changed.

Merge commit 'de7e9124bea659d873d5488809d92a334104cb53'

* commit 'de7e9124bea659d873d5488809d92a334104cb53':
  As we are sharing the view between embedded and full

1 files changed, 10 insertions, 11 deletions

diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp
index 553b455..b815c90 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.cpp
+++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp
@@ -113,14 +113,8 @@ void PluginWidgetAndroid::setWindow(NPWindow* window, bool isTransparent) {
 
     if (m_drawingModel == kSurface_ANPDrawingModel) {
 
-        // if the surface exists check for changes and update accordingly
-        if (m_embeddedView && m_pluginBounds != oldPluginBounds) {
-
-            m_core->updateSurface(m_embeddedView, window->x, window->y,
-                                  window->width, window->height);
-
         // if the surface does not exist then create a new surface
-        } else if(!m_embeddedView) {
+        if (!m_embeddedView) {
 
             WebCore::PluginPackage* pkg = m_pluginView->plugin();
             NPP instance = m_pluginView->instance();
@@ -136,10 +130,15 @@ void PluginWidgetAndroid::setWindow(NPWindow* window, bool isTransparent) {
                 JNIEnv* env = JSC::Bindings::getJNIEnv();
                 m_embeddedView = env->NewGlobalRef(tempObj);
             }
-        }
-        if (m_isFullScreen && m_pluginBounds != oldPluginBounds) {
-            m_core->updateFullScreenPlugin(window->x, window->y,
-                    window->width, window->height);
+        } else if (m_pluginBounds != oldPluginBounds) {
+            // if the surface exists check for changes and update accordingly
+            if (m_isFullScreen) {
+                m_core->updateFullScreenPlugin(window->x, window->y,
+                        window->width, window->height);
+            } else {
+                m_core->updateSurface(m_embeddedView, window->x, window->y,
+                                      window->width, window->height);
+            }
         }
     } else {
         m_flipPixelRef->safeUnref();