Title: [94255] trunk/Source/WebCore
- Revision
- 94255
- Author
- [email protected]
- Date
- 2011-08-31 17:26:46 -0700 (Wed, 31 Aug 2011)
Log Message
Fix compile issues when enabling HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
https://bugs.webkit.org/show_bug.cgi?id=67332
Reviewed by Darin Adler.
* loader/mac/ResourceLoaderMac.mm:
(WebCore::ResourceLoader::didReceiveDataArray):
* platform/network/cf/ResourceHandleCFNet.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (94254 => 94255)
--- trunk/Source/WebCore/ChangeLog 2011-09-01 00:21:20 UTC (rev 94254)
+++ trunk/Source/WebCore/ChangeLog 2011-09-01 00:26:46 UTC (rev 94255)
@@ -1,3 +1,14 @@
+2011-08-31 Pratik Solanki <[email protected]>
+
+ Fix compile issues when enabling HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+ https://bugs.webkit.org/show_bug.cgi?id=67332
+
+ Reviewed by Darin Adler.
+
+ * loader/mac/ResourceLoaderMac.mm:
+ (WebCore::ResourceLoader::didReceiveDataArray):
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+
2011-08-31 Dan Bernstein <[email protected]>
Refined the heuristic introduced to fix <rdar://problem/10002140> Text gets clipped in
Modified: trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm (94254 => 94255)
--- trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2011-09-01 00:21:20 UTC (rev 94254)
+++ trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2011-09-01 00:26:46 UTC (rev 94255)
@@ -81,7 +81,7 @@
CFDataRef data = "" i));
int dataLen = static_cast<int>(CFDataGetLength(data));
- if (m_shouldBufferData) {
+ if (m_options.shouldBufferData == BufferData) {
if (!m_resourceData)
m_resourceData = SharedBuffer::create();
m_resourceData->append(data);
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (94254 => 94255)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2011-09-01 00:21:20 UTC (rev 94254)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2011-09-01 00:26:46 UTC (rev 94255)
@@ -894,6 +894,8 @@
}
#endif
+#endif // USE(CFNETWORK)
+
#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
void ResourceHandle::handleDataArray(CFArrayRef dataArray)
{
@@ -927,8 +929,6 @@
}
#endif
-#endif // USE(CFNETWORK)
-
#if USE(CFURLSTORAGESESSIONS)
RetainPtr<CFURLStorageSessionRef> ResourceHandle::createPrivateBrowsingStorageSession(CFStringRef identifier)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
