Don't call NPP_SetWindow before we have the plugin geometry.

webkit/glue/webplugin_impl.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "webkit/glue/webplugin_impl.h"
 
 #include "Cursor.h"
 #include "Document.h"
 #include "DocumentLoader.h"
@@ skipping 154 matching lines @@
     parent()->hostWindow()->repaint(damageRect, true);
   }
 }
 
 void WebPluginContainer::setFocus() {
   WebCore::Widget::setFocus();
   impl_->setFocus();
 }
 
 void WebPluginContainer::show() {
-  bool old_visible = isVisible();
   setSelfVisible(true);
-  // We don't want to force a geometry update when the plugin widget is
-  // already visible as this involves a geometry update which may lead
-  // to unnecessary window moves in the plugin process.
-  if (old_visible != isVisible()) {
-    // This is to force an updategeometry call to the plugin process
-    // where the plugin window can be hidden or shown.
-    frameRectsChanged();
-  }
+  impl_->UpdateVisibility();
 
   WebCore::Widget::show();
 }
 
 void WebPluginContainer::hide() {
-  bool old_visible = isVisible();
   setSelfVisible(false);
-  if (old_visible != isVisible()) {
-    // This is to force an updategeometry call to the plugin process
-    // where the plugin window can be hidden or shown.
-    frameRectsChanged();
-  }
+  impl_->UpdateVisibility();
 
   WebCore::Widget::hide();
 }
 
 void WebPluginContainer::handleEvent(WebCore::Event* event) {
   impl_->handleEvent(event);
 }
 
 void WebPluginContainer::frameRectsChanged() {
   WebCore::Widget::frameRectsChanged();
   // This is a hack to tickle re-positioning of the plugin in the case where
   // our parent view was scrolled.
   impl_->setFrameRect(frameRect());
 }
 
 // We override this function, to make sure that geometry updates are sent
 // over to the plugin. For e.g. when a plugin is instantiated it does
 // not have a valid parent. As a result the first geometry update from
 // webkit is ignored. This function is called when the plugin eventually
 // gets a parent.
 void WebPluginContainer::setParentVisible(bool visible) {
   if (isParentVisible() == visible)
     return;  // No change.
 
   WebCore::Widget::setParentVisible(visible);
   if (!isSelfVisible())
     return;  // This widget has explicitely been marked as not visible.
 
-  // This is to force an updategeometry call to the plugin process
-  // where the plugin window can be hidden or shown.
-  frameRectsChanged();
-}
-
-// We override this function so that if the plugin is windowed, we can call
-// NPP_SetWindow at the first possible moment.  This ensures that NPP_SetWindow
-// is called before the manual load data is sent to a plugin.  If this order is
-// reversed, Flash won't load videos.
-void WebPluginContainer::setParent(WebCore::ScrollView* view) {
-  WebCore::Widget::setParent(view);
-  if (view) {
-    impl_->setFrameRect(frameRect());
-  }
+  impl_->UpdateVisibility();
 }
 
 void WebPluginContainer::windowCutoutRects(const WebCore::IntRect& bounds,
                                            WTF::Vector<WebCore::IntRect>*
                                            cutouts) const {
   impl_->windowCutoutRects(bounds, cutouts);
 }
 
 void WebPluginContainer::didReceiveResponse(
     const WebCore::ResourceResponse& response) {
   set_ignore_response_error(false);
 
+  // Manual loading, so make sure that the plugin receives window geometry
+  // before data, or else plugins misbehave.
+  frameRectsChanged();
+
   HttpResponseInfo http_response_info;
   ReadHttpResponseInfo(response, &http_response_info);
 
   impl_->delegate_->DidReceiveManualResponse(
       http_response_info.url,
       base::SysWideToNativeMB(http_response_info.mime_type),
       base::SysWideToNativeMB(impl_->GetAllHeaders(response)),
       http_response_info.expected_length,
       http_response_info.last_modified);
 }
@@ skipping 403 matching lines @@
 
   if (window_) {
     // Notify the window hosting the plugin (the WebViewDelegate) that
     // it needs to adjust the plugin, so that all the HWNDs can be moved
     // at the same time.
     WebPluginGeometry move;
     move.window = window_;
     move.window_rect = webkit_glue::FromIntRect(window_rect);
     move.clip_rect = webkit_glue::FromIntRect(clip_rect);
     move.cutout_rects = cutout_rects;
+    move.rects_valid = true;
     move.visible = widget_->isVisible();
 
     webview->delegate()->DidMove(webview, move);
   }
 
   // Notify the plugin that its parameters have changed.
   delegate_->UpdateGeometry(webkit_glue::FromIntRect(window_rect),
                             webkit_glue::FromIntRect(clip_rect));
 
   // Initiate a download on the plugin url. This should be done for the
@@ skipping 660 matching lines @@
     client_index = clients_.erase(client_index);
     if (resource_client)
       resource_client->DidFail();
   }
 
   // This needs to be called now and not in the destructor since the
   // webframe_ might not be valid anymore.
   webframe_->set_plugin_delegate(NULL);
   webframe_ = NULL;
 }
+
+void WebPluginImpl::UpdateVisibility() {
+  if (!window_)
+    return;
+
+  WebCore::Frame* frame = element_->document()->frame();
+  WebFrameImpl* webframe = WebFrameImpl::FromFrame(frame);
+  WebViewImpl* webview = webframe->GetWebViewImpl();
+  if (!webview->delegate())
+    return;
+
+  WebPluginGeometry move;
+  move.window = window_;
+  move.window_rect = gfx::Rect();
+  move.clip_rect = gfx::Rect();
+  move.rects_valid = false;
+  move.visible = widget_->isVisible();
+
+  webview->delegate()->DidMove(webview, move);
+}