Merge 125500

Source/WebCore/html/PluginDocument.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 150 matching lines @@
 
 Node* PluginDocument::pluginNode()
 {
     return m_pluginNode.get();
 }
 
 void PluginDocument::detach()
 {
     // Release the plugin node so that we don't have a circular reference.
     m_pluginNode = 0;
+    if (FrameLoader* loader = frame()->loader())
+        loader->client()->redirectDataToPlugin(0);
     HTMLDocument::detach();
 }
 
 void PluginDocument::cancelManualPluginLoad()
 {
     // PluginDocument::cancelManualPluginLoad should only be called once, but there are issues
     // with how many times we call beforeload on object elements. <rdar://problem/8441094>.
     if (!shouldLoadPluginManually())
         return;
 
     frame()->loader()->activeDocumentLoader()->mainResourceLoader()->cancel();
     setShouldLoadPluginManually(false);
 }
 
 }