Changeset 74202 in webkit

Timestamp:

Dec 16, 2010 11:37:44 AM (13 years ago)

Author:

andersca@apple.com

Message:

Save the manual plug-in stream data and redeliver it when the plug-in is initialized
​https://bugs.webkit.org/show_bug.cgi?id=51201

Reviewed by Darin Adler.

WebCore:

Export SharedBuffer related symbols.

• WebCore.exp.in:

WebKit2:

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::PluginView):
Initialize m_manualStreamState.

(WebKit::PluginView::manualLoadDidReceiveResponse):
If the plug-in hasn't been initialized, store the response.

(WebKit::PluginView::manualLoadDidReceiveData):
If the plug-in hasn't been initialized, store the data.

(WebKit::PluginView::manualLoadDidFinishLoading):
If the plug-in hasn't been initialized, update the state.

(WebKit::PluginView::manualLoadDidFail):
If the plug-in hasn't been initialized, store the error and update the state.

(WebKit::PluginView::initializePlugin):
Call redeliverManualStream.

(WebKit::PluginView::redeliverManualStream):
Redeliver the manual stream to the plug-in.

• WebProcess/Plugins/PluginView.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (7 diffs)
• WebKit2/WebProcess/Plugins/PluginView.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-16  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Save the manual plug-in stream data and redeliver it when the plug-in is initialized
+        https://bugs.webkit.org/show_bug.cgi?id=51201
+
+        Export SharedBuffer related symbols.
+
+        * WebCore.exp.in:
+
 2010-12-16  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/WebCore.exp.in

@@ -272 +272 @@
 __ZN7WebCore12SharedBuffer12createNSDataEv
 __ZN7WebCore12SharedBuffer24createWithContentsOfFileERKN3WTF6StringE
+__ZN7WebCore12SharedBuffer6appendEPKcj
 __ZN7WebCore12SharedBufferC1EPKci
+__ZN7WebCore12SharedBufferC1Ev
 __ZN7WebCore12SharedBufferD1Ev
 __ZN7WebCore12SpellChecker8didCheckEiRKN3WTF6VectorINS_19SpellCheckingResultELm0EEE
@@ -981 +983 @@
 __ZNK7WebCore12RenderObject7childAtEj
 __ZNK7WebCore12RenderWidget14windowClipRectEv
+__ZNK7WebCore12SharedBuffer11getSomeDataERPKcj
 __ZNK7WebCore12SharedBuffer4dataEv
 __ZNK7WebCore12SharedBuffer4sizeEv

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-16  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Save the manual plug-in stream data and redeliver it when the plug-in is initialized
+        https://bugs.webkit.org/show_bug.cgi?id=51201
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::PluginView):
+        Initialize m_manualStreamState.
+
+        (WebKit::PluginView::manualLoadDidReceiveResponse):
+        If the plug-in hasn't been initialized, store the response.
+
+        (WebKit::PluginView::manualLoadDidReceiveData):
+        If the plug-in hasn't been initialized, store the data.
+        
+        (WebKit::PluginView::manualLoadDidFinishLoading):
+        If the plug-in hasn't been initialized, update the state.
+
+        (WebKit::PluginView::manualLoadDidFail):
+        If the plug-in hasn't been initialized, store the error and update the state.
+        
+        (WebKit::PluginView::initializePlugin):
+        Call redeliverManualStream.
+
+        (WebKit::PluginView::redeliverManualStream):
+        Redeliver the manual stream to the plug-in.
+
+        * WebProcess/Plugins/PluginView.h:
+
 2010-12-16  Kimmo Kinnunen  <kimmo.t.kinnunen@nokia.com>
 

trunk/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -251 +251 @@
     , m_pendingURLRequestsTimer(RunLoop::main(), this, &PluginView::pendingURLRequestsTimerFired)
     , m_npRuntimeObjectMap(this)
+    , m_manualStreamState(StreamStateInitial)
 {
 #if PLATFORM(MAC)
@@ -297 +298 @@
         return;
 
+    if (!m_isInitialized) {
+        ASSERT(m_manualStreamState == StreamStateInitial);
+        m_manualStreamState = StreamStateHasReceivedResponse;
+        m_manualStreamResponse = response;
+        return;
+    }
+
     // Compute the stream related data from the resource response.
     const KURL& responseURL = response.url();
@@ -317 +325 @@
         return;
 
+    if (!m_isInitialized) {
+        ASSERT(m_manualStreamState == StreamStateHasReceivedResponse);
+        if (!m_manualStreamData)
+            m_manualStreamData = SharedBuffer::create();
+
+        m_manualStreamData->append(bytes, length);
+        return;
+    }
+
     m_plugin->manualStreamDidReceiveData(bytes, length);
 }
@@ -326 +343 @@
         return;
 
+    if (!m_isInitialized) {
+        ASSERT(m_manualStreamState == StreamStateHasReceivedResponse);
+        m_manualStreamState = StreamStateFinished;
+        return;
+    }
+
     m_plugin->manualStreamDidFinishLoading();
 }
@@ -334 +357 @@
     if (!m_plugin)
         return;
+
+    if (!m_isInitialized) {
+        m_manualStreamState = StreamStateFinished;
+        m_manualStreamError = error;
+        m_manualStreamData = nullptr;
+        return;
+    }
 
     m_plugin->manualStreamDidFail(error.isCancellation());
@@ -412 +442 @@
 
     viewGeometryDidChange();
+
+    redeliverManualStream();
 
 #if PLATFORM(MAC)
@@ -721 +753 @@
 }
 
+void PluginView::redeliverManualStream()
+{
+    if (m_manualStreamState == StreamStateInitial) {
+        // Nothing to do.
+        return;
+    }
+
+    if (m_manualStreamState == StreamStateFailed) {
+        manualLoadDidFail(m_manualStreamError);
+        return;
+    }
+
+    // Deliver the response.
+    manualLoadDidReceiveResponse(m_manualStreamResponse);
+
+    // Deliver the data.
+    if (m_manualStreamData) {
+        const char* data;
+        unsigned position = 0;
+
+        while (unsigned length = m_manualStreamData->getSomeData(data, position)) {
+            manualLoadDidReceiveData(data, length);
+            position += length;
+        }
+
+        m_manualStreamData = nullptr;
+    }
+
+    if (m_manualStreamState == StreamStateFinished)
+        manualLoadDidFinishLoading();
+}
+
 void PluginView::invalidateRect(const IntRect& dirtyRect)
 {

trunk/WebKit2/WebProcess/Plugins/PluginView.h

@@ -34 +34 @@
 
 #include <WebCore/MediaCanStartListener.h>
+#include <WebCore/ResourceError.h>
+#include <WebCore/ResourceResponse.h>
 #include <WebCore/PluginViewBase.h>
 #include <wtf/Deque.h>
@@ -91 +93 @@
     void removeStream(Stream*);
     void cancelAllStreams();
+
+    void redeliverManualStream();
 
     // WebCore::PluginViewBase
@@ -161 +165 @@
     // A map of all related NPObjects for this plug-in view.
     NPRuntimeObjectMap m_npRuntimeObjectMap;
+
+    // The manual stream state. This is used so we can deliver a manual stream to a plug-in
+    // when it is initialized.
+    enum ManualStreamState {
+        StreamStateInitial,
+        StreamStateHasReceivedResponse,
+        StreamStateFinished,
+        StreamStateFailed
+    };
+    ManualStreamState m_manualStreamState;
+
+    WebCore::ResourceResponse m_manualStreamResponse;
+    WebCore::ResourceError m_manualStreamError;
+    RefPtr<WebCore::SharedBuffer> m_manualStreamData;
 };