summaryrefslogtreecommitdiffstats
path: root/WebCore/plugins/PluginStream.cpp
diff options
context:
space:
mode:
authorRussell Brenner <russellbrenner@google.com>2010-11-18 17:33:13 -0800
committerRussell Brenner <russellbrenner@google.com>2010-12-02 13:47:21 -0800
commit6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch)
tree103a13998c33944d6ab3b8318c509a037e639460 /WebCore/plugins/PluginStream.cpp
parentbdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff)
downloadexternal_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip
external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz
external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebCore/plugins/PluginStream.cpp')
-rw-r--r--WebCore/plugins/PluginStream.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/WebCore/plugins/PluginStream.cpp b/WebCore/plugins/PluginStream.cpp
index 4d73789..f9021a8 100644
--- a/WebCore/plugins/PluginStream.cpp
+++ b/WebCore/plugins/PluginStream.cpp
@@ -31,6 +31,7 @@
#include "Frame.h"
#include "FrameLoader.h"
#include "PluginDebug.h"
+#include "ResourceLoadScheduler.h"
#include "SharedBuffer.h"
#include "SubresourceLoader.h"
#include <StringExtras.h>
@@ -93,12 +94,7 @@ PluginStream::~PluginStream()
void PluginStream::start()
{
ASSERT(!m_loadManually);
-
- m_loader = NetscapePlugInStreamLoader::create(m_frame, this);
-
- m_loader->setShouldBufferData(false);
- m_loader->documentLoader()->addPlugInStreamLoader(m_loader.get());
- m_loader->load(m_resourceRequest);
+ m_loader = resourceLoadScheduler()->schedulePluginStreamLoad(m_frame, this, m_resourceRequest);
}
void PluginStream::stop()