[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 18:43:52 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 572ea041d49fe167a2bf244321975fe63133a7e2
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 16 19:45:37 2010 +0000
Add a bunch of m_isStarted assertions to plug-in code.
Reviewed by John Sullivan.
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::frameDidFinishLoading):
(WebKit::NetscapePlugin::frameDidFail):
(WebKit::NetscapePlugin::didEvaluateJavaScript):
(WebKit::NetscapePlugin::streamDidReceiveResponse):
(WebKit::NetscapePlugin::streamDidReceiveData):
(WebKit::NetscapePlugin::streamDidFinishLoading):
(WebKit::NetscapePlugin::streamDidFail):
(WebKit::NetscapePlugin::manualStreamDidReceiveResponse):
(WebKit::NetscapePlugin::manualStreamDidReceiveData):
(WebKit::NetscapePlugin::manualStreamDidFinishLoading):
(WebKit::NetscapePlugin::manualStreamDidFail):
(WebKit::NetscapePlugin::handleMouseEvent):
(WebKit::NetscapePlugin::handleWheelEvent):
(WebKit::NetscapePlugin::handleMouseEnterEvent):
(WebKit::NetscapePlugin::handleMouseLeaveEvent):
(WebKit::NetscapePlugin::handleKeyboardEvent):
(WebKit::NetscapePlugin::setFocus):
(WebKit::NetscapePlugin::pluginScriptableNPObject):
(WebKit::NetscapePlugin::privateBrowsingStateChanged):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74203 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index cb91451..03fd0d2 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,32 @@
2010-12-16 Anders Carlsson <andersca at apple.com>
+ Reviewed by John Sullivan.
+
+ Add a bunch of m_isStarted assertions to plug-in code.
+
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::frameDidFinishLoading):
+ (WebKit::NetscapePlugin::frameDidFail):
+ (WebKit::NetscapePlugin::didEvaluateJavaScript):
+ (WebKit::NetscapePlugin::streamDidReceiveResponse):
+ (WebKit::NetscapePlugin::streamDidReceiveData):
+ (WebKit::NetscapePlugin::streamDidFinishLoading):
+ (WebKit::NetscapePlugin::streamDidFail):
+ (WebKit::NetscapePlugin::manualStreamDidReceiveResponse):
+ (WebKit::NetscapePlugin::manualStreamDidReceiveData):
+ (WebKit::NetscapePlugin::manualStreamDidFinishLoading):
+ (WebKit::NetscapePlugin::manualStreamDidFail):
+ (WebKit::NetscapePlugin::handleMouseEvent):
+ (WebKit::NetscapePlugin::handleWheelEvent):
+ (WebKit::NetscapePlugin::handleMouseEnterEvent):
+ (WebKit::NetscapePlugin::handleMouseLeaveEvent):
+ (WebKit::NetscapePlugin::handleKeyboardEvent):
+ (WebKit::NetscapePlugin::setFocus):
+ (WebKit::NetscapePlugin::pluginScriptableNPObject):
+ (WebKit::NetscapePlugin::privateBrowsingStateChanged):
+
+2010-12-16 Anders Carlsson <andersca at apple.com>
+
Reviewed by Darin Adler.
Save the manual plug-in stream data and redeliver it when the plug-in is initialized
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
index c5fb912..8f34b38 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
@@ -473,6 +473,8 @@ void NetscapePlugin::geometryDidChange(const IntRect& frameRect, const IntRect&
void NetscapePlugin::frameDidFinishLoading(uint64_t requestID)
{
+ ASSERT(m_isStarted);
+
PendingURLNotifyMap::iterator it = m_pendingURLNotifications.find(requestID);
if (it == m_pendingURLNotifications.end())
return;
@@ -487,6 +489,8 @@ void NetscapePlugin::frameDidFinishLoading(uint64_t requestID)
void NetscapePlugin::frameDidFail(uint64_t requestID, bool wasCancelled)
{
+ ASSERT(m_isStarted);
+
PendingURLNotifyMap::iterator it = m_pendingURLNotifications.find(requestID);
if (it == m_pendingURLNotifications.end())
return;
@@ -501,6 +505,8 @@ void NetscapePlugin::frameDidFail(uint64_t requestID, bool wasCancelled)
void NetscapePlugin::didEvaluateJavaScript(uint64_t requestID, const String& requestURLString, const String& result)
{
+ ASSERT(m_isStarted);
+
if (NetscapePluginStream* pluginStream = streamFromID(requestID))
pluginStream->sendJavaScriptStream(requestURLString, result);
}
@@ -508,24 +514,32 @@ void NetscapePlugin::didEvaluateJavaScript(uint64_t requestID, const String& req
void NetscapePlugin::streamDidReceiveResponse(uint64_t streamID, const KURL& responseURL, uint32_t streamLength,
uint32_t lastModifiedTime, const String& mimeType, const String& headers)
{
+ ASSERT(m_isStarted);
+
if (NetscapePluginStream* pluginStream = streamFromID(streamID))
pluginStream->didReceiveResponse(responseURL, streamLength, lastModifiedTime, mimeType, headers);
}
void NetscapePlugin::streamDidReceiveData(uint64_t streamID, const char* bytes, int length)
{
+ ASSERT(m_isStarted);
+
if (NetscapePluginStream* pluginStream = streamFromID(streamID))
pluginStream->didReceiveData(bytes, length);
}
void NetscapePlugin::streamDidFinishLoading(uint64_t streamID)
{
+ ASSERT(m_isStarted);
+
if (NetscapePluginStream* pluginStream = streamFromID(streamID))
pluginStream->didFinishLoading();
}
void NetscapePlugin::streamDidFail(uint64_t streamID, bool wasCancelled)
{
+ ASSERT(m_isStarted);
+
if (NetscapePluginStream* pluginStream = streamFromID(streamID))
pluginStream->didFail(wasCancelled);
}
@@ -533,6 +547,7 @@ void NetscapePlugin::streamDidFail(uint64_t streamID, bool wasCancelled)
void NetscapePlugin::manualStreamDidReceiveResponse(const KURL& responseURL, uint32_t streamLength, uint32_t lastModifiedTime,
const String& mimeType, const String& headers)
{
+ ASSERT(m_isStarted);
ASSERT(m_loadManually);
ASSERT(!m_manualStream);
@@ -542,6 +557,7 @@ void NetscapePlugin::manualStreamDidReceiveResponse(const KURL& responseURL, uin
void NetscapePlugin::manualStreamDidReceiveData(const char* bytes, int length)
{
+ ASSERT(m_isStarted);
ASSERT(m_loadManually);
ASSERT(m_manualStream);
@@ -550,6 +566,7 @@ void NetscapePlugin::manualStreamDidReceiveData(const char* bytes, int length)
void NetscapePlugin::manualStreamDidFinishLoading()
{
+ ASSERT(m_isStarted);
ASSERT(m_loadManually);
ASSERT(m_manualStream);
@@ -558,6 +575,7 @@ void NetscapePlugin::manualStreamDidFinishLoading()
void NetscapePlugin::manualStreamDidFail(bool wasCancelled)
{
+ ASSERT(m_isStarted);
ASSERT(m_loadManually);
ASSERT(m_manualStream);
@@ -566,36 +584,49 @@ void NetscapePlugin::manualStreamDidFail(bool wasCancelled)
bool NetscapePlugin::handleMouseEvent(const WebMouseEvent& mouseEvent)
{
+ ASSERT(m_isStarted);
+
return platformHandleMouseEvent(mouseEvent);
}
bool NetscapePlugin::handleWheelEvent(const WebWheelEvent& wheelEvent)
{
+ ASSERT(m_isStarted);
+
return platformHandleWheelEvent(wheelEvent);
}
bool NetscapePlugin::handleMouseEnterEvent(const WebMouseEvent& mouseEvent)
{
+ ASSERT(m_isStarted);
+
return platformHandleMouseEnterEvent(mouseEvent);
}
bool NetscapePlugin::handleMouseLeaveEvent(const WebMouseEvent& mouseEvent)
{
+ ASSERT(m_isStarted);
+
return platformHandleMouseLeaveEvent(mouseEvent);
}
bool NetscapePlugin::handleKeyboardEvent(const WebKeyboardEvent& keyboardEvent)
{
+ ASSERT(m_isStarted);
+
return platformHandleKeyboardEvent(keyboardEvent);
}
void NetscapePlugin::setFocus(bool hasFocus)
{
+ ASSERT(m_isStarted);
+
platformSetFocus(hasFocus);
}
NPObject* NetscapePlugin::pluginScriptableNPObject()
{
+ ASSERT(m_isStarted);
NPObject* scriptableNPObject = 0;
if (NPP_GetValue(NPPVpluginScriptableNPObject, &scriptableNPObject) != NPERR_NO_ERROR)
@@ -606,6 +637,8 @@ NPObject* NetscapePlugin::pluginScriptableNPObject()
void NetscapePlugin::privateBrowsingStateChanged(bool privateBrowsingEnabled)
{
+ ASSERT(m_isStarted);
+
// From https://wiki.mozilla.org/Plugins:PrivateMode
// When the browser turns private mode on or off it will call NPP_SetValue for "NPNVprivateModeBool"
// (assigned enum value 18) with a pointer to an NPBool value on all applicable instances.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list