Merge 77706 - 2011-02-04 Adam Barth <abarth@webkit.org>...

Source/WebCore/html/PluginDocument.cpp

Index: Source/WebCore/html/PluginDocument.cpp
===================================================================
--- Source/WebCore/html/PluginDocument.cpp	(revision 77831)
+++ Source/WebCore/html/PluginDocument.cpp	(working copy)
@@ -28,6 +28,7 @@
 #include "DocumentLoader.h"
 #include "Frame.h"
 #include "FrameLoaderClient.h"
+#include "FrameView.h"
 #include "HTMLEmbedElement.h"
 #include "HTMLHtmlElement.h"
 #include "HTMLNames.h"
@@ -115,6 +116,13 @@
 
     document()->updateLayout();
 
+    // Below we assume that renderer->widget() to have been created by
+    // document()->updateLayout(). However, in some cases, updateLayout() will 
+    // recurse too many times and delay its post-layout tasks (such as creating
+    // the widget). Here we kick off the pending post-layout tasks so that we
+    // can synchronously redirect data to the plugin.
+    frame->view()->flushAnyPendingPostLayoutTasks();
+
     if (RenderPart* renderer = m_embedElement->renderPart()) {
         if (Widget* widget = renderer->widget()) {
             frame->loader()->client()->redirectDataToPlugin(widget);