Title: [120036] trunk/Source/WebCore
- Revision
- 120036
- Author
- mary...@torchmobile.com.cn
- Date
- 2012-06-11 20:46:36 -0700 (Mon, 11 Jun 2012)
Log Message
[BlackBerry] Add handling of notifyDataReceived in NetworkJob even there's no data inside
https://bugs.webkit.org/show_bug.cgi?id=88773
Reviewed by Rob Buis.
Handling notifyDataReceived event even if there is no data inside.
This event was critical because it gives downloadFilterStream a chance
to follow up NetworkStream close event, and it also make pluginView in
FrameLoaderBlackBerry return normal logic.
RIM PR# 164563
Reviewed internally by Leo Yang.
* platform/network/blackberry/NetworkJob.cpp:
(WebCore::NetworkJob::handleNotifyDataReceived):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (120035 => 120036)
--- trunk/Source/WebCore/ChangeLog 2012-06-12 03:44:38 UTC (rev 120035)
+++ trunk/Source/WebCore/ChangeLog 2012-06-12 03:46:36 UTC (rev 120036)
@@ -1,5 +1,24 @@
2012-06-11 Mary Wu <mary...@torchmobile.com.cn>
+ [BlackBerry] Add handling of notifyDataReceived in NetworkJob even there's no data inside
+ https://bugs.webkit.org/show_bug.cgi?id=88773
+
+ Reviewed by Rob Buis.
+
+ Handling notifyDataReceived event even if there is no data inside.
+ This event was critical because it gives downloadFilterStream a chance
+ to follow up NetworkStream close event, and it also make pluginView in
+ FrameLoaderBlackBerry return normal logic.
+
+ RIM PR# 164563
+
+ Reviewed internally by Leo Yang.
+
+ * platform/network/blackberry/NetworkJob.cpp:
+ (WebCore::NetworkJob::handleNotifyDataReceived):
+
+2012-06-11 Mary Wu <mary...@torchmobile.com.cn>
+
[BlackBerry] Wrong mimetype for empty file link
https://bugs.webkit.org/show_bug.cgi?id=88642
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (120035 => 120036)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2012-06-12 03:44:38 UTC (rev 120035)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2012-06-12 03:46:36 UTC (rev 120036)
@@ -385,9 +385,12 @@
if ((!m_isFile && !m_statusReceived) || m_cancelled)
return;
- if (!buf || !len)
+ if (!buf || !len) {
+ sendResponseIfNeeded();
+ if (isClientAvailable())
+ m_handle->client()->didReceiveData(m_handle.get(), 0, 0, 0);
return;
-
+ }
// The loadFile API sets the override content type,
// this will always be used as the content type and should not be overridden.
if (!m_dataReceived && !m_isOverrideContentType) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
