Title: [103305] trunk/Source/WebCore
- Revision
- 103305
- Author
- leo.y...@torchmobile.com.cn
- Date
- 2011-12-19 22:22:39 -0800 (Mon, 19 Dec 2011)
Log Message
[BlackBerry] Upstream the BlackBerry change to ResourceRequestBase.cpp
https://bugs.webkit.org/show_bug.cgi?id=74910
Reviewed by Daniel Bates.
No functionality change to the existing code, no new tests.
* platform/network/ResourceRequestBase.cpp: The BlackBerry porting has its own
initializeMaximumHTTPConnectionCountPerHost(). Exclude the default implementation.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (103304 => 103305)
--- trunk/Source/WebCore/ChangeLog 2011-12-20 05:43:21 UTC (rev 103304)
+++ trunk/Source/WebCore/ChangeLog 2011-12-20 06:22:39 UTC (rev 103305)
@@ -1,5 +1,17 @@
2011-12-19 Leo Yang <leo.y...@torchmobile.com.cn>
+ [BlackBerry] Upstream the BlackBerry change to ResourceRequestBase.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=74910
+
+ Reviewed by Daniel Bates.
+
+ No functionality change to the existing code, no new tests.
+
+ * platform/network/ResourceRequestBase.cpp: The BlackBerry porting has its own
+ initializeMaximumHTTPConnectionCountPerHost(). Exclude the default implementation.
+
+2011-12-19 Leo Yang <leo.y...@torchmobile.com.cn>
+
[BlackBerry] Upstream the BlackBerry change to NetworkStateNotifier.h
https://bugs.webkit.org/show_bug.cgi?id=74904
Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (103304 => 103305)
--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2011-12-20 05:43:21 UTC (rev 103304)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2011-12-20 06:22:39 UTC (rev 103305)
@@ -449,7 +449,7 @@
m_resourceRequestUpdated = true;
}
-#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(QT)
+#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(QT) && !PLATFORM(BLACKBERRY)
unsigned initializeMaximumHTTPConnectionCountPerHost()
{
// This is used by the loader to control the number of issued parallel load requests.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
