[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
andersca at apple.com
andersca at apple.com
Wed Dec 22 17:53:04 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ffc62aada61501626c19c72024b8d4f59a8cf9ac
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 2 00:06:51 2010 +0000
Implement the remaining PluginController/Plugin member functions
https://bugs.webkit.org/show_bug.cgi?id=50356
Reviewed by Sam Weinig.
* PluginProcess/PluginControllerProxy.cpp:
(WebKit::PluginControllerProxy::cancelStreamLoad):
(WebKit::PluginControllerProxy::cancelManualStreamLoad):
(WebKit::PluginControllerProxy::setStatusbarText):
(WebKit::PluginControllerProxy::pluginProcessCrashed):
(WebKit::PluginControllerProxy::frameDidFinishLoading):
(WebKit::PluginControllerProxy::frameDidFail):
(WebKit::PluginControllerProxy::manualStreamDidReceiveResponse):
(WebKit::PluginControllerProxy::manualStreamDidReceiveData):
(WebKit::PluginControllerProxy::manualStreamDidFinishLoading):
(WebKit::PluginControllerProxy::manualStreamDidFail):
* PluginProcess/PluginControllerProxy.h:
* PluginProcess/PluginControllerProxy.messages.in:
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::frameDidFinishLoading):
(WebKit::PluginProxy::frameDidFail):
(WebKit::PluginProxy::manualStreamDidReceiveResponse):
(WebKit::PluginProxy::manualStreamDidReceiveData):
(WebKit::PluginProxy::manualStreamDidFinishLoading):
(WebKit::PluginProxy::manualStreamDidFail):
(WebKit::PluginProxy::windowFrameChanged):
(WebKit::PluginProxy::cancelStreamLoad):
(WebKit::PluginProxy::cancelManualStreamLoad):
(WebKit::PluginProxy::setStatusbarText):
* WebProcess/Plugins/PluginProxy.h:
* WebProcess/Plugins/PluginProxy.messages.in:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73083 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 66334af..b729f30 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,37 @@
+2010-12-01 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Implement the remaining PluginController/Plugin member functions
+ https://bugs.webkit.org/show_bug.cgi?id=50356
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::cancelStreamLoad):
+ (WebKit::PluginControllerProxy::cancelManualStreamLoad):
+ (WebKit::PluginControllerProxy::setStatusbarText):
+ (WebKit::PluginControllerProxy::pluginProcessCrashed):
+ (WebKit::PluginControllerProxy::frameDidFinishLoading):
+ (WebKit::PluginControllerProxy::frameDidFail):
+ (WebKit::PluginControllerProxy::manualStreamDidReceiveResponse):
+ (WebKit::PluginControllerProxy::manualStreamDidReceiveData):
+ (WebKit::PluginControllerProxy::manualStreamDidFinishLoading):
+ (WebKit::PluginControllerProxy::manualStreamDidFail):
+ * PluginProcess/PluginControllerProxy.h:
+ * PluginProcess/PluginControllerProxy.messages.in:
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::frameDidFinishLoading):
+ (WebKit::PluginProxy::frameDidFail):
+ (WebKit::PluginProxy::manualStreamDidReceiveResponse):
+ (WebKit::PluginProxy::manualStreamDidReceiveData):
+ (WebKit::PluginProxy::manualStreamDidFinishLoading):
+ (WebKit::PluginProxy::manualStreamDidFail):
+ (WebKit::PluginProxy::windowFrameChanged):
+ (WebKit::PluginProxy::cancelStreamLoad):
+ (WebKit::PluginProxy::cancelManualStreamLoad):
+ (WebKit::PluginProxy::setStatusbarText):
+ * WebProcess/Plugins/PluginProxy.h:
+ * WebProcess/Plugins/PluginProxy.messages.in:
+
2010-12-01 Steve Falkenburg <sfalken at apple.com>
Reviewed by Adam Roben.
diff --git a/WebKit2/PluginProcess/PluginControllerProxy.cpp b/WebKit2/PluginProcess/PluginControllerProxy.cpp
index 4107483..9e1b64e 100644
--- a/WebKit2/PluginProcess/PluginControllerProxy.cpp
+++ b/WebKit2/PluginProcess/PluginControllerProxy.cpp
@@ -34,7 +34,6 @@
#include "NPRuntimeUtilities.h"
#include "NPVariantData.h"
#include "NetscapePlugin.h"
-#include "NotImplemented.h"
#include "PluginProcess.h"
#include "PluginProxyMessages.h"
#include "WebCoreArgumentCoders.h"
@@ -159,12 +158,12 @@ void PluginControllerProxy::loadURL(uint64_t requestID, const String& method, co
void PluginControllerProxy::cancelStreamLoad(uint64_t streamID)
{
- notImplemented();
+ m_connection->connection()->send(Messages::PluginProxy::CancelStreamLoad(streamID), m_pluginInstanceID);
}
void PluginControllerProxy::cancelManualStreamLoad()
{
- notImplemented();
+ m_connection->connection()->send(Messages::PluginProxy::CancelManualStreamLoad(), m_pluginInstanceID);
}
NPObject* PluginControllerProxy::windowScriptNPObject()
@@ -214,9 +213,9 @@ bool PluginControllerProxy::evaluate(NPObject* npObject, const String& scriptStr
return true;
}
-void PluginControllerProxy::setStatusbarText(const WTF::String&)
+void PluginControllerProxy::setStatusbarText(const String& statusbarText)
{
- notImplemented();
+ m_connection->connection()->send(Messages::PluginProxy::SetStatusbarText(statusbarText), m_pluginInstanceID);
}
bool PluginControllerProxy::isAcceleratedCompositingEnabled()
@@ -226,7 +225,8 @@ bool PluginControllerProxy::isAcceleratedCompositingEnabled()
void PluginControllerProxy::pluginProcessCrashed()
{
- notImplemented();
+ // This should never be called from here.
+ ASSERT_NOT_REACHED();
}
String PluginControllerProxy::proxiesForURL(const String& urlString)
@@ -258,7 +258,17 @@ bool PluginControllerProxy::isPrivateBrowsingEnabled()
{
return m_isPrivateBrowsingEnabled;
}
-
+
+void PluginControllerProxy::frameDidFinishLoading(uint64_t requestID)
+{
+ m_plugin->frameDidFinishLoading(requestID);
+}
+
+void PluginControllerProxy::frameDidFail(uint64_t requestID, bool wasCancelled)
+{
+ m_plugin->frameDidFail(requestID, wasCancelled);
+}
+
void PluginControllerProxy::geometryDidChange(const IntRect& frameRect, const IntRect& clipRect, const SharedMemory::Handle& backingStoreHandle)
{
m_frameRect = frameRect;
@@ -300,6 +310,26 @@ void PluginControllerProxy::streamDidFail(uint64_t streamID, bool wasCancelled)
{
m_plugin->streamDidFail(streamID, wasCancelled);
}
+
+void PluginControllerProxy::manualStreamDidReceiveResponse(const String& responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers)
+{
+ m_plugin->manualStreamDidReceiveResponse(KURL(ParsedURLString, responseURLString), streamLength, lastModifiedTime, mimeType, headers);
+}
+
+void PluginControllerProxy::manualStreamDidReceiveData(const CoreIPC::DataReference& data)
+{
+ m_plugin->manualStreamDidReceiveData(reinterpret_cast<const char*>(data.data()), data.size());
+}
+
+void PluginControllerProxy::manualStreamDidFinishLoading()
+{
+ m_plugin->manualStreamDidFinishLoading();
+}
+
+void PluginControllerProxy::manualStreamDidFail(bool wasCancelled)
+{
+ m_plugin->manualStreamDidFail(wasCancelled);
+}
void PluginControllerProxy::handleMouseEvent(const WebMouseEvent& mouseEvent, bool& handled)
{
diff --git a/WebKit2/PluginProcess/PluginControllerProxy.h b/WebKit2/PluginProcess/PluginControllerProxy.h
index 6934329..9e76813 100644
--- a/WebKit2/PluginProcess/PluginControllerProxy.h
+++ b/WebKit2/PluginProcess/PluginControllerProxy.h
@@ -93,12 +93,18 @@ private:
virtual bool isPrivateBrowsingEnabled();
// Message handlers.
+ void frameDidFinishLoading(uint64_t requestID);
+ void frameDidFail(uint64_t requestID, bool wasCancelled);
void geometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect, const SharedMemory::Handle& backingStoreHandle);
void didEvaluateJavaScript(uint64_t requestID, const String& requestURLString, const String& result);
void streamDidReceiveResponse(uint64_t streamID, const String& responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers);
void streamDidReceiveData(uint64_t streamID, const CoreIPC::DataReference& data);
void streamDidFinishLoading(uint64_t streamID);
void streamDidFail(uint64_t streamID, bool wasCancelled);
+ void manualStreamDidReceiveResponse(const String& responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers);
+ void manualStreamDidReceiveData(const CoreIPC::DataReference& data);
+ void manualStreamDidFinishLoading();
+ void manualStreamDidFail(bool wasCancelled);
void handleMouseEvent(const WebMouseEvent&, bool& handled);
void handleWheelEvent(const WebWheelEvent&, bool& handled);
void handleMouseEnterEvent(const WebMouseEvent&, bool& handled);
diff --git a/WebKit2/PluginProcess/PluginControllerProxy.messages.in b/WebKit2/PluginProcess/PluginControllerProxy.messages.in
index e21c9f7..0ddef49 100644
--- a/WebKit2/PluginProcess/PluginControllerProxy.messages.in
+++ b/WebKit2/PluginProcess/PluginControllerProxy.messages.in
@@ -26,6 +26,12 @@ messages -> PluginControllerProxy {
# Sent when the plug-in geometry changes.
GeometryDidChange(WebCore::IntRect frameRect, WebCore::IntRect clipRect, WebKit::SharedMemory::Handle backingStoreHandle)
+ # Sent when a frame has finished loading.
+ FrameDidFinishLoading(uint64_t requestID)
+
+ # Sent when a frame dfailed to load.
+ FrameDidFail(uint64_t requestID, bool wasCancelled)
+
# Sent when JavaScript that the plug-in asked to be evaluated has been evaluated.
DidEvaluateJavaScript(uint64_t requestID, WTF::String requestURLString, WTF::String result)
@@ -41,6 +47,18 @@ messages -> PluginControllerProxy {
# Sent when a plug-in stream has failed to load.
StreamDidFail(uint64_t streamID, bool wasCancelled)
+ # Sent when the plug-in receives a response for the manual stream.
+ ManualStreamDidReceiveResponse(WTF::String responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, WTF::String mimeType, WTF::String headers)
+
+ # Sent when the plug-in receives data for the manual stream.
+ ManualStreamDidReceiveData(CoreIPC::DataReference data)
+
+ # Sent when the plug-in manual stream has finishes loading.
+ ManualStreamDidFinishLoading()
+
+ # Sent when the plug-in manual stream has failed to load.
+ ManualStreamDidFail(bool wasCancelled)
+
# Sent when a mouse event (that isn't a mouse enter/leave event or a wheel event) should be processed.
HandleMouseEvent(WebKit::WebMouseEvent mouseEvent) -> (bool handled)
diff --git a/WebKit2/WebProcess/Plugins/PluginProxy.cpp b/WebKit2/WebProcess/Plugins/PluginProxy.cpp
index c9d9a59..1330065 100644
--- a/WebKit2/WebProcess/Plugins/PluginProxy.cpp
+++ b/WebKit2/WebProcess/Plugins/PluginProxy.cpp
@@ -32,7 +32,6 @@
#include "NPRemoteObjectMap.h"
#include "NPRuntimeUtilities.h"
#include "NPVariantData.h"
-#include "NotImplemented.h"
#include "PluginController.h"
#include "PluginControllerProxyMessages.h"
#include "PluginProcessConnection.h"
@@ -187,12 +186,12 @@ void PluginProxy::geometryDidChange(const IntRect& frameRect, const IntRect& cli
void PluginProxy::frameDidFinishLoading(uint64_t requestID)
{
- notImplemented();
+ m_connection->connection()->send(Messages::PluginControllerProxy::FrameDidFinishLoading(requestID), m_pluginInstanceID);
}
void PluginProxy::frameDidFail(uint64_t requestID, bool wasCancelled)
{
- notImplemented();
+ m_connection->connection()->send(Messages::PluginControllerProxy::FrameDidFail(requestID, wasCancelled), m_pluginInstanceID);
}
void PluginProxy::didEvaluateJavaScript(uint64_t requestID, const WTF::String& requestURLString, const WTF::String& result)
@@ -222,22 +221,22 @@ void PluginProxy::streamDidFail(uint64_t streamID, bool wasCancelled)
void PluginProxy::manualStreamDidReceiveResponse(const KURL& responseURL, uint32_t streamLength, uint32_t lastModifiedTime, const WTF::String& mimeType, const WTF::String& headers)
{
- notImplemented();
+ m_connection->connection()->send(Messages::PluginControllerProxy::ManualStreamDidReceiveResponse(responseURL.string(), streamLength, lastModifiedTime, mimeType, headers), m_pluginInstanceID);
}
void PluginProxy::manualStreamDidReceiveData(const char* bytes, int length)
{
- notImplemented();
+ m_connection->connection()->send(Messages::PluginControllerProxy::ManualStreamDidReceiveData(CoreIPC::DataReference(reinterpret_cast<const uint8_t*>(bytes), length)), m_pluginInstanceID);
}
void PluginProxy::manualStreamDidFinishLoading()
{
- notImplemented();
+ m_connection->connection()->send(Messages::PluginControllerProxy::ManualStreamDidFinishLoading(), m_pluginInstanceID);
}
void PluginProxy::manualStreamDidFail(bool wasCancelled)
{
- notImplemented();
+ m_connection->connection()->send(Messages::PluginControllerProxy::ManualStreamDidFail(wasCancelled), m_pluginInstanceID);
}
bool PluginProxy::handleMouseEvent(const WebMouseEvent& mouseEvent)
@@ -312,7 +311,6 @@ void PluginProxy::windowFocusChanged(bool hasFocus)
void PluginProxy::windowFrameChanged(const IntRect& windowFrame)
{
m_connection->connection()->send(Messages::PluginControllerProxy::WindowFrameChanged(windowFrame), m_pluginInstanceID);
- notImplemented();
}
void PluginProxy::windowVisibilityChanged(bool isVisible)
@@ -394,6 +392,21 @@ void PluginProxy::evaluate(const NPVariantData& npObjectAsVariantData, const Str
releaseNPVariantValue(&npObjectAsVariant);
}
+void PluginProxy::cancelStreamLoad(uint64_t streamID)
+{
+ m_pluginController->cancelStreamLoad(streamID);
+}
+
+void PluginProxy::cancelManualStreamLoad()
+{
+ m_pluginController->cancelManualStreamLoad();
+}
+
+void PluginProxy::setStatusbarText(const String& statusbarText)
+{
+ m_pluginController->setStatusbarText(statusbarText);
+}
+
void PluginProxy::update(const IntRect& paintedRect)
{
if (paintedRect == m_frameRect)
diff --git a/WebKit2/WebProcess/Plugins/PluginProxy.h b/WebKit2/WebProcess/Plugins/PluginProxy.h
index 4657fe0..94956da 100644
--- a/WebKit2/WebProcess/Plugins/PluginProxy.h
+++ b/WebKit2/WebProcess/Plugins/PluginProxy.h
@@ -112,6 +112,9 @@ private:
void getWindowScriptNPObject(uint64_t& windowScriptNPObjectID);
void getPluginElementNPObject(uint64_t& pluginElementNPObjectID);
void evaluate(const NPVariantData& npObjectAsVariantData, const String& scriptString, bool allowPopups, bool& returnValue, NPVariantData& resultData);
+ void cancelStreamLoad(uint64_t streamID);
+ void cancelManualStreamLoad();
+ void setStatusbarText(const String& statusbarText);
RefPtr<PluginProcessConnection> m_connection;
uint64_t m_pluginInstanceID;
diff --git a/WebKit2/WebProcess/Plugins/PluginProxy.messages.in b/WebKit2/WebProcess/Plugins/PluginProxy.messages.in
index 44e92b7..5ef324b 100644
--- a/WebKit2/WebProcess/Plugins/PluginProxy.messages.in
+++ b/WebKit2/WebProcess/Plugins/PluginProxy.messages.in
@@ -46,6 +46,15 @@ messages -> PluginProxy {
# Evaluates the given JavaScript string.
Evaluate(WebKit::NPVariantData npObjectAsVariantData, WTF::String scriptString, bool allowPopups) -> (bool returnValue, WebKit::NPVariantData resultData)
+
+ # Cancels the given stream load.
+ CancelStreamLoad(uint64_t streamID)
+
+ # Cancel the manual stream load.
+ CancelManualStreamLoad()
+
+ # Set the status bar text.
+ SetStatusbarText(WTF::String statusbarText)
}
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list