[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 11:15:13 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1afe467c5b4c022cf63d80a9772b2808bf73637e
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 16 00:31:05 2010 +0000
Set notifyData to the stream's notification data
https://bugs.webkit.org/show_bug.cgi?id=42429
Reviewed by Dan Bernstein.
* WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
(WebKit::NetscapePluginStream::start):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63500 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 9faee8f..b174b66 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-15 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ Set notifyData to the stream's notification data
+ https://bugs.webkit.org/show_bug.cgi?id=42429
+
+ * WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
+ (WebKit::NetscapePluginStream::start):
+
2010-07-15 Brent Fulgham <bfulgham at webkit.org>
Build fix. Don't include CoreGraphics.h on non-CG builds.
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
index a69a698..65caf19 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
@@ -152,7 +152,7 @@ bool NetscapePluginStream::start(const WebCore::String& responseURLString, uint3
m_npStream.url = m_responseURL.data();
m_npStream.end = streamLength;
m_npStream.lastmodified = lastModifiedTime;
- m_npStream.notifyData = 0;
+ m_npStream.notifyData = m_notificationData;
m_npStream.headers = m_headers.length() == 0 ? 0 : m_headers.data();
NPError error = m_plugin->NPP_NewStream(const_cast<char*>(m_mimeType.data()), &m_npStream, false, &m_transferMode);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list