[webkit-changes] [176089] trunk/LayoutTests

[psolanki]

Title: [176089] trunk/LayoutTests








Revision 176089
Author psola...@apple.com
Date 2014-11-13 13:57:00 -0800 (Thu, 13 Nov 2014)


Log Message
Rename ios-sim to ios-sim-deprecated.

The results here are historical and new results should go into ios-simulator
directory. Eventually, we should get rid of this directory completely.

Rubber-stamped by Simon Fraser.

* platform/ios-sim: Removed.
* platform/ios-sim-deprecated: Copied from LayoutTests/platform/ios-sim.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/ios-sim-deprecated/


Removed Paths

trunk/LayoutTests/platform/ios-sim/




Diff

Modified: trunk/LayoutTests/ChangeLog (176088 => 176089)

--- trunk/LayoutTests/ChangeLog	2014-11-13 21:55:28 UTC (rev 176088)
+++ trunk/LayoutTests/ChangeLog	2014-11-13 21:57:00 UTC (rev 176089)
@@ -1,3 +1,15 @@
+2014-11-13  Pratik Solanki  psola...@apple.com
+
+Rename ios-sim to ios-sim-deprecated.
+
+The results here are historical and new results should go into ios-simulator
+directory. Eventually, we should get rid of this directory completely.
+
+Rubber-stamped by Simon Fraser.
+
+* platform/ios-sim: Removed.
+* platform/ios-sim-deprecated: Copied from LayoutTests/platform/ios-sim.
+
 2014-11-13  Benjamin Poulain  bpoul...@apple.com
 
 Implement the matching for :nth-last-child(An+B of selector-list)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [174404] trunk/Source/WebCore

[psolanki]

Title: [174404] trunk/Source/WebCore








Revision 174404
Author psola...@apple.com
Date 2014-10-07 13:37:48 -0700 (Tue, 07 Oct 2014)


Log Message
[iOS] WebKit1 clients crash in DiskCacheMonitor::tryGetFileBackedSharedBufferFromCFURLCachedResponse()
https://bugs.webkit.org/show_bug.cgi?id=137495
rdar://problem/18495034

Reviewed by Andreas Kling.

Retain/release the CFCachedURLResponseRef object otherwise we could access a deleted object
and crash on the web thread.

* loader/cocoa/DiskCacheMonitorCocoa.mm:
(WebCore::DiskCacheMonitor::DiskCacheMonitor):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (174403 => 174404)

--- trunk/Source/WebCore/ChangeLog	2014-10-07 19:33:53 UTC (rev 174403)
+++ trunk/Source/WebCore/ChangeLog	2014-10-07 20:37:48 UTC (rev 174404)
@@ -1,3 +1,17 @@
+2014-10-07  Pratik Solanki  psola...@apple.com
+
+[iOS] WebKit1 clients crash in DiskCacheMonitor::tryGetFileBackedSharedBufferFromCFURLCachedResponse()
+https://bugs.webkit.org/show_bug.cgi?id=137495
+rdar://problem/18495034
+
+Reviewed by Andreas Kling.
+
+Retain/release the CFCachedURLResponseRef object otherwise we could access a deleted object
+and crash on the web thread.
+
+* loader/cocoa/DiskCacheMonitorCocoa.mm:
+(WebCore::DiskCacheMonitor::DiskCacheMonitor):
+
 2014-10-07  Christophe Dumez  cdu...@apple.com
 
 Use is() / downcast() for RenderText / RenderTextFragment


Modified: trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm (174403 => 174404)

--- trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm	2014-10-07 19:33:53 UTC (rev 174403)
+++ trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm	2014-10-07 20:37:48 UTC (rev 174404)
@@ -110,8 +110,10 @@
 #if USE(WEB_THREAD)
 CFCachedURLResponseCallBackBlock blockToRun = ^ (CFCachedURLResponseRef response)
 {
+CFRetain(response);
 WebThreadRun(^ {
 block(response);
+CFRelease(response);
 });
 };
 #else






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [174244] trunk/Source/WebCore

[psolanki]

Title: [174244] trunk/Source/WebCore








Revision 174244
Author psola...@apple.com
Date 2014-10-02 16:39:34 -0700 (Thu, 02 Oct 2014)


Log Message
[iOS] Networking process stops loading web pages while running Alexa test with random URL list
https://bugs.webkit.org/show_bug.cgi?id=137362
rdar://problem/18507382

Reviewed by Alexey Proskuryakov.

ResourceHandleCFURLConnectionDelegateWithOperationQueue needs to signal threads waiting on
its semaphore when the handle is being destroyed. Otherwise, we can leave dispatch threads
hanging around waiting for a response. This can happen when the Web Content process dies.
Any thread/queue waiting on a response from that web process will leak and stay around
forever. If we reach the dispatch queue limit of 64, then all networking will cease to
happen in the Networking process. Fix this by signalling waiting threads and clearing out
our state in much the same way that -[WebCoreResourceHandleAsOperationQueueDelegate
detachHandle] does for Mac.

* platform/network/cf/ResourceHandleCFURLConnectionDelegate.h:
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::releaseHandle):
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.h
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (174243 => 174244)

--- trunk/Source/WebCore/ChangeLog	2014-10-02 23:36:34 UTC (rev 174243)
+++ trunk/Source/WebCore/ChangeLog	2014-10-02 23:39:34 UTC (rev 174244)
@@ -1,3 +1,25 @@
+2014-10-02  Pratik Solanki  psola...@apple.com
+
+[iOS] Networking process stops loading web pages while running Alexa test with random URL list
+https://bugs.webkit.org/show_bug.cgi?id=137362
+rdar://problem/18507382
+
+Reviewed by Alexey Proskuryakov.
+
+ResourceHandleCFURLConnectionDelegateWithOperationQueue needs to signal threads waiting on
+its semaphore when the handle is being destroyed. Otherwise, we can leave dispatch threads
+hanging around waiting for a response. This can happen when the Web Content process dies.
+Any thread/queue waiting on a response from that web process will leak and stay around
+forever. If we reach the dispatch queue limit of 64, then all networking will cease to
+happen in the Networking process. Fix this by signalling waiting threads and clearing out
+our state in much the same way that -[WebCoreResourceHandleAsOperationQueueDelegate
+detachHandle] does for Mac.
+
+* platform/network/cf/ResourceHandleCFURLConnectionDelegate.h:
+* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
+(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::releaseHandle):
+* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.h:
+
 2014-10-02  Christophe Dumez  cdu...@apple.com
 
 Use is() / downcast() for CSSBasicShape objects


Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.h (174243 => 174244)

--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.h	2014-10-02 23:36:34 UTC (rev 174243)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.h	2014-10-02 23:39:34 UTC (rev 174244)
@@ -45,7 +45,7 @@
 CFURLConnectionClient_V6 makeConnectionClient() const;
 virtual void setupRequest(CFMutableURLRequestRef) = 0;
 virtual void setupConnectionScheduling(CFURLConnectionRef) = 0;
-void releaseHandle();
+virtual void releaseHandle();
 
 virtual void continueWillSendRequest(CFURLRequestRef) = 0;
 virtual void continueDidReceiveResponse() = 0;


Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp (174243 => 174244)

--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp	2014-10-02 23:36:34 UTC (rev 174243)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp	2014-10-02 23:39:34 UTC (rev 174244)
@@ -63,6 +63,15 @@
 return !!m_handle;
 }
 
+void ResourceHandleCFURLConnectionDelegateWithOperationQueue::releaseHandle()
+{
+ResourceHandleCFURLConnectionDelegate::releaseHandle();
+m_requestResult = nullptr;
+m_cachedResponseResult = nullptr;
+m_boolResult = false;
+dispatch_semaphore_signal(m_semaphore);
+}
+
 void ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest(CFMutableURLRequestRef request)
 {
 #if PLATFORM(IOS)


Modified: 

[webkit-changes] [173858] trunk/Source/WebCore

[psolanki]

Title: [173858] trunk/Source/WebCore








Revision 173858
Author psola...@apple.com
Date 2014-09-22 17:47:06 -0700 (Mon, 22 Sep 2014)


Log Message
Follow on fix for [iOS] ASSERTION FAILED: WTF::isMainThread() in WebCore::memoryCache() when using WebKit1
https://bugs.webkit.org/show_bug.cgi?id=136962

Rubber-stamped by Simon Fraser.

Remove the const per review comment. It is not needed.

* loader/cocoa/DiskCacheMonitorCocoa.mm:
(WebCore::DiskCacheMonitor::DiskCacheMonitor):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (173857 => 173858)

--- trunk/Source/WebCore/ChangeLog	2014-09-23 00:23:54 UTC (rev 173857)
+++ trunk/Source/WebCore/ChangeLog	2014-09-23 00:47:06 UTC (rev 173858)
@@ -1,3 +1,15 @@
+2014-09-22  Pratik Solanki  psola...@apple.com
+
+Follow on fix for [iOS] ASSERTION FAILED: WTF::isMainThread() in WebCore::memoryCache() when using WebKit1
+https://bugs.webkit.org/show_bug.cgi?id=136962
+
+Rubber-stamped by Simon Fraser.
+
+Remove the const per review comment. It is not needed.
+
+* loader/cocoa/DiskCacheMonitorCocoa.mm:
+(WebCore::DiskCacheMonitor::DiskCacheMonitor):
+
 2014-09-22  Simon Fraser  simon.fra...@apple.com
 
 Move nodeFromPoint() back to Document where it belongs


Modified: trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm (173857 => 173858)

--- trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm	2014-09-23 00:23:54 UTC (rev 173857)
+++ trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm	2014-09-23 00:47:06 UTC (rev 173858)
@@ -108,7 +108,7 @@
 };
 
 #if USE(WEB_THREAD)
-CFCachedURLResponseCallBackBlock blockToRun = ^ (const CFCachedURLResponseRef response)
+CFCachedURLResponseCallBackBlock blockToRun = ^ (CFCachedURLResponseRef response)
 {
 WebThreadRun(^ {
 block(response);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [173782] trunk/Source/WebCore

[psolanki]

Title: [173782] trunk/Source/WebCore








Revision 173782
Author psola...@apple.com
Date 2014-09-19 17:05:13 -0700 (Fri, 19 Sep 2014)


Log Message
[iOS] ASSERTION FAILED: WTF::isMainThread() in WebCore::memoryCache() when using WebKit1
https://bugs.webkit.org/show_bug.cgi?id=136962
rdar://problem/18342344

Reviewed by Geoffrey Garen.

The disk cache monitor callback code was being executed on the main thread. This is wrong
when the web thread is being used in WebKit1 on iOS. The code needs to run on the web
thread. Use WebThreadRun to dispatch the block to the web thread. This works for WebKit2 as
well since when web thread is not being used, WebThreadRun invokes the block directly.

* loader/cocoa/DiskCacheMonitorCocoa.mm:
(WebCore::DiskCacheMonitor::DiskCacheMonitor):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (173781 => 173782)

--- trunk/Source/WebCore/ChangeLog	2014-09-19 23:10:41 UTC (rev 173781)
+++ trunk/Source/WebCore/ChangeLog	2014-09-20 00:05:13 UTC (rev 173782)
@@ -1,3 +1,19 @@
+2014-09-19  Pratik Solanki  psola...@apple.com
+
+[iOS] ASSERTION FAILED: WTF::isMainThread() in WebCore::memoryCache() when using WebKit1
+https://bugs.webkit.org/show_bug.cgi?id=136962
+rdar://problem/18342344
+
+Reviewed by Geoffrey Garen.
+
+The disk cache monitor callback code was being executed on the main thread. This is wrong
+when the web thread is being used in WebKit1 on iOS. The code needs to run on the web
+thread. Use WebThreadRun to dispatch the block to the web thread. This works for WebKit2 as
+well since when web thread is not being used, WebThreadRun invokes the block directly.
+
+* loader/cocoa/DiskCacheMonitorCocoa.mm:
+(WebCore::DiskCacheMonitor::DiskCacheMonitor):
+
 2014-09-19  Jer Noble  jer.no...@apple.com
 
 Unreviewed build fix; pass duration into the lambda.


Modified: trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm (173781 => 173782)

--- trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm	2014-09-19 23:10:41 UTC (rev 173781)
+++ trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm	2014-09-20 00:05:13 UTC (rev 173782)
@@ -43,6 +43,10 @@
 #endif
 #endif
 
+#if USE(WEB_THREAD)
+#include WebCoreThreadRun.h
+#endif
+
 #if (PLATFORM(IOS)  __IPHONE_OS_VERSION_MIN_REQUIRED = 8) || (PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090)
 
 typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
@@ -88,6 +92,7 @@
 // Set up the disk caching callback to create the ShareableResource and send it to the WebProcess.
 CFCachedURLResponseCallBackBlock block = ^(CFCachedURLResponseRef cachedResponse)
 {
+ASSERT(isMainThread());
 // If the monitor isn't there then it timed out before this resource was cached to disk.
 if (!rawMonitor)
 return;
@@ -102,7 +107,17 @@
 monitor-resourceBecameFileBacked(fileBackedBuffer);
 };
 
-_CFCachedURLResponseSetBecameFileBackedCallBackBlock(cachedResponse, block, dispatch_get_main_queue());
+#if USE(WEB_THREAD)
+CFCachedURLResponseCallBackBlock blockToRun = ^ (const CFCachedURLResponseRef response)
+{
+WebThreadRun(^ {
+block(response);
+});
+};
+#else
+CFCachedURLResponseCallBackBlock blockToRun = block;
+#endif
+_CFCachedURLResponseSetBecameFileBackedCallBackBlock(cachedResponse, blockToRun, dispatch_get_main_queue());
 }
 
 void DiskCacheMonitor::resourceBecameFileBacked(PassRefPtrSharedBuffer fileBackedBuffer)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [173265] trunk/Source

[psolanki]

Title: [173265] trunk/Source








Revision 173265
Author psola...@apple.com
Date 2014-09-04 10:36:21 -0700 (Thu, 04 Sep 2014)


Log Message
Remove iOS specific disk image cache
https://bugs.webkit.org/show_bug.cgi?id=136517

Reviewed by Antti Koivisto.

Disk image cache code unnecessarily complicates SharedBuffer implementation. We can remove
this now since we don't enable it in WebKit2 on iOS.

Source/WebCore:

* WebCore.exp.in:
* WebCore.xcodeproj/project.pbxproj:
* loader/ResourceBuffer.cpp:
(WebCore::ResourceBuffer::isUsingDiskImageCache): Deleted.
* loader/ResourceBuffer.h:
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::canUseDiskImageCache): Deleted.
(WebCore::CachedImage::useDiskImageCache): Deleted.
* loader/cache/CachedImage.h:
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::isUsingDiskImageCache): Deleted.
* loader/cache/CachedResource.h:
(WebCore::CachedResource::canUseDiskImageCache): Deleted.
(WebCore::CachedResource::useDiskImageCache): Deleted.
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::TypeStatistic::addResource):
(WebCore::MemoryCache::dumpStats):
(WebCore::MemoryCache::dumpLRULists):
(WebCore::MemoryCache::flushCachedImagesToDisk): Deleted.
* loader/cache/MemoryCache.h:
(WebCore::MemoryCache::TypeStatistic::TypeStatistic):
* loader/ios/DiskImageCacheClientIOS.h: Removed.
* loader/ios/DiskImageCacheIOS.h: Removed.
* loader/ios/DiskImageCacheIOS.mm: Removed.
* platform/Logging.h:
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::SharedBuffer):
(WebCore::SharedBuffer::~SharedBuffer):
(WebCore::SharedBuffer::data):
(WebCore::SharedBuffer::append):
(WebCore::SharedBuffer::buffer):
(WebCore::SharedBuffer::getSomeData):
(WebCore::SharedBuffer::isAllowedToBeMemoryMapped): Deleted.
(WebCore::SharedBuffer::allowToBeMemoryMapped): Deleted.
(WebCore::SharedBuffer::failedMemoryMap): Deleted.
(WebCore::SharedBuffer::markAsMemoryMapped): Deleted.
(WebCore::SharedBuffer::memoryMappedNotificationCallbackData): Deleted.
(WebCore::SharedBuffer::memoryMappedNotificationCallback): Deleted.
(WebCore::SharedBuffer::setMemoryMappedNotificationCallback): Deleted.
* platform/SharedBuffer.h:
(WebCore::SharedBuffer::isMemoryMapped): Deleted.
* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::SharedBuffer):
* platform/mac/SharedBufferMac.mm:
(-[WebCoreSharedBufferData length]):
(-[WebCoreSharedBufferData bytes]):
(WebCore::SharedBuffer::createCFData):
(-[WebCoreSharedBufferData initWithMemoryMappedSharedBuffer:]): Deleted.

Source/WebKit:

* WebKit.xcodeproj/project.pbxproj:

Source/WebKit/ios:

* WebCoreSupport/WebDiskImageCacheClientIOS.h: Removed.
* WebCoreSupport/WebDiskImageCacheClientIOS.mm: Removed.
* WebView/WebPDFViewPlaceholder.mm:
(-[WebPDFViewPlaceholder finishedLoadingWithDataSource:]):
(-[WebPDFViewPlaceholder dataSourceMemoryMapped]): Deleted.
(-[WebPDFViewPlaceholder dataSourceMemoryMapFailed]): Deleted.

Source/WebKit/mac:

* Misc/WebCache.mm:
(+[WebCache statistics]):
* WebView/WebDataSource.mm:
(-[WebDataSource _setAllowToBeMemoryMapped]):
(-[WebDataSource setDataSourceDelegate:]):
(-[WebDataSource dataSourceDelegate]):
(-[WebDataSource dealloc]):
(BufferMemoryMapped): Deleted.
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences diskImageCacheEnabled]): Deleted.
(-[WebPreferences setDiskImageCacheEnabled:]): Deleted.
(-[WebPreferences diskImageCacheMinimumImageSize]): Deleted.
(-[WebPreferences setDiskImageCacheMinimumImageSize:]): Deleted.
(-[WebPreferences diskImageCacheMaximumCacheSize]): Deleted.
(-[WebPreferences setDiskImageCacheMaximumCacheSize:]): Deleted.
(-[WebPreferences _diskImageCacheSavedCacheDirectory]): Deleted.
(-[WebPreferences _setDiskImageCacheSavedCacheDirectory:]): Deleted.
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(+[WebView _handleMemoryWarning]):
(-[WebView _preferencesChanged:]):

Source/WTF:

* wtf/FeatureDefines.h:

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/FeatureDefines.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/loader/ResourceBuffer.cpp
trunk/Source/WebCore/loader/ResourceBuffer.h
trunk/Source/WebCore/loader/cache/CachedImage.cpp
trunk/Source/WebCore/loader/cache/CachedImage.h
trunk/Source/WebCore/loader/cache/CachedResource.cpp
trunk/Source/WebCore/loader/cache/CachedResource.h
trunk/Source/WebCore/loader/cache/MemoryCache.cpp
trunk/Source/WebCore/loader/cache/MemoryCache.h
trunk/Source/WebCore/platform/Logging.h
trunk/Source/WebCore/platform/SharedBuffer.cpp
trunk/Source/WebCore/platform/SharedBuffer.h
trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp
trunk/Source/WebCore/platform/mac/SharedBufferMac.mm
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKit/ios/ChangeLog

[webkit-changes] [173299] trunk/Source/WebKit/mac

[psolanki]

Title: [173299] trunk/Source/WebKit/mac








Revision 173299
Author psola...@apple.com
Date 2014-09-04 18:02:43 -0700 (Thu, 04 Sep 2014)


Log Message
Bring back [WebPreferences setDiskImageCacheEnabled:] for backwards compatibility
https://bugs.webkit.org/show_bug.cgi?id=136560

Reviewed by Joseph Pecoraro.

I removed the disk image caching code in r173265. However, we still have clients that call
setDiskImageCacheEnabled. Add in a stub method until we can wean the clients off this call.

* WebView/WebPreferences.mm:
(-[WebPreferences setDiskImageCacheEnabled:]):
* WebView/WebPreferencesPrivate.h:

Modified Paths

trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebPreferences.mm
trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h




Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (173298 => 173299)

--- trunk/Source/WebKit/mac/ChangeLog	2014-09-05 00:57:22 UTC (rev 173298)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-09-05 01:02:43 UTC (rev 173299)
@@ -1,3 +1,17 @@
+2014-09-04  Pratik Solanki  psola...@apple.com
+
+Bring back [WebPreferences setDiskImageCacheEnabled:] for backwards compatibility
+https://bugs.webkit.org/show_bug.cgi?id=136560
+
+Reviewed by Joseph Pecoraro.
+
+I removed the disk image caching code in r173265. However, we still have clients that call
+setDiskImageCacheEnabled. Add in a stub method until we can wean the clients off this call.
+
+* WebView/WebPreferences.mm:
+(-[WebPreferences setDiskImageCacheEnabled:]):
+* WebView/WebPreferencesPrivate.h:
+
 2014-09-03  Andy Estes  aes...@apple.com
 
 [Cocoa] Some WebKitLegacy headers migrated from WebCore incorrectly contain WEBCORE_EXPORT


Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (173298 => 173299)

--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm	2014-09-05 00:57:22 UTC (rev 173298)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm	2014-09-05 01:02:43 UTC (rev 173299)
@@ -1904,6 +1904,11 @@
 [self _setBoolValue:enabled forKey:WebKitAccelerated2dCanvasEnabledPreferenceKey];
 }
 
+- (void)setDiskImageCacheEnabled:(BOOL)enabled
+{
+// Staging. Can be removed once there are no more callers.
+}
+
 - (BOOL)isFrameFlatteningEnabled
 {
 return [self _boolValueForKey:WebKitFrameFlatteningEnabledPreferenceKey];


Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (173298 => 173299)

--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h	2014-09-05 00:57:22 UTC (rev 173298)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h	2014-09-05 01:02:43 UTC (rev 173299)
@@ -271,6 +271,9 @@
 - (void)_setMinimumZoomFontSize:(float)size;
 - (float)_minimumZoomFontSize;
 
+// Deprecated. Has no effect.
+- (void)setDiskImageCacheEnabled:(BOOL)enabled;
+
 - (void)setMediaPlaybackAllowsAirPlay:(BOOL)flag;
 - (BOOL)mediaPlaybackAllowsAirPlay;
 #endif






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [173300] trunk/Source/WebCore

[psolanki]

Title: [173300] trunk/Source/WebCore








Revision 173300
Author psola...@apple.com
Date 2014-09-04 18:09:31 -0700 (Thu, 04 Sep 2014)


Log Message
Unreviewed. Speculative EFL and GTK build fix after r173272. Remove the filename argument
from the various ResourceResponse constructors.

* platform/network/curl/ResourceResponse.h:
(WebCore::ResourceResponse::ResourceResponse):
* platform/network/soup/ResourceResponse.h:
(WebCore::ResourceResponse::ResourceResponse):
* platform/network/win/ResourceResponse.h:
(WebCore::ResourceResponse::ResourceResponse):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/curl/ResourceResponse.h
trunk/Source/WebCore/platform/network/soup/ResourceResponse.h
trunk/Source/WebCore/platform/network/win/ResourceResponse.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (173299 => 173300)

--- trunk/Source/WebCore/ChangeLog	2014-09-05 01:02:43 UTC (rev 173299)
+++ trunk/Source/WebCore/ChangeLog	2014-09-05 01:09:31 UTC (rev 173300)
@@ -1,3 +1,15 @@
+2014-09-04  Pratik Solanki  psola...@apple.com
+
+Unreviewed. Speculative EFL and GTK build fix after r173272. Remove the filename argument
+from the various ResourceResponse constructors.
+
+* platform/network/curl/ResourceResponse.h:
+(WebCore::ResourceResponse::ResourceResponse):
+* platform/network/soup/ResourceResponse.h:
+(WebCore::ResourceResponse::ResourceResponse):
+* platform/network/win/ResourceResponse.h:
+(WebCore::ResourceResponse::ResourceResponse):
+
 2014-09-04  Simon Fraser  simon.fra...@apple.com
 
 border-radius should not force layer backing store


Modified: trunk/Source/WebCore/platform/network/curl/ResourceResponse.h (173299 => 173300)

--- trunk/Source/WebCore/platform/network/curl/ResourceResponse.h	2014-09-05 01:02:43 UTC (rev 173299)
+++ trunk/Source/WebCore/platform/network/curl/ResourceResponse.h	2014-09-05 01:09:31 UTC (rev 173300)
@@ -39,8 +39,8 @@
 {
 }
 
-ResourceResponse(const URL url, const String mimeType, long long expectedLength, const String textEncodingName, const String filename)
-: ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename),
+ResourceResponse(const URL url, const String mimeType, long long expectedLength, const String textEncodingName)
+: ResourceResponseBase(url, mimeType, expectedLength, textEncodingName),
   m_responseFired(false)
 {
 }


Modified: trunk/Source/WebCore/platform/network/soup/ResourceResponse.h (173299 => 173300)

--- trunk/Source/WebCore/platform/network/soup/ResourceResponse.h	2014-09-05 01:02:43 UTC (rev 173299)
+++ trunk/Source/WebCore/platform/network/soup/ResourceResponse.h	2014-09-05 01:09:31 UTC (rev 173300)
@@ -42,8 +42,8 @@
 {
 }
 
-ResourceResponse(const URL url, const String mimeType, long long expectedLength, const String textEncodingName, const String filename)
-: ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename)
+ResourceResponse(const URL url, const String mimeType, long long expectedLength, const String textEncodingName)
+: ResourceResponseBase(url, mimeType, expectedLength, textEncodingName)
 , m_soupFlags(static_castSoupMessageFlags(0))
 , m_tlsErrors(static_castGTlsCertificateFlags(0))
 {


Modified: trunk/Source/WebCore/platform/network/win/ResourceResponse.h (173299 => 173300)

--- trunk/Source/WebCore/platform/network/win/ResourceResponse.h	2014-09-05 01:02:43 UTC (rev 173299)
+++ trunk/Source/WebCore/platform/network/win/ResourceResponse.h	2014-09-05 01:09:31 UTC (rev 173300)
@@ -35,8 +35,8 @@
 {
 }
 
-ResourceResponse(const URL url, const String mimeType, long long expectedLength, const String textEncodingName, const String filename)
-: ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename)
+ResourceResponse(const URL url, const String mimeType, long long expectedLength, const String textEncodingName)
+: ResourceResponseBase(url, mimeType, expectedLength, textEncodingName)
 {
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [173301] trunk/Source/WebCore

[psolanki]

Title: [173301] trunk/Source/WebCore








Revision 173301
Author psola...@apple.com
Date 2014-09-04 18:36:11 -0700 (Thu, 04 Sep 2014)


Log Message
Unreviewed. Another speculative build fix after r173272. Add a stub implementation for
ResourceResponse::platformSuggestedFilename(). Filed bug 136562 for proper fix.

* platform/network/soup/ResourceResponseSoup.cpp:
(ResourceResponse::platformSuggestedFilename):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (173300 => 173301)

--- trunk/Source/WebCore/ChangeLog	2014-09-05 01:09:31 UTC (rev 173300)
+++ trunk/Source/WebCore/ChangeLog	2014-09-05 01:36:11 UTC (rev 173301)
@@ -1,5 +1,13 @@
 2014-09-04  Pratik Solanki  psola...@apple.com
 
+Unreviewed. Another speculative build fix after r173272. Add a stub implementation for
+ResourceResponse::platformSuggestedFilename(). Filed bug 136562 for proper fix.
+
+* platform/network/soup/ResourceResponseSoup.cpp:
+(ResourceResponse::platformSuggestedFilename):
+
+2014-09-04  Pratik Solanki  psola...@apple.com
+
 Unreviewed. Speculative EFL and GTK build fix after r173272. Remove the filename argument
 from the various ResourceResponse constructors.
 


Modified: trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp (173300 => 173301)

--- trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp	2014-09-05 01:09:31 UTC (rev 173300)
+++ trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp	2014-09-05 01:36:11 UTC (rev 173301)
@@ -103,4 +103,9 @@
 
 }
 
+String ResourceResponse::platformSuggestedFilename() const
+{
+return String();
+}
+
 #endif






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [173303] trunk/Source/WebCore

[psolanki]

Title: [173303] trunk/Source/WebCore








Revision 173303
Author psola...@apple.com
Date 2014-09-04 18:52:53 -0700 (Thu, 04 Sep 2014)


Log Message
Unreviewed. Speculative build fix. Add platformSuggestedFilename() to all the ResourceResponse header files.

* platform/network/curl/ResourceResponse.h:
(WebCore::ResourceResponse::platformSuggestedFilename):
* platform/network/soup/ResourceResponse.h:
* platform/network/win/ResourceResponse.h:
(WebCore::ResourceResponse::platformSuggestedFilename):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/curl/ResourceResponse.h
trunk/Source/WebCore/platform/network/soup/ResourceResponse.h
trunk/Source/WebCore/platform/network/win/ResourceResponse.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (173302 => 173303)

--- trunk/Source/WebCore/ChangeLog	2014-09-05 01:37:28 UTC (rev 173302)
+++ trunk/Source/WebCore/ChangeLog	2014-09-05 01:52:53 UTC (rev 173303)
@@ -1,5 +1,15 @@
 2014-09-04  Pratik Solanki  psola...@apple.com
 
+Unreviewed. Speculative build fix. Add platformSuggestedFilename() to all the ResourceResponse header files.
+
+* platform/network/curl/ResourceResponse.h:
+(WebCore::ResourceResponse::platformSuggestedFilename):
+* platform/network/soup/ResourceResponse.h:
+* platform/network/win/ResourceResponse.h:
+(WebCore::ResourceResponse::platformSuggestedFilename):
+
+2014-09-04  Pratik Solanki  psola...@apple.com
+
 Unreviewed. Another speculative build fix after r173272. Add a stub implementation for
 ResourceResponse::platformSuggestedFilename(). Filed bug 136562 for proper fix.
 


Modified: trunk/Source/WebCore/platform/network/curl/ResourceResponse.h (173302 => 173303)

--- trunk/Source/WebCore/platform/network/curl/ResourceResponse.h	2014-09-05 01:37:28 UTC (rev 173302)
+++ trunk/Source/WebCore/platform/network/curl/ResourceResponse.h	2014-09-05 01:52:53 UTC (rev 173303)
@@ -58,6 +58,7 @@
 
 PassOwnPtrCrossThreadResourceResponseData doPlatformCopyData(PassOwnPtrCrossThreadResourceResponseData data) const { return data; }
 void doPlatformAdopt(PassOwnPtrCrossThreadResourceResponseData) { }
+String platformSuggestedFilename() const { return String(); }
 
 bool m_responseFired;
 };


Modified: trunk/Source/WebCore/platform/network/soup/ResourceResponse.h (173302 => 173303)

--- trunk/Source/WebCore/platform/network/soup/ResourceResponse.h	2014-09-05 01:37:28 UTC (rev 173302)
+++ trunk/Source/WebCore/platform/network/soup/ResourceResponse.h	2014-09-05 01:52:53 UTC (rev 173303)
@@ -85,6 +85,7 @@
 GTlsCertificateFlags m_tlsErrors;
 
 void doUpdateResourceResponse() { }
+String platformSuggestedFilename() const;
 
 PassOwnPtrCrossThreadResourceResponseData doPlatformCopyData(PassOwnPtrCrossThreadResourceResponseData data) const { return data; }
 void doPlatformAdopt(PassOwnPtrCrossThreadResourceResponseData) { }


Modified: trunk/Source/WebCore/platform/network/win/ResourceResponse.h (173302 => 173303)

--- trunk/Source/WebCore/platform/network/win/ResourceResponse.h	2014-09-05 01:37:28 UTC (rev 173302)
+++ trunk/Source/WebCore/platform/network/win/ResourceResponse.h	2014-09-05 01:52:53 UTC (rev 173303)
@@ -47,6 +47,7 @@
 
 PassOwnPtrCrossThreadResourceResponseData doPlatformCopyData(PassOwnPtrCrossThreadResourceResponseData data) const { return data; }
 void doPlatformAdopt(PassOwnPtrCrossThreadResourceResponseData) { }
+String platformSuggestedFilename() const { return String(); }
 };
 
 struct CrossThreadResourceResponseData : public CrossThreadResourceResponseDataBase {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [173080] trunk/Source/WebCore

[psolanki]

Title: [173080] trunk/Source/WebCore








Revision 173080
Author psola...@apple.com
Date 2014-08-28 14:08:26 -0700 (Thu, 28 Aug 2014)


Log Message
WebContent hangs under SharedBuffer::duplicateDataBufferIfNecessary() while browsing some websites
https://bugs.webkit.org/show_bug.cgi?id=136347
rdar://problem/18073745

Reviewed by Andreas Kling.

When passing data to ImageIO, we create a copy if we have to reallocate the buffer. We would
set the size of the new buffer to be the size of the SharedBuffer data. This causes memory
churn since we would create a new buffer for every data chunk we get. Fix this by at least
doubling the capacity of the buffer when we duplicate it.

* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::duplicateDataBufferIfNecessary):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/SharedBuffer.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (173079 => 173080)

--- trunk/Source/WebCore/ChangeLog	2014-08-28 21:01:25 UTC (rev 173079)
+++ trunk/Source/WebCore/ChangeLog	2014-08-28 21:08:26 UTC (rev 173080)
@@ -1,3 +1,19 @@
+2014-08-28  Pratik Solanki  psola...@apple.com
+
+WebContent hangs under SharedBuffer::duplicateDataBufferIfNecessary() while browsing some websites
+https://bugs.webkit.org/show_bug.cgi?id=136347
+rdar://problem/18073745
+
+Reviewed by Andreas Kling.
+
+When passing data to ImageIO, we create a copy if we have to reallocate the buffer. We would
+set the size of the new buffer to be the size of the SharedBuffer data. This causes memory
+churn since we would create a new buffer for every data chunk we get. Fix this by at least
+doubling the capacity of the buffer when we duplicate it.
+
+* platform/SharedBuffer.cpp:
+(WebCore::SharedBuffer::duplicateDataBufferIfNecessary):
+
 2014-08-28  Dan Bernstein  m...@apple.com
 
 iOS build fix.


Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (173079 => 173080)

--- trunk/Source/WebCore/platform/SharedBuffer.cpp	2014-08-28 21:01:25 UTC (rev 173079)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp	2014-08-28 21:08:26 UTC (rev 173080)
@@ -27,6 +27,7 @@
 #include config.h
 #include SharedBuffer.h
 
+#include algorithm
 #include wtf/PassOwnPtr.h
 #include wtf/unicode/UTF8.h
 
@@ -351,11 +352,13 @@
 
 void SharedBuffer::duplicateDataBufferIfNecessary() const
 {
-if (m_buffer-hasOneRef() || m_size = m_buffer-data.capacity())
+size_t currentCapacity = m_buffer-data.capacity();
+if (m_buffer-hasOneRef() || m_size = currentCapacity)
 return;
 
+size_t newCapacity = std::max(static_castsize_t(m_size), currentCapacity * 2);
 RefPtrDataBuffer newBuffer = adoptRef(new DataBuffer);
-newBuffer-data.reserveInitialCapacity(m_size);
+newBuffer-data.reserveInitialCapacity(newCapacity);
 newBuffer-data = ""
 m_buffer = newBuffer.release();
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [172811] trunk/Source

[psolanki]

Title: [172811] trunk/Source








Revision 172811
Author psola...@apple.com
Date 2014-08-20 14:07:36 -0700 (Wed, 20 Aug 2014)


Log Message
Move DiskCacheMonitor to WebCore so that WebKit1 clients can use it as well
https://bugs.webkit.org/show_bug.cgi?id=135896

Reviewed by Andreas Kling.

Source/WebCore:

Refactor code and move it to WebCore.

* WebCore.exp.in:
* WebCore.xcodeproj/project.pbxproj:
* loader/ResourceLoader.h:
Make willCacheResponse protected so that SubresourceLoader can override it.
* loader/SubresourceLoader.h:
* loader/cocoa/DiskCacheMonitorCocoa.h: Added.
Mostly the same as the existing NetworkDiskCacheMonitor class in WebKit2. In the
CFNetwork callback block, it calls a virtual function that is overridden by
NetworkDiskCacheMonitor to send a message to WebContent process.
(WebCore::DiskCacheMonitor::~DiskCacheMonitor):
(WebCore::DiskCacheMonitor::resourceRequest):
(WebCore::DiskCacheMonitor::sessionID):
* loader/cocoa/DiskCacheMonitorCocoa.mm:
(WebCore::DiskCacheMonitor::tryGetFileBackedSharedBufferFromCFURLCachedResponse):
Copied from NetworkResourceLoader::tryGetFileBackedSharedBufferFromCFURLCachedResponse.
(WebCore::DiskCacheMonitor::monitorFileBackingStoreCreation):
(WebCore::DiskCacheMonitor::DiskCacheMonitor):
(WebCore::DiskCacheMonitor::resourceBecameFileBacked):
Replace the cached resource data with the contents of the file backed buffer. This is
used in WebKit1 (and also for any resource loads that happen from the WebContent
process).
* loader/cocoa/SubresourceLoaderCocoa.mm: Added.
(WebCore::SubresourceLoader::willCacheResponse):
Override willCacheresponse from ResourceLoader to listen for disk cache notifications.

Source/WebKit2:

* NetworkProcess/mac/NetworkDiskCacheMonitor.h:
Inherit from WebCore::DiskCacheMonitor which has the bulk of the functionality now.
(WebKit::NetworkDiskCacheMonitor::~NetworkDiskCacheMonitor):
* NetworkProcess/mac/NetworkDiskCacheMonitor.mm:
(WebKit::NetworkDiskCacheMonitor::monitorFileBackingStoreCreation):
(WebKit::NetworkDiskCacheMonitor::NetworkDiskCacheMonitor):
(WebKit::NetworkDiskCacheMonitor::resourceBecameFileBacked):
Override virtual method and send the data to the WebContent process as before.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/loader/ResourceLoader.h
trunk/Source/WebCore/loader/SubresourceLoader.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.h
trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.mm


Added Paths

trunk/Source/WebCore/loader/cocoa/
trunk/Source/WebCore/loader/cocoa/DiskCacheMonitor.h
trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h
trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm
trunk/Source/WebCore/loader/cocoa/SubresourceLoaderCocoa.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (172810 => 172811)

--- trunk/Source/WebCore/ChangeLog	2014-08-20 21:04:34 UTC (rev 172810)
+++ trunk/Source/WebCore/ChangeLog	2014-08-20 21:07:36 UTC (rev 172811)
@@ -1,3 +1,37 @@
+2014-08-20  Pratik Solanki  psola...@apple.com
+
+Move DiskCacheMonitor to WebCore so that WebKit1 clients can use it as well
+https://bugs.webkit.org/show_bug.cgi?id=135896
+
+Reviewed by Andreas Kling.
+
+Refactor code and move it to WebCore.
+
+* WebCore.exp.in:
+* WebCore.xcodeproj/project.pbxproj:
+* loader/ResourceLoader.h:
+Make willCacheResponse protected so that SubresourceLoader can override it.
+* loader/SubresourceLoader.h:
+* loader/cocoa/DiskCacheMonitorCocoa.h: Added.
+Mostly the same as the existing NetworkDiskCacheMonitor class in WebKit2. In the
+CFNetwork callback block, it calls a virtual function that is overridden by
+NetworkDiskCacheMonitor to send a message to WebContent process.
+(WebCore::DiskCacheMonitor::~DiskCacheMonitor):
+(WebCore::DiskCacheMonitor::resourceRequest):
+(WebCore::DiskCacheMonitor::sessionID):
+* loader/cocoa/DiskCacheMonitorCocoa.mm:
+(WebCore::DiskCacheMonitor::tryGetFileBackedSharedBufferFromCFURLCachedResponse):
+Copied from NetworkResourceLoader::tryGetFileBackedSharedBufferFromCFURLCachedResponse.
+(WebCore::DiskCacheMonitor::monitorFileBackingStoreCreation):
+(WebCore::DiskCacheMonitor::DiskCacheMonitor):
+(WebCore::DiskCacheMonitor::resourceBecameFileBacked):
+Replace the cached resource data with the contents of the file backed buffer. This is
+used in WebKit1 (and also for any resource loads that happen from the WebContent
+process).
+* loader/cocoa/SubresourceLoaderCocoa.mm: Added.
+(WebCore::SubresourceLoader::willCacheResponse):
+Override willCacheresponse from ResourceLoader to listen for disk 

[webkit-changes] [172726] trunk/Tools

[psolanki]

Title: [172726] trunk/Tools








Revision 172726
Author psola...@apple.com
Date 2014-08-18 14:14:54 -0700 (Mon, 18 Aug 2014)


Log Message
Make update-webkit more lenient for pure git svn repositories
https://bugs.webkit.org/show_bug.cgi?id=135805

Reviewed by Oliver Hunt.

Make the call to git fetch be non fatal. If you have a pure git svn repository, then the
call to git fetch will fail and update-webkit will abort. The purpose of r72966 was to
provide an optimization when you have a git repository setup. We should not fail if the
git setup does not have svn-remote.svn.fetch set.

* Scripts/update-webkit:
(runGitUpdate):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/update-webkit




Diff

Modified: trunk/Tools/ChangeLog (172725 => 172726)

--- trunk/Tools/ChangeLog	2014-08-18 21:14:35 UTC (rev 172725)
+++ trunk/Tools/ChangeLog	2014-08-18 21:14:54 UTC (rev 172726)
@@ -1,3 +1,18 @@
+2014-08-18  Pratik Solanki  psola...@apple.com
+
+Make update-webkit more lenient for pure git svn repositories
+https://bugs.webkit.org/show_bug.cgi?id=135805
+
+Reviewed by Oliver Hunt.
+
+Make the call to git fetch be non fatal. If you have a pure git svn repository, then the
+call to git fetch will fail and update-webkit will abort. The purpose of r72966 was to
+provide an optimization when you have a git repository setup. We should not fail if the
+git setup does not have svn-remote.svn.fetch set.
+
+* Scripts/update-webkit:
+(runGitUpdate):
+
 2014-08-18  Simon Fraser  simon.fra...@apple.com
 
 Enable Web Inspector in MiniBrowser WK2 windows


Modified: trunk/Tools/Scripts/update-webkit (172725 => 172726)

--- trunk/Tools/Scripts/update-webkit	2014-08-18 21:14:35 UTC (rev 172725)
+++ trunk/Tools/Scripts/update-webkit	2014-08-18 21:14:54 UTC (rev 172726)
@@ -125,7 +125,7 @@
 {
 # Doing a git fetch first allows setups with svn-remote.svn.fetch = trunk:refs/remotes/origin/master
 # to perform the rebase much much faster.
-system(git, fetch) == 0 or die;
+system(git, fetch);
 if (isGitSVN()) {
 system(git, svn, rebase) == 0 or die;
 } else {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [172735] trunk/Source/WebCore

[psolanki]

Title: [172735] trunk/Source/WebCore








Revision 172735
Author psola...@apple.com
Date 2014-08-18 16:22:59 -0700 (Mon, 18 Aug 2014)


Log Message
Use modern for loop instead of iterators in SharedBufferCF.cpp
https://bugs.webkit.org/show_bug.cgi?id=136000

Reviewed by Andreas Kling.

* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::copyBufferAndClear):
(WebCore::SharedBuffer::copySomeDataFromDataArray):
(WebCore::SharedBuffer::maybeAppendDataArray): Use auto instead of auto for less RetainPtr/refcount churn.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (172734 => 172735)

--- trunk/Source/WebCore/ChangeLog	2014-08-18 23:20:00 UTC (rev 172734)
+++ trunk/Source/WebCore/ChangeLog	2014-08-18 23:22:59 UTC (rev 172735)
@@ -1,3 +1,15 @@
+2014-08-18  Pratik Solanki  psola...@apple.com
+
+Use modern for loop instead of iterators in SharedBufferCF.cpp
+https://bugs.webkit.org/show_bug.cgi?id=136000
+
+Reviewed by Andreas Kling.
+
+* platform/cf/SharedBufferCF.cpp:
+(WebCore::SharedBuffer::copyBufferAndClear):
+(WebCore::SharedBuffer::copySomeDataFromDataArray):
+(WebCore::SharedBuffer::maybeAppendDataArray): Use auto instead of auto for less RetainPtr/refcount churn.
+
 2014-08-18  Antti Koivisto  an...@apple.com
 
 Tighten RenderCounter typing


Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (172734 => 172735)

--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp	2014-08-18 23:20:00 UTC (rev 172734)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp	2014-08-18 23:22:59 UTC (rev 172735)
@@ -157,11 +157,10 @@
 return;
 
 CFIndex bytesLeft = bytesToCopy;
-VectorRetainPtrCFDataRef::const_iterator end = m_dataArray.end();
-for (VectorRetainPtrCFDataRef::const_iterator it = m_dataArray.begin(); it != end; ++it) {
-CFIndex dataLen = CFDataGetLength(it-get());
+for (auto cfData : m_dataArray) {
+CFIndex dataLen = CFDataGetLength(cfData.get());
 ASSERT(bytesLeft = dataLen);
-memcpy(destination, CFDataGetBytePtr(it-get()), dataLen);
+memcpy(destination, CFDataGetBytePtr(cfData.get()), dataLen);
 destination += dataLen;
 bytesLeft -= dataLen;
 }
@@ -170,14 +169,13 @@
 
 unsigned SharedBuffer::copySomeDataFromDataArray(const char* someData, unsigned position) const
 {
-VectorRetainPtrCFDataRef::const_iterator end = m_dataArray.end();
 unsigned totalOffset = 0;
-for (VectorRetainPtrCFDataRef::const_iterator it = m_dataArray.begin(); it != end; ++it) {
-unsigned dataLen = static_castunsigned(CFDataGetLength(it-get()));
+for (auto cfData : m_dataArray) {
+unsigned dataLen = static_castunsigned(CFDataGetLength(cfData.get()));
 ASSERT(totalOffset = position);
 unsigned localOffset = position - totalOffset;
 if (localOffset  dataLen) {
-someData = reinterpret_castconst char *(CFDataGetBytePtr(it-get())) + localOffset;
+someData = reinterpret_castconst char *(CFDataGetBytePtr(cfData.get())) + localOffset;
 return dataLen - localOffset;
 }
 totalOffset += dataLen;
@@ -205,7 +203,7 @@
 #if !ASSERT_DISABLED
 unsigned originalSize = size();
 #endif
-for (auto cfData : data-m_dataArray)
+for (auto cfData : data-m_dataArray)
 append(cfData.get());
 ASSERT(size() == originalSize + data-size());
 return true;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [172736] trunk/Source

[psolanki]

Title: [172736] trunk/Source








Revision 172736
Author psola...@apple.com
Date 2014-08-18 16:25:49 -0700 (Mon, 18 Aug 2014)


Log Message
Remove PurgeableBuffer since it is not very useful any more
https://bugs.webkit.org/show_bug.cgi?id=135939

Reviewed by Geoffrey Garen.

Source/WebCore:

The usefulness of having purgeable memory for cached resources has diminished now that
WebKit uses file backed resources when possible. Since this is read only memory, it is in
essence purgeable. Having the PurgeableBuffer code adds additional complexity that we
don't need. e.g. on my Mac, I am not seeing any entry for WebCore purgeable data when I
run vmmap against the web processes that I have running. It is used on iOS, however even
there much of the purgeable memory we create gets replaced by file backed memory once we get
the notification from CFNetwork.

No new tests because no functional changes.

* WebCore.xcodeproj/project.pbxproj:
* inspector/InspectorPageAgent.cpp:
(WebCore::prepareCachedResourceBuffer):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::subresource):
* loader/ResourceBuffer.cpp:
(WebCore::ResourceBuffer::hasPurgeableBuffer): Deleted.
(WebCore::ResourceBuffer::setShouldUsePurgeableMemory): Deleted.
(WebCore::ResourceBuffer::createPurgeableBuffer): Deleted.
(WebCore::ResourceBuffer::releasePurgeableBuffer): Deleted.
* loader/ResourceBuffer.h:
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::didFinishLoading):
* loader/cache/CachedCSSStyleSheet.cpp:
(WebCore::CachedCSSStyleSheet::sheetText):
(WebCore::CachedCSSStyleSheet::destroyDecodedData):
* loader/cache/CachedCSSStyleSheet.h:
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::image):
(WebCore::CachedImage::imageForRenderer):
(WebCore::CachedImage::imageSizeForRenderer):
(WebCore::CachedImage::destroyDecodedData):
(WebCore::CachedImage::canUseDiskImageCache):
* loader/cache/CachedImage.h:
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::addClientToSet):
(WebCore::CachedResource::isSafeToMakePurgeable): Deleted.
(WebCore::CachedResource::makePurgeable): Deleted.
(WebCore::CachedResource::isPurgeable): Deleted.
(WebCore::CachedResource::wasPurged): Deleted.
* loader/cache/CachedResource.h:
(WebCore::CachedResource::resourceBuffer):
(WebCore::CachedResource::purgePriority): Deleted.
* loader/cache/CachedScript.cpp:
(WebCore::CachedScript::script):
(WebCore::CachedScript::destroyDecodedData):
* loader/cache/CachedScript.h:
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::resourceForRequestImpl):
(WebCore::MemoryCache::pruneDeadResourcesToSize):
(WebCore::MemoryCache::evict):
(WebCore::MemoryCache::TypeStatistic::addResource):
(WebCore::MemoryCache::dumpStats):
(WebCore::MemoryCache::dumpLRULists):
(WebCore::MemoryCache::makeResourcePurgeable): Deleted.
* loader/cache/MemoryCache.h:
(WebCore::MemoryCache::TypeStatistic::TypeStatistic):
(WebCore::MemoryCache::shouldMakeResourcePurgeableOnEviction): Deleted.
* platform/PurgePriority.h: Removed.
* platform/PurgeableBuffer.h: Removed.
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::SharedBuffer):
(WebCore::SharedBuffer::size):
(WebCore::SharedBuffer::data):
(WebCore::SharedBuffer::append):
(WebCore::SharedBuffer::clear):
(WebCore::SharedBuffer::copy):
(WebCore::SharedBuffer::getSomeData):
(WebCore::SharedBuffer::adoptPurgeableBuffer): Deleted.
(WebCore::SharedBuffer::createPurgeableBuffer): Deleted.
(WebCore::SharedBuffer::releasePurgeableBuffer): Deleted.
* platform/SharedBuffer.h:
(WebCore::SharedBuffer::hasPurgeableBuffer): Deleted.
(WebCore::SharedBuffer::shouldUsePurgeableMemory): Deleted.
* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::SharedBuffer):
* platform/mac/PurgeableBufferMac.cpp: Removed.
* platform/mac/SharedBufferMac.mm:
(WebCore::SharedBuffer::createCFData):
* platform/soup/SharedBufferSoup.cpp:

Source/WebKit/mac:

* Misc/WebCache.mm:
(+[WebCache statistics]):

Source/WebKit/win:

* WebCache.cpp:
(WebCache::statistics):

Source/WebKit2:

* WebProcess/WebProcess.cpp:
(WebKit::getWebCoreMemoryCacheStatistics):

Source/WTF:

* wtf/Platform.h: Remove ENABLE_PURGEABLE_MEMORY define.
* wtf/VMTags.h: Remove VM tags used by WebCore for cached resource purgeable memory.

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Platform.h
trunk/Source/WTF/wtf/VMTags.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/inspector/InspectorPageAgent.cpp
trunk/Source/WebCore/loader/DocumentLoader.cpp
trunk/Source/WebCore/loader/ResourceBuffer.cpp
trunk/Source/WebCore/loader/ResourceBuffer.h
trunk/Source/WebCore/loader/SubresourceLoader.cpp
trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h
trunk/Source/WebCore/loader/cache/CachedImage.cpp
trunk/Source/WebCore/loader/cache/CachedImage.h
trunk/Source/WebCore/loader/cache/CachedResource.cpp
trunk/Source/WebCore/loader/cache/CachedResource.h

[webkit-changes] [172691] trunk/Source/WebKit2

[psolanki]

Title: [172691] trunk/Source/WebKit2








Revision 172691
Author psola...@apple.com
Date 2014-08-16 12:01:37 -0700 (Sat, 16 Aug 2014)


Log Message
Rename DiskCacheMonitor to NetworkDiskCacheMonitor
https://bugs.webkit.org/show_bug.cgi?id=135897

Reviewed by Andreas Kling.

In preparation for moving DiskCacheMonitor code to WebCore in bug 135896, rename the WebKit2
class to NetworkDiskCacheMonitor.

* NetworkProcess/mac/NetworkDiskCacheMonitor.h: Renamed from Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h.
(WebKit::NetworkDiskCacheMonitor::resourceRequest):
* NetworkProcess/mac/NetworkDiskCacheMonitor.mm: Renamed from Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm.
(WebKit::NetworkDiskCacheMonitor::monitorFileBackingStoreCreation):
(WebKit::NetworkDiskCacheMonitor::NetworkDiskCacheMonitor):
(WebKit::NetworkDiskCacheMonitor::messageSenderConnection):
(WebKit::NetworkDiskCacheMonitor::messageSenderDestinationID):
* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
(WebKit::NetworkResourceLoader::willCacheResponseAsync):
* WebKit2.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj


Added Paths

trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.h
trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.mm


Removed Paths

trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h
trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (172690 => 172691)

--- trunk/Source/WebKit2/ChangeLog	2014-08-16 14:26:17 UTC (rev 172690)
+++ trunk/Source/WebKit2/ChangeLog	2014-08-16 19:01:37 UTC (rev 172691)
@@ -1,3 +1,24 @@
+2014-08-16  Pratik Solanki  psola...@apple.com
+
+Rename DiskCacheMonitor to NetworkDiskCacheMonitor
+https://bugs.webkit.org/show_bug.cgi?id=135897
+
+Reviewed by Andreas Kling.
+
+In preparation for moving DiskCacheMonitor code to WebCore in bug 135896, rename the WebKit2
+class to NetworkDiskCacheMonitor.
+
+* NetworkProcess/mac/NetworkDiskCacheMonitor.h: Renamed from Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h.
+(WebKit::NetworkDiskCacheMonitor::resourceRequest):
+* NetworkProcess/mac/NetworkDiskCacheMonitor.mm: Renamed from Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm.
+(WebKit::NetworkDiskCacheMonitor::monitorFileBackingStoreCreation):
+(WebKit::NetworkDiskCacheMonitor::NetworkDiskCacheMonitor):
+(WebKit::NetworkDiskCacheMonitor::messageSenderConnection):
+(WebKit::NetworkDiskCacheMonitor::messageSenderDestinationID):
+* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+(WebKit::NetworkResourceLoader::willCacheResponseAsync):
+* WebKit2.xcodeproj/project.pbxproj:
+
 2014-08-16  Byungseon Shin  sun.s...@lge.com
 
 [GTK] build fails with error: cannot allocate an object of abstract type 'WebKit::PageClientImpl'


Deleted: trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h (172690 => 172691)

--- trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h	2014-08-16 14:26:17 UTC (rev 172690)
+++ trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h	2014-08-16 19:01:37 UTC (rev 172691)
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in the
- *documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef DiskCacheMonitor_h
-#define DiskCacheMonitor_h
-
-#include MessageSender.h
-#include WebCore/ResourceRequest.h
-#include WebCore/SessionID.h
-#include wtf/RunLoop.h
-
-typedef const struct _CFCachedURLResponse* CFCachedURLResponseRef;
-
-namespace 

[webkit-changes] [172502] trunk/Source

[psolanki]

Title: [172502] trunk/Source








Revision 172502
Author psola...@apple.com
Date 2014-08-12 15:50:40 -0700 (Tue, 12 Aug 2014)


Log Message
Cached file backed resources don't make it to the Web Process when NETWORK_CFDATA_ARRAY_CALLBACK is enabled
https://bugs.webkit.org/show_bug.cgi?id=135727
rdar://problem/17947880

Reviewed by Darin Adler.

Source/WebCore:

Add SharedBuffer::existingCFData() which returns CFDataRef if it has one. Refactor
this code out of createCFData().

* WebCore.exp.in:
* platform/SharedBuffer.h:
* platform/mac/SharedBufferMac.mm:
(WebCore::SharedBuffer::existingCFData): Added.
(WebCore::SharedBuffer::createCFData):

Source/WebKit2:

tryGetShareableHandleFromSharedBuffer() assumed that we have a file backed resource only if
we had a CFDataRef (platformData()) in SharedBuffer. This is wrong when we use the data
array callbacks since the file backed buffer could be in the data array. Instead of relying
on hasPlatformData(), explicitly ask the SharedBuffer to give us a CFDataRef if it has one
so that SharedBuffer can take care of the data array case.

* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
(WebKit::NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/platform/SharedBuffer.h
trunk/Source/WebCore/platform/mac/SharedBufferMac.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (172501 => 172502)

--- trunk/Source/WebCore/ChangeLog	2014-08-12 22:48:36 UTC (rev 172501)
+++ trunk/Source/WebCore/ChangeLog	2014-08-12 22:50:40 UTC (rev 172502)
@@ -1,3 +1,20 @@
+2014-08-12  Pratik Solanki  psola...@apple.com
+
+Cached file backed resources don't make it to the Web Process when NETWORK_CFDATA_ARRAY_CALLBACK is enabled
+https://bugs.webkit.org/show_bug.cgi?id=135727
+rdar://problem/17947880
+
+Reviewed by Darin Adler.
+
+Add SharedBuffer::existingCFData() which returns CFDataRef if it has one. Refactor
+this code out of createCFData().
+
+* WebCore.exp.in:
+* platform/SharedBuffer.h:
+* platform/mac/SharedBufferMac.mm:
+(WebCore::SharedBuffer::existingCFData): Added.
+(WebCore::SharedBuffer::createCFData):
+
 2014-08-12  Tim Horton  timothy_hor...@apple.com
 
 Small region (~1px tall) where you get the selection button instead of the phone number overlay


Modified: trunk/Source/WebCore/WebCore.exp.in (172501 => 172502)

--- trunk/Source/WebCore/WebCore.exp.in	2014-08-12 22:48:36 UTC (rev 172501)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-08-12 22:50:40 UTC (rev 172502)
@@ -242,6 +242,7 @@
 __ZN7WebCore12SharedBuffer11adoptVectorERN3WTF6VectorIcLm0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore12SharedBuffer12createCFDataEv
 __ZN7WebCore12SharedBuffer12createNSDataEv
+__ZN7WebCore12SharedBuffer14existingCFDataEv
 __ZN7WebCore12SharedBuffer24createWithContentsOfFileERKN3WTF6StringE
 __ZN7WebCore12SharedBuffer6appendEPKcj
 __ZN7WebCore12SharedBuffer6appendEPS0_


Modified: trunk/Source/WebCore/platform/SharedBuffer.h (172501 => 172502)

--- trunk/Source/WebCore/platform/SharedBuffer.h	2014-08-12 22:48:36 UTC (rev 172501)
+++ trunk/Source/WebCore/platform/SharedBuffer.h	2014-08-12 22:50:40 UTC (rev 172502)
@@ -74,6 +74,7 @@
 #endif
 #if USE(CF)
 RetainPtrCFDataRef createCFData();
+CFDataRef existingCFData();
 static PassRefPtrSharedBuffer wrapCFData(CFDataRef);
 #endif
 


Modified: trunk/Source/WebCore/platform/mac/SharedBufferMac.mm (172501 => 172502)

--- trunk/Source/WebCore/platform/mac/SharedBufferMac.mm	2014-08-12 22:48:36 UTC (rev 172501)
+++ trunk/Source/WebCore/platform/mac/SharedBufferMac.mm	2014-08-12 22:50:40 UTC (rev 172502)
@@ -128,16 +128,24 @@
 return adoptNS((NSData *)createCFData().leakRef());
 }
 
-RetainPtrCFDataRef SharedBuffer::createCFData()
+CFDataRef SharedBuffer::existingCFData()
 {
 if (m_cfData)
-return m_cfData;
+return m_cfData.get();
 
 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
 if (m_dataArray.size() == 1)
-return m_dataArray.at(0);
+return m_dataArray.at(0).get();
 #endif
 
+return nullptr;
+}
+
+RetainPtrCFDataRef SharedBuffer::createCFData()
+{
+if (CFDataRef cfData = existingCFData())
+return cfData;
+
 #if ENABLE(DISK_IMAGE_CACHE)
 if (isMemoryMapped())
 return adoptCF((CFDataRef)adoptNS([[WebCoreSharedBufferData alloc] initWithMemoryMappedSharedBuffer:*this]).leakRef());


Modified: trunk/Source/WebKit2/ChangeLog (172501 => 172502)

--- trunk/Source/WebKit2/ChangeLog	2014-08-12 22:48:36 UTC (rev 172501)
+++ trunk/Source/WebKit2/ChangeLog	2014-08-12 22:50:40 UTC (rev 172502)
@@ -1,3 +1,20 @@
+2014-08-12  Pratik Solanki  psola...@apple.com
+
+Cached file backed resources don't make it to the Web Process when NETWORK_CFDATA_ARRAY_CALLBACK is enabled
+

[webkit-changes] [172508] trunk/Source/WTF

[psolanki]

Title: [172508] trunk/Source/WTF








Revision 172508
Author psola...@apple.com
Date 2014-08-12 16:45:48 -0700 (Tue, 12 Aug 2014)


Log Message
Enable didReceiveDataArray callback on Mac
https://bugs.webkit.org/show_bug.cgi?id=135554
rdar://problem/9170731

Reviewed by Andreas Kling.

Enable WTF_USE_NETWORK_CFDATA_ARRAY_CALLBACK for all Cocoa platforms so that we use the same
code path for Mac and iOS.

* wtf/Platform.h:

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Platform.h




Diff

Modified: trunk/Source/WTF/ChangeLog (172507 => 172508)

--- trunk/Source/WTF/ChangeLog	2014-08-12 23:40:27 UTC (rev 172507)
+++ trunk/Source/WTF/ChangeLog	2014-08-12 23:45:48 UTC (rev 172508)
@@ -1,3 +1,16 @@
+2014-08-12  Pratik Solanki  psola...@apple.com
+
+Enable didReceiveDataArray callback on Mac
+https://bugs.webkit.org/show_bug.cgi?id=135554
+rdar://problem/9170731
+
+Reviewed by Andreas Kling.
+
+Enable WTF_USE_NETWORK_CFDATA_ARRAY_CALLBACK for all Cocoa platforms so that we use the same
+code path for Mac and iOS.
+
+* wtf/Platform.h:
+
 2014-08-12  Alex Christensen  achristen...@webkit.org
 
 Generate header detection headers for CMake on Windows.


Modified: trunk/Source/WTF/wtf/Platform.h (172507 => 172508)

--- trunk/Source/WTF/wtf/Platform.h	2014-08-12 23:40:27 UTC (rev 172507)
+++ trunk/Source/WTF/wtf/Platform.h	2014-08-12 23:45:48 UTC (rev 172508)
@@ -465,14 +465,12 @@
 
 #define WTF_USE_CF 1
 #define WTF_USE_FOUNDATION 1
+#define WTF_USE_NETWORK_CFDATA_ARRAY_CALLBACK 1
 #define ENABLE_USER_MESSAGE_HANDLERS 1
+#define HAVE_OUT_OF_PROCESS_LAYER_HOSTING 1
 
 #endif
 
-#if PLATFORM(COCOA)
-#define HAVE_OUT_OF_PROCESS_LAYER_HOSTING 1
-#endif
-
 #if PLATFORM(MAC)
 
 #define WTF_USE_APPKIT 1
@@ -501,7 +499,6 @@
 #define DONT_FINALIZE_ON_MAIN_THREAD 1
 #define HAVE_READLINE 1
 #define WTF_USE_CFNETWORK 1
-#define WTF_USE_NETWORK_CFDATA_ARRAY_CALLBACK 1
 #define WTF_USE_UIKIT_EDITING 1
 #define WTF_USE_WEB_THREAD 1
 #define WTF_USE_QUICK_LOOK 1






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [172215] trunk/Source/WebCore

[psolanki]

Title: [172215] trunk/Source/WebCore








Revision 172215
Author psola...@apple.com
Date 2014-08-07 10:20:16 -0700 (Thu, 07 Aug 2014)


Log Message
Random resource replacement on beta.icloud.com
https://bugs.webkit.org/show_bug.cgi?id=135685
rdar://problem/17937975

Reviewed by Alexey Proskuryakov.

Revert the performance optimization in r170499. It turns out we could get a delayed disk
cache notification for a resource that has since been changed in WebCore. In such a case, we
were replacing the newer resource data with the older disk cached resource data. This was
happening for cached POST content on beta.icloud.com. Fix this by forcing a memcmp of data
contents before replacing it which is what we used to do before.

* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::tryReplaceEncodedData):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/cache/CachedResource.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (172214 => 172215)

--- trunk/Source/WebCore/ChangeLog	2014-08-07 16:37:59 UTC (rev 172214)
+++ trunk/Source/WebCore/ChangeLog	2014-08-07 17:20:16 UTC (rev 172215)
@@ -1,3 +1,20 @@
+2014-08-07  Pratik Solanki  psola...@apple.com
+
+Random resource replacement on beta.icloud.com
+https://bugs.webkit.org/show_bug.cgi?id=135685
+rdar://problem/17937975
+
+Reviewed by Alexey Proskuryakov.
+
+Revert the performance optimization in r170499. It turns out we could get a delayed disk
+cache notification for a resource that has since been changed in WebCore. In such a case, we
+were replacing the newer resource data with the older disk cached resource data. This was
+happening for cached POST content on beta.icloud.com. Fix this by forcing a memcmp of data
+contents before replacing it which is what we used to do before.
+
+* loader/cache/CachedResource.cpp:
+(WebCore::CachedResource::tryReplaceEncodedData):
+
 2014-08-06  Brent Fulgham  bfulg...@apple.com
 
 [Mac, iOS] Captions are appearing multiple times during repeated video play through


Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (172214 => 172215)

--- trunk/Source/WebCore/loader/cache/CachedResource.cpp	2014-08-07 16:37:59 UTC (rev 172214)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp	2014-08-07 17:20:16 UTC (rev 172215)
@@ -896,8 +896,11 @@
 if (!mayTryReplaceEncodedData())
 return;
 
-ASSERT(m_data-size() == newBuffer-size());
-ASSERT(!memcmp(m_data-data(), newBuffer-data(), m_data-size()));
+// We have to do the memcmp because we can't tell if the replacement file backed data is for the
+// same resource or if we made a second request with the same URL which gave us a different
+// resource. We have seen this happen for cached POST resources.
+if (m_data-size() != newBuffer-size() || memcmp(m_data-data(), newBuffer-data(), m_data-size()))
+return;
 
 m_data-tryReplaceSharedBufferContents(newBuffer.get());
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [171993] trunk/Source/WebCore

[psolanki]

Title: [171993] trunk/Source/WebCore








Revision 171993
Author psola...@apple.com
Date 2014-08-04 10:19:12 -0700 (Mon, 04 Aug 2014)


Log Message
QuickLook resources are cache-replaced with their original binary data causing ASSERT(m_data-size() == newBuffer-size()) in CachedResource.cpp
https://bugs.webkit.org/show_bug.cgi?id=135548
rdar://problem/17891321

Reviewed by David Kilzer.

When loading QuickLook resources, the SharedBuffer in the CachedResource is actually a
converted representation of the real QuickLook resource. Replacing this with the actual
network resource (which is what tryReplaceEncodedData() tried to do) is wrong and triggered
asserts in the code.

Fix this by having CachedRawResource::mayTryReplaceEncodedData() return false if we are
loading a QuickLook resource.

No new tests because we don't have a way to test QuickLook documents.

* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::ResourceLoader):
(WebCore::ResourceLoader::didCreateQuickLookHandle):
Set a flag to indicate that we are loading a QuickLook document.
* loader/ResourceLoader.h:
(WebCore::ResourceLoader::isQuickLookResource):
* loader/cache/CachedRawResource.cpp:
(WebCore::CachedRawResource::CachedRawResource):
(WebCore::CachedRawResource::finishLoading):
Check if we were loading a QuickLook document and if so disable encoded data
replacement.
* loader/cache/CachedRawResource.h:
Add a new bool field returned by mayTryReplaceEncodedData(). Default is true but it is
set to false in finishLoading() if we were loading QuickLook document.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/ResourceLoader.cpp
trunk/Source/WebCore/loader/ResourceLoader.h
trunk/Source/WebCore/loader/cache/CachedRawResource.cpp
trunk/Source/WebCore/loader/cache/CachedRawResource.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (171992 => 171993)

--- trunk/Source/WebCore/ChangeLog	2014-08-04 17:17:30 UTC (rev 171992)
+++ trunk/Source/WebCore/ChangeLog	2014-08-04 17:19:12 UTC (rev 171993)
@@ -1,3 +1,36 @@
+2014-08-04  Pratik Solanki  psola...@apple.com
+
+QuickLook resources are cache-replaced with their original binary data causing ASSERT(m_data-size() == newBuffer-size()) in CachedResource.cpp
+https://bugs.webkit.org/show_bug.cgi?id=135548
+rdar://problem/17891321
+
+Reviewed by David Kilzer.
+
+When loading QuickLook resources, the SharedBuffer in the CachedResource is actually a
+converted representation of the real QuickLook resource. Replacing this with the actual
+network resource (which is what tryReplaceEncodedData() tried to do) is wrong and triggered
+asserts in the code.
+
+Fix this by having CachedRawResource::mayTryReplaceEncodedData() return false if we are
+loading a QuickLook resource.
+
+No new tests because we don't have a way to test QuickLook documents.
+
+* loader/ResourceLoader.cpp:
+(WebCore::ResourceLoader::ResourceLoader):
+(WebCore::ResourceLoader::didCreateQuickLookHandle):
+Set a flag to indicate that we are loading a QuickLook document.
+* loader/ResourceLoader.h:
+(WebCore::ResourceLoader::isQuickLookResource):
+* loader/cache/CachedRawResource.cpp:
+(WebCore::CachedRawResource::CachedRawResource):
+(WebCore::CachedRawResource::finishLoading):
+Check if we were loading a QuickLook document and if so disable encoded data
+replacement.
+* loader/cache/CachedRawResource.h:
+Add a new bool field returned by mayTryReplaceEncodedData(). Default is true but it is
+set to false in finishLoading() if we were loading QuickLook document.
+
 2014-08-04  Jer Noble  jer.no...@apple.com
 
 [MSE] Seeking occasionally causes many frames to be displayed in fast forward mode


Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (171992 => 171993)

--- trunk/Source/WebCore/loader/ResourceLoader.cpp	2014-08-04 17:17:30 UTC (rev 171992)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp	2014-08-04 17:19:12 UTC (rev 171993)
@@ -62,6 +62,7 @@
 , m_cancellationStatus(NotCancelled)
 , m_defersLoading(frame-page()-defersLoading())
 , m_options(options)
+, m_isQuickLookResource(false)
 {
 }
 
@@ -618,6 +619,7 @@
 #if USE(QUICK_LOOK)
 void ResourceLoader::didCreateQuickLookHandle(QuickLookHandle handle)
 {
+m_isQuickLookResource = true;
 frameLoader()-client().didCreateQuickLookHandle(handle);
 }
 #endif


Modified: trunk/Source/WebCore/loader/ResourceLoader.h (171992 => 171993)

--- trunk/Source/WebCore/loader/ResourceLoader.h	2014-08-04 17:17:30 UTC (rev 171992)
+++ trunk/Source/WebCore/loader/ResourceLoader.h	2014-08-04 17:19:12 UTC (rev 171993)
@@ -116,6 +116,7 @@
 #if USE(QUICK_LOOK)
 virtual void didCreateQuickLookHandle(QuickLookHandle) override;
 #endif
+bool isQuickLookResource() { return m_isQuickLookResource; }
 
 

[webkit-changes] [171931] trunk/Source/WebCore

[psolanki]

Title: [171931] trunk/Source/WebCore








Revision 171931
Author psola...@apple.com
Date 2014-08-01 11:29:28 -0700 (Fri, 01 Aug 2014)


Log Message
Remove EventNames.h include from header files
https://bugs.webkit.org/show_bug.cgi?id=135486

Reviewed by Alexey Proskuryakov.

No new tests because no functional changes.

* Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h:
* Modules/gamepad/GamepadEvent.h:
* Modules/indexeddb/IDBRequest.h:
* Modules/indexeddb/IDBTransaction.h:
* Modules/mediastream/RTCStatsResponse.h:
* Modules/websockets/WebSocket.h:
* css/FontLoader.h:
* dom/SecurityPolicyViolationEvent.h:
* loader/appcache/DOMApplicationCache.h:
* workers/AbstractWorker.h:
* workers/Worker.h:
* workers/WorkerGlobalScope.h:
* xml/XMLHttpRequest.h:
* xml/XMLHttpRequestProgressEvent.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h
trunk/Source/WebCore/Modules/gamepad/GamepadEvent.h
trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h
trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h
trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.h
trunk/Source/WebCore/Modules/websockets/WebSocket.h
trunk/Source/WebCore/css/FontLoader.h
trunk/Source/WebCore/dom/SecurityPolicyViolationEvent.h
trunk/Source/WebCore/loader/appcache/DOMApplicationCache.h
trunk/Source/WebCore/workers/AbstractWorker.h
trunk/Source/WebCore/workers/Worker.h
trunk/Source/WebCore/workers/WorkerGlobalScope.h
trunk/Source/WebCore/xml/XMLHttpRequest.h
trunk/Source/WebCore/xml/XMLHttpRequestProgressEvent.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (171930 => 171931)

--- trunk/Source/WebCore/ChangeLog	2014-08-01 18:28:13 UTC (rev 171930)
+++ trunk/Source/WebCore/ChangeLog	2014-08-01 18:29:28 UTC (rev 171931)
@@ -1,3 +1,27 @@
+2014-08-01  Pratik Solanki  psola...@apple.com
+
+Remove EventNames.h include from header files
+https://bugs.webkit.org/show_bug.cgi?id=135486
+
+Reviewed by Alexey Proskuryakov.
+
+No new tests because no functional changes.
+
+* Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h:
+* Modules/gamepad/GamepadEvent.h:
+* Modules/indexeddb/IDBRequest.h:
+* Modules/indexeddb/IDBTransaction.h:
+* Modules/mediastream/RTCStatsResponse.h:
+* Modules/websockets/WebSocket.h:
+* css/FontLoader.h:
+* dom/SecurityPolicyViolationEvent.h:
+* loader/appcache/DOMApplicationCache.h:
+* workers/AbstractWorker.h:
+* workers/Worker.h:
+* workers/WorkerGlobalScope.h:
+* xml/XMLHttpRequest.h:
+* xml/XMLHttpRequestProgressEvent.h:
+
 2014-08-01  Simon Fraser  simon.fra...@apple.com
 
 nullptr goodness in RenderLayer


Modified: trunk/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h (171930 => 171931)

--- trunk/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h	2014-08-01 18:28:13 UTC (rev 171930)
+++ trunk/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h	2014-08-01 18:29:28 UTC (rev 171931)
@@ -29,7 +29,6 @@
 #if ENABLE(IOS_AIRPLAY)
 
 #include Event.h
-#include EventNames.h
 
 namespace WebCore {
 


Modified: trunk/Source/WebCore/Modules/gamepad/GamepadEvent.h (171930 => 171931)

--- trunk/Source/WebCore/Modules/gamepad/GamepadEvent.h	2014-08-01 18:28:13 UTC (rev 171930)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadEvent.h	2014-08-01 18:29:28 UTC (rev 171931)
@@ -28,7 +28,6 @@
 #if ENABLE(GAMEPAD)
 
 #include Event.h
-#include EventNames.h
 #include Gamepad.h
 #include wtf/RefPtr.h
 


Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h (171930 => 171931)

--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h	2014-08-01 18:28:13 UTC (rev 171930)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h	2014-08-01 18:29:28 UTC (rev 171931)
@@ -37,7 +37,6 @@
 #include DOMStringList.h
 #include Event.h
 #include EventListener.h
-#include EventNames.h
 #include EventTarget.h
 #include IDBAny.h
 #include IDBCallbacks.h


Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h (171930 => 171931)

--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h	2014-08-01 18:28:13 UTC (rev 171930)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h	2014-08-01 18:29:28 UTC (rev 171931)
@@ -32,7 +32,6 @@
 #include DOMError.h
 #include Event.h
 #include EventListener.h
-#include EventNames.h
 #include EventTarget.h
 #include IDBDatabaseMetadata.h
 #include IndexedDB.h


Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.h (171930 => 171931)

--- trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.h	2014-08-01 18:28:13 UTC (rev 171930)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.h	2014-08-01 18:29:28 UTC (rev 171931)
@@ -30,7 +30,6 @@
 #include DOMStringList.h
 #include Event.h
 #include EventListener.h
-#include EventNames.h
 #include EventTarget.h
 #include 

[webkit-changes] [171817] trunk/LayoutTests

[psolanki]

Title: [171817] trunk/LayoutTests








Revision 171817
Author psola...@apple.com
Date 2014-07-30 14:28:03 -0700 (Wed, 30 Jul 2014)


Log Message
Move iphone-simulator test results landed in r171094 to the correct directory.

* platform/ios-sim/fast/events/ontouchstart-active-selector-expected.txt: Renamed from LayoutTests/platform/iphone-simulator/fast/events/ontouchstart-active-selector-expected.txt.
* platform/ios-sim/fast/events/ontouchstart-active-selector.html: Renamed from LayoutTests/platform/iphone-simulator/fast/events/ontouchstart-active-selector.html.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/ios-sim/fast/events/ontouchstart-active-selector-expected.txt
trunk/LayoutTests/platform/ios-sim/fast/events/ontouchstart-active-selector.html


Removed Paths

trunk/LayoutTests/platform/iphone-simulator/fast/events/ontouchstart-active-selector-expected.txt
trunk/LayoutTests/platform/iphone-simulator/fast/events/ontouchstart-active-selector.html




Diff

Modified: trunk/LayoutTests/ChangeLog (171816 => 171817)

--- trunk/LayoutTests/ChangeLog	2014-07-30 21:03:31 UTC (rev 171816)
+++ trunk/LayoutTests/ChangeLog	2014-07-30 21:28:03 UTC (rev 171817)
@@ -1,3 +1,10 @@
+2014-07-30  Pratik Solanki  psola...@apple.com
+
+Move iphone-simulator test results landed in r171094 to the correct directory.
+
+* platform/ios-sim/fast/events/ontouchstart-active-selector-expected.txt: Renamed from LayoutTests/platform/iphone-simulator/fast/events/ontouchstart-active-selector-expected.txt.
+* platform/ios-sim/fast/events/ontouchstart-active-selector.html: Renamed from LayoutTests/platform/iphone-simulator/fast/events/ontouchstart-active-selector.html.
+
 2014-07-29  Jinwoo Song  jinwoo7.s...@samsung.com
 
 [EFL] Unreviewed EFL gardening. Rebaseline tests after r170418.


Copied: trunk/LayoutTests/platform/ios-sim/fast/events/ontouchstart-active-selector-expected.txt (from rev 171816, trunk/LayoutTests/platform/iphone-simulator/fast/events/ontouchstart-active-selector-expected.txt) (0 => 171817)

--- trunk/LayoutTests/platform/ios-sim/fast/events/ontouchstart-active-selector-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/ios-sim/fast/events/ontouchstart-active-selector-expected.txt	2014-07-30 21:28:03 UTC (rev 171817)
@@ -0,0 +1,12 @@
+This tests the :active selector on touchable elements
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS getComputedStyle(touchMe).backgroundColor is 'rgb(0, 0, 255)'
+PASS getComputedStyle(touchMe).backgroundColor is 'rgb(255, 255, 0)'
+PASS getComputedStyle(touchMe).backgroundColor is 'rgb(0, 0, 255)'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Copied: trunk/LayoutTests/platform/ios-sim/fast/events/ontouchstart-active-selector.html (from rev 171816, trunk/LayoutTests/platform/iphone-simulator/fast/events/ontouchstart-active-selector.html) (0 => 171817)

--- trunk/LayoutTests/platform/ios-sim/fast/events/ontouchstart-active-selector.html	(rev 0)
+++ trunk/LayoutTests/platform/ios-sim/fast/events/ontouchstart-active-selector.html	2014-07-30 21:28:03 UTC (rev 171817)
@@ -0,0 +1,50 @@
+!DOCTYPE html
+html
+head
+script src=""
+
+style
+#touchMe {
+background-color: blue;
+width: 200px;
+height: 200px;
+top: 0;
+left: 0;
+}
+#touchMe:active {
+background-color: yellow;
+}
+/style
+/head
+body
+div id=touchMe _ontouchstart_=/div
+script
+
+description(This tests the :active selector on touchable elements);
+
+if (!window.eventSender)
+debug(This test will FAIL outside of DRT, but you can test it manually by touching the blue square below. If it turns yellow when touched, the test is a PASS.);
+
+touchMe = document.getElementById(touchMe);
+
+shouldBe(getComputedStyle(touchMe).backgroundColor, 'rgb(0, 0, 255)');
+
+if (window.eventSender) {
+eventSender.clearTouchPoints();
+eventSender.addTouchPoint(touchMe.offsetLeft + 10, touchMe.offsetTop + 10);
+eventSender.touchStart();
+}
+
+shouldBe(getComputedStyle(touchMe).backgroundColor, 'rgb(255, 255, 0)');
+
+if (window.eventSender) {
+eventSender.clearTouchPoints();
+eventSender.touchEnd();
+}
+
+shouldBe(getComputedStyle(touchMe).backgroundColor, 'rgb(0, 0, 255)');
+
+/script
+script src=""
+/body
+/html


Deleted: trunk/LayoutTests/platform/iphone-simulator/fast/events/ontouchstart-active-selector-expected.txt (171816 => 171817)

--- trunk/LayoutTests/platform/iphone-simulator/fast/events/ontouchstart-active-selector-expected.txt	2014-07-30 21:03:31 UTC (rev 171816)
+++ trunk/LayoutTests/platform/iphone-simulator/fast/events/ontouchstart-active-selector-expected.txt	2014-07-30 21:28:03 UTC (rev 171817)
@@ -1,12 +0,0 @@
-This tests the :active selector on touchable elements
-
-On success, you will see a series of PASS messages, followed by TEST COMPLETE.
-
-
-PASS 

[webkit-changes] [171743] trunk/Source

[psolanki]

Title: [171743] trunk/Source








Revision 171743
Author psola...@apple.com
Date 2014-07-29 07:35:13 -0700 (Tue, 29 Jul 2014)


Log Message
Get SharedBuffer.h out of ResourceBuffer.h (and a few other places)
https://bugs.webkit.org/show_bug.cgi?id=131782

Original patch by Tim Horton.
Reviewed by Darin Adler.

Source/WebCore:
No new tests because no functional changes.

* Modules/indexeddb/IDBCallbacks.h:
* Modules/indexeddb/IDBCursorBackend.h:
* loader/ios/DiskImageCacheIOS.h:
Forward declare SharedBuffer in headers.

* Modules/indexeddb/IDBRequest.cpp:
* loader/cache/CachedImage.cpp:
* loader/icon/IconLoader.cpp:
* loader/ios/DiskImageCacheIOS.mm:
* loader/cache/MemoryCache.cpp:
* loader/mac/ResourceBuffer.mm:
Include SharedBuffer.h in implementation files.

* Modules/notifications/Notification.h:
* loader/appcache/ApplicationCacheGroup.h:
Remove unnecessary includes.

* loader/ResourceBuffer.cpp:
(WebCore::ResourceBuffer::adoptSharedBuffer):
* loader/ResourceBuffer.h:
Out-of-line adoptSharedBuffer so that the PassRefPtr doesn't require including SharedBuffer.h.

* platform/graphics/opentype/OpenTypeMathData.cpp:
* platform/graphics/opentype/OpenTypeMathData.h:
Out-of-line destructor to avoid requiring SharedBuffer.h for the RefPtr.
Forward-declare SharedBuffer in the header, include in implementation.

Source/WebKit2:
* NetworkProcess/NetworkResourceLoader.cpp:
* WebProcess/Network/NetworkProcessConnection.cpp:
Include SharedBuffer.h in implementation files.

* WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h:
Un-indent namespace and remove SharedBuffer forward-declaration.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h
trunk/Source/WebCore/Modules/indexeddb/IDBCursorBackend.h
trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp
trunk/Source/WebCore/Modules/notifications/Notification.h
trunk/Source/WebCore/loader/ResourceBuffer.cpp
trunk/Source/WebCore/loader/ResourceBuffer.h
trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h
trunk/Source/WebCore/loader/cache/CachedImage.cpp
trunk/Source/WebCore/loader/cache/MemoryCache.cpp
trunk/Source/WebCore/loader/icon/IconLoader.cpp
trunk/Source/WebCore/loader/ios/DiskImageCacheIOS.h
trunk/Source/WebCore/loader/ios/DiskImageCacheIOS.mm
trunk/Source/WebCore/loader/mac/ResourceBuffer.mm
trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.cpp
trunk/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h
trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (171742 => 171743)

--- trunk/Source/WebCore/ChangeLog	2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/ChangeLog	2014-07-29 14:35:13 UTC (rev 171743)
@@ -1,3 +1,40 @@
+2014-07-28  Pratik Solanki  psola...@apple.com
+
+Get SharedBuffer.h out of ResourceBuffer.h (and a few other places)
+https://bugs.webkit.org/show_bug.cgi?id=131782
+
+Original patch by Tim Horton.
+Reviewed by Darin Adler.
+
+No new tests because no functional changes.
+
+* Modules/indexeddb/IDBCallbacks.h:
+* Modules/indexeddb/IDBCursorBackend.h:
+* loader/ios/DiskImageCacheIOS.h:
+Forward declare SharedBuffer in headers.
+
+* Modules/indexeddb/IDBRequest.cpp:
+* loader/cache/CachedImage.cpp:
+* loader/icon/IconLoader.cpp:
+* loader/ios/DiskImageCacheIOS.mm:
+* loader/cache/MemoryCache.cpp:
+* loader/mac/ResourceBuffer.mm:
+Include SharedBuffer.h in implementation files.
+
+* Modules/notifications/Notification.h:
+* loader/appcache/ApplicationCacheGroup.h:
+Remove unnecessary includes.
+
+* loader/ResourceBuffer.cpp:
+(WebCore::ResourceBuffer::adoptSharedBuffer):
+* loader/ResourceBuffer.h:
+Out-of-line adoptSharedBuffer so that the PassRefPtr doesn't require including SharedBuffer.h.
+
+* platform/graphics/opentype/OpenTypeMathData.cpp:
+* platform/graphics/opentype/OpenTypeMathData.h:
+Out-of-line destructor to avoid requiring SharedBuffer.h for the RefPtr.
+Forward-declare SharedBuffer in the header, include in implementation.
+
 2014-07-29  Zan Dobersek  zdober...@igalia.com
 
 [TexMap] GraphicsLayerTextureMapper::addAnimation() box size parameter should be FloatSize


Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h (171742 => 171743)

--- trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h	2014-07-29 12:42:53 UTC (rev 171742)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h	2014-07-29 14:35:13 UTC (rev 171743)
@@ -32,7 +32,6 @@
 #include IDBDatabaseError.h
 #include IDBKey.h
 #include IDBKeyPath.h
-#include SharedBuffer.h
 #include wtf/RefCounted.h
 
 

[webkit-changes] [171766] trunk/Source/WebCore

[psolanki]

Title: [171766] trunk/Source/WebCore








Revision 171766
Author psola...@apple.com
Date 2014-07-29 14:41:36 -0700 (Tue, 29 Jul 2014)


Log Message
[iOS] REGRESSION(r171526): PDF documents fail to load in WebKit1 with disk image caching enabled
https://bugs.webkit.org/show_bug.cgi?id=135359
rdar://problem/17824645

Reviewed by Darin Adler.

r171526 broke the case where we have a memory mapped file from the DiskImageCache in the
SharedBuffer. In such a case, m_buffer is empty and createCFData() returned an
WebCoreSharedBufferData with an empty buffer.

Fix this by taking the easy route of bringing back the old code for the disk image cache
file backed case. In the long run we probably want to remove the iOS specific disk image
cache anyway.

Review also uncovered another bug in r171526 where we were balancing an Objective-C alloc
with a CFRelease which is incorrect when running under GC. Fix that by using adoptNS along
with adoptCF which is what the code did before.

No new tests because the bug only occurs on device and we can't run tests on device yet.

* platform/mac/SharedBufferMac.mm:
(-[WebCoreSharedBufferData initWithDiskImageSharedBuffer:]):
(-[WebCoreSharedBufferData length]):
(-[WebCoreSharedBufferData bytes]):
(WebCore::SharedBuffer::createCFData):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/SharedBufferMac.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (171765 => 171766)

--- trunk/Source/WebCore/ChangeLog	2014-07-29 21:25:23 UTC (rev 171765)
+++ trunk/Source/WebCore/ChangeLog	2014-07-29 21:41:36 UTC (rev 171766)
@@ -1,3 +1,31 @@
+2014-07-29  Pratik Solanki  psola...@apple.com
+
+[iOS] REGRESSION(r171526): PDF documents fail to load in WebKit1 with disk image caching enabled
+https://bugs.webkit.org/show_bug.cgi?id=135359
+rdar://problem/17824645
+
+Reviewed by Darin Adler.
+
+r171526 broke the case where we have a memory mapped file from the DiskImageCache in the
+SharedBuffer. In such a case, m_buffer is empty and createCFData() returned an
+WebCoreSharedBufferData with an empty buffer.
+
+Fix this by taking the easy route of bringing back the old code for the disk image cache
+file backed case. In the long run we probably want to remove the iOS specific disk image
+cache anyway.
+
+Review also uncovered another bug in r171526 where we were balancing an Objective-C alloc
+with a CFRelease which is incorrect when running under GC. Fix that by using adoptNS along
+with adoptCF which is what the code did before.
+
+No new tests because the bug only occurs on device and we can't run tests on device yet.
+
+* platform/mac/SharedBufferMac.mm:
+(-[WebCoreSharedBufferData initWithDiskImageSharedBuffer:]):
+(-[WebCoreSharedBufferData length]):
+(-[WebCoreSharedBufferData bytes]):
+(WebCore::SharedBuffer::createCFData):
+
 2014-07-29  Benjamin Poulain  bpoul...@apple.com
 
 VisitedLinkState::determineLinkState should take a reference


Modified: trunk/Source/WebCore/platform/mac/SharedBufferMac.mm (171765 => 171766)

--- trunk/Source/WebCore/platform/mac/SharedBufferMac.mm	2014-07-29 21:25:23 UTC (rev 171765)
+++ trunk/Source/WebCore/platform/mac/SharedBufferMac.mm	2014-07-29 21:41:36 UTC (rev 171766)
@@ -36,10 +36,16 @@
 
 @interface WebCoreSharedBufferData : NSData
 {
-RefPtrSharedBuffer::DataBuffer buffer;
+RefPtrSharedBuffer::DataBuffer sharedBufferDataBuffer;
+#if ENABLE(DISK_IMAGE_CACHE)
+RefPtrSharedBuffer sharedBuffer;
+#endif
 }
 
 - (id)initWithSharedBufferDataBuffer:(SharedBuffer::DataBuffer*)dataBuffer;
+#if ENABLE(DISK_IMAGE_CACHE)
+- (id)initWithMemoryMappedSharedBuffer:(SharedBuffer)memoryMappedSharedBuffer;
+#endif
 @end
 
 @implementation WebCoreSharedBufferData
@@ -71,19 +77,41 @@
 self = [super init];
 
 if (self)
-buffer = dataBuffer;
+sharedBufferDataBuffer = dataBuffer;
 
 return self;
 }
 
+#if ENABLE(DISK_IMAGE_CACHE)
+- (id)initWithMemoryMappedSharedBuffer:(SharedBuffer)memoryMappedSharedBuffer
+{
+ASSERT(memoryMappedSharedBuffer.isMemoryMapped());
+self = [super init];
+
+if (!self)
+return nil;
+
+sharedBuffer = memoryMappedSharedBuffer;
+return self;
+}
+#endif
+
 - (NSUInteger)length
 {
-return buffer-data.size();
+#if ENABLE(DISK_IMAGE_CACHE)
+if (sharedBuffer)
+return sharedBuffer-size();
+#endif
+return sharedBufferDataBuffer-data.size();
 }
 
 - (const void *)bytes
 {
-return reinterpret_castconst void*(buffer-data.data());
+#if ENABLE(DISK_IMAGE_CACHE)
+if (sharedBuffer)
+return sharedBuffer-data();
+#endif
+return sharedBufferDataBuffer-data.data();
 }
 
 @end
@@ -110,14 +138,19 @@
 return m_dataArray.at(0);
 #endif
 
+#if ENABLE(DISK_IMAGE_CACHE)
+if (isMemoryMapped())
+return adoptCF((CFDataRef)adoptNS([[WebCoreSharedBufferData 

[webkit-changes] [171673] trunk/Source/WebKit

[psolanki]

Title: [171673] trunk/Source/WebKit








Revision 171673
Author psola...@apple.com
Date 2014-07-27 23:50:21 -0700 (Sun, 27 Jul 2014)


Log Message
Remove unused preference keys
https://bugs.webkit.org/show_bug.cgi?id=135280

Reviewed by Darin Adler.

Source/WebKit/mac:
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences _setPageCacheSize:]): Deleted.
(-[WebPreferences _pageCacheSize]): Deleted.
(-[WebPreferences _setObjectCacheSize:]): Deleted.
(-[WebPreferences _objectCacheSize]): Deleted.
* WebView/WebPreferencesPrivate.h:

Source/WebKit/win:
* WebPreferenceKeysPrivate.h:

Modified Paths

trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
trunk/Source/WebKit/mac/WebView/WebPreferences.mm
trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h




Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (171672 => 171673)

--- trunk/Source/WebKit/mac/ChangeLog	2014-07-28 06:47:28 UTC (rev 171672)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-07-28 06:50:21 UTC (rev 171673)
@@ -1,3 +1,19 @@
+2014-07-27  Pratik Solanki  psola...@apple.com
+
+Remove unused preference keys
+https://bugs.webkit.org/show_bug.cgi?id=135280
+
+Reviewed by Darin Adler.
+
+* WebView/WebPreferenceKeysPrivate.h:
+* WebView/WebPreferences.mm:
+(+[WebPreferences initialize]):
+(-[WebPreferences _setPageCacheSize:]): Deleted.
+(-[WebPreferences _pageCacheSize]): Deleted.
+(-[WebPreferences _setObjectCacheSize:]): Deleted.
+(-[WebPreferences _objectCacheSize]): Deleted.
+* WebView/WebPreferencesPrivate.h:
+
 2014-07-27  Filip Pizlo  fpi...@apple.com
 
 Merge r170090, r170092, r170129, r170141, r170161, r170215, r170275, r170375, r170376, r170382, r170383, r170399, r170436, r170489, r170490, r170556 from ftlopt.


Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (171672 => 171673)

--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h	2014-07-28 06:47:28 UTC (rev 171672)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h	2014-07-28 06:50:21 UTC (rev 171673)
@@ -171,9 +171,6 @@
 // default.
 #define WebKitEnableDeferredUpdatesPreferenceKey @WebKitEnableDeferredUpdates
 
-// For debugging only. Don't use these.
-#define WebKitPageCacheSizePreferenceKey @WebKitPageCacheSizePreferenceKey
-#define WebKitObjectCacheSizePreferenceKey @WebKitObjectCacheSizePreferenceKey
 #define WebKitDebugFullPageZoomPreferenceKey @WebKitDebugFullPageZoomPreferenceKey
 
 #define WebKitMinimumZoomFontSizePreferenceKey @WebKitMinimumZoomFontSizePreferenceKey


Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (171672 => 171673)

--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm	2014-07-28 06:47:28 UTC (rev 171672)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm	2014-07-28 06:50:21 UTC (rev 171673)
@@ -554,7 +554,6 @@
 [NSNumber numberWithInt:-1],  WebKitLayoutIntervalPreferenceKey,
 [NSNumber numberWithFloat:-1.0f], WebKitMaxParseDurationPreferenceKey,
 [NSNumber numberWithBool:NO], WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey,
-[NSNumber numberWithInt:-1],  WebKitPageCacheSizePreferenceKey,
 [NSNumber numberWithBool:NO], WebKitAlwaysRequestGeolocationPermissionPreferenceKey,
 [NSNumber numberWithInt:InterpolationLow], WebKitInterpolationQualityPreferenceKey,
 [NSNumber numberWithBool:YES],WebKitPasswordEchoEnabledPreferenceKey,
@@ -1446,26 +1445,6 @@
 return [self _floatValueForKey:WebKitMaxParseDurationPreferenceKey];
 }
 
-- (void)_setPageCacheSize:(int)size
-{
-[self _setIntegerValue:size forKey:WebKitPageCacheSizePreferenceKey];
-}
-
-- (int)_pageCacheSize
-{
-return [self _integerValueForKey:WebKitPageCacheSizePreferenceKey];
-}
-
-- (void)_setObjectCacheSize:(int)size
-{
-[self _setIntegerValue:size forKey:WebKitObjectCacheSizePreferenceKey];
-}
-
-- (int)_objectCacheSize
-{
-return [self _integerValueForKey:WebKitObjectCacheSizePreferenceKey];
-}
-
 - (void)_setAlwaysUseBaselineOfPrimaryFont:(BOOL)flag
 {
 [self _setBoolValue:flag forKey:WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey];


Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (171672 => 171673)

--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h	2014-07-28 06:47:28 UTC (rev 171672)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h	2014-07-28 06:50:21 UTC (rev 171673)
@@ -308,10 +308,6 @@
 - (int)_layoutInterval;
 - (void)_setMaxParseDuration:(float)d;
 - (float)_maxParseDuration;
-- (void)_setPageCacheSize:(int)size;
-- (int)_pageCacheSize;
-- (void)_setObjectCacheSize:(int)size;
-- (int)_objectCacheSize;
 - (void)_setInterpolationQuality:(int)quality;
 - (int)_interpolationQuality;
 - 

[webkit-changes] [171619] trunk/Source/WebCore

[psolanki]

Title: [171619] trunk/Source/WebCore








Revision 171619
Author psola...@apple.com
Date 2014-07-25 14:53:26 -0700 (Fri, 25 Jul 2014)


Log Message
[iOS] REGRESSION(r171526): Images fail to load sometimes
https://bugs.webkit.org/show_bug.cgi?id=135304
rdar://problem/17811922

Reviewed by Alexey Proskuryakov.

SharedBuffer::createCFData() calls data() as a way to coalesce the data array elements and
segments into m_buffer. However, data() has an optimization where if we had a single element
in the data array, it would just return that and not do coalescing. So when we passed
m_buffer to WebCoreSharedData, we passed a buffer with no data in it.

Fix this by bringing the optimization to createCFData() and return the CFDataRef from the
data array if we just have a single element.

No new tests. Should be covered by existing tests.

* platform/mac/SharedBufferMac.mm:
(WebCore::SharedBuffer::createCFData):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/SharedBufferMac.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (171618 => 171619)

--- trunk/Source/WebCore/ChangeLog	2014-07-25 21:49:12 UTC (rev 171618)
+++ trunk/Source/WebCore/ChangeLog	2014-07-25 21:53:26 UTC (rev 171619)
@@ -1,3 +1,24 @@
+2014-07-25  Pratik Solanki  psola...@apple.com
+
+[iOS] REGRESSION(r171526): Images fail to load sometimes
+https://bugs.webkit.org/show_bug.cgi?id=135304
+rdar://problem/17811922
+
+Reviewed by Alexey Proskuryakov.
+
+SharedBuffer::createCFData() calls data() as a way to coalesce the data array elements and
+segments into m_buffer. However, data() has an optimization where if we had a single element
+in the data array, it would just return that and not do coalescing. So when we passed
+m_buffer to WebCoreSharedData, we passed a buffer with no data in it.
+
+Fix this by bringing the optimization to createCFData() and return the CFDataRef from the
+data array if we just have a single element.
+
+No new tests. Should be covered by existing tests.
+
+* platform/mac/SharedBufferMac.mm:
+(WebCore::SharedBuffer::createCFData):
+
 2014-07-25  Jer Noble  jer.no...@apple.com
 
 [MSE] High CPU usage in SampleMap::findSamplesWithinPresentationRange() with a large number of buffered samples.


Modified: trunk/Source/WebCore/platform/mac/SharedBufferMac.mm (171618 => 171619)

--- trunk/Source/WebCore/platform/mac/SharedBufferMac.mm	2014-07-25 21:49:12 UTC (rev 171618)
+++ trunk/Source/WebCore/platform/mac/SharedBufferMac.mm	2014-07-25 21:53:26 UTC (rev 171619)
@@ -105,6 +105,11 @@
 if (m_cfData)
 return m_cfData;
 
+#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
+if (m_dataArray.size() == 1)
+return m_dataArray.at(0);
+#endif
+
 data(); // Force data into m_buffer from segments or data array.
 if (hasPurgeableBuffer()) {
 RefPtrSharedBuffer::DataBuffer copiedBuffer = adoptRef(new DataBuffer);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [171526] trunk/Source/WebCore

[psolanki]

Title: [171526] trunk/Source/WebCore








Revision 171526
Author psola...@apple.com
Date 2014-07-24 14:37:43 -0700 (Thu, 24 Jul 2014)


Log Message
Sharing SharedBuffer between WebCore and ImageIO is racy and crash prone
https://bugs.webkit.org/show_bug.cgi?id=135069
rdar://problem/17470655

Reviewed by Simon Fraser.

When passing image data to ImageIO for decoding, we pass an NSData subclass that is a wraper
around SharedBuffer. This can be a problem when ImageIO tries to access the data on the CA
thread. End result is data corruption on large image loads and potential crashes. The fix is
to have SharedBuffer create a copy of its data if the data has been passed to ImageIO and
might be accessed concurrently.

Since Vector is not refcounted, we do this by having a new refcounted object in SharedBuffer
that contains the buffer and we pass that in our NSData subclass WebCoreSharedBufferData.
Code that would result in the Vector memory moving e.g. append(), resize(), now checks to
see if the buffer was shared and if so, will create a new copy of the vector. This ensures
that the main thread does not end up invalidating the vector memory that we have passed it
to ImageIO.

No new tests because no functional changes.

* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::makePurgeable):
Remove early return - createPurgeableMemory() has the correct check now.
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::SharedBuffer):
(WebCore::SharedBuffer::adoptVector):
(WebCore::SharedBuffer::createPurgeableBuffer):
Don't create purgeable buffer if we are sharing the buffer.
(WebCore::SharedBuffer::append):
(WebCore::SharedBuffer::clear):
(WebCore::SharedBuffer::copy):
(WebCore::SharedBuffer::duplicateDataBufferIfNecessary): Added.
Create a new copy of the data if we have shared the buffer and if appending to it would
exceed the capacity of the vector resulting in memmove.
(WebCore::SharedBuffer::appendToInternalBuffer): Added.
(WebCore::SharedBuffer::clearInternalBuffer): Added.
(WebCore::SharedBuffer::buffer):
Create a new copy of the buffer if we have shared it.
(WebCore::SharedBuffer::getSomeData):
* platform/SharedBuffer.h:
* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::SharedBuffer):
(WebCore::SharedBuffer::singleDataArrayBuffer):
(WebCore::SharedBuffer::maybeAppendDataArray):
* platform/mac/SharedBufferMac.mm:
Pass the InternalBuffer object to WebCoreSharedBufferData
(-[WebCoreSharedBufferData dealloc]):
(-[WebCoreSharedBufferData initWithSharedBufferInternalBuffer:]):
(-[WebCoreSharedBufferData length]):
(-[WebCoreSharedBufferData bytes]):
(WebCore::SharedBuffer::createNSData):
Call createCFData() instead of duplicating code.
(WebCore::SharedBuffer::createCFData):
If the data is in purgeable memory, make a copy of it since m_buffer was cleared when
creating the purgeable buffer.
(-[WebCoreSharedBufferData initWithSharedBuffer:]): Deleted.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/cache/CachedResource.cpp
trunk/Source/WebCore/platform/SharedBuffer.cpp
trunk/Source/WebCore/platform/SharedBuffer.h
trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp
trunk/Source/WebCore/platform/mac/SharedBufferMac.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (171525 => 171526)

--- trunk/Source/WebCore/ChangeLog	2014-07-24 21:12:53 UTC (rev 171525)
+++ trunk/Source/WebCore/ChangeLog	2014-07-24 21:37:43 UTC (rev 171526)
@@ -1,3 +1,63 @@
+2014-07-24  Pratik Solanki  psola...@apple.com
+
+Sharing SharedBuffer between WebCore and ImageIO is racy and crash prone
+https://bugs.webkit.org/show_bug.cgi?id=135069
+rdar://problem/17470655
+
+Reviewed by Simon Fraser.
+
+When passing image data to ImageIO for decoding, we pass an NSData subclass that is a wraper
+around SharedBuffer. This can be a problem when ImageIO tries to access the data on the CA
+thread. End result is data corruption on large image loads and potential crashes. The fix is
+to have SharedBuffer create a copy of its data if the data has been passed to ImageIO and
+might be accessed concurrently.
+
+Since Vector is not refcounted, we do this by having a new refcounted object in SharedBuffer
+that contains the buffer and we pass that in our NSData subclass WebCoreSharedBufferData.
+Code that would result in the Vector memory moving e.g. append(), resize(), now checks to
+see if the buffer was shared and if so, will create a new copy of the vector. This ensures
+that the main thread does not end up invalidating the vector memory that we have passed it
+to ImageIO.
+
+No new tests because no functional changes.
+
+* loader/cache/CachedResource.cpp:
+(WebCore::CachedResource::makePurgeable):
+Remove early return - createPurgeableMemory() has the correct check now.
+* platform/SharedBuffer.cpp:
+

[webkit-changes] [171575] trunk/Source/WebKit/mac

[psolanki]

Title: [171575] trunk/Source/WebKit/mac








Revision 171575
Author psola...@apple.com
Date 2014-07-24 19:26:34 -0700 (Thu, 24 Jul 2014)


Log Message
[iOS] Remove prefs to tweak cache values
https://bugs.webkit.org/show_bug.cgi?id=135274
rdar://problem/17784826

Reviewed by Alexey Proskuryakov.

Remove iOS specific code that used to look up user defaults to see if any cache values were
overridden. This was added for testing, is not used any more and is actually harmful now. It
can cause unnecessary memory churn when under memory pressure since we call [WebView _setCacheModel]
as a means to clear out memory cache.

* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences _setNSURLMemoryCacheSize:]): Deleted.
(-[WebPreferences _NSURLMemoryCacheSize]): Deleted.
(-[WebPreferences _setNSURLDiskCacheSize:]): Deleted.
(-[WebPreferences _NSURLDiskCacheSize]): Deleted.
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(+[WebView _setCacheModel:]):

Modified Paths

trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
trunk/Source/WebKit/mac/WebView/WebPreferences.mm
trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h
trunk/Source/WebKit/mac/WebView/WebView.mm




Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (171574 => 171575)

--- trunk/Source/WebKit/mac/ChangeLog	2014-07-25 01:31:40 UTC (rev 171574)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-07-25 02:26:34 UTC (rev 171575)
@@ -1,3 +1,27 @@
+2014-07-24  Pratik Solanki  psola...@apple.com
+
+[iOS] Remove prefs to tweak cache values
+https://bugs.webkit.org/show_bug.cgi?id=135274
+rdar://problem/17784826
+
+Reviewed by Alexey Proskuryakov.
+
+Remove iOS specific code that used to look up user defaults to see if any cache values were
+overridden. This was added for testing, is not used any more and is actually harmful now. It
+can cause unnecessary memory churn when under memory pressure since we call [WebView _setCacheModel]
+as a means to clear out memory cache.
+
+* WebView/WebPreferenceKeysPrivate.h:
+* WebView/WebPreferences.mm:
+(+[WebPreferences initialize]):
+(-[WebPreferences _setNSURLMemoryCacheSize:]): Deleted.
+(-[WebPreferences _NSURLMemoryCacheSize]): Deleted.
+(-[WebPreferences _setNSURLDiskCacheSize:]): Deleted.
+(-[WebPreferences _NSURLDiskCacheSize]): Deleted.
+* WebView/WebPreferencesPrivate.h:
+* WebView/WebView.mm:
+(+[WebView _setCacheModel:]):
+
 2014-07-24  Peyton Randolph  prando...@apple.com
 
 Rename feature flag for long-press gesture on Mac.   


Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (171574 => 171575)

--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h	2014-07-25 01:31:40 UTC (rev 171574)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h	2014-07-25 02:26:34 UTC (rev 171575)
@@ -183,8 +183,6 @@
 #define WebKitTelephoneParsingEnabledPreferenceKey @WebKitTelephoneParsingEnabledPreferenceKey
 #define WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey @WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey
 #define WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey @WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey
-#define WebKitNSURLMemoryCacheSizePreferenceKey @WebKitNSURLMemoryCacheSizePreferenceKey
-#define WebKitNSURLDiskCacheSizePreferenceKey @WebKitNSURLDiskCacheSizePreferenceKey
 #define WebKitAlwaysRequestGeolocationPermissionPreferenceKey @WebKitAlwaysRequestGeolocationPermission
 #define WebKitLayoutIntervalPreferenceKey @WebKitLayoutIntervalPreferenceKey
 #define WebKitMaxParseDurationPreferenceKey @WebKitMaxParseDurationPreferenceKey


Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (171574 => 171575)

--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm	2014-07-25 01:31:40 UTC (rev 171574)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm	2014-07-25 02:26:34 UTC (rev 171575)
@@ -555,9 +555,6 @@
 [NSNumber numberWithFloat:-1.0f], WebKitMaxParseDurationPreferenceKey,
 [NSNumber numberWithBool:NO], WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey,
 [NSNumber numberWithInt:-1],  WebKitPageCacheSizePreferenceKey,
-[NSNumber numberWithInt:-1],  WebKitObjectCacheSizePreferenceKey,
-[NSNumber numberWithInt:-1],  WebKitNSURLMemoryCacheSizePreferenceKey,
-[NSNumber numberWithInt:-1],  WebKitNSURLDiskCacheSizePreferenceKey,
 [NSNumber numberWithBool:NO], WebKitAlwaysRequestGeolocationPermissionPreferenceKey,
 [NSNumber numberWithInt:InterpolationLow], WebKitInterpolationQualityPreferenceKey,
 [NSNumber numberWithBool:YES],WebKitPasswordEchoEnabledPreferenceKey,
@@ -1469,26 +1466,6 @@
 return [self 

[webkit-changes] [171579] trunk/Source/WebCore

[psolanki]

Title: [171579] trunk/Source/WebCore








Revision 171579
Author psola...@apple.com
Date 2014-07-24 21:27:57 -0700 (Thu, 24 Jul 2014)


Log Message
REGRESSION(r171526): [GTK] Massive crashes.
https://bugs.webkit.org/show_bug.cgi?id=135283

Unreviewed. GTK build fix after r171526. Initialize m_buffer in SharedBuffer constructor.

* platform/soup/SharedBufferSoup.cpp:
(WebCore::SharedBuffer::SharedBuffer):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (171578 => 171579)

--- trunk/Source/WebCore/ChangeLog	2014-07-25 03:12:26 UTC (rev 171578)
+++ trunk/Source/WebCore/ChangeLog	2014-07-25 04:27:57 UTC (rev 171579)
@@ -1,3 +1,13 @@
+2014-07-24  Pratik Solanki  psola...@apple.com
+
+REGRESSION(r171526): [GTK] Massive crashes.
+https://bugs.webkit.org/show_bug.cgi?id=135283
+
+Unreviewed. GTK build fix after r171526. Initialize m_buffer in SharedBuffer constructor.
+
+* platform/soup/SharedBufferSoup.cpp:
+(WebCore::SharedBuffer::SharedBuffer):
+
 2014-07-24  Tim Horton  timothy_hor...@apple.com
 
 Crashes under scanSelectionForTelephoneNumbers in Range::text() on some sites


Modified: trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp (171578 => 171579)

--- trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp	2014-07-25 03:12:26 UTC (rev 171578)
+++ trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp	2014-07-25 04:27:57 UTC (rev 171579)
@@ -29,6 +29,7 @@
 
 SharedBuffer::SharedBuffer(SoupBuffer* soupBuffer)
 : m_size(0)
+, m_buffer(adoptRef(new DataBuffer))
 , m_soupBuffer(soupBuffer)
 {
 ASSERT(soupBuffer);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [171497] trunk/Source/WebCore

[psolanki]

Title: [171497] trunk/Source/WebCore








Revision 171497
Author psola...@apple.com
Date 2014-07-23 17:08:10 -0700 (Wed, 23 Jul 2014)


Log Message
Get rid of SharedBuffer::NSDataRetainPtrWithoutImplicitConversionOperator
https://bugs.webkit.org/show_bug.cgi?id=135219

Reviewed by Anders Carlsson.

No new tests because no functional changes.

* loader/ResourceBuffer.h:
* loader/mac/ResourceBuffer.mm:
(WebCore::ResourceBuffer::createNSData):
* platform/SharedBuffer.h:
(WebCore::SharedBuffer::NSDataRetainPtrWithoutImplicitConversionOperator::NSDataRetainPtrWithoutImplicitConversionOperator): Deleted.
* platform/mac/SharedBufferMac.mm:
(WebCore::SharedBuffer::createNSData):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/ResourceBuffer.h
trunk/Source/WebCore/loader/mac/ResourceBuffer.mm
trunk/Source/WebCore/platform/SharedBuffer.h
trunk/Source/WebCore/platform/mac/SharedBufferMac.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (171496 => 171497)

--- trunk/Source/WebCore/ChangeLog	2014-07-23 23:20:22 UTC (rev 171496)
+++ trunk/Source/WebCore/ChangeLog	2014-07-24 00:08:10 UTC (rev 171497)
@@ -1,3 +1,20 @@
+2014-07-23  Pratik Solanki  psola...@apple.com
+
+Get rid of SharedBuffer::NSDataRetainPtrWithoutImplicitConversionOperator
+https://bugs.webkit.org/show_bug.cgi?id=135219
+
+Reviewed by Anders Carlsson.
+
+No new tests because no functional changes.
+
+* loader/ResourceBuffer.h:
+* loader/mac/ResourceBuffer.mm:
+(WebCore::ResourceBuffer::createNSData):
+* platform/SharedBuffer.h:
+(WebCore::SharedBuffer::NSDataRetainPtrWithoutImplicitConversionOperator::NSDataRetainPtrWithoutImplicitConversionOperator): Deleted.
+* platform/mac/SharedBufferMac.mm:
+(WebCore::SharedBuffer::createNSData):
+
 2014-07-23  Zalan Bujtas  za...@apple.com
 
 Subpixel rendering: Cleanup RenderLayerCompositor::deviceScaleFactor()


Modified: trunk/Source/WebCore/loader/ResourceBuffer.h (171496 => 171497)

--- trunk/Source/WebCore/loader/ResourceBuffer.h	2014-07-23 23:20:22 UTC (rev 171496)
+++ trunk/Source/WebCore/loader/ResourceBuffer.h	2014-07-24 00:08:10 UTC (rev 171497)
@@ -81,7 +81,7 @@
 PassOwnPtrPurgeableBuffer releasePurgeableBuffer();
 
 #if USE(FOUNDATION)
-SharedBuffer::NSDataRetainPtrWithoutImplicitConversionOperator createNSData();
+RetainPtrNSData createNSData();
 #endif
 #if USE(CF)
 RetainPtrCFDataRef createCFData();


Modified: trunk/Source/WebCore/loader/mac/ResourceBuffer.mm (171496 => 171497)

--- trunk/Source/WebCore/loader/mac/ResourceBuffer.mm	2014-07-23 23:20:22 UTC (rev 171496)
+++ trunk/Source/WebCore/loader/mac/ResourceBuffer.mm	2014-07-24 00:08:10 UTC (rev 171497)
@@ -28,7 +28,7 @@
 
 namespace WebCore {
 
-SharedBuffer::NSDataRetainPtrWithoutImplicitConversionOperator ResourceBuffer::createNSData()
+RetainPtrNSData ResourceBuffer::createNSData()
 {
 return m_sharedBuffer-createNSData();
 }


Modified: trunk/Source/WebCore/platform/SharedBuffer.h (171496 => 171497)

--- trunk/Source/WebCore/platform/SharedBuffer.h	2014-07-23 23:20:22 UTC (rev 171496)
+++ trunk/Source/WebCore/platform/SharedBuffer.h	2014-07-24 00:08:10 UTC (rev 171497)
@@ -68,23 +68,7 @@
 ~SharedBuffer();
 
 #if USE(FOUNDATION)
-// FIXME: This class exists as a temporary workaround so that code that does:
-// [buffer-createNSData() autorelease] will fail to compile.
-// Once both Mac and iOS builds with this change we can change the return type to be RetainPtrNSData,
-// since we're mostly worried about existing code breaking (it's unlikely that we'd use retain/release together
-// with RetainPtr in new code.
-class NSDataRetainPtrWithoutImplicitConversionOperator : public RetainPtrNSData* {
-public:
-templatetypename T
-NSDataRetainPtrWithoutImplicitConversionOperator(RetainPtrT* other)
-: RetainPtrNSData*(WTF::move(other))
-{
-}
-
-explicit operator PtrType() = delete;
-};
-
-NSDataRetainPtrWithoutImplicitConversionOperator createNSData();
+RetainPtrNSData createNSData();
 static PassRefPtrSharedBuffer wrapNSData(NSData *data);
 #endif
 #if USE(CF)


Modified: trunk/Source/WebCore/platform/mac/SharedBufferMac.mm (171496 => 171497)

--- trunk/Source/WebCore/platform/mac/SharedBufferMac.mm	2014-07-23 23:20:22 UTC (rev 171496)
+++ trunk/Source/WebCore/platform/mac/SharedBufferMac.mm	2014-07-24 00:08:10 UTC (rev 171497)
@@ -96,8 +96,8 @@
 return adoptRef(new SharedBuffer((CFDataRef)nsData));
 }
 
-SharedBuffer::NSDataRetainPtrWithoutImplicitConversionOperator SharedBuffer::createNSData()
-{
+RetainPtrNSData SharedBuffer::createNSData()
+{
 return adoptNS([[WebCoreSharedBufferData alloc] initWithSharedBuffer:this]);
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org

[webkit-changes] [171338] trunk/Source/WebKit/mac

[psolanki]

Title: [171338] trunk/Source/WebKit/mac








Revision 171338
Author psola...@apple.com
Date 2014-07-21 23:12:13 -0700 (Mon, 21 Jul 2014)


Log Message
Unreviewed iOS build fix after r171321.

* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):

Modified Paths

trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebView.mm




Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (171337 => 171338)

--- trunk/Source/WebKit/mac/ChangeLog	2014-07-22 04:35:30 UTC (rev 171337)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-07-22 06:12:13 UTC (rev 171338)
@@ -1,3 +1,10 @@
+2014-07-21  Pratik Solanki  psola...@apple.com
+
+Unreviewed iOS build fix after r171321.
+
+* WebView/WebView.mm:
+(-[WebView _preferencesChanged:]):
+
 2014-07-21  Beth Dakin  bda...@apple.com
 
 WK1 should always setAcceleratedCompositingForFixedPositionEnabled(true) on 


Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (171337 => 171338)

--- trunk/Source/WebKit/mac/WebView/WebView.mm	2014-07-22 04:35:30 UTC (rev 171337)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2014-07-22 06:12:13 UTC (rev 171338)
@@ -2298,7 +2298,7 @@
 settings.setPlugInSnapshottingEnabled([preferences plugInSnapshottingEnabled]);
 
 settings.setFixedPositionCreatesStackingContext(true);
-#if __MAC_OS_X_VERSION_MIN_REQUIRED = 10100
+#if PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 10100
 settings.setAcceleratedCompositingForFixedPositionEnabled(true);
 #endif
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [171289] trunk/Source/WebCore

[psolanki]

Title: [171289] trunk/Source/WebCore








Revision 171289
Author psola...@apple.com
Date 2014-07-20 21:30:19 -0700 (Sun, 20 Jul 2014)


Log Message
Reduce the chances of a race condition when sharing SharedBuffer
https://bugs.webkit.org/show_bug.cgi?id=135060
rdar://problem/17729444

Reviewed by Darin Adler.

We currently pass a SharedBuffer wrapped in WebCoreSharedBufferData to ImageIO for image
decoding. This is not thread safe since ImageIO will access this buffer on a separate
thread. We access SharedBuffer::buffer() on the other thread which resizes the Vector
m_buffer if m_size is greater than the vector size. Since the code in SharedBuffer::append()
sets m_size before appending the data to the buffer, m_size is out of sync with the m_buffer
size for the entire duration of the Vector append which could be doing a lot of copying if
the resource is large. While this change does not fix the race condition, we can at least
reduce the chances of SharedBuffer::buffer() calling resize() by setting m_size after the
cector has finished appending.

No new tests because no functional changes.

* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::append):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/SharedBuffer.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (171288 => 171289)

--- trunk/Source/WebCore/ChangeLog	2014-07-21 03:08:25 UTC (rev 171288)
+++ trunk/Source/WebCore/ChangeLog	2014-07-21 04:30:19 UTC (rev 171289)
@@ -1,3 +1,26 @@
+2014-07-20  Pratik Solanki  psola...@apple.com
+
+Reduce the chances of a race condition when sharing SharedBuffer
+https://bugs.webkit.org/show_bug.cgi?id=135060
+rdar://problem/17729444
+
+Reviewed by Darin Adler.
+
+We currently pass a SharedBuffer wrapped in WebCoreSharedBufferData to ImageIO for image
+decoding. This is not thread safe since ImageIO will access this buffer on a separate
+thread. We access SharedBuffer::buffer() on the other thread which resizes the Vector
+m_buffer if m_size is greater than the vector size. Since the code in SharedBuffer::append()
+sets m_size before appending the data to the buffer, m_size is out of sync with the m_buffer
+size for the entire duration of the Vector append which could be doing a lot of copying if
+the resource is large. While this change does not fix the race condition, we can at least
+reduce the chances of SharedBuffer::buffer() calling resize() by setting m_size after the
+cector has finished appending.
+
+No new tests because no functional changes.
+
+* platform/SharedBuffer.cpp:
+(WebCore::SharedBuffer::append):
+
 2014-07-20  Jeremy Jones  jere...@apple.com
 
 Disable ff/rw based on canPlayFastForward and canPlayFastRewind.


Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (171288 => 171289)

--- trunk/Source/WebCore/platform/SharedBuffer.cpp	2014-07-21 03:08:25 UTC (rev 171288)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp	2014-07-21 04:30:19 UTC (rev 171289)
@@ -356,10 +356,10 @@
 bytesToCopy = std::min(length, segmentSize);
 }
 #else
-m_size += length;
 if (m_buffer.isEmpty())
 m_buffer.reserveInitialCapacity(length);
 m_buffer.append(data, length);
+m_size += length;
 #endif
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [170958] trunk/Source/WebKit2

[psolanki]

Title: [170958] trunk/Source/WebKit2








Revision 170958
Author psola...@apple.com
Date 2014-07-09 23:14:35 -0700 (Wed, 09 Jul 2014)


Log Message
Buffer CSS and JS resources in network process before sending over to web process
https://bugs.webkit.org/show_bug.cgi?id=134560
rdar://problem/16737186

Reviewed by Antti Koivisto.

For CSS and JS resources, ask the network process to buffer the entire resource instead of
sending it to web process in chunks since the web process can't do anything with a partial
css or js file.

* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::NetworkResourceLoader):
* Shared/Network/NetworkResourceLoadParameters.cpp:
(WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters):
(WebKit::NetworkResourceLoadParameters::encode):
(WebKit::NetworkResourceLoadParameters::decode):
* Shared/Network/NetworkResourceLoadParameters.h:
* WebProcess/Network/WebResourceLoadScheduler.cpp:
(WebKit::WebResourceLoadScheduler::scheduleLoad):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp
trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h
trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170957 => 170958)

--- trunk/Source/WebKit2/ChangeLog	2014-07-10 06:08:58 UTC (rev 170957)
+++ trunk/Source/WebKit2/ChangeLog	2014-07-10 06:14:35 UTC (rev 170958)
@@ -1,3 +1,25 @@
+2014-07-09  Pratik Solanki  psola...@apple.com
+
+Buffer CSS and JS resources in network process before sending over to web process
+https://bugs.webkit.org/show_bug.cgi?id=134560
+rdar://problem/16737186
+
+Reviewed by Antti Koivisto.
+
+For CSS and JS resources, ask the network process to buffer the entire resource instead of
+sending it to web process in chunks since the web process can't do anything with a partial
+css or js file.
+
+* NetworkProcess/NetworkResourceLoader.cpp:
+(WebKit::NetworkResourceLoader::NetworkResourceLoader):
+* Shared/Network/NetworkResourceLoadParameters.cpp:
+(WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters):
+(WebKit::NetworkResourceLoadParameters::encode):
+(WebKit::NetworkResourceLoadParameters::decode):
+* Shared/Network/NetworkResourceLoadParameters.h:
+* WebProcess/Network/WebResourceLoadScheduler.cpp:
+(WebKit::WebResourceLoadScheduler::scheduleLoad):
+
 2014-07-09  Benjamin Poulain  bpoul...@apple.com
 
 [iOS][WK2] Disable text quantization while actively changing the page's scale factor


Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (170957 => 170958)

--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2014-07-10 06:08:58 UTC (rev 170957)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2014-07-10 06:14:35 UTC (rev 170958)
@@ -99,10 +99,12 @@
 
 ASSERT(RunLoop::isMain());
 
-if (reply) {
+if (reply || parameters.shouldBufferResource)
+m_bufferedData = WebCore::SharedBuffer::create();
+
+if (reply)
 m_networkLoaderClient = std::make_uniqueSynchronousNetworkLoaderClient(m_request, reply);
-m_bufferedData = WebCore::SharedBuffer::create();
-} else
+else
 m_networkLoaderClient = std::make_uniqueAsynchronousNetworkLoaderClient();
 }
 


Modified: trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp (170957 => 170958)

--- trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp	2014-07-10 06:08:58 UTC (rev 170957)
+++ trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp	2014-07-10 06:14:35 UTC (rev 170958)
@@ -48,6 +48,7 @@
 , shouldClearReferrerOnHTTPSToHTTPRedirect(true)
 , isMainResource(false)
 , defersLoading(false)
+, shouldBufferResource(false)
 {
 }
 
@@ -96,6 +97,7 @@
 encoder  shouldClearReferrerOnHTTPSToHTTPRedirect;
 encoder  isMainResource;
 encoder  defersLoading;
+encoder  shouldBufferResource;
 }
 
 bool NetworkResourceLoadParameters::decode(IPC::ArgumentDecoder decoder, NetworkResourceLoadParameters result)
@@ -148,6 +150,8 @@
 return false;
 if (!decoder.decode(result.defersLoading))
 return false;
+if (!decoder.decode(result.shouldBufferResource))
+return false;
 
 return true;
 }


Modified: trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h (170957 => 170958)

--- trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h	2014-07-10 06:08:58 UTC (rev 170957)
+++ trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h	2014-07-10 06:14:35 UTC (rev 170958)
@@ -64,6 +64,7 @@
 bool shouldClearReferrerOnHTTPSToHTTPRedirect;
 bool isMainResource;
 bool defersLoading;
+bool shouldBufferResource;
 

[webkit-changes] [170975] trunk/Source/WebCore

[psolanki]

Title: [170975] trunk/Source/WebCore








Revision 170975
Author psola...@apple.com
Date 2014-07-10 13:48:44 -0700 (Thu, 10 Jul 2014)


Log Message
ASSERT in SharedBuffer::maybeAppendDataArray() on MobileSafari launch
https://bugs.webkit.org/show_bug.cgi?id=134812
rdar://problem/17628434

Reviewed by Joseph Pecoraro.

Fix bug in my fix in r170930. Initialize the badly named m_shouldUsePurgeableMemory field to
false. This field indicates when it is okay to use purgeable memory and is set to true once
the resource is finished loading. By setting it to true in the constructor we were creating
purgeable memory while the resource was still being loaded and this triggered the assert.

No new tests. Should be covered by existing tests.

* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::SharedBuffer):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (170974 => 170975)

--- trunk/Source/WebCore/ChangeLog	2014-07-10 20:33:05 UTC (rev 170974)
+++ trunk/Source/WebCore/ChangeLog	2014-07-10 20:48:44 UTC (rev 170975)
@@ -1,3 +1,21 @@
+2014-07-10  Pratik Solanki  psola...@apple.com
+
+ASSERT in SharedBuffer::maybeAppendDataArray() on MobileSafari launch
+https://bugs.webkit.org/show_bug.cgi?id=134812
+rdar://problem/17628434
+
+Reviewed by Joseph Pecoraro.
+
+Fix bug in my fix in r170930. Initialize the badly named m_shouldUsePurgeableMemory field to
+false. This field indicates when it is okay to use purgeable memory and is set to true once
+the resource is finished loading. By setting it to true in the constructor we were creating
+purgeable memory while the resource was still being loaded and this triggered the assert.
+
+No new tests. Should be covered by existing tests.
+
+* platform/cf/SharedBufferCF.cpp:
+(WebCore::SharedBuffer::SharedBuffer):
+
 2014-07-10  Andreas Kling  akl...@apple.com
 
 [iOS WebKit2] Some memory pressure relief tweaks.


Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (170974 => 170975)

--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp	2014-07-10 20:33:05 UTC (rev 170974)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp	2014-07-10 20:48:44 UTC (rev 170975)
@@ -128,7 +128,7 @@
 
 SharedBuffer::SharedBuffer(CFArrayRef cfDataArray)
 : m_size(0)
-, m_shouldUsePurgeableMemory(true)
+, m_shouldUsePurgeableMemory(false)
 #if ENABLE(DISK_IMAGE_CACHE)
 , m_isMemoryMapped(false)
 , m_diskImageCacheId(DiskImageCache::invalidDiskCacheId)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [170977] trunk/Source/WebKit2

[psolanki]

Title: [170977] trunk/Source/WebKit2








Revision 170977
Author psola...@apple.com
Date 2014-07-10 14:35:52 -0700 (Thu, 10 Jul 2014)


Log Message
Unreviewed iOS build fix after r170974. Define id if building a non ObjC file.

* UIProcess/mac/ViewSnapshotStore.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170976 => 170977)

--- trunk/Source/WebKit2/ChangeLog	2014-07-10 21:28:05 UTC (rev 170976)
+++ trunk/Source/WebKit2/ChangeLog	2014-07-10 21:35:52 UTC (rev 170977)
@@ -1,3 +1,9 @@
+2014-07-10  Pratik Solanki  psola...@apple.com
+
+Unreviewed iOS build fix after r170974. Define id if building a non ObjC file.
+
+* UIProcess/mac/ViewSnapshotStore.h:
+
 2014-07-10  Tim Horton  timothy_hor...@apple.com
 
 Store ViewSnapshots directly on the WebBackForwardListItem


Modified: trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h (170976 => 170977)

--- trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h	2014-07-10 21:28:05 UTC (rev 170976)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h	2014-07-10 21:35:52 UTC (rev 170977)
@@ -35,6 +35,10 @@
 #include wtf/RetainPtr.h
 #include wtf/text/WTFString.h
 
+#if !defined(__OBJC__)
+typedef struct objc_object *id;
+#endif
+
 OBJC_CLASS CAContext;
 
 #if PLATFORM(MAC)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [170928] trunk/Source

[psolanki]

Title: [170928] trunk/Source








Revision 170928
Author psola...@apple.com
Date 2014-07-09 13:55:35 -0700 (Wed, 09 Jul 2014)


Log Message
Move resource buffering from SynchronousNetworkLoaderClient to NetworkResourceLoader
https://bugs.webkit.org/show_bug.cgi?id=134732

Reviewed by Darin Adler.

Source/WebCore:
No new tests because no functional changes.

* WebCore.exp.in:

Source/WebKit2:
Buffer the resource in NetworkResourceLoader instead of SynchronousNetworkLoaderClient. This
is in preparation for bug 134560 where we will be supporting JS and CSS resource buffering
that uses AsynchronousNetworkLoaderClient.

* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::NetworkResourceLoader):
(WebKit::NetworkResourceLoader::didReceiveBuffer):
(WebKit::NetworkResourceLoader::didFinishLoading):
* NetworkProcess/NetworkResourceLoader.h:
(WebKit::NetworkResourceLoader::bufferedData):
* NetworkProcess/SynchronousNetworkLoaderClient.cpp:
(WebKit::SynchronousNetworkLoaderClient::didReceiveBuffer):
(WebKit::SynchronousNetworkLoaderClient::didFinishLoading):
(WebKit::SynchronousNetworkLoaderClient::didFail):
(WebKit::SynchronousNetworkLoaderClient::sendDelayedReply):
* NetworkProcess/SynchronousNetworkLoaderClient.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h
trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp
trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (170927 => 170928)

--- trunk/Source/WebCore/ChangeLog	2014-07-09 20:52:35 UTC (rev 170927)
+++ trunk/Source/WebCore/ChangeLog	2014-07-09 20:55:35 UTC (rev 170928)
@@ -1,3 +1,14 @@
+2014-07-09  Pratik Solanki  psola...@apple.com
+
+Move resource buffering from SynchronousNetworkLoaderClient to NetworkResourceLoader
+https://bugs.webkit.org/show_bug.cgi?id=134732
+
+Reviewed by Darin Adler.
+
+No new tests because no functional changes.
+
+* WebCore.exp.in:
+
 2014-07-09  Tim Horton  timothy_hor...@apple.com
 
 Fix the !USE(IOSURFACE) build.


Modified: trunk/Source/WebCore/WebCore.exp.in (170927 => 170928)

--- trunk/Source/WebCore/WebCore.exp.in	2014-07-09 20:52:35 UTC (rev 170927)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-07-09 20:55:35 UTC (rev 170928)
@@ -244,6 +244,7 @@
 __ZN7WebCore12SharedBuffer12createNSDataEv
 __ZN7WebCore12SharedBuffer24createWithContentsOfFileERKN3WTF6StringE
 __ZN7WebCore12SharedBuffer6appendEPKcj
+__ZN7WebCore12SharedBuffer6appendEPS0_
 __ZN7WebCore12SharedBufferC1EPKcj
 __ZN7WebCore12SharedBufferC1EPKhj
 __ZN7WebCore12SharedBufferC1Ev


Modified: trunk/Source/WebKit2/ChangeLog (170927 => 170928)

--- trunk/Source/WebKit2/ChangeLog	2014-07-09 20:52:35 UTC (rev 170927)
+++ trunk/Source/WebKit2/ChangeLog	2014-07-09 20:55:35 UTC (rev 170928)
@@ -1,3 +1,27 @@
+2014-07-09  Pratik Solanki  psola...@apple.com
+
+Move resource buffering from SynchronousNetworkLoaderClient to NetworkResourceLoader
+https://bugs.webkit.org/show_bug.cgi?id=134732
+
+Reviewed by Darin Adler.
+
+Buffer the resource in NetworkResourceLoader instead of SynchronousNetworkLoaderClient. This
+is in preparation for bug 134560 where we will be supporting JS and CSS resource buffering
+that uses AsynchronousNetworkLoaderClient.
+
+* NetworkProcess/NetworkResourceLoader.cpp:
+(WebKit::NetworkResourceLoader::NetworkResourceLoader):
+(WebKit::NetworkResourceLoader::didReceiveBuffer):
+(WebKit::NetworkResourceLoader::didFinishLoading):
+* NetworkProcess/NetworkResourceLoader.h:
+(WebKit::NetworkResourceLoader::bufferedData):
+* NetworkProcess/SynchronousNetworkLoaderClient.cpp:
+(WebKit::SynchronousNetworkLoaderClient::didReceiveBuffer):
+(WebKit::SynchronousNetworkLoaderClient::didFinishLoading):
+(WebKit::SynchronousNetworkLoaderClient::didFail):
+(WebKit::SynchronousNetworkLoaderClient::sendDelayedReply):
+* NetworkProcess/SynchronousNetworkLoaderClient.h:
+
 2014-07-09  Benjamin Poulain  bpoul...@apple.com
 
 [iOS][WK2] subviews of the unscaled view drift out during CA animations


Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (170927 => 170928)

--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2014-07-09 20:52:35 UTC (rev 170927)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2014-07-09 20:55:35 UTC (rev 170928)
@@ -99,9 +99,10 @@
 
 ASSERT(RunLoop::isMain());
 
-if (reply)
+if (reply) {
 m_networkLoaderClient = std::make_uniqueSynchronousNetworkLoaderClient(m_request, reply);
-else
+m_bufferedData = WebCore::SharedBuffer::create();
+} else
 

[webkit-changes] [170930] trunk/Source/WebCore

[psolanki]

Title: [170930] trunk/Source/WebCore








Revision 170930
Author psola...@apple.com
Date 2014-07-09 14:19:47 -0700 (Wed, 09 Jul 2014)


Log Message
Add SharedBuffer::wrapCFDataArray() and use it
https://bugs.webkit.org/show_bug.cgi?id=134733

Reviewed by Antti Koivisto.

No new tests. Should be covered by existing tests.

* platform/SharedBuffer.h:
* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::wrapCFDataArray):
(WebCore::SharedBuffer::SharedBuffer):
* platform/network/ResourceHandle.h:
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::handleDataArray): Deleted.
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveDataArray):
* platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
(WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveDataArray):
* platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
(-[WebCoreResourceHandleAsDelegate connection:didReceiveDataArray:]):
* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveDataArray:]):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/SharedBuffer.h
trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp
trunk/Source/WebCore/platform/network/ResourceHandle.h
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm
trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (170929 => 170930)

--- trunk/Source/WebCore/ChangeLog	2014-07-09 21:16:17 UTC (rev 170929)
+++ trunk/Source/WebCore/ChangeLog	2014-07-09 21:19:47 UTC (rev 170930)
@@ -1,5 +1,30 @@
 2014-07-09  Pratik Solanki  psola...@apple.com
 
+Add SharedBuffer::wrapCFDataArray() and use it
+https://bugs.webkit.org/show_bug.cgi?id=134733
+
+Reviewed by Antti Koivisto.
+
+No new tests. Should be covered by existing tests.
+
+* platform/SharedBuffer.h:
+* platform/cf/SharedBufferCF.cpp:
+(WebCore::SharedBuffer::wrapCFDataArray):
+(WebCore::SharedBuffer::SharedBuffer):
+* platform/network/ResourceHandle.h:
+* platform/network/cf/ResourceHandleCFNet.cpp:
+(WebCore::ResourceHandle::handleDataArray): Deleted.
+* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
+(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveDataArray):
+* platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
+(WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveDataArray):
+* platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
+(-[WebCoreResourceHandleAsDelegate connection:didReceiveDataArray:]):
+* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
+(-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveDataArray:]):
+
+2014-07-09  Pratik Solanki  psola...@apple.com
+
 Move resource buffering from SynchronousNetworkLoaderClient to NetworkResourceLoader
 https://bugs.webkit.org/show_bug.cgi?id=134732
 


Modified: trunk/Source/WebCore/platform/SharedBuffer.h (170929 => 170930)

--- trunk/Source/WebCore/platform/SharedBuffer.h	2014-07-09 21:16:17 UTC (rev 170929)
+++ trunk/Source/WebCore/platform/SharedBuffer.h	2014-07-09 21:19:47 UTC (rev 170930)
@@ -118,6 +118,7 @@
 unsigned platformDataSize() const;
 
 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
+static PassRefPtrSharedBuffer wrapCFDataArray(CFArrayRef);
 void append(CFDataRef);
 #endif
 
@@ -196,6 +197,7 @@
 bool m_shouldUsePurgeableMemory;
 mutable OwnPtrPurgeableBuffer m_purgeableBuffer;
 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
+explicit SharedBuffer(CFArrayRef);
 mutable VectorRetainPtrCFDataRef m_dataArray;
 unsigned copySomeDataFromDataArray(const char* someData, unsigned position) const;
 const char *singleDataArrayBuffer() const;


Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (170929 => 170930)

--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp	2014-07-09 21:16:17 UTC (rev 170929)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp	2014-07-09 21:19:47 UTC (rev 170930)
@@ -29,6 +29,7 @@
 #include SharedBuffer.h
 
 #include PurgeableBuffer.h
+#include wtf/cf/TypeCasts.h
 
 #if ENABLE(DISK_IMAGE_CACHE)
 #include DiskImageCacheIOS.h
@@ -112,6 +113,27 @@
 }
 
 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
+PassRefPtrSharedBuffer SharedBuffer::wrapCFDataArray(CFArrayRef cfDataArray)
+{
+   

[webkit-changes] [170938] trunk/Source/WebCore

[psolanki]

Title: [170938] trunk/Source/WebCore








Revision 170938
Author psola...@apple.com
Date 2014-07-09 17:18:17 -0700 (Wed, 09 Jul 2014)


Log Message
Make SharedBuffer::append(SharedBuffer*) be smarter about CFData and data arrays
https://bugs.webkit.org/show_bug.cgi?id=134731

Reviewed by Antti Koivisto.

If the target SharedBuffer has a CFDataRef or a data array then we can simply retain that
CFDataRef or data array elements in the SharedBuffer being appended to. This avoids
unnecessary copying.

No new tests because no functional changes.

* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::append):
(WebCore::SharedBuffer::maybeAppendPlatformData):
* platform/SharedBuffer.h:
* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::maybeAppendPlatformData):
(WebCore::SharedBuffer::maybeAppendDataArray):
* platform/soup/SharedBufferSoup.cpp:
(WebCore::SharedBuffer::maybeAppendPlatformData):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/SharedBuffer.cpp
trunk/Source/WebCore/platform/SharedBuffer.h
trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp
trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (170937 => 170938)

--- trunk/Source/WebCore/ChangeLog	2014-07-09 23:48:26 UTC (rev 170937)
+++ trunk/Source/WebCore/ChangeLog	2014-07-10 00:18:17 UTC (rev 170938)
@@ -1,3 +1,26 @@
+2014-07-09  Pratik Solanki  psola...@apple.com
+
+Make SharedBuffer::append(SharedBuffer*) be smarter about CFData and data arrays
+https://bugs.webkit.org/show_bug.cgi?id=134731
+
+Reviewed by Antti Koivisto.
+
+If the target SharedBuffer has a CFDataRef or a data array then we can simply retain that
+CFDataRef or data array elements in the SharedBuffer being appended to. This avoids
+unnecessary copying.
+
+No new tests because no functional changes.
+
+* platform/SharedBuffer.cpp:
+(WebCore::SharedBuffer::append):
+(WebCore::SharedBuffer::maybeAppendPlatformData):
+* platform/SharedBuffer.h:
+* platform/cf/SharedBufferCF.cpp:
+(WebCore::SharedBuffer::maybeAppendPlatformData):
+(WebCore::SharedBuffer::maybeAppendDataArray):
+* platform/soup/SharedBufferSoup.cpp:
+(WebCore::SharedBuffer::maybeAppendPlatformData):
+
 2014-07-09  Brent Fulgham  bfulg...@apple.com
 
 [Win] Remove uses of 'bash' in build system


Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (170937 => 170938)

--- trunk/Source/WebCore/platform/SharedBuffer.cpp	2014-07-09 23:48:26 UTC (rev 170937)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp	2014-07-10 00:18:17 UTC (rev 170938)
@@ -296,6 +296,13 @@
 
 void SharedBuffer::append(SharedBuffer* data)
 {
+if (maybeAppendPlatformData(data))
+return;
+#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
+if (maybeAppendDataArray(data))
+return;
+#endif
+
 const char* segment;
 size_t position = 0;
 while (size_t length = data-getSomeData(segment, position)) {
@@ -512,6 +519,11 @@
 return 0;
 }
 
+inline bool SharedBuffer::maybeAppendPlatformData(SharedBuffer*)
+{
+return false;
+}
+
 #endif
 
 PassRefPtrSharedBuffer utf8Buffer(const String string)


Modified: trunk/Source/WebCore/platform/SharedBuffer.h (170937 => 170938)

--- trunk/Source/WebCore/platform/SharedBuffer.h	2014-07-09 23:48:26 UTC (rev 170937)
+++ trunk/Source/WebCore/platform/SharedBuffer.h	2014-07-10 00:18:17 UTC (rev 170938)
@@ -189,6 +189,7 @@
 
 void clearPlatformData();
 void maybeTransferPlatformData();
+bool maybeAppendPlatformData(SharedBuffer*);
 
 void copyBufferAndClear(char* destination, unsigned bytesToCopy) const;
 
@@ -201,6 +202,7 @@
 mutable VectorRetainPtrCFDataRef m_dataArray;
 unsigned copySomeDataFromDataArray(const char* someData, unsigned position) const;
 const char *singleDataArrayBuffer() const;
+bool maybeAppendDataArray(SharedBuffer*);
 #else
 mutable Vectorchar* m_segments;
 #endif


Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (170937 => 170938)

--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp	2014-07-09 23:48:26 UTC (rev 170937)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp	2014-07-10 00:18:17 UTC (rev 170938)
@@ -112,6 +112,14 @@
 m_cfData = newContents-m_cfData;
 }
 
+bool SharedBuffer::maybeAppendPlatformData(SharedBuffer* newContents)
+{
+if (size() || !newContents-m_cfData)
+return false;
+m_cfData = newContents-m_cfData;
+return true;
+}
+
 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
 PassRefPtrSharedBuffer SharedBuffer::wrapCFDataArray(CFArrayRef cfDataArray)
 {
@@ -187,6 +195,19 @@
 
 return reinterpret_castconst char*(CFDataGetBytePtr(m_dataArray.at(0).get()));
 }
+
+bool SharedBuffer::maybeAppendDataArray(SharedBuffer* data)
+{
+if (m_buffer.size() || m_cfData || !data-m_dataArray.size())
+return false;
+#if !ASSERT_DISABLED
+unsigned 

[webkit-changes] [170880] trunk/Source/WebCore

[psolanki]

Title: [170880] trunk/Source/WebCore








Revision 170880
Author psola...@apple.com
Date 2014-07-07 22:56:32 -0700 (Mon, 07 Jul 2014)


Log Message
Unreviewed. iOS build fix after r170871.

* rendering/RenderThemeIOS.mm:
(WebCore::adjustInputElementButtonStyle):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderThemeIOS.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (170879 => 170880)

--- trunk/Source/WebCore/ChangeLog	2014-07-08 05:51:06 UTC (rev 170879)
+++ trunk/Source/WebCore/ChangeLog	2014-07-08 05:56:32 UTC (rev 170880)
@@ -1,3 +1,10 @@
+2014-07-07  Pratik Solanki  psola...@apple.com
+
+Unreviewed. iOS build fix after r170871.
+
+* rendering/RenderThemeIOS.mm:
+(WebCore::adjustInputElementButtonStyle):
+
 2014-07-07  Zalan Bujtas  za...@apple.com
 
 Subpixel rendering: icloud.com password arrow has clipped circle at some window sizes.


Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (170879 => 170880)

--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm	2014-07-08 05:51:06 UTC (rev 170879)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm	2014-07-08 05:56:32 UTC (rev 170880)
@@ -588,7 +588,7 @@
 Font font = style.font();
 
 RenderObject* renderer = inputElement.renderer();
-if (font.isSVGFont()  !renderer)
+if (font.primaryFont()-isSVGFont()  !renderer)
 return;
 
 FontCachePurgePreventer fontCachePurgePreventer;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [170762] trunk/Source/WebCore

[psolanki]

Title: [170762] trunk/Source/WebCore








Revision 170762
Author psola...@apple.com
Date 2014-07-03 12:48:21 -0700 (Thu, 03 Jul 2014)


Log Message
Preserve old behavior of creating an NSURLRequest of the exact same type as passed to us
https://bugs.webkit.org/show_bug.cgi?id=134605
rdar://problem/17544641

Reviewed by Andreas Kling.

We have client code that passes us a subclass of NSURLRequest to load resource. Later when
we call willSendRequest, they test to make sure they get an object of the same type. My
optimization in r170642 broke this path when I cleared out the NSURLRequest object. We
already had code in updateNSURLRequest() that was taking this quirk into account but I broke
that. Fix it by reverting to old behavior for such clients.

No new tests though we need one. I will add it later.

* platform/network/cf/ResourceRequest.h:
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::doUpdatePlatformRequest):
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
(WebCore::ResourceRequest::setStorageSession):
* platform/network/ios/ResourceRequestIOS.mm:
(WebCore::ResourceRequest::updateNSURLRequest):
(WebCore::ResourceRequest::clearOrUpdateNSURLRequest):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/cf/ResourceRequest.h
trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
trunk/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (170761 => 170762)

--- trunk/Source/WebCore/ChangeLog	2014-07-03 19:30:28 UTC (rev 170761)
+++ trunk/Source/WebCore/ChangeLog	2014-07-03 19:48:21 UTC (rev 170762)
@@ -1,3 +1,28 @@
+2014-07-03  Pratik Solanki  psola...@apple.com
+
+Preserve old behavior of creating an NSURLRequest of the exact same type as passed to us
+https://bugs.webkit.org/show_bug.cgi?id=134605
+rdar://problem/17544641
+
+Reviewed by Andreas Kling.
+
+We have client code that passes us a subclass of NSURLRequest to load resource. Later when
+we call willSendRequest, they test to make sure they get an object of the same type. My
+optimization in r170642 broke this path when I cleared out the NSURLRequest object. We
+already had code in updateNSURLRequest() that was taking this quirk into account but I broke
+that. Fix it by reverting to old behavior for such clients.
+
+No new tests though we need one. I will add it later.
+
+* platform/network/cf/ResourceRequest.h:
+* platform/network/cf/ResourceRequestCFNet.cpp:
+(WebCore::ResourceRequest::doUpdatePlatformRequest):
+(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+(WebCore::ResourceRequest::setStorageSession):
+* platform/network/ios/ResourceRequestIOS.mm:
+(WebCore::ResourceRequest::updateNSURLRequest):
+(WebCore::ResourceRequest::clearOrUpdateNSURLRequest):
+
 2014-07-02  Anders Carlsson  ander...@apple.com
 
 Stop using EncoderAdapter/DecoderAdapter for FormData


Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (170761 => 170762)

--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h	2014-07-03 19:30:28 UTC (rev 170761)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h	2014-07-03 19:48:21 UTC (rev 170762)
@@ -66,6 +66,7 @@
 #if PLATFORM(COCOA)
 ResourceRequest(NSURLRequest *);
 void updateNSURLRequest();
+void clearOrUpdateNSURLRequest();
 #endif
 
 ResourceRequest(CFURLRequestRef cfRequest)


Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (170761 => 170762)

--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp	2014-07-03 19:30:28 UTC (rev 170761)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp	2014-07-03 19:48:21 UTC (rev 170762)
@@ -196,7 +196,7 @@
 
 m_cfRequest = adoptCF(cfRequest);
 #if PLATFORM(COCOA)
-m_nsRequest = nullptr;
+clearOrUpdateNSURLRequest();
 #endif
 }
 
@@ -231,7 +231,7 @@
 
 m_cfRequest = adoptCF(cfRequest);
 #if PLATFORM(COCOA)
-m_nsRequest = nullptr;
+clearOrUpdateNSURLRequest();
 #endif
 }
 
@@ -343,7 +343,7 @@
 wkSetRequestStorageSession(storageSession, cfRequest);
 m_cfRequest = adoptCF(cfRequest);
 #if PLATFORM(COCOA)
-m_nsRequest = nullptr;
+clearOrUpdateNSURLRequest();
 #endif
 }
 


Modified: trunk/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm (170761 => 170762)

--- trunk/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm	2014-07-03 19:30:28 UTC (rev 170761)
+++ trunk/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm	2014-07-03 19:48:21 UTC (rev 170762)
@@ -52,6 +52,12 @@
 
 void ResourceRequest::updateNSURLRequest()
 {
+if (m_cfRequest)
+m_nsRequest = adoptNS([[NSMutableURLRequest alloc] _initWithCFURLRequest:m_cfRequest.get()]);
+}
+
+void ResourceRequest::clearOrUpdateNSURLRequest()
+{
 // There is 

[webkit-changes] [170642] trunk/Source/WebCore

[psolanki]

Title: [170642] trunk/Source/WebCore








Revision 170642
Author psola...@apple.com
Date 2014-07-01 09:45:03 -0700 (Tue, 01 Jul 2014)


Log Message
Create NSURLRequest lazily when USE(CFNETWORK) is enabled
https://bugs.webkit.org/show_bug.cgi?id=134441

Reviewed by Andreas Kling.

No new tests. Should be covered by existing tests.

* platform/network/cf/ResourceRequest.h:
(WebCore::ResourceRequest::ResourceRequest):
(WebCore::ResourceRequest::encodingRequiresPlatformData):
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::doUpdatePlatformRequest):
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
(WebCore::ResourceRequest::setStorageSession):
* platform/network/cocoa/ResourceRequestCocoa.mm:
(WebCore::ResourceRequest::nsURLRequest):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/cf/ResourceRequest.h
trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (170641 => 170642)

--- trunk/Source/WebCore/ChangeLog	2014-07-01 16:43:03 UTC (rev 170641)
+++ trunk/Source/WebCore/ChangeLog	2014-07-01 16:45:03 UTC (rev 170642)
@@ -1,3 +1,22 @@
+2014-07-01  Pratik Solanki  psola...@apple.com
+
+Create NSURLRequest lazily when USE(CFNETWORK) is enabled
+https://bugs.webkit.org/show_bug.cgi?id=134441
+
+Reviewed by Andreas Kling.
+
+No new tests. Should be covered by existing tests.
+
+* platform/network/cf/ResourceRequest.h:
+(WebCore::ResourceRequest::ResourceRequest):
+(WebCore::ResourceRequest::encodingRequiresPlatformData):
+* platform/network/cf/ResourceRequestCFNet.cpp:
+(WebCore::ResourceRequest::doUpdatePlatformRequest):
+(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+(WebCore::ResourceRequest::setStorageSession):
+* platform/network/cocoa/ResourceRequestCocoa.mm:
+(WebCore::ResourceRequest::nsURLRequest):
+
 2014-07-01  Brady Eidson  beid...@apple.com
 
 Combine the Telephone and Selection overlay controllers, updating UI behavior.


Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (170641 => 170642)

--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h	2014-07-01 16:43:03 UTC (rev 170641)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h	2014-07-01 16:45:03 UTC (rev 170642)
@@ -72,9 +72,6 @@
 : ResourceRequestBase()
 , m_cfRequest(cfRequest)
 {
-#if PLATFORM(COCOA)
-updateNSURLRequest();
-#endif
 }
 #else
 ResourceRequest(NSURLRequest *nsRequest)
@@ -90,7 +87,11 @@
 void applyWebArchiveHackForMail();
 #endif
 #if PLATFORM(COCOA)
+#if USE(CFNETWORK)
+bool encodingRequiresPlatformData() const { return m_httpBody || m_cfRequest; }
+#else
 bool encodingRequiresPlatformData() const { return m_httpBody || m_nsRequest; }
+#endif
 NSURLRequest *nsURLRequest(HTTPBodyUpdatePolicy) const;
 #endif
 


Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (170641 => 170642)

--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp	2014-07-01 16:43:03 UTC (rev 170641)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp	2014-07-01 16:45:03 UTC (rev 170642)
@@ -196,7 +196,7 @@
 
 m_cfRequest = adoptCF(cfRequest);
 #if PLATFORM(COCOA)
-updateNSURLRequest();
+m_nsRequest = nullptr;
 #endif
 }
 
@@ -231,7 +231,7 @@
 
 m_cfRequest = adoptCF(cfRequest);
 #if PLATFORM(COCOA)
-updateNSURLRequest();
+m_nsRequest = nullptr;
 #endif
 }
 
@@ -343,7 +343,7 @@
 wkSetRequestStorageSession(storageSession, cfRequest);
 m_cfRequest = adoptCF(cfRequest);
 #if PLATFORM(COCOA)
-updateNSURLRequest();
+m_nsRequest = nullptr;
 #endif
 }
 


Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (170641 => 170642)

--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm	2014-07-01 16:43:03 UTC (rev 170641)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm	2014-07-01 16:45:03 UTC (rev 170642)
@@ -53,6 +53,10 @@
 NSURLRequest *ResourceRequest::nsURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const
 {
 updatePlatformRequest(bodyPolicy);
+#if USE(CFNETWORK)
+if (!m_nsRequest)
+const_castResourceRequest*(this)-updateNSURLRequest();
+#endif
 return [[m_nsRequest.get() retain] autorelease];
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [170647] trunk/Tools

[psolanki]

Title: [170647] trunk/Tools








Revision 170647
Author psola...@apple.com
Date 2014-07-01 10:29:15 -0700 (Tue, 01 Jul 2014)


Log Message
Unreviewed. Adding myself to the reviewers list to make commit bot happy.

* Scripts/webkitpy/common/config/contributors.json:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/contributors.json




Diff

Modified: trunk/Tools/ChangeLog (170646 => 170647)

--- trunk/Tools/ChangeLog	2014-07-01 17:25:10 UTC (rev 170646)
+++ trunk/Tools/ChangeLog	2014-07-01 17:29:15 UTC (rev 170647)
@@ -1,3 +1,9 @@
+2014-07-01  Pratik Solanki  psola...@apple.com
+
+Unreviewed. Adding myself to the reviewers list to make commit bot happy.
+
+* Scripts/webkitpy/common/config/contributors.json:
+
 2014-07-01  Youenn Fablet  youenn.fab...@crf.canon.fr
 
 webkit-patch apply-from-bug / apply-attachment should not ask for credentials if none are required


Modified: trunk/Tools/Scripts/webkitpy/common/config/contributors.json (170646 => 170647)

--- trunk/Tools/Scripts/webkitpy/common/config/contributors.json	2014-07-01 17:25:10 UTC (rev 170646)
+++ trunk/Tools/Scripts/webkitpy/common/config/contributors.json	2014-07-01 17:29:15 UTC (rev 170647)
@@ -2142,14 +2142,6 @@
 pol
  ]
   },
-  Pratik Solanki : {
- emails : [
-psola...@apple.com
- ],
- nicks : [
-    psolanki
- ]
-  },
   Pravin D : {
  emails : [
 prav...@webkit.org,
@@ -4364,6 +4356,14 @@
 philn
  ]
   },
+  Pratik Solanki : {
+ emails : [
+psola...@apple.com
+ ],
+ nicks : [
+    psolanki
+ ]
+  },
   Richard Williamson : {
  emails : [
 r...@apple.com






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [170685] trunk

[psolanki]

Title: [170685] trunk








Revision 170685
Author psola...@apple.com
Date 2014-07-01 17:57:52 -0700 (Tue, 01 Jul 2014)


Log Message
Encode/decode CFURLRequestRefs when USE(CFNETWORK) is enabled
https://bugs.webkit.org/show_bug.cgi?id=134454
rdar://problem/17510980

Reviewed by Andreas Kling.

Source/WebKit2:
Use new helper methods to serialize/deserialize CFURLRequestRef directly so we can avoid
creating NSURLRequest.

* Shared/mac/WebCoreArgumentCodersMac.mm:
(IPC::ArgumentCoderResourceRequest::encodePlatformData):
(IPC::ArgumentCoderResourceRequest::decodePlatformData):

WebKitLibraries:
* WebKitSystemInterface.h:
* libWebKitSystemInterfaceMavericks.a:
* libWebKitSystemInterfaceMountainLion.a:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
trunk/WebKitLibraries/ChangeLog
trunk/WebKitLibraries/WebKitSystemInterface.h
trunk/WebKitLibraries/libWebKitSystemInterfaceMavericks.a
trunk/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170684 => 170685)

--- trunk/Source/WebKit2/ChangeLog	2014-07-02 00:49:13 UTC (rev 170684)
+++ trunk/Source/WebKit2/ChangeLog	2014-07-02 00:57:52 UTC (rev 170685)
@@ -1,3 +1,18 @@
+2014-07-01  Pratik Solanki  psola...@apple.com
+
+Encode/decode CFURLRequestRefs when USE(CFNETWORK) is enabled
+https://bugs.webkit.org/show_bug.cgi?id=134454
+rdar://problem/17510980
+
+Reviewed by Andreas Kling.
+
+Use new helper methods to serialize/deserialize CFURLRequestRef directly so we can avoid
+creating NSURLRequest.
+
+* Shared/mac/WebCoreArgumentCodersMac.mm:
+(IPC::ArgumentCoderResourceRequest::encodePlatformData):
+(IPC::ArgumentCoderResourceRequest::decodePlatformData):
+
 2014-07-01  Benjamin Poulain  benja...@webkit.org
 
 [iOS][WK2] Fix a race between the short tap and long tap highlight


Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (170684 => 170685)

--- trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm	2014-07-02 00:49:13 UTC (rev 170684)
+++ trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm	2014-07-02 00:57:52 UTC (rev 170685)
@@ -35,12 +35,45 @@
 #import WebCore/ResourceError.h
 #import WebCore/ResourceRequest.h
 
+#if USE(CFNETWORK)
+#import CFNetwork/CFURLRequest.h
+#endif
+
 using namespace WebCore;
 
 namespace IPC {
 
+#if USE(CFNETWORK)
 void ArgumentCoderResourceRequest::encodePlatformData(ArgumentEncoder encoder, const ResourceRequest resourceRequest)
 {
+RetainPtrCFURLRequestRef requestToSerialize = resourceRequest.cfURLRequest(DoNotUpdateHTTPBody);
+
+bool requestIsPresent = requestToSerialize;
+encoder  requestIsPresent;
+
+if (!requestIsPresent)
+return;
+
+// We don't send HTTP body over IPC for better performance.
+// Also, it's not always possible to do, as streams can only be created in process that does networking.
+RetainPtrCFDataRef requestHTTPBody = adoptCF(CFURLRequestCopyHTTPRequestBody(requestToSerialize.get()));
+RetainPtrCFReadStreamRef requestHTTPBodyStream = adoptCF(CFURLRequestCopyHTTPRequestBodyStream(requestToSerialize.get()));
+if (requestHTTPBody || requestHTTPBodyStream) {
+CFMutableURLRequestRef mutableRequest = CFURLRequestCreateMutableCopy(0, requestToSerialize.get());
+requestToSerialize = adoptCF(mutableRequest);
+CFURLRequestSetHTTPRequestBody(mutableRequest, nil);
+CFURLRequestSetHTTPRequestBodyStream(mutableRequest, nil);
+}
+
+RetainPtrCFDictionaryRef dictionary = adoptCF(WKCFURLRequestCreateSerializableRepresentation(requestToSerialize.get(), IPC::tokenNullTypeRef()));
+IPC::encode(encoder, dictionary.get());
+
+// The fallback array is part of CFURLRequest, but it is not encoded by WKCFURLRequestCreateSerializableRepresentation.
+encoder  resourceRequest.responseContentDispositionEncodingFallbackArray();
+}
+#else
+void ArgumentCoderResourceRequest::encodePlatformData(ArgumentEncoder encoder, const ResourceRequest resourceRequest)
+{
 RetainPtrNSURLRequest requestToSerialize = resourceRequest.nsURLRequest(DoNotUpdateHTTPBody);
 
 bool requestIsPresent = requestToSerialize;
@@ -63,6 +96,7 @@
 // The fallback array is part of NSURLRequest, but it is not encoded by WKNSURLRequestCreateSerializableRepresentation.
 encoder  resourceRequest.responseContentDispositionEncodingFallbackArray();
 }
+#endif
 
 bool ArgumentCoderResourceRequest::decodePlatformData(ArgumentDecoder decoder, ResourceRequest resourceRequest)
 {
@@ -79,11 +113,19 @@
 if (!IPC::decode(decoder, dictionary))
 return false;
 
+#if USE(CFNETWORK)
+RetainPtrCFURLRequestRef cfURLRequest = adoptCF(WKCreateCFURLRequestFromSerializableRepresentation(dictionary.get(), IPC::tokenNullTypeRef()));
+if (!cfURLRequest)
+return false;
+
+resourceRequest = ResourceRequest(cfURLRequest.get());
+#else
   

[webkit-changes] [170578] trunk/Source/WebCore

[psolanki]

Title: [170578] trunk/Source/WebCore








Revision 170578
Author psola...@apple.com
Date 2014-06-29 23:36:13 -0700 (Sun, 29 Jun 2014)


Log Message
Create NSURLRequest lazily when USE(CFNETWORK) is enabled
https://bugs.webkit.org/show_bug.cgi?id=134441

Reviewed by Sam Weinig.

No new tests. Should be covered by exsting tests.

* platform/network/cf/ResourceRequest.h:
(WebCore::ResourceRequest::ResourceRequest):
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::doUpdatePlatformRequest):
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
(WebCore::ResourceRequest::setStorageSession):
* platform/network/cocoa/ResourceRequestCocoa.mm:
(WebCore::ResourceRequest::nsURLRequest):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/cf/ResourceRequest.h
trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (170577 => 170578)

--- trunk/Source/WebCore/ChangeLog	2014-06-30 04:43:29 UTC (rev 170577)
+++ trunk/Source/WebCore/ChangeLog	2014-06-30 06:36:13 UTC (rev 170578)
@@ -1,3 +1,21 @@
+2014-06-29  Pratik Solanki  psola...@apple.com
+
+Create NSURLRequest lazily when USE(CFNETWORK) is enabled
+https://bugs.webkit.org/show_bug.cgi?id=134441
+
+Reviewed by Sam Weinig.
+
+No new tests. Should be covered by exsting tests.
+
+* platform/network/cf/ResourceRequest.h:
+(WebCore::ResourceRequest::ResourceRequest):
+* platform/network/cf/ResourceRequestCFNet.cpp:
+(WebCore::ResourceRequest::doUpdatePlatformRequest):
+(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+(WebCore::ResourceRequest::setStorageSession):
+* platform/network/cocoa/ResourceRequestCocoa.mm:
+(WebCore::ResourceRequest::nsURLRequest):
+
 2014-06-29  Ryuan Choi  ryuan.c...@samsung.com
 
 [EFL] Remove netscape plugin implementation from WebCore


Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (170577 => 170578)

--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h	2014-06-30 04:43:29 UTC (rev 170577)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h	2014-06-30 06:36:13 UTC (rev 170578)
@@ -72,9 +72,6 @@
 : ResourceRequestBase()
 , m_cfRequest(cfRequest)
 {
-#if PLATFORM(COCOA)
-updateNSURLRequest();
-#endif
 }
 #else
 ResourceRequest(NSURLRequest *nsRequest)


Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (170577 => 170578)

--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp	2014-06-30 04:43:29 UTC (rev 170577)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp	2014-06-30 06:36:13 UTC (rev 170578)
@@ -196,7 +196,7 @@
 
 m_cfRequest = adoptCF(cfRequest);
 #if PLATFORM(COCOA)
-updateNSURLRequest();
+m_nsRequest = nullptr;
 #endif
 }
 
@@ -231,7 +231,7 @@
 
 m_cfRequest = adoptCF(cfRequest);
 #if PLATFORM(COCOA)
-updateNSURLRequest();
+m_nsRequest = nullptr;
 #endif
 }
 
@@ -343,7 +343,7 @@
 wkSetRequestStorageSession(storageSession, cfRequest);
 m_cfRequest = adoptCF(cfRequest);
 #if PLATFORM(COCOA)
-updateNSURLRequest();
+m_nsRequest = nullptr;
 #endif
 }
 


Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (170577 => 170578)

--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm	2014-06-30 04:43:29 UTC (rev 170577)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm	2014-06-30 06:36:13 UTC (rev 170578)
@@ -53,6 +53,10 @@
 NSURLRequest *ResourceRequest::nsURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const
 {
 updatePlatformRequest(bodyPolicy);
+#if USE(CFNETWORK)
+if (!m_nsRequest)
+const_castResourceRequest*(this)-updateNSURLRequest();
+#endif
 return [[m_nsRequest.get() retain] autorelease];
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [170574] trunk/Source/WebCore

[psolanki]

Title: [170574] trunk/Source/WebCore








Revision 170574
Author psola...@apple.com
Date 2014-06-29 13:59:03 -0700 (Sun, 29 Jun 2014)


Log Message
Refactor ResourceRequest into Cocoa and iOS specific files
https://bugs.webkit.org/show_bug.cgi?id=134430

Reviewed by Andreas Kling.

No new tests because no functional changes.

* WebCore.xcodeproj/project.pbxproj:
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::applyWebArchiveHackForMail): Deleted.
* platform/network/cocoa/ResourceRequestCocoa.mm: Copied from Source/WebCore/platform/network/mac/ResourceRequestMac.mm.
(WebCore::ResourceRequest::nsURLRequest):
(WebCore::ResourceRequest::cfURLRequest):
(WebCore::ResourceRequest::doUpdateResourceRequest):
(WebCore::ResourceRequest::doUpdateResourceHTTPBody):
(WebCore::ResourceRequest::doUpdatePlatformRequest):
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
(WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties):
(WebCore::ResourceRequest::applyWebArchiveHackForMail):
(WebCore::ResourceRequest::setStorageSession):
* platform/network/ios/ResourceRequestIOS.mm: Added.
(WebCore::ResourceRequest::useQuickLookResourceCachingQuirks):
(WebCore::ResourceRequest::ResourceRequest):
(WebCore::ResourceRequest::updateNSURLRequest):
* platform/network/mac/ResourceRequestMac.mm:
(WebCore::initQuickLookResourceCachingQuirks):
(WebCore::ResourceRequest::useQuickLookResourceCachingQuirks):
(WebCore::ResourceRequest::ResourceRequest):
(WebCore::ResourceRequest::updateNSURLRequest):
(WebCore::ResourceRequest::applyWebArchiveHackForMail):
(WebCore::ResourceRequest::nsURLRequest): Deleted.
(WebCore::ResourceRequest::cfURLRequest): Deleted.
(WebCore::ResourceRequest::doUpdateResourceRequest): Deleted.
(WebCore::ResourceRequest::doUpdateResourceHTTPBody): Deleted.
(WebCore::ResourceRequest::doUpdatePlatformRequest): Deleted.
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody): Deleted.
(WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties): Deleted.
(WebCore::ResourceRequest::setStorageSession): Deleted.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm


Added Paths

trunk/Source/WebCore/platform/network/cocoa/
trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm
trunk/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (170573 => 170574)

--- trunk/Source/WebCore/ChangeLog	2014-06-29 17:10:27 UTC (rev 170573)
+++ trunk/Source/WebCore/ChangeLog	2014-06-29 20:59:03 UTC (rev 170574)
@@ -1,3 +1,44 @@
+2014-06-29  Pratik Solanki  pratik.sola...@gmail.com
+
+Refactor ResourceRequest into Cocoa and iOS specific files
+https://bugs.webkit.org/show_bug.cgi?id=134430
+
+Reviewed by Andreas Kling.
+
+No new tests because no functional changes.
+
+* WebCore.xcodeproj/project.pbxproj:
+* platform/network/cf/ResourceRequestCFNet.cpp:
+(WebCore::ResourceRequest::applyWebArchiveHackForMail): Deleted.
+* platform/network/cocoa/ResourceRequestCocoa.mm: Copied from Source/WebCore/platform/network/mac/ResourceRequestMac.mm.
+(WebCore::ResourceRequest::nsURLRequest):
+(WebCore::ResourceRequest::cfURLRequest):
+(WebCore::ResourceRequest::doUpdateResourceRequest):
+(WebCore::ResourceRequest::doUpdateResourceHTTPBody):
+(WebCore::ResourceRequest::doUpdatePlatformRequest):
+(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+(WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties):
+(WebCore::ResourceRequest::applyWebArchiveHackForMail):
+(WebCore::ResourceRequest::setStorageSession):
+* platform/network/ios/ResourceRequestIOS.mm: Added.
+(WebCore::ResourceRequest::useQuickLookResourceCachingQuirks):
+(WebCore::ResourceRequest::ResourceRequest):
+(WebCore::ResourceRequest::updateNSURLRequest):
+* platform/network/mac/ResourceRequestMac.mm:
+(WebCore::initQuickLookResourceCachingQuirks):
+(WebCore::ResourceRequest::useQuickLookResourceCachingQuirks):
+(WebCore::ResourceRequest::ResourceRequest):
+(WebCore::ResourceRequest::updateNSURLRequest):
+(WebCore::ResourceRequest::applyWebArchiveHackForMail):
+(WebCore::ResourceRequest::nsURLRequest): Deleted.
+(WebCore::ResourceRequest::cfURLRequest): Deleted.
+(WebCore::ResourceRequest::doUpdateResourceRequest): Deleted.
+(WebCore::ResourceRequest::doUpdateResourceHTTPBody): Deleted.
+(WebCore::ResourceRequest::doUpdatePlatformRequest): Deleted.
+(WebCore::ResourceRequest::doUpdatePlatformHTTPBody): Deleted.
+(WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties): Deleted.
+

[webkit-changes] [170190] trunk/Source/WebCore

[psolanki]

Title: [170190] trunk/Source/WebCore








Revision 170190
Author psola...@apple.com
Date 2014-06-20 10:25:06 -0700 (Fri, 20 Jun 2014)


Log Message
Enable synchronous willSendRequest on iOS
https://bugs.webkit.org/show_bug.cgi?id=134081
rdar://problem/17350927

Reviewed by Andreas Kling.

We lost the call to make willSendrequest callbacks be synchronous if possible during code
refactoring. The call is present in ResourceHandleMac.mm but that code is not called when
we use the CFNetwork based loader. Call the SPI in setupRequest().

No new tests because existing tests should cover this functionality.

* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willSendRequest):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (170189 => 170190)

--- trunk/Source/WebCore/ChangeLog	2014-06-20 17:20:48 UTC (rev 170189)
+++ trunk/Source/WebCore/ChangeLog	2014-06-20 17:25:06 UTC (rev 170190)
@@ -1,3 +1,21 @@
+2014-06-19  Pratik Solanki  psola...@apple.com
+
+Enable synchronous willSendRequest on iOS
+https://bugs.webkit.org/show_bug.cgi?id=134081
+rdar://problem/17350927
+
+Reviewed by Andreas Kling.
+
+We lost the call to make willSendrequest callbacks be synchronous if possible during code
+refactoring. The call is present in ResourceHandleMac.mm but that code is not called when
+we use the CFNetwork based loader. Call the SPI in setupRequest().
+
+No new tests because existing tests should cover this functionality.
+
+* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
+(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest):
+(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willSendRequest):
+
 2014-06-20  Carlos Garcia Campos  cgar...@igalia.com
 
 [GTK] Do not build quota files when QUOTA is disabled


Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp (170189 => 170190)

--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp	2014-06-20 17:20:48 UTC (rev 170189)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp	2014-06-20 17:25:06 UTC (rev 170190)
@@ -37,6 +37,7 @@
 #include SharedBuffer.h
 #include WebCoreSystemInterface.h
 #include WebCoreURLResponse.h
+#include wtf/MainThread.h
 #include wtf/text/CString.h
 #include wtf/text/WTFString.h
 
@@ -64,6 +65,9 @@
 
 void ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest(CFMutableURLRequestRef request)
 {
+#if PLATFORM(IOS)
+CFURLRequestSetShouldStartSynchronously(request, 1);
+#endif
 CFURLRef requestURL = CFURLRequestGetURL(request);
 if (!requestURL)
 return;
@@ -86,6 +90,8 @@
 }
 }
 
+ASSERT(!isMainThread());
+
 RefPtrResourceHandleCFURLConnectionDelegateWithOperationQueue protector(this);
 
 dispatch_async(dispatch_get_main_queue(), ^{






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [170154] trunk/Source/WebKit2

[psolanki]

Title: [170154] trunk/Source/WebKit2








Revision 170154
Author psola...@apple.com
Date 2014-06-19 11:33:20 -0700 (Thu, 19 Jun 2014)


Log Message
Copy SharedBuffer data into IPC message directly
https://bugs.webkit.org/show_bug.cgi?id=133920

Reviewed by Anders Carlsson.

When data array callbacks are enabled, we currently merge all the CFDataRefs in SharedBuffer
into one contiguous memory buffer when creating IPC::DataReference. This patch creates a
subclass of DataReference that uses SharedBuffer::getSomeData() to copy the data directly
into the IPC message.

* NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
(WebKit::AsynchronousNetworkLoaderClient::didReceiveBuffer):
* Platform/IPC/ArgumentEncoder.cpp:
(IPC::ArgumentEncoder::reserve): Added.
(IPC::ArgumentEncoder::grow):
* Platform/IPC/ArgumentEncoder.h:
* Platform/IPC/DataReference.cpp:
(IPC::SharedBufferDataReference::encode):
* Platform/IPC/DataReference.h:
(IPC::DataReference::~DataReference):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp
trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp
trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.h
trunk/Source/WebKit2/Platform/IPC/DataReference.cpp
trunk/Source/WebKit2/Platform/IPC/DataReference.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170153 => 170154)

--- trunk/Source/WebKit2/ChangeLog	2014-06-19 17:53:17 UTC (rev 170153)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-19 18:33:20 UTC (rev 170154)
@@ -1,3 +1,26 @@
+2014-06-19  Pratik Solanki  psola...@apple.com
+
+Copy SharedBuffer data into IPC message directly
+https://bugs.webkit.org/show_bug.cgi?id=133920
+
+Reviewed by Anders Carlsson.
+
+When data array callbacks are enabled, we currently merge all the CFDataRefs in SharedBuffer
+into one contiguous memory buffer when creating IPC::DataReference. This patch creates a
+subclass of DataReference that uses SharedBuffer::getSomeData() to copy the data directly
+into the IPC message.
+
+* NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
+(WebKit::AsynchronousNetworkLoaderClient::didReceiveBuffer):
+* Platform/IPC/ArgumentEncoder.cpp:
+(IPC::ArgumentEncoder::reserve): Added.
+(IPC::ArgumentEncoder::grow):
+* Platform/IPC/ArgumentEncoder.h:
+* Platform/IPC/DataReference.cpp:
+(IPC::SharedBufferDataReference::encode):
+* Platform/IPC/DataReference.h:
+(IPC::DataReference::~DataReference):
+
 2014-06-18  Zan Dobersek  zdober...@igalia.com
 
 Unreviewed. Fixing the GTK+ build after r170114.


Modified: trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp (170153 => 170154)

--- trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp	2014-06-19 17:53:17 UTC (rev 170153)
+++ trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp	2014-06-19 18:33:20 UTC (rev 170154)
@@ -75,7 +75,7 @@
 }
 #endif // __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
 
-IPC::DataReference dataReference(reinterpret_castconst uint8_t*(buffer-data()), buffer-size());
+IPC::SharedBufferDataReference dataReference(buffer);
 loader-sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveData(dataReference, encodedDataLength));
 }
 


Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp (170153 => 170154)

--- trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp	2014-06-19 17:53:17 UTC (rev 170153)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp	2014-06-19 18:33:20 UTC (rev 170154)
@@ -81,28 +81,33 @@
 return ((value + alignment - 1) / alignment) * alignment;
 }
 
-uint8_t* ArgumentEncoder::grow(unsigned alignment, size_t size)
+void ArgumentEncoder::reserve(size_t size)
 {
-size_t alignedSize = roundUpToAlignment(m_bufferSize, alignment);
-
-if (alignedSize + size  m_bufferCapacity) {
-size_t newCapacity = roundUpToAlignment(m_bufferCapacity * 2, 4096);
-while (newCapacity  alignedSize + size)
-newCapacity *= 2;
+if (size = m_bufferCapacity)
+return;
 
-uint8_t* newBuffer = static_castuint8_t*(allocBuffer(newCapacity));
-if (!newBuffer)
-CRASH();
+size_t newCapacity = roundUpToAlignment(m_bufferCapacity * 2, 4096);
+while (newCapacity  size)
+newCapacity *= 2;
 
-memcpy(newBuffer, m_buffer, m_bufferSize);
+uint8_t* newBuffer = static_castuint8_t*(allocBuffer(newCapacity));
+if (!newBuffer)
+CRASH();
 
-if (m_buffer != m_inlineBuffer)
-freeBuffer(m_buffer, m_bufferCapacity);
+memcpy(newBuffer, m_buffer, m_bufferSize);
 
-m_buffer = newBuffer;
-m_bufferCapacity = newCapacity;
-}
+if (m_buffer != m_inlineBuffer)
+freeBuffer(m_buffer, m_bufferCapacity);
 
+m_buffer = newBuffer;
+m_bufferCapacity = newCapacity;
+}
+
+uint8_t* 

[webkit-changes] [169883] trunk/Source

[psolanki]

Title: [169883] trunk/Source








Revision 169883
Author psola...@apple.com
Date 2014-06-12 00:25:31 -0700 (Thu, 12 Jun 2014)


Log Message
Avoid creating a CFData when checking if a resource is file backed
https://bugs.webkit.org/show_bug.cgi?id=133783

Reviewed by Andreas Kling.

Source/WebCore:
Export SharedBuffer::hasPlatformData().

No new tests because no functional changes.

* WebCore.exp.in:
* platform/SharedBuffer.h:

Source/WebKit2:
When a resource is file backed, we have it as a single CFDataRef in SharedBuffer. Add an
early return in tryGetShareableHandleFromSharedBuffer() so we don't end up creating a new
CFDataRef if we don't already have one in SharedBuffer. If we had to create a CFDataRef, the
it can't have been a file backed resource.

* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
(WebKit::NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/platform/SharedBuffer.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (169882 => 169883)

--- trunk/Source/WebCore/ChangeLog	2014-06-12 06:36:20 UTC (rev 169882)
+++ trunk/Source/WebCore/ChangeLog	2014-06-12 07:25:31 UTC (rev 169883)
@@ -1,3 +1,17 @@
+2014-06-12  Pratik Solanki  psola...@apple.com
+
+Avoid creating a CFData when checking if a resource is file backed
+https://bugs.webkit.org/show_bug.cgi?id=133783
+
+Reviewed by Andreas Kling.
+
+Export SharedBuffer::hasPlatformData().
+
+No new tests because no functional changes.
+
+* WebCore.exp.in:
+* platform/SharedBuffer.h:
+
 2014-06-11  Myles C. Maxfield  mmaxfi...@apple.com
 
 SVGGlyphToPathTranslator ASSERTs when encountering a missing glyph in an SVG font


Modified: trunk/Source/WebCore/WebCore.exp.in (169882 => 169883)

--- trunk/Source/WebCore/WebCore.exp.in	2014-06-12 06:36:20 UTC (rev 169882)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-06-12 07:25:31 UTC (rev 169883)
@@ -1598,6 +1598,7 @@
 __ZNK7WebCore12RenderObject7childAtEj
 __ZNK7WebCore12RenderWidget14windowClipRectEv
 __ZNK7WebCore12SharedBuffer11getSomeDataERPKcj
+__ZNK7WebCore12SharedBuffer15hasPlatformDataEv
 __ZNK7WebCore12SharedBuffer4dataEv
 __ZNK7WebCore12SharedBuffer4sizeEv
 __ZNK7WebCore12TextEncoding6decodeEPKcmbRb


Modified: trunk/Source/WebCore/platform/SharedBuffer.h (169882 => 169883)

--- trunk/Source/WebCore/platform/SharedBuffer.h	2014-06-12 06:36:20 UTC (rev 169882)
+++ trunk/Source/WebCore/platform/SharedBuffer.h	2014-06-12 07:25:31 UTC (rev 169883)
@@ -171,6 +171,7 @@
 void createPurgeableBuffer() const;
 
 void tryReplaceContentsWithPlatformBuffer(SharedBuffer*);
+bool hasPlatformData() const;
 
 private:
 SharedBuffer();
@@ -187,7 +188,6 @@
 
 void clearPlatformData();
 void maybeTransferPlatformData();
-bool hasPlatformData() const;
 
 void copyBufferAndClear(char* destination, unsigned bytesToCopy) const;
 


Modified: trunk/Source/WebKit2/ChangeLog (169882 => 169883)

--- trunk/Source/WebKit2/ChangeLog	2014-06-12 06:36:20 UTC (rev 169882)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-12 07:25:31 UTC (rev 169883)
@@ -1,3 +1,18 @@
+2014-06-12  Pratik Solanki  psola...@apple.com
+
+Avoid creating a CFData when checking if a resource is file backed
+https://bugs.webkit.org/show_bug.cgi?id=133783
+
+Reviewed by Andreas Kling.
+
+When a resource is file backed, we have it as a single CFDataRef in SharedBuffer. Add an
+early return in tryGetShareableHandleFromSharedBuffer() so we don't end up creating a new
+CFDataRef if we don't already have one in SharedBuffer. If we had to create a CFDataRef, the
+it can't have been a file backed resource.
+
+* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+(WebKit::NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer):
+
 2014-06-11  Gyuyoung Kim  gyuyoung@samsung.com
 
 Fix build break on EFL and GTK ports since r169820


Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (169882 => 169883)

--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm	2014-06-12 06:36:20 UTC (rev 169882)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm	2014-06-12 07:25:31 UTC (rev 169883)
@@ -93,6 +93,9 @@
 if (!cache)
 return;
 
+if (!buffer-hasPlatformData())
+return;
+
 RetainPtrCFDataRef data = ""
 if (_CFURLCacheIsResponseDataMemMapped(cache, data.get()) == kCFBooleanFalse)
 return;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [169868] trunk/Source/WebCore

[psolanki]

Title: [169868] trunk/Source/WebCore








Revision 169868
Author psola...@apple.com
Date 2014-06-11 17:46:49 -0700 (Wed, 11 Jun 2014)


Log Message
Keep CFDataRefs in SharedBuffer instead of merging them
https://bugs.webkit.org/show_bug.cgi?id=133775

Reviewed by Alexey Proskuryakov.

Instead of merging the CFDataRefs into one buffer, save them in as CFDataRefs in
SharedBuffer. They will get merged when code calls buffer() later on.

No new tests because no functional changes.

* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::handleDataArray):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (169867 => 169868)

--- trunk/Source/WebCore/ChangeLog	2014-06-12 00:32:28 UTC (rev 169867)
+++ trunk/Source/WebCore/ChangeLog	2014-06-12 00:46:49 UTC (rev 169868)
@@ -1,3 +1,18 @@
+2014-06-11  Pratik Solanki  psola...@apple.com
+
+Keep CFDataRefs in SharedBuffer instead of merging them
+https://bugs.webkit.org/show_bug.cgi?id=133775
+
+Reviewed by Alexey Proskuryakov.
+
+Instead of merging the CFDataRefs into one buffer, save them in as CFDataRefs in
+SharedBuffer. They will get merged when code calls buffer() later on.
+
+No new tests because no functional changes.
+
+* platform/network/cf/ResourceHandleCFNet.cpp:
+(WebCore::ResourceHandle::handleDataArray):
+
 2014-06-11  Alexey Proskuryakov  a...@apple.com
 
 editing/selection/selection-in-iframe-removed-crash.html or selection-invalid-offset.html crashes intermittently


Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (169867 => 169868)

--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp	2014-06-12 00:32:28 UTC (rev 169867)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp	2014-06-12 00:46:49 UTC (rev 169868)
@@ -640,18 +640,11 @@
 return;
 }
 
-CFIndex totalSize = 0;
-CFIndex index;
-for (index = 0; index  count; index++)
-totalSize += CFDataGetLength(static_castCFDataRef(CFArrayGetValueAtIndex(dataArray, index)));
+RefPtrSharedBuffer sharedBuffer = SharedBuffer::create();
+for (CFIndex index = 0; index  count; index++)
+sharedBuffer-append(static_castCFDataRef(CFArrayGetValueAtIndex(dataArray, index)));
 
-RetainPtrCFMutableDataRef mergedData = adoptCF(CFDataCreateMutable(kCFAllocatorDefault, totalSize));
-for (index = 0; index  count; index++) {
-CFDataRef data = "" index));
-CFDataAppendBytes(mergedData.get(), CFDataGetBytePtr(data), CFDataGetLength(data));
-}
-
-client()-didReceiveBuffer(this, SharedBuffer::wrapCFData(mergedData.get()), -1);
+client()-didReceiveBuffer(this, sharedBuffer, -1);
 }
 #endif
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [169627] trunk/Source/WebKit/mac

[psolanki]

Title: [169627] trunk/Source/WebKit/mac








Revision 169627
Author psola...@apple.com
Date 2014-06-05 14:40:08 -0700 (Thu, 05 Jun 2014)


Log Message
Remove unsused method _setAcceleratedImageDecoding
https://bugs.webkit.org/show_bug.cgi?id=133554

Reviewed by Jon Honeycutt.

* WebView/WebView.mm:
(+[WebView _setAcceleratedImageDecoding:]): Deleted.
* WebView/WebViewPrivate.h:

Modified Paths

trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebView.mm
trunk/Source/WebKit/mac/WebView/WebViewPrivate.h




Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (169626 => 169627)

--- trunk/Source/WebKit/mac/ChangeLog	2014-06-05 21:36:40 UTC (rev 169626)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-06-05 21:40:08 UTC (rev 169627)
@@ -1,3 +1,14 @@
+2014-06-05  Pratik Solanki  psola...@apple.com
+
+Remove unsused method _setAcceleratedImageDecoding
+https://bugs.webkit.org/show_bug.cgi?id=133554
+
+Reviewed by Jon Honeycutt.
+
+* WebView/WebView.mm:
+(+[WebView _setAcceleratedImageDecoding:]): Deleted.
+* WebView/WebViewPrivate.h:
+
 2014-06-05  Benjamin Poulain  bpoul...@apple.com
 
 [iOS][WK2] Add device orientation


Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (169626 => 169627)

--- trunk/Source/WebKit/mac/WebView/WebView.mm	2014-06-05 21:36:40 UTC (rev 169626)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2014-06-05 21:40:08 UTC (rev 169627)
@@ -1591,11 +1591,6 @@
 resourceLoadScheduler()-resumePendingRequests();
 }
 
-+ (void)_setAcceleratedImageDecoding:(BOOL)enabled
-{
-UNUSED_PARAM(enabled);
-}
-
 + (void)_setAllowCookies:(BOOL)allow
 {
 ResourceRequestBase::setDefaultAllowCookies(allow);


Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (169626 => 169627)

--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h	2014-06-05 21:36:40 UTC (rev 169626)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h	2014-06-05 21:40:08 UTC (rev 169627)
@@ -444,7 +444,6 @@
 - (void)_setResourceLoadSchedulerSuspended:(BOOL)suspend;
 + (void)_setTileCacheLayerPoolCapacity:(unsigned)capacity;
 
-+ (void)_setAcceleratedImageDecoding:(BOOL)enabled;
 + (void)_setAllowCookies:(BOOL)allow;
 + (BOOL)_allowCookies;
 + (BOOL)_isUnderMemoryPressure;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168452] trunk/Source

[psolanki]

Title: [168452] trunk/Source








Revision 168452
Author psola...@apple.com
Date 2014-05-07 16:28:50 -0700 (Wed, 07 May 2014)


Log Message
Use system defaults for hardware jpeg decoding
https://bugs.webkit.org/show_bug.cgi?id=132661
rdar://problem/11348201

Reviewed by Tim Horton.

Remove code that explicitly disabled hardware image decoding. Let the system decide what to do.

Source/WebCore:
* WebCore.exp.in:
* platform/graphics/ImageSource.h:
(WebCore::ImageSource::acceleratedImageDecodingEnabled): Deleted.
(WebCore::ImageSource::setAcceleratedImageDecodingEnabled): Deleted.
* platform/graphics/cg/ImageSourceCG.cpp:
(WebCore::ImageSource::imageSourceOptions):

Source/WebKit/mac:
* WebView/WebView.mm:
(+[WebView _setAcceleratedImageDecoding:]):
(+[WebView _acceleratedImageDecoding]): Deleted.
* WebView/WebViewPrivate.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/platform/graphics/ImageSource.h
trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebView.mm
trunk/Source/WebKit/mac/WebView/WebViewPrivate.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (168451 => 168452)

--- trunk/Source/WebCore/ChangeLog	2014-05-07 23:22:07 UTC (rev 168451)
+++ trunk/Source/WebCore/ChangeLog	2014-05-07 23:28:50 UTC (rev 168452)
@@ -1,3 +1,20 @@
+2014-05-07  Pratik Solanki  psola...@apple.com
+
+Use system defaults for hardware jpeg decoding
+https://bugs.webkit.org/show_bug.cgi?id=132661
+rdar://problem/11348201
+
+Reviewed by Tim Horton.
+
+Remove code that explicitly disabled hardware image decoding. Let the system decide what to do.
+
+* WebCore.exp.in:
+* platform/graphics/ImageSource.h:
+(WebCore::ImageSource::acceleratedImageDecodingEnabled): Deleted.
+(WebCore::ImageSource::setAcceleratedImageDecodingEnabled): Deleted.
+* platform/graphics/cg/ImageSourceCG.cpp:
+(WebCore::ImageSource::imageSourceOptions):
+
 2014-05-07  Radu Stavila  stav...@adobe.com
 
 Use after free in WebCore::RenderObject::nextSibling / WebCore::RenderBoxModelObject::moveChildrenTo


Modified: trunk/Source/WebCore/WebCore.exp.in (168451 => 168452)

--- trunk/Source/WebCore/WebCore.exp.in	2014-05-07 23:22:07 UTC (rev 168451)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-05-07 23:28:50 UTC (rev 168452)
@@ -2455,7 +2455,6 @@
 __ZN7WebCore11EditCommand18setEndingSelectionERKNS_16VisibleSelectionE
 __ZN7WebCore11FileChooser16chooseMediaFilesERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEERKS3_PNS_4IconE
 __ZN7WebCore11Geolocation29resetAllGeolocationPermissionEv
-__ZN7WebCore11ImageSource26s_acceleratedImageDecodingE
 __ZN7WebCore11MathMLNames4initEv
 __ZN7WebCore11MemoryCache18pruneDeadResourcesEv
 __ZN7WebCore11MemoryCache18pruneLiveResourcesEb


Modified: trunk/Source/WebCore/platform/graphics/ImageSource.h (168451 => 168452)

--- trunk/Source/WebCore/platform/graphics/ImageSource.h	2014-05-07 23:22:07 UTC (rev 168451)
+++ trunk/Source/WebCore/platform/graphics/ImageSource.h	2014-05-07 23:28:50 UTC (rev 168452)
@@ -166,11 +166,6 @@
 static void setMaxPixelsPerDecodedImage(unsigned maxPixels) { s_maxPixelsPerDecodedImage = maxPixels; }
 #endif
 
-#if PLATFORM(IOS)
-static bool acceleratedImageDecodingEnabled() { return s_acceleratedImageDecoding; }
-static void setAcceleratedImageDecodingEnabled(bool flag) { s_acceleratedImageDecoding = flag; }
-#endif
-
 private:
 NativeImageDecoderPtr m_decoder;
 
@@ -185,7 +180,6 @@
 mutable int m_baseSubsampling;
 mutable bool m_isProgressive;
 CFDictionaryRef imageSourceOptions(ShouldSkipMetadata, int subsampling = 0) const;
-static bool s_acceleratedImageDecoding;
 #endif
 };
 


Modified: trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp (168451 => 168452)

--- trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp	2014-05-07 23:22:07 UTC (rev 168451)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp	2014-05-07 23:28:50 UTC (rev 168452)
@@ -53,10 +53,6 @@
 const CFStringRef kCGImageSourceShouldPreferRGB32 = CFSTR(kCGImageSourceShouldPreferRGB32);
 const CFStringRef kCGImageSourceSkipMetadata = CFSTR(kCGImageSourceSkipMetadata);
 
-#if PLATFORM(IOS)
-bool ImageSource::s_acceleratedImageDecoding;
-#endif
-
 #if !PLATFORM(COCOA)
 size_t sharedBufferGetBytesAtPosition(void* info, void* buffer, off_t position, size_t count)
 {
@@ -133,11 +129,10 @@
 if (!options[subsampling]) {
 int subsampleInt = 1  subsampling; // [0..3] = [1, 2, 4, 8]
 RetainPtrCFNumberRef subsampleNumber = adoptCF(CFNumberCreate(nullptr,  kCFNumberIntType,  subsampleInt));
-const CFIndex numOptions = 5;
+const CFIndex numOptions = 4;
 const CFBooleanRef imageSourceSkipMetaData = (skipMetaData == ImageSource::SkipMetadata) ? kCFBooleanTrue : kCFBooleanFalse;
-const CFBooleanRef 

[webkit-changes] [168298] trunk/Tools

[psolanki]

Title: [168298] trunk/Tools








Revision 168298
Author psola...@apple.com
Date 2014-05-05 10:50:06 -0700 (Mon, 05 May 2014)


Log Message
Update framework locations in package-root
https://bugs.webkit.org/show_bug.cgi?id=132571

Reviewed by Simon Fraser.

* Scripts/package-root:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/package-root




Diff

Modified: trunk/Tools/ChangeLog (168297 => 168298)

--- trunk/Tools/ChangeLog	2014-05-05 17:47:14 UTC (rev 168297)
+++ trunk/Tools/ChangeLog	2014-05-05 17:50:06 UTC (rev 168298)
@@ -1,3 +1,12 @@
+2014-05-05  Pratik Solanki  psola...@apple.com
+
+Update framework locations in package-root
+https://bugs.webkit.org/show_bug.cgi?id=132571
+
+Reviewed by Simon Fraser.
+
+* Scripts/package-root:
+
 2014-05-05  Ryuan Choi  ryuan.c...@samsung.com
 
 [EFL][WK2] Refactor favicon database APIs


Modified: trunk/Tools/Scripts/package-root (168297 => 168298)

--- trunk/Tools/Scripts/package-root	2014-05-05 17:47:14 UTC (rev 168297)
+++ trunk/Tools/Scripts/package-root	2014-05-05 17:50:06 UTC (rev 168298)
@@ -68,8 +68,8 @@
 
 setConfiguration();
 
-my @privateFrameworks = qw(WebCore WebKit WebKit2);
-my @publicFrameworks = qw(_javascript_Core);
+my @privateFrameworks = qw(WebCore WebKitLegacy WebKit2);
+my @publicFrameworks = qw(_javascript_Core WebKit);
 my $privateInstallPath = /System/Library/PrivateFrameworks;
 my $publicInstallPath = /System/Library/Frameworks;
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168248] trunk/Source

[psolanki]

Title: [168248] trunk/Source








Revision 168248
Author psola...@apple.com
Date 2014-05-04 15:53:41 -0700 (Sun, 04 May 2014)


Log Message
Shortcircuit shouldUseCredentialStorage callback
https://bugs.webkit.org/show_bug.cgi?id=132308
rdar://problem/16806708

Reviewed by Alexey Proskuryakov.

If we are going to return true from the shouldUseCredentialStorage callback then we don't
really need to have CFNetwork/Foundation call us. We can just disable the callback and
CFNetwork will assume true. Add a separate subclass that implements this callback when we
need to return false. We can also eliminate the corresponding async callbacks. This avoids
pingponging between dispatch queue and main thread in the common case.

No new tests because no change in functionality.

Source/WebCore:
* WebCore.exp.in:
* platform/network/ResourceHandle.cpp:
* platform/network/ResourceHandle.h:
* platform/network/ResourceHandleClient.cpp:
* platform/network/ResourceHandleClient.h:
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::createCFURLConnection):
(WebCore::ResourceHandle::shouldUseCredentialStorage):
* platform/network/cf/ResourceHandleCFURLConnectionDelegate.h:
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::shouldUseCredentialStorage):
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.h:
* platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
* platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.h:
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::start):
(WebCore::ResourceHandle::makeDelegate):
(WebCore::ResourceHandle::delegate):
(WebCore::ResourceHandle::platformLoadResourceSynchronously):
(WebCore::ResourceHandle::shouldUseCredentialStorage):
* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h:
* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
(-[WebCoreResourceHandleWithCredentialStorageAsOperationQueueDelegate connectionShouldUseCredentialStorage:]):
* platform/network/soup/ResourceHandleSoup.cpp:

Source/WebKit2:
* NetworkProcess/NetworkResourceLoader.cpp: Remove shouldUseCredentialStorageAsync() callbacks.
* NetworkProcess/NetworkResourceLoader.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/platform/network/ResourceHandle.cpp
trunk/Source/WebCore/platform/network/ResourceHandle.h
trunk/Source/WebCore/platform/network/ResourceHandleClient.cpp
trunk/Source/WebCore/platform/network/ResourceHandleClient.h
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.h
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.h
trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.h
trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h
trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (168247 => 168248)

--- trunk/Source/WebCore/ChangeLog	2014-05-04 22:39:29 UTC (rev 168247)
+++ trunk/Source/WebCore/ChangeLog	2014-05-04 22:53:41 UTC (rev 168248)
@@ -1,3 +1,44 @@
+2014-05-04  Pratik Solanki  psola...@apple.com
+
+Shortcircuit shouldUseCredentialStorage callback
+https://bugs.webkit.org/show_bug.cgi?id=132308
+rdar://problem/16806708
+
+Reviewed by Alexey Proskuryakov.
+
+If we are going to return true from the shouldUseCredentialStorage callback then we don't
+really need to have CFNetwork/Foundation call us. We can just disable the callback and
+CFNetwork will assume true. Add a separate subclass that implements this callback when we
+need to return false. We can also eliminate the corresponding async callbacks. This avoids
+pingponging between dispatch queue and main thread in the common case.
+
+No new tests because no change in functionality.
+
+* WebCore.exp.in:
+* platform/network/ResourceHandle.cpp:
+* platform/network/ResourceHandle.h:
+* platform/network/ResourceHandleClient.cpp:
+* platform/network/ResourceHandleClient.h:
+* platform/network/cf/ResourceHandleCFNet.cpp:
+

[webkit-changes] [168250] trunk/Source/WebKit2

[psolanki]

Title: [168250] trunk/Source/WebKit2








Revision 168250
Author psola...@apple.com
Date 2014-05-04 17:42:20 -0700 (Sun, 04 May 2014)


Log Message
Reduce calls to CFURLCacheCopySharedURLCache
https://bugs.webkit.org/show_bug.cgi?id=132464
rdar://problem/16806694

Address review comments by collapsing multi-line code into a single ASSERT.

* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
(WebKit::NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (168249 => 168250)

--- trunk/Source/WebKit2/ChangeLog	2014-05-05 00:21:32 UTC (rev 168249)
+++ trunk/Source/WebKit2/ChangeLog	2014-05-05 00:42:20 UTC (rev 168250)
@@ -1,5 +1,16 @@
 2014-05-04  Pratik Solanki  psola...@apple.com
 
+Reduce calls to CFURLCacheCopySharedURLCache
+https://bugs.webkit.org/show_bug.cgi?id=132464
+rdar://problem/16806694
+
+Address review comments by collapsing multi-line code into a single ASSERT.
+
+* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+(WebKit::NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer):
+
+2014-05-04  Pratik Solanki  psola...@apple.com
+
 Shortcircuit shouldUseCredentialStorage callback
 https://bugs.webkit.org/show_bug.cgi?id=132308
 rdar://problem/16806708


Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (168249 => 168250)

--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm	2014-05-05 00:21:32 UTC (rev 168249)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm	2014-05-05 00:42:20 UTC (rev 168250)
@@ -87,11 +87,8 @@
 void NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer(ShareableResource::Handle handle, SharedBuffer* buffer)
 {
 static CFURLCacheRef cache = CFURLCacheCopySharedURLCache();
-#if !ASSERT_DISABLED
 ASSERT(isMainThread());
-RetainPtrCFURLCacheRef currentCache = adoptCF(CFURLCacheCopySharedURLCache());
-ASSERT(cache == currentCache.get());
-#endif
+ASSERT(cache == adoptCF(CFURLCacheCopySharedURLCache()));
 
 if (!cache)
 return;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168231] trunk/Source/WebKit2

[psolanki]

Title: [168231] trunk/Source/WebKit2








Revision 168231
Author psola...@apple.com
Date 2014-05-03 17:13:11 -0700 (Sat, 03 May 2014)


Log Message
Reduce calls to CFURLCacheCopySharedURLCache
https://bugs.webkit.org/show_bug.cgi?id=132464
rdar://problem/16806694

Reviewed by Alexey Proskuryakov.

CFURLCacheCopySharedURLCache grabs a mutex and can sometimes block. Avoid that by stashing
the cache reference in a static.

* NetworkProcess/NetworkResourceLoader.h: Coalesce ifdef'd code.
* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
(WebKit::NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer):
(WebKit::NetworkResourceLoader::willCacheResponseAsync): Use more correct ifdef for
Foundation based callback.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h
trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (168230 => 168231)

--- trunk/Source/WebKit2/ChangeLog	2014-05-03 22:16:53 UTC (rev 168230)
+++ trunk/Source/WebKit2/ChangeLog	2014-05-04 00:13:11 UTC (rev 168231)
@@ -1,3 +1,20 @@
+2014-05-02  Pratik Solanki  psola...@apple.com
+
+Reduce calls to CFURLCacheCopySharedURLCache
+https://bugs.webkit.org/show_bug.cgi?id=132464
+rdar://problem/16806694
+
+Reviewed by Alexey Proskuryakov.
+
+CFURLCacheCopySharedURLCache grabs a mutex and can sometimes block. Avoid that by stashing
+the cache reference in a static.
+
+* NetworkProcess/NetworkResourceLoader.h: Coalesce ifdef'd code.
+* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+(WebKit::NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer):
+(WebKit::NetworkResourceLoader::willCacheResponseAsync): Use more correct ifdef for
+Foundation based callback.
+
 2014-05-03  Sam Weinig  s...@webkit.org
 
 [Cocoa WebKit2] Add basic _WKWebsiteDataStore implementation


Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (168230 => 168231)

--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h	2014-05-03 22:16:53 UTC (rev 168230)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h	2014-05-04 00:13:11 UTC (rev 168231)
@@ -124,6 +124,7 @@
 
 #if PLATFORM(IOS) || (PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090)
 static void tryGetShareableHandleFromCFURLCachedResponse(ShareableResource::Handle, CFCachedURLResponseRef);
+static void tryGetShareableHandleFromSharedBuffer(ShareableResource::Handle, WebCore::SharedBuffer*);
 #endif
 
 bool isSynchronous() const;
@@ -141,16 +142,11 @@
 return result;
 }
 
-
 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
 void continueCanAuthenticateAgainstProtectionSpace(bool);
 #endif
 void continueWillSendRequest(const WebCore::ResourceRequest newRequest);
 
-#if PLATFORM(IOS) || (PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090)
-static void tryGetShareableHandleFromSharedBuffer(ShareableResource::Handle, WebCore::SharedBuffer*);
-#endif
-
 private:
 NetworkResourceLoader(const NetworkResourceLoadParameters, NetworkConnectionToWebProcess*, PassRefPtrMessages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply);
 


Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (168230 => 168231)

--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm	2014-05-03 22:16:53 UTC (rev 168230)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm	2014-05-04 00:13:11 UTC (rev 168231)
@@ -86,12 +86,18 @@
 
 void NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer(ShareableResource::Handle handle, SharedBuffer* buffer)
 {
-RetainPtrCFURLCacheRef cache = adoptCF(CFURLCacheCopySharedURLCache());
+static CFURLCacheRef cache = CFURLCacheCopySharedURLCache();
+#if !ASSERT_DISABLED
+ASSERT(isMainThread());
+RetainPtrCFURLCacheRef currentCache = adoptCF(CFURLCacheCopySharedURLCache());
+ASSERT(cache == currentCache.get());
+#endif
+
 if (!cache)
 return;
 
 RetainPtrCFDataRef data = ""
-if (_CFURLCacheIsResponseDataMemMapped(cache.get(), data.get()) == kCFBooleanFalse)
+if (_CFURLCacheIsResponseDataMemMapped(cache, data.get()) == kCFBooleanFalse)
 return;
 
 tryGetShareableHandleFromCFData(handle, data.get());
@@ -113,9 +119,9 @@
 
 m_handle-continueWillCacheResponse(cfResponse);
 }
-#endif
 
-#if !PLATFORM(IOS)
+#else
+
 void NetworkResourceLoader::willCacheResponseAsync(ResourceHandle* handle, NSCachedURLResponse *nsResponse)
 {
 ASSERT_UNUSED(handle, handle == m_handle);
@@ -127,7 +133,7 @@
 
 m_handle-continueWillCacheResponse(nsResponse);
 }
-#endif // !PLATFORM(IOS)
+#endif // !USE(CFNETWORK)
 
 } // namespace WebKit
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [168232] trunk/Source

[psolanki]

Title: [168232] trunk/Source








Revision 168232
Author psola...@apple.com
Date 2014-05-03 17:17:11 -0700 (Sat, 03 May 2014)


Log Message
Shortcircuit shouldUseCredentialStorage callback
https://bugs.webkit.org/show_bug.cgi?id=132308
rdar://problem/16806708

Reviewed by Alexey Proskuryakov.

If we are going to return true from the shouldUseCredentialStorage callback then we don't
really need to have CFNetwork/Foundation call us. We can just disable the callback and
CFNetwork will assume true. Add a separate subclass that implements this callback when we
need to return false. We can also eliminate the corresponding async callbacks. This avoids
pingponging between dispatch queue and main thread in the common case.

No new tests because no change in functionality.

Source/WebCore:
* WebCore.exp.in:
* platform/network/ResourceHandle.cpp:
* platform/network/ResourceHandle.h:
* platform/network/ResourceHandleClient.cpp:
* platform/network/ResourceHandleClient.h:
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::createCFURLConnection):
(WebCore::ResourceHandle::shouldUseCredentialStorage):
* platform/network/cf/ResourceHandleCFURLConnectionDelegate.h:
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::shouldUseCredentialStorage):
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.h:
* platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
* platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.h:
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::start):
(WebCore::ResourceHandle::makeDelegate):
(WebCore::ResourceHandle::delegate):
(WebCore::ResourceHandle::platformLoadResourceSynchronously):
(WebCore::ResourceHandle::shouldUseCredentialStorage):
* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h:
* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
(-[WebCoreResourceHandleWithCredentialStorageAsOperationQueueDelegate connectionShouldUseCredentialStorage:]):
* platform/network/soup/ResourceHandleSoup.cpp:

Source/WebKit2:
* NetworkProcess/NetworkResourceLoader.cpp: Remove shouldUseCredentialStorageAsync() callbacks.
* NetworkProcess/NetworkResourceLoader.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/platform/network/ResourceHandle.cpp
trunk/Source/WebCore/platform/network/ResourceHandle.h
trunk/Source/WebCore/platform/network/ResourceHandleClient.cpp
trunk/Source/WebCore/platform/network/ResourceHandleClient.h
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.h
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.h
trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.h
trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h
trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (168231 => 168232)

--- trunk/Source/WebCore/ChangeLog	2014-05-04 00:13:11 UTC (rev 168231)
+++ trunk/Source/WebCore/ChangeLog	2014-05-04 00:17:11 UTC (rev 168232)
@@ -1,3 +1,44 @@
+2014-05-02  Pratik Solanki  psola...@apple.com
+
+Shortcircuit shouldUseCredentialStorage callback
+https://bugs.webkit.org/show_bug.cgi?id=132308
+rdar://problem/16806708
+
+Reviewed by Alexey Proskuryakov.
+
+If we are going to return true from the shouldUseCredentialStorage callback then we don't
+really need to have CFNetwork/Foundation call us. We can just disable the callback and
+CFNetwork will assume true. Add a separate subclass that implements this callback when we
+need to return false. We can also eliminate the corresponding async callbacks. This avoids
+pingponging between dispatch queue and main thread in the common case.
+
+No new tests because no change in functionality.
+
+* WebCore.exp.in:
+* platform/network/ResourceHandle.cpp:
+* platform/network/ResourceHandle.h:
+* platform/network/ResourceHandleClient.cpp:
+* platform/network/ResourceHandleClient.h:
+* platform/network/cf/ResourceHandleCFNet.cpp:
+

[webkit-changes] [167859] trunk/Source/WebKit2

[psolanki]

Title: [167859] trunk/Source/WebKit2








Revision 167859
Author psola...@apple.com
Date 2014-04-27 12:47:36 -0700 (Sun, 27 Apr 2014)


Log Message
Unreviewed. iOS build fix.

* UIProcess/ios/SmartMagnificationController.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/ios/SmartMagnificationController.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (167858 => 167859)

--- trunk/Source/WebKit2/ChangeLog	2014-04-27 18:32:57 UTC (rev 167858)
+++ trunk/Source/WebKit2/ChangeLog	2014-04-27 19:47:36 UTC (rev 167859)
@@ -1,3 +1,9 @@
+2014-04-27  Pratik Solanki  psola...@apple.com
+
+Unreviewed. iOS build fix.
+
+* UIProcess/ios/SmartMagnificationController.h:
+
 2014-04-27  Zan Dobersek  zdober...@igalia.com
 
 Move cross-port WebKit2 code to std::unique_ptr


Modified: trunk/Source/WebKit2/UIProcess/ios/SmartMagnificationController.h (167858 => 167859)

--- trunk/Source/WebKit2/UIProcess/ios/SmartMagnificationController.h	2014-04-27 18:32:57 UTC (rev 167858)
+++ trunk/Source/WebKit2/UIProcess/ios/SmartMagnificationController.h	2014-04-27 19:47:36 UTC (rev 167859)
@@ -30,6 +30,7 @@
 
 #include MessageReceiver.h
 #include WebCore/FloatRect.h
+#include wtf/Noncopyable.h
 #include wtf/RetainPtr.h
 
 OBJC_CLASS WKContentView;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [167457] trunk/Source/WebKit2

[psolanki]

Title: [167457] trunk/Source/WebKit2








Revision 167457
Author psola...@apple.com
Date 2014-04-17 15:39:18 -0700 (Thu, 17 Apr 2014)


Log Message
_webProcessIdentifier should return 0 if the web process crashed
https://bugs.webkit.org/show_bug.cgi?id=131813
rdar://problem/16650605

Reviewed by Anders Carlsson.

* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _hasWebProcess]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (167456 => 167457)

--- trunk/Source/WebKit2/ChangeLog	2014-04-17 22:30:46 UTC (rev 167456)
+++ trunk/Source/WebKit2/ChangeLog	2014-04-17 22:39:18 UTC (rev 167457)
@@ -1,3 +1,15 @@
+2014-04-17  Pratik Solanki  psola...@apple.com
+
+_webProcessIdentifier should return 0 if the web process crashed
+https://bugs.webkit.org/show_bug.cgi?id=131813
+rdar://problem/16650605
+
+Reviewed by Anders Carlsson.
+
+* UIProcess/API/Cocoa/WKWebView.mm:
+(-[WKWebView _hasWebProcess]):
+* UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
 2014-04-17  Darin Adler  da...@apple.com
 
 Remove use of deprecatedDeleteAllValues in NPRemoteObjectMap::pluginDestroyed


Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (167456 => 167457)

--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2014-04-17 22:30:46 UTC (rev 167456)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2014-04-17 22:39:18 UTC (rev 167457)
@@ -952,7 +952,7 @@
 
 - (pid_t)_webProcessIdentifier
 {
-return _page-processIdentifier();
+return _page-isValid() ? _page-processIdentifier() : 0;
 }
 
 - (NSData *)_sessionState






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [167302] trunk/Source/WebCore

[psolanki]

Title: [167302] trunk/Source/WebCore








Revision 167302
Author psola...@apple.com
Date 2014-04-14 23:57:02 -0700 (Mon, 14 Apr 2014)


Log Message
Unreviewed. Attempt to fix Windows build after r167277.

* page/FrameView.cpp:
(WebCore::FrameView::willPaintContents):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/FrameView.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (167301 => 167302)

--- trunk/Source/WebCore/ChangeLog	2014-04-15 06:51:53 UTC (rev 167301)
+++ trunk/Source/WebCore/ChangeLog	2014-04-15 06:57:02 UTC (rev 167302)
@@ -1,3 +1,10 @@
+2014-04-14  Pratik Solanki  psola...@apple.com
+
+Unreviewed. Attempt to fix Windows build after r167277.
+
+* page/FrameView.cpp:
+(WebCore::FrameView::willPaintContents):
+
 2014-04-14  Commit Queue  commit-qu...@webkit.org
 
 Unreviewed, rolling out r167261.


Modified: trunk/Source/WebCore/page/FrameView.cpp (167301 => 167302)

--- trunk/Source/WebCore/page/FrameView.cpp	2014-04-15 06:51:53 UTC (rev 167301)
+++ trunk/Source/WebCore/page/FrameView.cpp	2014-04-15 06:57:02 UTC (rev 167302)
@@ -3449,7 +3449,7 @@
 paintingState.isTopLevelPainter = !sCurrentPaintTimeStamp;
 
 if (paintingState.isTopLevelPainter  memoryPressureHandler().isUnderMemoryPressure()) {
-LOG(MemoryPressure, Under memory pressure: %s, __PRETTY_FUNCTION__);
+LOG(MemoryPressure, Under memory pressure: %s, WTF_PRETTY_FUNCTION);
 
 // To avoid unnecessary image decoding, we don't prune recently-decoded live resources here since
 // we might need some live bitmaps on painting.






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [167200] trunk/Source/WebCore

[psolanki]

Title: [167200] trunk/Source/WebCore








Revision 167200
Author psola...@apple.com
Date 2014-04-13 12:20:11 -0700 (Sun, 13 Apr 2014)


Log Message
Move early return out of dispatch_async() block so we can return from willSendRequest quickly
https://bugs.webkit.org/show_bug.cgi?id=131478
rdar://problem/16575535

Reviewed by Alexey Proskuryakov.

Do a quick check to see if we need to synthesize the redirect response on the dispatch queue
and return from willSendRequest callback quickly instead of always doing an effectively synchronous
call to the main thread. We can't call synthesizeRedirectResponseIfNecessary on the dispatch
queue since that accesses the ResourceRequest.

No new tests because no change in functionality.

* platform/network/cf/ResourceHandleCFURLConnectionDelegate.h:
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest): Save the
request scheme to use later for early return from willSendRequest.
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willSendRequest):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.h
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (167199 => 167200)

--- trunk/Source/WebCore/ChangeLog	2014-04-13 18:01:54 UTC (rev 167199)
+++ trunk/Source/WebCore/ChangeLog	2014-04-13 19:20:11 UTC (rev 167200)
@@ -1,3 +1,24 @@
+2014-04-10  Pratik Solanki  psola...@apple.com
+
+Move early return out of dispatch_async() block so we can return from willSendRequest quickly
+https://bugs.webkit.org/show_bug.cgi?id=131478
+rdar://problem/16575535
+
+Reviewed by Alexey Proskuryakov.
+
+Do a quick check to see if we need to synthesize the redirect response on the dispatch queue
+and return from willSendRequest callback quickly instead of always doing an effectively synchronous
+call to the main thread. We can't call synthesizeRedirectResponseIfNecessary on the dispatch
+queue since that accesses the ResourceRequest.
+
+No new tests because no change in functionality.
+
+* platform/network/cf/ResourceHandleCFURLConnectionDelegate.h:
+* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
+(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest): Save the
+request scheme to use later for early return from willSendRequest.
+(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willSendRequest):
+
 2014-04-08  Oliver Hunt  oli...@apple.com
 
 Rewrite Function.bind as a builtin


Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.h (167199 => 167200)

--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.h	2014-04-13 18:01:54 UTC (rev 167199)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.h	2014-04-13 19:20:11 UTC (rev 167200)
@@ -94,6 +94,7 @@
 
 protected:
 ResourceHandle* m_handle;
+RetainPtrCFStringRef m_originalScheme;
 };
 
 } // namespace WebCore.


Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp (167199 => 167200)

--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp	2014-04-13 18:01:54 UTC (rev 167199)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp	2014-04-13 19:20:11 UTC (rev 167200)
@@ -62,8 +62,12 @@
 return !!m_handle;
 }
 
-void ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest(CFMutableURLRequestRef)
+void ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest(CFMutableURLRequestRef request)
 {
+CFURLRef requestURL = CFURLRequestGetURL(request);
+if (!requestURL)
+return;
+m_originalScheme = adoptCF(CFURLCopyScheme(requestURL));
 }
 
 void ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupConnectionScheduling(CFURLConnectionRef connection)
@@ -73,6 +77,15 @@
 
 CFURLRequestRef ResourceHandleCFURLConnectionDelegateWithOperationQueue::willSendRequest(CFURLRequestRef cfRequest, CFURLResponseRef originalRedirectResponse)
 {
+// If the protocols of the new request and the current request match, this is not an HSTS redirect and we don't need to synthesize a redirect response.
+if (!originalRedirectResponse) {
+RetainPtrCFStringRef newScheme = adoptCF(CFURLCopyScheme(CFURLRequestGetURL(cfRequest)));
+if (CFStringCompare(newScheme.get(), m_originalScheme.get(), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+CFRetain(cfRequest);
+return cfRequest;
+}
+}
+
 

[webkit-changes] [167201] trunk/Source/WebKit2

[psolanki]

Title: [167201] trunk/Source/WebKit2








Revision 167201
Author psola...@apple.com
Date 2014-04-13 12:23:43 -0700 (Sun, 13 Apr 2014)


Log Message
Don't use ImportanceAssertion on iOS
https://bugs.webkit.org/show_bug.cgi?id=131481
rdar://problem/16575830

Reviewed by Darin Adler.

We have other API to mark processes as being in use on iOS. No need to use ImportanceAssertion.

* Platform/IPC/MessageDecoder.cpp:
* Platform/IPC/MessageDecoder.h:
* Platform/IPC/mac/ConnectionMac.cpp:
(IPC::Connection::receiveSourceEventHandler):
* Platform/IPC/mac/ImportanceAssertion.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp
trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h
trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp
trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (167200 => 167201)

--- trunk/Source/WebKit2/ChangeLog	2014-04-13 19:20:11 UTC (rev 167200)
+++ trunk/Source/WebKit2/ChangeLog	2014-04-13 19:23:43 UTC (rev 167201)
@@ -1,3 +1,19 @@
+2014-04-13  Pratik Solanki  psola...@apple.com
+
+Don't use ImportanceAssertion on iOS
+https://bugs.webkit.org/show_bug.cgi?id=131481
+rdar://problem/16575830
+
+Reviewed by Darin Adler.
+
+We have other API to mark processes as being in use on iOS. No need to use ImportanceAssertion.
+
+* Platform/IPC/MessageDecoder.cpp:
+* Platform/IPC/MessageDecoder.h:
+* Platform/IPC/mac/ConnectionMac.cpp:
+(IPC::Connection::receiveSourceEventHandler):
+* Platform/IPC/mac/ImportanceAssertion.h:
+
 2014-04-13  Commit Queue  commit-qu...@webkit.org
 
 Unreviewed, rolling out r167168 and r167194.


Modified: trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp (167200 => 167201)

--- trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp	2014-04-13 19:20:11 UTC (rev 167200)
+++ trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp	2014-04-13 19:23:43 UTC (rev 167201)
@@ -31,7 +31,7 @@
 #include MessageFlags.h
 #include StringReference.h
 
-#if PLATFORM(IOS) || PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
+#if PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
 #include ImportanceAssertion.h
 #endif
 
@@ -66,7 +66,7 @@
 return m_messageFlags  DispatchMessageWhenWaitingForSyncReply;
 }
 
-#if PLATFORM(IOS) || PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
+#if PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
 void MessageDecoder::setImportanceAssertion(std::unique_ptrImportanceAssertion assertion)
 {
 m_importanceAssertion = std::move(assertion);


Modified: trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h (167200 => 167201)

--- trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h	2014-04-13 19:20:11 UTC (rev 167200)
+++ trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h	2014-04-13 19:23:43 UTC (rev 167201)
@@ -46,7 +46,7 @@
 bool isSyncMessage() const;
 bool shouldDispatchMessageWhenWaitingForSyncReply() const;
 
-#if PLATFORM(IOS) || PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
+#if PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
 void setImportanceAssertion(std::unique_ptrImportanceAssertion);
 #endif
 
@@ -57,7 +57,7 @@
 
 uint64_t m_destinationID;
 
-#if PLATFORM(IOS) || PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
+#if PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
 std::unique_ptrImportanceAssertion m_importanceAssertion;
 #endif
 };


Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp (167200 => 167201)

--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp	2014-04-13 19:20:11 UTC (rev 167200)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp	2014-04-13 19:23:43 UTC (rev 167201)
@@ -416,7 +416,7 @@
 std::unique_ptrMessageDecoder decoder = createMessageDecoder(header);
 ASSERT(decoder);
 
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
+#if PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
 decoder-setImportanceAssertion(std::make_uniqueImportanceAssertion(header));
 #endif
 


Modified: trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h (167200 => 167201)

--- trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h	2014-04-13 19:20:11 UTC (rev 167200)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h	2014-04-13 19:23:43 UTC (rev 167201)
@@ -26,7 +26,7 @@
 #ifndef ImportanceAssertion_h
 #define ImportanceAssertion_h
 
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
+#if PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
 
 #if __has_include(libproc_internal.h)
 #include libproc_internal.h
@@ -58,6 +58,6 @@
 
 }
 
-#endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
+#endif // PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
 
 #endif // ImportanceAssertion_h






___
webkit-changes mailing list
webkit-changes@lists.webkit.org

[webkit-changes] [167143] trunk/Source/WebKit2

[psolanki]

Title: [167143] trunk/Source/WebKit2








Revision 167143
Author psola...@apple.com
Date 2014-04-11 13:33:26 -0700 (Fri, 11 Apr 2014)


Log Message
[iOS WebKit2]: Share NSURLCache directory for webkit processes
https://bugs.webkit.org/show_bug.cgi?id=131513
rdar://problem/16420859

Reviewed by Alexey Proskuryakov.

Use iOS specific NSURLCache API to share the cache directory used by the networking process,
web process and Safari.

* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm
trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (167142 => 167143)

--- trunk/Source/WebKit2/ChangeLog	2014-04-11 20:24:56 UTC (rev 167142)
+++ trunk/Source/WebKit2/ChangeLog	2014-04-11 20:33:26 UTC (rev 167143)
@@ -1,3 +1,19 @@
+2014-04-11  Pratik Solanki  psola...@apple.com
+
+[iOS WebKit2]: Share NSURLCache directory for webkit processes
+https://bugs.webkit.org/show_bug.cgi?id=131513
+rdar://problem/16420859
+
+Reviewed by Alexey Proskuryakov.
+
+Use iOS specific NSURLCache API to share the cache directory used by the networking process,
+web process and Safari.
+
+* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+* WebProcess/cocoa/WebProcessCocoa.mm:
+(WebKit::WebProcess::platformInitializeWebProcess):
+
 2014-04-11  Alexey Proskuryakov  a...@apple.com
 
 [Mac] Add IconServices to WebProcess sandbox profile


Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (167142 => 167143)

--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2014-04-11 20:24:56 UTC (rev 167142)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2014-04-11 20:33:26 UTC (rev 167143)
@@ -44,6 +44,12 @@
 extern C void _CFURLCacheSetMinSizeForVMCachedResource(CFURLCacheRef, CFIndex);
 #endif
 
+#if PLATFORM(IOS)
+@interface NSURLCache (WKDetails)
+-(id)_initWithMemoryCapacity:(NSUInteger)memoryCapacity diskCapacity:(NSUInteger)diskCapacity relativePath:(NSString *)path;
+@end
+#endif
+
 namespace WebKit {
 
 void NetworkProcess::platformLowMemoryHandler(bool)
@@ -54,20 +60,24 @@
 
 void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessCreationParameters parameters)
 {
+#if PLATFORM(IOS)
+if (!parameters.uiProcessBundleIdentifier.isNull()) {
+[NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
+_initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
+diskCapacity:parameters.nsURLCacheDiskCapacity
+relativePath:parameters.uiProcessBundleIdentifier]).get()];
+}
+#else
 m_diskCacheDirectory = parameters.diskCacheDirectory;
 
 if (!m_diskCacheDirectory.isNull()) {
 SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
-#if PLATFORM(IOS)
-NSString *diskCachePath = nil;
-#else
-NSString *diskCachePath = parameters.diskCacheDirectory;
-#endif
 [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
 initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
 diskCapacity:parameters.nsURLCacheDiskCapacity
-diskPath:diskCachePath]).get()];
+diskPath:parameters.diskCacheDirectory]).get()];
 }
+#endif
 
 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
 RetainPtrCFURLCacheRef cache = adoptCF(CFURLCacheCopySharedURLCache());


Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (167142 => 167143)

--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm	2014-04-11 20:24:56 UTC (rev 167142)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm	2014-04-11 20:33:26 UTC (rev 167143)
@@ -53,6 +53,12 @@
 #import objc/runtime.h
 #import stdio.h
 
+#if PLATFORM(IOS)
+@interface NSURLCache (WKDetails)
+-(id)_initWithMemoryCapacity:(NSUInteger)memoryCapacity diskCapacity:(NSUInteger)diskCapacity relativePath:(NSString *)path;
+@end
+#endif
+
 using namespace WebCore;
 
 namespace WebKit {
@@ -164,17 +170,21 @@
 // When the network process is enabled, each web process wants a stand-alone
 // NSURLCache, which it can disable to save memory.
 if (!usesNetworkProcess()) {
-if (!parameters.diskCacheDirectory.isNull()) {
 #if PLATFORM(IOS)
-NSString *diskCachePath = nil;
+if (!parameters.uiProcessBundleIdentifier.isNull()) {
+[NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
+_initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
+diskCapacity:parameters.nsURLCacheDiskCapacity
+

[webkit-changes] [166533] trunk/Source/WebCore

[psolanki]

Title: [166533] trunk/Source/WebCore








Revision 166533
Author psola...@apple.com
Date 2014-03-31 15:04:27 -0700 (Mon, 31 Mar 2014)


Log Message
Unreviewed. iOS build fix after r166532. Add missing comma.

* dom/DocumentMarker.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/DocumentMarker.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (166532 => 166533)

--- trunk/Source/WebCore/ChangeLog	2014-03-31 21:53:42 UTC (rev 166532)
+++ trunk/Source/WebCore/ChangeLog	2014-03-31 22:04:27 UTC (rev 166533)
@@ -1,3 +1,9 @@
+2014-03-31  Pratik Solanki  psola...@apple.com
+
+Unreviewed. iOS build fix after r166532. Add missing comma.
+
+* dom/DocumentMarker.h:
+
 2014-03-31  Brady Eidson  beid...@apple.com
 
 Add variant of phone number parsing that use DocumentMarker in the current selection


Modified: trunk/Source/WebCore/dom/DocumentMarker.h (166532 => 166533)

--- trunk/Source/WebCore/dom/DocumentMarker.h	2014-03-31 21:53:42 UTC (rev 166532)
+++ trunk/Source/WebCore/dom/DocumentMarker.h	2014-03-31 22:04:27 UTC (rev 166533)
@@ -72,7 +72,7 @@
 // and it has alternative text.
 DictationAlternatives = 1  9,
 #if ENABLE(TELEPHONE_NUMBER_DETECTION)
-TelephoneNumber = 1  10
+TelephoneNumber = 1  10,
 #endif
 #if PLATFORM(IOS)
 // FIXME: iOS should share the same Dictation marks as everyone else.






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [166552] trunk/Source/WebKit2

[psolanki]

Title: [166552] trunk/Source/WebKit2








Revision 166552
Author psola...@apple.com
Date 2014-03-31 17:53:29 -0700 (Mon, 31 Mar 2014)


Log Message
Remove duplicate entries in Derived Sources.

Rubber-stamped by Anders Carlsson.

* WebKit2.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/WebKit2/ChangeLog (166551 => 166552)

--- trunk/Source/WebKit2/ChangeLog	2014-04-01 00:19:14 UTC (rev 166551)
+++ trunk/Source/WebKit2/ChangeLog	2014-04-01 00:53:29 UTC (rev 166552)
@@ -1,3 +1,11 @@
+2014-03-31  Pratik Solanki  psola...@apple.com
+
+Remove duplicate entries in Derived Sources.
+
+Rubber-stamped by Anders Carlsson.
+
+* WebKit2.xcodeproj/project.pbxproj:
+
 2014-03-31  Tim Horton  timothy_hor...@apple.com
 
 Fix the build.


Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (166551 => 166552)

--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2014-04-01 00:19:14 UTC (rev 166551)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2014-04-01 00:53:29 UTC (rev 166552)
@@ -6281,8 +6281,6 @@
 		C0CE729D1247E71D00BC0EC4 /* Derived Sources */ = {
 			isa = PBXGroup;
 			children = (
-2D819B9F1862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp */,
-2D819BA01862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h */,
 2DE6943B18BD2A68005C15E5 /* SmartMagnificationControllerMessageReceiver.cpp */,
 2DE6943C18BD2A68005C15E5 /* SmartMagnificationControllerMessages.h */,
 512F58A012A883AD00629530 /* AuthenticationManagerMessageReceiver.cpp */,






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [166400] trunk/Source/WebKit2

[psolanki]

Title: [166400] trunk/Source/WebKit2








Revision 166400
Author psola...@apple.com
Date 2014-03-27 23:24:14 -0700 (Thu, 27 Mar 2014)


Log Message
[iOS WebKit2] Tweak cache sizes for iOS
https://bugs.webkit.org/show_bug.cgi?id=130871

Reviewed by Sam Weinig.

Bring over the tweaks we had made to memory cache size for WebKit1 on iOS to WebKit2. These
were made per findings in rdar://8611638.

* Shared/CacheModel.cpp:
(WebKit::calculateCacheSizes):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/CacheModel.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (166399 => 166400)

--- trunk/Source/WebKit2/ChangeLog	2014-03-28 06:21:42 UTC (rev 166399)
+++ trunk/Source/WebKit2/ChangeLog	2014-03-28 06:24:14 UTC (rev 166400)
@@ -1,3 +1,16 @@
+2014-03-27  Pratik Solanki  psola...@apple.com
+
+[iOS WebKit2] Tweak cache sizes for iOS
+https://bugs.webkit.org/show_bug.cgi?id=130871
+
+Reviewed by Sam Weinig.
+
+Bring over the tweaks we had made to memory cache size for WebKit1 on iOS to WebKit2. These
+were made per findings in rdar://8611638.
+
+* Shared/CacheModel.cpp:
+(WebKit::calculateCacheSizes):
+
 2014-03-27  Jinwoo Song  jinwoo7.s...@samsung.com
 
 [WK2][EFL] Fix wrong parameter name in ewk_view_user_agent_set()


Modified: trunk/Source/WebKit2/Shared/CacheModel.cpp (166399 => 166400)

--- trunk/Source/WebKit2/Shared/CacheModel.cpp	2014-03-28 06:21:42 UTC (rev 166399)
+++ trunk/Source/WebKit2/Shared/CacheModel.cpp	2014-03-28 06:24:14 UTC (rev 166400)
@@ -139,6 +139,12 @@
 
 deadDecodedDataDeletionInterval = 60;
 
+#if PLATFORM(IOS)
+if (memorySize = 1024)
+urlCacheMemoryCapacity = 16 * 1024 * 1024;
+else
+urlCacheMemoryCapacity = 8 * 1024 * 1024;
+#else
 // Foundation memory cache capacity (in bytes)
 // (These values are small because WebCore does most caching itself.)
 if (memorySize = 1024)
@@ -148,7 +154,8 @@
 else if (memorySize = 256)
 urlCacheMemoryCapacity = 1 * 1024 * 1024;
 else
-urlCacheMemoryCapacity =  512 * 1024; 
+urlCacheMemoryCapacity =  512 * 1024;
+#endif
 
 // Foundation disk cache capacity (in bytes)
 if (diskFreeSize = 16384)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [166385] trunk/Source/WebKit2

[psolanki]

Title: [166385] trunk/Source/WebKit2








Revision 166385
Author psola...@apple.com
Date 2014-03-27 16:46:32 -0700 (Thu, 27 Mar 2014)


Log Message
[iOS WebKit2] Share network process code between iOS and Mac
https://bugs.webkit.org/show_bug.cgi?id=130861

Reviewed by Sam Weinig.

Implement network process functions for iOS by moving common code from NetworkProcessMac.mm
to a new shared file NetworkProcessCocoa.mm and sharing between iOS and Mac.

* NetworkProcess/NetworkProcess.h:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm: Added.
(WebKit::NetworkProcess::platformLowMemoryHandler):
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
Common initialization code for iOS and Mac.
(WebKit::memorySize):
(WebKit::volumeFreeSize):
(WebKit::NetworkProcess::platformSetCacheModel):
* NetworkProcess/ios/NetworkProcessIOS.mm:
(WebKit::NetworkProcess::initializeProcess):
Remove unnecessary #if PLATFORM(IOS).
(WebKit::NetworkProcess::platformInitializeNetworkProcess):
* NetworkProcess/mac/NetworkProcessMac.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcess):
* WebKit2.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h
trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm
trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj


Added Paths

trunk/Source/WebKit2/NetworkProcess/cocoa/
trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (166384 => 166385)

--- trunk/Source/WebKit2/ChangeLog	2014-03-27 23:41:46 UTC (rev 166384)
+++ trunk/Source/WebKit2/ChangeLog	2014-03-27 23:46:32 UTC (rev 166385)
@@ -1,3 +1,29 @@
+2014-03-27  Pratik Solanki  psola...@apple.com
+
+[iOS WebKit2] Share network process code between iOS and Mac
+https://bugs.webkit.org/show_bug.cgi?id=130861
+
+Reviewed by Sam Weinig.
+
+Implement network process functions for iOS by moving common code from NetworkProcessMac.mm
+to a new shared file NetworkProcessCocoa.mm and sharing between iOS and Mac.
+
+* NetworkProcess/NetworkProcess.h:
+* NetworkProcess/cocoa/NetworkProcessCocoa.mm: Added.
+(WebKit::NetworkProcess::platformLowMemoryHandler):
+(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+Common initialization code for iOS and Mac.
+(WebKit::memorySize):
+(WebKit::volumeFreeSize):
+(WebKit::NetworkProcess::platformSetCacheModel):
+* NetworkProcess/ios/NetworkProcessIOS.mm:
+(WebKit::NetworkProcess::initializeProcess):
+Remove unnecessary #if PLATFORM(IOS).
+(WebKit::NetworkProcess::platformInitializeNetworkProcess):
+* NetworkProcess/mac/NetworkProcessMac.mm:
+(WebKit::NetworkProcess::platformInitializeNetworkProcess):
+* WebKit2.xcodeproj/project.pbxproj:
+
 2014-03-27  Enrica Casucci  enr...@apple.com
 
 Add support for AirPlay picker in WK2 for iOS.


Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (166384 => 166385)

--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h	2014-03-27 23:41:46 UTC (rev 166384)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h	2014-03-27 23:46:32 UTC (rev 166385)
@@ -138,6 +138,8 @@
 NetworkProcessSupplementMap m_supplements;
 
 #if PLATFORM(COCOA)
+void platformInitializeNetworkProcessCocoa(const NetworkProcessCreationParameters);
+
 // FIXME: We'd like to be able to do this without the #ifdef, but WorkQueue + BinarySemaphore isn't good enough since
 // multiple requests to clear the cache can come in before previous requests complete, and we need to wait for all of them.
 // In the future using WorkQueue and a counting semaphore would work, as would WorkQueue supporting the libdispatch concept of work groups.


Added: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (0 => 166385)

--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm	(rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2014-03-27 23:46:32 UTC (rev 166385)
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED 

[webkit-changes] [166387] trunk/Source/WebKit2

[psolanki]

Title: [166387] trunk/Source/WebKit2








Revision 166387
Author psola...@apple.com
Date 2014-03-27 17:27:27 -0700 (Thu, 27 Mar 2014)


Log Message
[iOS WebKit2] Don't pass disk cache directory path on iOS
https://bugs.webkit.org/show_bug.cgi?id=130862

Reviewed by Sam Weinig.

The diskPath passed to NSURLCache initializer is treated differently on Mac and iOS. Just
pass nil for now until we sort out the API.

* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm
trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (166386 => 166387)

--- trunk/Source/WebKit2/ChangeLog	2014-03-27 23:52:23 UTC (rev 166386)
+++ trunk/Source/WebKit2/ChangeLog	2014-03-28 00:27:27 UTC (rev 166387)
@@ -1,5 +1,20 @@
 2014-03-27  Pratik Solanki  psola...@apple.com
 
+[iOS WebKit2] Don't pass disk cache directory path on iOS
+https://bugs.webkit.org/show_bug.cgi?id=130862
+
+Reviewed by Sam Weinig.
+
+The diskPath passed to NSURLCache initializer is treated differently on Mac and iOS. Just
+pass nil for now until we sort out the API.
+
+* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+* WebProcess/cocoa/WebProcessCocoa.mm:
+(WebKit::WebProcess::platformInitializeWebProcess):
+
+2014-03-27  Pratik Solanki  psola...@apple.com
+
 [iOS WebKit2] Share network process code between iOS and Mac
 https://bugs.webkit.org/show_bug.cgi?id=130861
 


Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (166386 => 166387)

--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2014-03-27 23:52:23 UTC (rev 166386)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2014-03-28 00:27:27 UTC (rev 166387)
@@ -56,10 +56,15 @@
 
 if (!m_diskCacheDirectory.isNull()) {
 SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
+#if PLATFORM(IOS)
+NSString *diskCachePath = nil;
+#else
+NSString *diskCachePath = parameters.diskCacheDirectory;
+#endif
 [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
 initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
 diskCapacity:parameters.nsURLCacheDiskCapacity
-diskPath:parameters.diskCacheDirectory]).get()];
+diskPath:diskCachePath]).get()];
 }
 
 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED = 1090


Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (166386 => 166387)

--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm	2014-03-27 23:52:23 UTC (rev 166386)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm	2014-03-28 00:27:27 UTC (rev 166387)
@@ -165,10 +165,15 @@
 // NSURLCache, which it can disable to save memory.
 if (!usesNetworkProcess()) {
 if (!parameters.diskCacheDirectory.isNull()) {
+#if PLATFORM(IOS)
+NSString *diskCachePath = nil;
+#else
+NSString *diskCachePath = parameters.diskCacheDirectory;
+#endif
 [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
 initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
 diskCapacity:parameters.nsURLCacheDiskCapacity
-diskPath:parameters.diskCacheDirectory]).get()];
+diskPath:diskCachePath]).get()];
 }
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [166319] trunk/Source/WebCore

[psolanki]

Title: [166319] trunk/Source/WebCore








Revision 166319
Author psola...@apple.com
Date 2014-03-26 14:45:27 -0700 (Wed, 26 Mar 2014)


Log Message
Unreviewed. iOS build fix after r166312. Soft link CMTimeRangeGetEnd.

* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (166318 => 166319)

--- trunk/Source/WebCore/ChangeLog	2014-03-26 21:32:19 UTC (rev 166318)
+++ trunk/Source/WebCore/ChangeLog	2014-03-26 21:45:27 UTC (rev 166319)
@@ -1,3 +1,9 @@
+2014-03-26  Pratik Solanki  psola...@apple.com
+
+Unreviewed. iOS build fix after r166312. Soft link CMTimeRangeGetEnd.
+
+* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+
 2014-03-26  Timothy Hatcher  timo...@apple.com
 
 Propagate the hiddenFromInspector flag on ResourceRequest in


Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (166318 => 166319)

--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2014-03-26 21:32:19 UTC (rev 166318)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2014-03-26 21:45:27 UTC (rev 166319)
@@ -68,6 +68,7 @@
 SOFT_LINK(CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time))
 SOFT_LINK(CoreMedia, CMTimeMake, CMTime, (int64_t value, int32_t timescale), (value, timescale))
 SOFT_LINK(CoreMedia, CMTimeRangeContainsTime, Boolean, (CMTimeRange range, CMTime time), (range, time))
+SOFT_LINK(CoreMedia, CMTimeRangeGetEnd, CMTime, (CMTimeRange range), (range))
 SOFT_LINK(CoreMedia, CMTimeRangeMake, CMTimeRange, (CMTime start, CMTime duration), (start, duration))
 SOFT_LINK(CoreMedia, CMTimeSubtract, CMTime, (CMTime minuend, CMTime subtrahend), (minuend, subtrahend))
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [166271] trunk/Source/WebKit2

[psolanki]

Title: [166271] trunk/Source/WebKit2








Revision 166271
Author psola...@apple.com
Date 2014-03-25 17:31:55 -0700 (Tue, 25 Mar 2014)


Log Message
Remove PLATFORM(IOS) from NetworkProcessMac.mm
https://bugs.webkit.org/show_bug.cgi?id=130751

Reviewed by Alexey Proskuryakov.

Code in NetworkProcessMac.mm is guarded by PLATFORM(MAC) and so is not compiled on iOS.
Having PLATFORM(IOS) code in this file is unnecessary and confusing.

* NetworkProcess/mac/NetworkProcessMac.mm:
(WebKit::NetworkProcess::initializeProcessName):
(WebKit::overrideSystemProxies):
(WebKit::NetworkProcess::platformInitializeNetworkProcess):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (166270 => 166271)

--- trunk/Source/WebKit2/ChangeLog	2014-03-26 00:01:09 UTC (rev 166270)
+++ trunk/Source/WebKit2/ChangeLog	2014-03-26 00:31:55 UTC (rev 166271)
@@ -1,3 +1,18 @@
+2014-03-25  Pratik Solanki  psola...@apple.com
+
+Remove PLATFORM(IOS) from NetworkProcessMac.mm
+https://bugs.webkit.org/show_bug.cgi?id=130751
+
+Reviewed by Alexey Proskuryakov.
+
+Code in NetworkProcessMac.mm is guarded by PLATFORM(MAC) and so is not compiled on iOS.
+Having PLATFORM(IOS) code in this file is unnecessary and confusing.
+
+* NetworkProcess/mac/NetworkProcessMac.mm:
+(WebKit::NetworkProcess::initializeProcessName):
+(WebKit::overrideSystemProxies):
+(WebKit::NetworkProcess::platformInitializeNetworkProcess):
+
 2014-03-25  Anders Carlsson  ander...@apple.com
 
 Add a UI delegate callback for handling window.open


Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm (166270 => 166271)

--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm	2014-03-26 00:01:09 UTC (rev 166270)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm	2014-03-26 00:31:55 UTC (rev 166271)
@@ -51,7 +51,7 @@
 extern C CFURLCacheRef CFURLCacheCopySharedURLCache();
 extern C void _CFURLCachePurgeMemoryCache(CFURLCacheRef);
 
-#if !PLATFORM(IOS)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
+#if __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
 extern C void _CFURLCacheSetMinSizeForVMCachedResource(CFURLCacheRef, CFIndex);
 #endif
 
@@ -71,15 +71,10 @@
 
 void NetworkProcess::initializeProcessName(const ChildProcessInitializationParameters parameters)
 {
-#if PLATFORM(IOS)
-UNUSED_PARAM(parameters);
-#else
 NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING(%@ Networking, visible name of the network process. The argument is the application name.), (NSString *)parameters.uiProcessName];
 WKSetVisibleApplicationName((CFStringRef)applicationName);
-#endif
 }
 
-#if !PLATFORM(IOS)
 static void overrideSystemProxies(const String httpProxy, const String httpsProxy)
 {
 NSMutableDictionary *proxySettings = [NSMutableDictionary dictionary];
@@ -112,7 +107,6 @@
 if ([proxySettings count]  0)
 WKCFNetworkSetOverrideSystemProxySettings((CFDictionaryRef)proxySettings);
 }
-#endif
 
 void NetworkProcess::platformLowMemoryHandler(bool)
 {
@@ -135,12 +129,10 @@
 SecItemShim::shared().initialize(this);
 #endif
 
-#if !PLATFORM(IOS)
 if (!parameters.httpProxy.isNull() || !parameters.httpsProxy.isNull())
 overrideSystemProxies(parameters.httpProxy, parameters.httpsProxy);
-#endif
 
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
+#if __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
 RetainPtrCFURLCacheRef cache = adoptCF(CFURLCacheCopySharedURLCache());
 if (!cache)
 return;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [166272] trunk/Source/WebCore

[psolanki]

Title: [166272] trunk/Source/WebCore








Revision 166272
Author psola...@apple.com
Date 2014-03-25 17:39:55 -0700 (Tue, 25 Mar 2014)


Log Message
Attempt to fix iOS build after r166261.

* WebCore.xcodeproj/project.pbxproj: Make SystemSleepListener.h a private header.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/WebCore/ChangeLog (166271 => 166272)

--- trunk/Source/WebCore/ChangeLog	2014-03-26 00:31:55 UTC (rev 166271)
+++ trunk/Source/WebCore/ChangeLog	2014-03-26 00:39:55 UTC (rev 166272)
@@ -1,3 +1,9 @@
+2014-03-25  Pratik Solanki  psola...@apple.com
+
+Attempt to fix iOS build after r166261.
+
+* WebCore.xcodeproj/project.pbxproj: Make SystemSleepListener.h a private header.
+
 2014-03-21  Jer Noble  jer.no...@apple.com
 
 [iOS] Enable caption support in full screen.


Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (166271 => 166272)

--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2014-03-26 00:31:55 UTC (rev 166271)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2014-03-26 00:39:55 UTC (rev 166272)
@@ -5560,7 +5560,7 @@
 		CD9DE18117AAD6A400EA386D /* DOMURLMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD9DE17E17AAD64E00EA386D /* DOMURLMediaSource.cpp */; };
 		CD9DE18217AAD6A400EA386D /* DOMURLMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9DE17F17AAD64E00EA386D /* DOMURLMediaSource.h */; };
 		CDA07FBD18E0A16A004699FA /* SystemSleepListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA07FBB18E0A16A004699FA /* SystemSleepListener.cpp */; };
-		CDA07FBE18E0A16A004699FA /* SystemSleepListener.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA07FBC18E0A16A004699FA /* SystemSleepListener.h */; };
+		CDA07FBE18E0A16A004699FA /* SystemSleepListener.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA07FBC18E0A16A004699FA /* SystemSleepListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		CDA07FC118E0A22B004699FA /* SystemSleepListenerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA07FBF18E0A22B004699FA /* SystemSleepListenerMac.mm */; };
 		CDA07FC218E0A22B004699FA /* SystemSleepListenerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA07FC018E0A22B004699FA /* SystemSleepListenerMac.h */; };
 		CDA79824170A258300D45C55 /* AudioSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA79823170A258300D45C55 /* AudioSession.cpp */; };






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [166284] trunk/Source/WebCore

[psolanki]

Title: [166284] trunk/Source/WebCore








Revision 166284
Author psola...@apple.com
Date 2014-03-25 22:37:00 -0700 (Tue, 25 Mar 2014)


Log Message
iOS build fix. Add missing semicolon.

* editing/cocoa/HTMLConverter.mm:
(HTMLConverter::_addAttachmentForElement):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (166283 => 166284)

--- trunk/Source/WebCore/ChangeLog	2014-03-26 04:22:52 UTC (rev 166283)
+++ trunk/Source/WebCore/ChangeLog	2014-03-26 05:37:00 UTC (rev 166284)
@@ -1,3 +1,10 @@
+2014-03-25  Pratik Solanki  psola...@apple.com
+
+iOS build fix. Add missing semicolon.
+
+* editing/cocoa/HTMLConverter.mm:
+(HTMLConverter::_addAttachmentForElement):
+
 2014-03-25  Sam Weinig  s...@webkit.org
 
 Speculative iOS build fix.


Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (166283 => 166284)

--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm	2014-03-26 04:22:52 UTC (rev 166283)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm	2014-03-26 05:37:00 UTC (rev 166284)
@@ -1505,7 +1505,7 @@
 #if PLATFORM(IOS)
 float verticalAlign = 0.0;
 if (element)
-_caches-floatPropertyValueForNode(*core(element), CSSPropertyVerticalAlign, verticalAlign)
+_caches-floatPropertyValueForNode(*core(element), CSSPropertyVerticalAlign, verticalAlign);
 attachment.get().bounds = CGRectMake(0, (verticalAlign / 100) * element.clientHeight, element.clientWidth, element.clientHeight);
 #endif
 RetainPtrNSString string = adoptNS([[NSString alloc] initWithFormat:(needsParagraph ? @%C\n : @%C), static_castunichar(NSAttachmentCharacter)]);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [166042] trunk/Source/WebCore

[psolanki]

Title: [166042] trunk/Source/WebCore








Revision 166042
Author psola...@apple.com
Date 2014-03-20 23:30:10 -0700 (Thu, 20 Mar 2014)


Log Message
Unreviewed. iOS build fix after r166017, r166032.

* platform/ScrollView.cpp:
(WebCore::ScrollView::visibleContentRectInternal):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/ScrollView.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (166041 => 166042)

--- trunk/Source/WebCore/ChangeLog	2014-03-21 05:26:21 UTC (rev 166041)
+++ trunk/Source/WebCore/ChangeLog	2014-03-21 06:30:10 UTC (rev 166042)
@@ -1,3 +1,10 @@
+2014-03-20  Pratik Solanki  psola...@apple.com
+
+Unreviewed. iOS build fix after r166017, r166032.
+
+* platform/ScrollView.cpp:
+(WebCore::ScrollView::visibleContentRectInternal):
+
 2014-03-20  Hyowon Kim  hw1008@samsung.com
 
 Move to using std::unique_ptr for EFL objects.


Modified: trunk/Source/WebCore/platform/ScrollView.cpp (166041 => 166042)

--- trunk/Source/WebCore/platform/ScrollView.cpp	2014-03-21 05:26:21 UTC (rev 166041)
+++ trunk/Source/WebCore/platform/ScrollView.cpp	2014-03-21 06:30:10 UTC (rev 166042)
@@ -307,7 +307,11 @@
 return m_fixedVisibleContentRect;
 #endif
 
+#if PLATFORM(IOS)
+return unobscuredContentRect();
+#else
 return unobscuredContentRect(scrollbarInclusion);
+#endif
 }
 #endif
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [166048] trunk/Source/WebKit

[psolanki]

Title: [166048] trunk/Source/WebKit








Revision 166048
Author psola...@apple.com
Date 2014-03-21 00:25:05 -0700 (Fri, 21 Mar 2014)


Log Message
Check for inappropriate macros in private headers
https://bugs.webkit.org/show_bug.cgi?id=130564

Reviewed by Filip Pizlo.

Check PrivateHeaders for inappropriate macros as well so that we avoid build breakages like
the one due to the original commit for bug 130142.

* WebKit.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/WebKit/ChangeLog (166047 => 166048)

--- trunk/Source/WebKit/ChangeLog	2014-03-21 07:13:59 UTC (rev 166047)
+++ trunk/Source/WebKit/ChangeLog	2014-03-21 07:25:05 UTC (rev 166048)
@@ -1,3 +1,15 @@
+2014-03-21  Pratik Solanki  psola...@apple.com
+
+Check for inappropriate macros in private headers
+https://bugs.webkit.org/show_bug.cgi?id=130564
+
+Reviewed by Filip Pizlo.
+
+Check PrivateHeaders for inappropriate macros as well so that we avoid build breakages like
+the one due to the original commit for bug 130142.
+
+* WebKit.xcodeproj/project.pbxproj:
+
 2014-03-20  Thiago de Barros Lacerda  thiago.lace...@openbossa.org
 
 [EFL][GTK] Get CMake to find Freetype2 properly


Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (166047 => 166048)

--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2014-03-21 07:13:59 UTC (rev 166047)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2014-03-21 07:25:05 UTC (rev 166048)
@@ -2227,7 +2227,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = if [ \${ACTION}\ = \installhdrs\ ]; then\nexit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers ]; then\n../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers Headers || exit $?\nfi;
+			shellScript = if [ \${ACTION}\ = \installhdrs\ ]; then\nexit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers ]; then\n../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers Headers PrivateHeaders || exit $?\nfi;
 		};
 /* End PBXShellScriptBuildPhase section */
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [166057] trunk/Source/WebCore

[psolanki]

Title: [166057] trunk/Source/WebCore








Revision 166057
Author psola...@apple.com
Date 2014-03-21 02:24:08 -0700 (Fri, 21 Mar 2014)


Log Message
Unreviewed. iOS build fix after r166046.

* WebCore.exp.in:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in




Diff

Modified: trunk/Source/WebCore/ChangeLog (166056 => 166057)

--- trunk/Source/WebCore/ChangeLog	2014-03-21 08:58:02 UTC (rev 166056)
+++ trunk/Source/WebCore/ChangeLog	2014-03-21 09:24:08 UTC (rev 166057)
@@ -1,3 +1,9 @@
+2014-03-21  Pratik Solanki  psola...@apple.com
+
+Unreviewed. iOS build fix after r166046.
+
+* WebCore.exp.in:
+
 2014-03-21  Laszlo Vidacs  lvidacs.u-sze...@partner.samsung.com
 
 Fix the !ENABLE(FILTERS) build


Modified: trunk/Source/WebCore/WebCore.exp.in (166056 => 166057)

--- trunk/Source/WebCore/WebCore.exp.in	2014-03-21 08:58:02 UTC (rev 166056)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-03-21 09:24:08 UTC (rev 166057)
@@ -802,6 +802,7 @@
 __ZN7WebCore19ResourceRequestBase50setResponseContentDispositionEncodingFallbackArrayERKN3WTF6StringES4_S4_
 __ZN7WebCore19ResourceRequestBase6setURLERKNS_3URLE
 __ZN7WebCore19SQLResultConstraintE
+__ZN7WebCore19TextResourceDecoder14decodeAndFlushEPKcm
 __ZN7WebCore19TextResourceDecoder5flushEv
 __ZN7WebCore19TextResourceDecoder6decodeEPKcm
 __ZN7WebCore19TextResourceDecoderC1ERKN3WTF6StringERKNS_12TextEncodingEb
@@ -2141,7 +2142,6 @@
 __ZN7WebCore17ScrollbarThemeMac24removeOverhangAreaShadowEP7CALayer
 __ZN7WebCore17ScrollbarThemeMac27setUpOverhangAreaBackgroundEP7CALayerRKNS_5ColorE
 __ZN7WebCore17ScrollbarThemeMac28removeOverhangAreaBackgroundEP7CALayer
-__ZN7WebCore19TextResourceDecoder14decodeAndFlushEPKcm
 __ZN7WebCore19applicationIsSafariEv
 __ZN7WebCore20PlatformEventFactory24createPlatformMouseEventEP7NSEventP6NSView
 __ZN7WebCore20PlatformEventFactory27createPlatformKeyboardEventEP7NSEvent






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [166075] trunk/Source/WebKit2

[psolanki]

Title: [166075] trunk/Source/WebKit2








Revision 166075
Author psola...@apple.com
Date 2014-03-21 10:55:59 -0700 (Fri, 21 Mar 2014)


Log Message
Add callbacks in WebKit2 Cocoa API for page load testing
https://bugs.webkit.org/show_bug.cgi?id=130569

Reviewed by Anders Carlsson.

* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h:
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
(didFirstVisuallyNonEmptyLayoutForFrame):
(didHandleOnloadEventsForFrame):
(setUpPageLoaderClient):
(willSendRequestForFrame):
(didInitiateLoadForResource):
(didFinishLoadForResource):
(didFailLoadForResource):
(setUpResourceLoadClient):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (166074 => 166075)

--- trunk/Source/WebKit2/ChangeLog	2014-03-21 17:52:39 UTC (rev 166074)
+++ trunk/Source/WebKit2/ChangeLog	2014-03-21 17:55:59 UTC (rev 166075)
@@ -1,3 +1,21 @@
+2014-03-21  Pratik Solanki  psola...@apple.com
+
+Add callbacks in WebKit2 Cocoa API for page load testing
+https://bugs.webkit.org/show_bug.cgi?id=130569
+
+Reviewed by Anders Carlsson.
+
+* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h:
+* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
+(didFirstVisuallyNonEmptyLayoutForFrame):
+(didHandleOnloadEventsForFrame):
+(setUpPageLoaderClient):
+(willSendRequestForFrame):
+(didInitiateLoadForResource):
+(didFinishLoadForResource):
+(didFailLoadForResource):
+(setUpResourceLoadClient):
+
 2014-03-21  Ryuan Choi  ryuan.c...@samsung.com
 
 [EFL][WK2] Remove Ewk_Error parameter from some async callbacks


Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h (166074 => 166075)

--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h	2014-03-21 17:52:39 UTC (rev 166074)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h	2014-03-21 17:55:59 UTC (rev 166075)
@@ -42,13 +42,19 @@
 - (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller didSameDocumentNavigationForFrame:(WKWebProcessPlugInFrame *)frame;
 - (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller globalObjectIsAvailableForFrame:(WKWebProcessPlugInFrame *)frame inScriptWorld:(WKWebProcessPlugInScriptWorld *)scriptWorld;
 - (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller didRemoveFrameFromHierarchy:(WKWebProcessPlugInFrame *)frame;
+- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller didHandleOnloadEventsForFrame:(WKWebProcessPlugInFrame *)frame;
 
 // Layout
 - (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller didLayoutForFrame:(WKWebProcessPlugInFrame *)frame;
 - (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller renderingProgressDidChange:(WKRenderingProgressEvents)events;
+- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController*)controller didFirstVisuallyNonEmptyLayoutForFrame:(WKWebProcessPlugInFrame *)frame;
 
 // Resource loading
 
 - (NSURLRequest *)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse;
 
+- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame didInitiateLoadForResource:(uint64_t)resource request:(NSURLRequest *)request;
+- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame didFinishLoadForResource:(uint64_t)resource;
+- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame didFailLoadForResource:(uint64_t)resource error:(NSError *)error;
+
 @end


Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (166074 => 166075)

--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm	2014-03-21 17:52:39 UTC (rev 166074)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm	2014-03-21 17:55:59 UTC (rev 166075)
@@ -154,6 +154,23 @@
 

[webkit-changes] [165979] trunk/Source

[psolanki]

Title: [165979] trunk/Source








Revision 165979
Author psola...@apple.com
Date 2014-03-20 11:40:36 -0700 (Thu, 20 Mar 2014)


Log Message
[iOS] Get code to compile on older iOS versions
https://bugs.webkit.org/show_bug.cgi?id=130142
rdar://problem/16302908

Reviewed by Darin Adler.

Source/WebCore:

* WebCore.exp.in:
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
(-[WebVideoFullscreenController WebCore::]):
(-[WebVideoFullscreenController enterFullscreen:]):
(-[WebVideoFullscreenController exitFullscreen]):
* platform/ios/WebVideoFullscreenInterfaceAVKit.h:
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
* platform/mac/HTMLConverter.mm:
(_dateForString):
* platform/network/cf/CookieJarCFNet.cpp:
(WebCore::copyCookiesForURLWithFirstPartyURL):
* platform/text/ios/LocalizedDateCache.mm:
(WebCore::LocalizedDateCache::calculateMaximumWidth):
* platform/text/mac/LocaleMac.mm:
(WebCore::LocaleMac::LocaleMac):

Source/WebKit/mac:

* History/WebHistory.mm:
(getDayBoundaries):
* Plugins/WebPluginController.h:
* Plugins/WebPluginController.mm:
(+[WebPluginController plugInViewWithArguments:fromPluginPackage:]):
* WebCoreSupport/WebFrameLoaderClient.mm:
(pluginView):
* WebView/WebPreferences.mm:
(-[WebPreferences _setAllowCompositingLayerVisualDegradation:]):
* WebView/WebPreferencesPrivate.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h
trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
trunk/Source/WebCore/platform/mac/HTMLConverter.mm
trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp
trunk/Source/WebCore/platform/text/ios/LocalizedDateCache.mm
trunk/Source/WebCore/platform/text/mac/LocaleMac.mm
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/History/WebHistory.mm
trunk/Source/WebKit/mac/Plugins/WebPluginController.h
trunk/Source/WebKit/mac/Plugins/WebPluginController.mm
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
trunk/Source/WebKit/mac/WebView/WebPreferences.mm
trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (165978 => 165979)

--- trunk/Source/WebCore/ChangeLog	2014-03-20 18:34:51 UTC (rev 165978)
+++ trunk/Source/WebCore/ChangeLog	2014-03-20 18:40:36 UTC (rev 165979)
@@ -1,3 +1,27 @@
+2014-03-20  Pratik Solanki  psola...@apple.com
+
+[iOS] Get code to compile on older iOS versions
+https://bugs.webkit.org/show_bug.cgi?id=130142
+rdar://problem/16302908
+
+Reviewed by Darin Adler.
+
+* WebCore.exp.in:
+* platform/ios/WebVideoFullscreenControllerAVKit.mm:
+(-[WebVideoFullscreenController WebCore::]):
+(-[WebVideoFullscreenController enterFullscreen:]):
+(-[WebVideoFullscreenController exitFullscreen]):
+* platform/ios/WebVideoFullscreenInterfaceAVKit.h:
+* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+* platform/mac/HTMLConverter.mm:
+(_dateForString):
+* platform/network/cf/CookieJarCFNet.cpp:
+(WebCore::copyCookiesForURLWithFirstPartyURL):
+* platform/text/ios/LocalizedDateCache.mm:
+(WebCore::LocalizedDateCache::calculateMaximumWidth):
+* platform/text/mac/LocaleMac.mm:
+(WebCore::LocaleMac::LocaleMac):
+
 2014-03-20  Simon Fraser  simon.fra...@apple.com
 
 Followup build fix: AnimationBase.h needs to be private because


Modified: trunk/Source/WebCore/WebCore.exp.in (165978 => 165979)

--- trunk/Source/WebCore/WebCore.exp.in	2014-03-20 18:34:51 UTC (rev 165978)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-03-20 18:40:36 UTC (rev 165979)
@@ -3234,15 +3234,6 @@
 #endif
 
 #if ENABLE(VIDEO)  PLATFORM(IOS)
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit11setDurationEd
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit14exitFullscreenEv
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit14setCurrentTimeEdd
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit15enterFullscreenER7CALayer
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit18setVideoDimensionsEbff
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit26setWebVideoFullscreenModelEPNS_23WebVideoFullscreenModelE
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit35setWebVideoFullscreenChangeObserverEPNS_32WebVideoFullscreenChangeObserverE
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit7setRateEbf
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKitC2Ev
 __ZN7WebCore35WebVideoFullscreenModelMediaElement10seekToTimeEd
 __ZN7WebCore35WebVideoFullscreenModelMediaElement11handleEventEPNS_22ScriptExecutionContextEPNS_5EventE
 __ZN7WebCore35WebVideoFullscreenModelMediaElement15setMediaElementEPNS_16HTMLMediaElementE
@@ -3257,11 +3248,23 @@
 __ZN7WebCore35WebVideoFullscreenModelMediaElementD2Ev
 __ZNK7WebCore16HTMLVideoElement10videoWidthEv
 __ZNK7WebCore16HTMLVideoElement11videoHeightEv

[webkit-changes] [165992] trunk/Source/WebCore

[psolanki]

Title: [165992] trunk/Source/WebCore








Revision 165992
Author psola...@apple.com
Date 2014-03-20 13:30:46 -0700 (Thu, 20 Mar 2014)


Log Message
iOS build fix after r165979.

* generate-export-file:
(preprocessorMacros):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/generate-export-file




Diff

Modified: trunk/Source/WebCore/ChangeLog (165991 => 165992)

--- trunk/Source/WebCore/ChangeLog	2014-03-20 20:26:28 UTC (rev 165991)
+++ trunk/Source/WebCore/ChangeLog	2014-03-20 20:30:46 UTC (rev 165992)
@@ -1,3 +1,10 @@
+2014-03-20  Pratik Solanki  psola...@apple.com
+
+iOS build fix after r165979.
+
+* generate-export-file:
+(preprocessorMacros):
+
 2014-03-20  David Hyatt  hy...@apple.com
 
 [New Multicolumn] getClientRects returns wrong rectangle


Modified: trunk/Source/WebCore/generate-export-file (165991 => 165992)

--- trunk/Source/WebCore/generate-export-file	2014-03-20 20:26:28 UTC (rev 165991)
+++ trunk/Source/WebCore/generate-export-file	2014-03-20 20:30:46 UTC (rev 165992)
@@ -96,6 +96,14 @@
 push(@args, -I . $ENV{BUILT_PRODUCTS_DIR} . $ENV{SDKROOT} . /usr/local/include) if $ENV{BUILT_PRODUCTS_DIR};
 push(@args, -I . $ENV{SDKROOT} . /usr/local/include);
 
+chomp(my $sdk_version = `xcrun --sdk $ENV{SDKROOT} --show-sdk-version`);
+if ($ENV{PLATFORM_NAME} eq iphoneos) {
+push(@args, -miphoneos-min-version= . $sdk_version);
+}
+if ($ENV{PLATFORM_NAME} eq iphonesimulator) {
+push(@args, -mios-simulator-version-min= . $sdk_version);
+}
+
 # Print out #define lines for all macros.
 push(@args, qw(-dM /dev/null));
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [166004] trunk/Source/WebCore

[psolanki]

Title: [166004] trunk/Source/WebCore








Revision 166004
Author psola...@apple.com
Date 2014-03-20 14:53:03 -0700 (Thu, 20 Mar 2014)


Log Message
iOS build fix after r165992.

* generate-export-file:
(preprocessorMacros):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/generate-export-file




Diff

Modified: trunk/Source/WebCore/ChangeLog (166003 => 166004)

--- trunk/Source/WebCore/ChangeLog	2014-03-20 21:19:03 UTC (rev 166003)
+++ trunk/Source/WebCore/ChangeLog	2014-03-20 21:53:03 UTC (rev 166004)
@@ -1,3 +1,10 @@
+2014-03-20  Pratik Solanki  psola...@apple.com
+
+iOS build fix after r165992.
+
+* generate-export-file:
+(preprocessorMacros):
+
 2014-03-20  Thiago de Barros Lacerda  thiago.lace...@openbossa.org
 
 [WebRTC] Moving RTCConfiguration and RTCIceServer to Modules/mediastream


Modified: trunk/Source/WebCore/generate-export-file (166003 => 166004)

--- trunk/Source/WebCore/generate-export-file	2014-03-20 21:19:03 UTC (rev 166003)
+++ trunk/Source/WebCore/generate-export-file	2014-03-20 21:53:03 UTC (rev 166004)
@@ -98,7 +98,7 @@
 
 chomp(my $sdk_version = `xcrun --sdk $ENV{SDKROOT} --show-sdk-version`);
 if ($ENV{PLATFORM_NAME} eq iphoneos) {
-push(@args, -miphoneos-min-version= . $sdk_version);
+push(@args, -miphoneos-version-min= . $sdk_version);
 }
 if ($ENV{PLATFORM_NAME} eq iphonesimulator) {
 push(@args, -mios-simulator-version-min= . $sdk_version);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [165944] trunk/Source

[psolanki]

Title: [165944] trunk/Source








Revision 165944
Author psola...@apple.com
Date 2014-03-19 22:10:51 -0700 (Wed, 19 Mar 2014)


Log Message
[iOS] Get code to compile on older iOS versions
https://bugs.webkit.org/show_bug.cgi?id=130142
rdar://problem/16302908

Reviewed by Darin Adler.

Source/WebCore:

* WebCore.exp.in:
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
(-[WebVideoFullscreenController WebCore::]):
(-[WebVideoFullscreenController enterFullscreen:]):
(-[WebVideoFullscreenController exitFullscreen]):
* platform/ios/WebVideoFullscreenInterfaceAVKit.h:
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
* platform/mac/HTMLConverter.mm:
(_dateForString):
* platform/network/cf/CookieJarCFNet.cpp:
(WebCore::copyCookiesForURLWithFirstPartyURL):
* platform/text/ios/LocalizedDateCache.mm:
(WebCore::LocalizedDateCache::calculateMaximumWidth):
* platform/text/mac/LocaleMac.mm:
(WebCore::LocaleMac::LocaleMac):

Source/WebKit/mac:

* History/WebHistory.mm:
(getDayBoundaries):
* Plugins/WebPluginController.h:
* Plugins/WebPluginController.mm:
(+[WebPluginController plugInViewWithArguments:fromPluginPackage:]):
* WebCoreSupport/WebFrameLoaderClient.mm:
(pluginView):
* WebView/WebPreferences.mm:
(-[WebPreferences _setAllowCompositingLayerVisualDegradation:]):
* WebView/WebPreferencesPrivate.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h
trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
trunk/Source/WebCore/platform/mac/HTMLConverter.mm
trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp
trunk/Source/WebCore/platform/text/ios/LocalizedDateCache.mm
trunk/Source/WebCore/platform/text/mac/LocaleMac.mm
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/History/WebHistory.mm
trunk/Source/WebKit/mac/Plugins/WebPluginController.h
trunk/Source/WebKit/mac/Plugins/WebPluginController.mm
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
trunk/Source/WebKit/mac/WebView/WebPreferences.mm
trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (165943 => 165944)

--- trunk/Source/WebCore/ChangeLog	2014-03-20 03:12:51 UTC (rev 165943)
+++ trunk/Source/WebCore/ChangeLog	2014-03-20 05:10:51 UTC (rev 165944)
@@ -1,3 +1,27 @@
+2014-03-19  Pratik Solanki  psola...@apple.com
+
+[iOS] Get code to compile on older iOS versions
+https://bugs.webkit.org/show_bug.cgi?id=130142
+rdar://problem/16302908
+
+Reviewed by Darin Adler.
+
+* WebCore.exp.in:
+* platform/ios/WebVideoFullscreenControllerAVKit.mm:
+(-[WebVideoFullscreenController WebCore::]):
+(-[WebVideoFullscreenController enterFullscreen:]):
+(-[WebVideoFullscreenController exitFullscreen]):
+* platform/ios/WebVideoFullscreenInterfaceAVKit.h:
+* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+* platform/mac/HTMLConverter.mm:
+(_dateForString):
+* platform/network/cf/CookieJarCFNet.cpp:
+(WebCore::copyCookiesForURLWithFirstPartyURL):
+* platform/text/ios/LocalizedDateCache.mm:
+(WebCore::LocalizedDateCache::calculateMaximumWidth):
+* platform/text/mac/LocaleMac.mm:
+(WebCore::LocaleMac::LocaleMac):
+
 2014-03-19  Byungseon Shin  sun.s...@lge.com
 
 Fix WEBKIT_WEBGL_compressed_texture_pvrtc extension support


Modified: trunk/Source/WebCore/WebCore.exp.in (165943 => 165944)

--- trunk/Source/WebCore/WebCore.exp.in	2014-03-20 03:12:51 UTC (rev 165943)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-03-20 05:10:51 UTC (rev 165944)
@@ -3234,15 +3234,6 @@
 #endif
 
 #if ENABLE(VIDEO)  PLATFORM(IOS)
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit11setDurationEd
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit14exitFullscreenEv
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit14setCurrentTimeEdd
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit15enterFullscreenER7CALayer
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit18setVideoDimensionsEbff
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit26setWebVideoFullscreenModelEPNS_23WebVideoFullscreenModelE
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit35setWebVideoFullscreenChangeObserverEPNS_32WebVideoFullscreenChangeObserverE
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit7setRateEbf
-__ZN7WebCore32WebVideoFullscreenInterfaceAVKitC2Ev
 __ZN7WebCore35WebVideoFullscreenModelMediaElement10seekToTimeEd
 __ZN7WebCore35WebVideoFullscreenModelMediaElement11handleEventEPNS_22ScriptExecutionContextEPNS_5EventE
 __ZN7WebCore35WebVideoFullscreenModelMediaElement15setMediaElementEPNS_16HTMLMediaElementE
@@ -3257,11 +3248,23 @@
 __ZN7WebCore35WebVideoFullscreenModelMediaElementD2Ev
 __ZNK7WebCore16HTMLVideoElement10videoWidthEv
 __ZNK7WebCore16HTMLVideoElement11videoHeightEv

[webkit-changes] [165214] trunk/Source/WebCore

[psolanki]

Title: [165214] trunk/Source/WebCore








Revision 165214
Author psola...@apple.com
Date 2014-03-06 13:59:14 -0800 (Thu, 06 Mar 2014)


Log Message
Unreviewed. iOS build fix after r165199.

* rendering/RootInlineBox.cpp:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RootInlineBox.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (165213 => 165214)

--- trunk/Source/WebCore/ChangeLog	2014-03-06 21:56:15 UTC (rev 165213)
+++ trunk/Source/WebCore/ChangeLog	2014-03-06 21:59:14 UTC (rev 165214)
@@ -1,3 +1,9 @@
+2014-03-06  Pratik Solanki  psola...@apple.com
+
+Unreviewed. iOS build fix after r165199.
+
+* rendering/RootInlineBox.cpp:
+
 2014-03-06  Benjamin Poulain  bpoul...@apple.com
 
 [iOS] Rename the actualVisibleXXXRect to unobscuredContentRect for consistency


Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (165213 => 165214)

--- trunk/Source/WebCore/rendering/RootInlineBox.cpp	2014-03-06 21:56:15 UTC (rev 165213)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp	2014-03-06 21:59:14 UTC (rev 165214)
@@ -37,6 +37,10 @@
 #include VerticalPositionCache.h
 #include wtf/NeverDestroyed.h
 
+#if PLATFORM(IOS)
+#include Settings.h
+#endif
+
 namespace WebCore {
 
 struct SameSizeAsRootInlineBox : public InlineFlowBox {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [165240] trunk/Source/WebCore

[psolanki]

Title: [165240] trunk/Source/WebCore








Revision 165240
Author psola...@apple.com
Date 2014-03-06 18:21:29 -0800 (Thu, 06 Mar 2014)


Log Message
[iOS] Crash on launch with website restrictions enabled
https://bugs.webkit.org/show_bug.cgi?id=129854
rdar://problem/16207016

Reviewed by Simon Fraser.

* platform/mac/ContentFilterMac.mm:
(WebCore::ContentFilter::ContentFilter): Initialize m_neFilterSourceQueue so that we don't
crash in the dtor due to garbage value in the field.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/ContentFilterMac.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (165239 => 165240)

--- trunk/Source/WebCore/ChangeLog	2014-03-07 02:18:38 UTC (rev 165239)
+++ trunk/Source/WebCore/ChangeLog	2014-03-07 02:21:29 UTC (rev 165240)
@@ -1,3 +1,15 @@
+2014-03-06  Pratik Solanki  psola...@apple.com
+
+[iOS] Crash on launch with website restrictions enabled
+https://bugs.webkit.org/show_bug.cgi?id=129854
+rdar://problem/16207016
+
+Reviewed by Simon Fraser.
+
+* platform/mac/ContentFilterMac.mm:
+(WebCore::ContentFilter::ContentFilter): Initialize m_neFilterSourceQueue so that we don't
+crash in the dtor due to garbage value in the field.
+
 2014-03-06  Simon Fraser  simon.fra...@apple.com
 
 Minor optimization in ScrollingTreeScrollingNodeMac


Modified: trunk/Source/WebCore/platform/mac/ContentFilterMac.mm (165239 => 165240)

--- trunk/Source/WebCore/platform/mac/ContentFilterMac.mm	2014-03-07 02:18:38 UTC (rev 165239)
+++ trunk/Source/WebCore/platform/mac/ContentFilterMac.mm	2014-03-07 02:21:29 UTC (rev 165240)
@@ -93,6 +93,7 @@
 ContentFilter::ContentFilter(const ResourceResponse response)
 #if HAVE(NE_FILTER_SOURCE)
 : m_neFilterSourceStatus(NEFilterSourceStatusNeedsMoreData)
+, m_neFilterSourceQueue(0)
 #endif
 {
 if ([getWebFilterEvaluatorClass() isManagedSession])






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [164931] trunk/Source

[psolanki]

Title: [164931] trunk/Source








Revision 164931
Author psola...@apple.com
Date 2014-03-01 15:31:03 -0800 (Sat, 01 Mar 2014)


Log Message
[iOS] selectionImageForcingBlackText should return autoreleased object
https://bugs.webkit.org/show_bug.cgi?id=129437
rdar://problem/15810384

Reviewed by Darin Adler.

Source/WebCore:

* bindings/objc/DOM.mm:
(-[DOMRange renderedImageForcingBlackText:renderedImageForcingBlackText:]):

Source/WebKit/mac:

* WebView/WebHTMLView.mm:
(-[WebHTMLView selectionImageForcingBlackText:selectionImageForcingBlackText:]):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/objc/DOM.mm
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebHTMLView.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (164930 => 164931)

--- trunk/Source/WebCore/ChangeLog	2014-03-01 23:30:51 UTC (rev 164930)
+++ trunk/Source/WebCore/ChangeLog	2014-03-01 23:31:03 UTC (rev 164931)
@@ -1,3 +1,14 @@
+2014-03-01  Pratik Solanki  psola...@apple.com
+
+[iOS] selectionImageForcingBlackText should return autoreleased object
+https://bugs.webkit.org/show_bug.cgi?id=129437
+rdar://problem/15810384
+
+Reviewed by Darin Adler.
+
+* bindings/objc/DOM.mm:
+(-[DOMRange renderedImageForcingBlackText:renderedImageForcingBlackText:]):
+
 2014-03-01  Yoav Weiss  y...@yoav.ws
 
 Fix srcset related bugs


Modified: trunk/Source/WebCore/bindings/objc/DOM.mm (164930 => 164931)

--- trunk/Source/WebCore/bindings/objc/DOM.mm	2014-03-01 23:30:51 UTC (rev 164930)
+++ trunk/Source/WebCore/bindings/objc/DOM.mm	2014-03-01 23:31:03 UTC (rev 164931)
@@ -611,7 +611,8 @@
 return nil;
 
 #if PLATFORM(IOS)
-return createDragImageForRange(*frame, *range, forceBlackText).leakRef();
+CGImageRef dragImage = createDragImageForRange(*frame, *range, forceBlackText).leakRef();
+return dragImage ? (CGImageRef)CFAutorelease(dragImage) : nil;
 #else
 return [createDragImageForRange(*frame, *range, forceBlackText).leakRef() autorelease];
 #endif


Modified: trunk/Source/WebKit/mac/ChangeLog (164930 => 164931)

--- trunk/Source/WebKit/mac/ChangeLog	2014-03-01 23:30:51 UTC (rev 164930)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-03-01 23:31:03 UTC (rev 164931)
@@ -1,3 +1,14 @@
+2014-03-01  Pratik Solanki  psola...@apple.com
+
+[iOS] selectionImageForcingBlackText should return autoreleased object
+https://bugs.webkit.org/show_bug.cgi?id=129437
+rdar://problem/15810384
+
+Reviewed by Darin Adler.
+
+* WebView/WebHTMLView.mm:
+(-[WebHTMLView selectionImageForcingBlackText:selectionImageForcingBlackText:]):
+
 2014-02-28  Dan Bernstein  m...@apple.com
 
 [Mac] Remove MailQuirksUserScript.js


Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (164930 => 164931)

--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2014-03-01 23:30:51 UTC (rev 164930)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2014-03-01 23:31:03 UTC (rev 164931)
@@ -6569,7 +6569,8 @@
 return nil;
 
 #if PLATFORM(IOS)
-return createDragImageForSelection(*coreFrame, forceBlackText).leakRef();
+CGImageRef dragImage = createDragImageForSelection(*coreFrame, forceBlackText).leakRef();
+return dragImage ? (CGImageRef)CFAutorelease(dragImage) : nil;
 #else
 return [createDragImageForSelection(*coreFrame, forceBlackText).leakRef() autorelease];
 #endif






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [164883] trunk/Source/WebKit2

[psolanki]

Title: [164883] trunk/Source/WebKit2








Revision 164883
Author psola...@apple.com
Date 2014-02-28 14:10:56 -0800 (Fri, 28 Feb 2014)


Log Message
[iOS][WebKit2] Don't grab mach exception port on iOS
https://bugs.webkit.org/show_bug.cgi?id=129505
rdar://problem/15972749

Reviewed by Anders Carlsson.

Don't grab the mach exception port on iOS so we get crash logs for web process and network
process.

* Shared/ChildProcessProxy.cpp:
(WebKit::ChildProcessProxy::didFinishLaunching):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (164882 => 164883)

--- trunk/Source/WebKit2/ChangeLog	2014-02-28 21:43:18 UTC (rev 164882)
+++ trunk/Source/WebKit2/ChangeLog	2014-02-28 22:10:56 UTC (rev 164883)
@@ -1,3 +1,17 @@
+2014-02-28  Pratik Solanki  psola...@apple.com
+
+[iOS][WebKit2] Don't grab mach exception port on iOS
+https://bugs.webkit.org/show_bug.cgi?id=129505
+rdar://problem/15972749
+
+Reviewed by Anders Carlsson.
+
+Don't grab the mach exception port on iOS so we get crash logs for web process and network
+process.
+
+* Shared/ChildProcessProxy.cpp:
+(WebKit::ChildProcessProxy::didFinishLaunching):
+
 2014-02-28  Brent Fulgham  bfulg...@apple.com
 
 Unreviewed build fix after r164832.


Modified: trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp (164882 => 164883)

--- trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp	2014-02-28 21:43:18 UTC (rev 164882)
+++ trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp	2014-02-28 22:10:56 UTC (rev 164883)
@@ -128,7 +128,7 @@
 ASSERT(!m_connection);
 
 m_connection = IPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main());
-#if OS(DARWIN)
+#if PLATFORM(MAC)
 m_connection-setShouldCloseConnectionOnMachExceptions();
 #endif
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [164905] trunk/Source/WebKit2

[psolanki]

Title: [164905] trunk/Source/WebKit2








Revision 164905
Author psola...@apple.com
Date 2014-02-28 20:10:24 -0800 (Fri, 28 Feb 2014)


Log Message
[iOS][WebKit2] Don't use any of the mach exception handling code on iOS
https://bugs.webkit.org/show_bug.cgi?id=129516

Reviewed by Sam Weinig.

This code is not used on iOS after my fix in r164883. We can just move it all under
!PLATFORM(IOS).

* Platform/IPC/Connection.h:
* Platform/IPC/mac/ConnectionMac.cpp:
(IPC::Connection::platformInvalidate):
(IPC::Connection::platformInitialize):
(IPC::Connection::open):
* Shared/ChildProcessProxy.cpp:
(WebKit::ChildProcessProxy::didFinishLaunching):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/IPC/Connection.h
trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp
trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (164904 => 164905)

--- trunk/Source/WebKit2/ChangeLog	2014-03-01 04:01:06 UTC (rev 164904)
+++ trunk/Source/WebKit2/ChangeLog	2014-03-01 04:10:24 UTC (rev 164905)
@@ -1,3 +1,21 @@
+2014-02-28  Pratik Solanki  psola...@apple.com
+
+[iOS][WebKit2] Don't use any of the mach exception handling code on iOS
+https://bugs.webkit.org/show_bug.cgi?id=129516
+
+Reviewed by Sam Weinig.
+
+This code is not used on iOS after my fix in r164883. We can just move it all under
+!PLATFORM(IOS).
+
+* Platform/IPC/Connection.h:
+* Platform/IPC/mac/ConnectionMac.cpp:
+(IPC::Connection::platformInvalidate):
+(IPC::Connection::platformInitialize):
+(IPC::Connection::open):
+* Shared/ChildProcessProxy.cpp:
+(WebKit::ChildProcessProxy::didFinishLaunching):
+
 2014-02-28  Benjamin Poulain  bpoul...@apple.com
 
 [iOS][WK2] highlight rects should never big bigger than the view


Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (164904 => 164905)

--- trunk/Source/WebKit2/Platform/IPC/Connection.h	2014-03-01 04:01:06 UTC (rev 164904)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h	2014-03-01 04:10:24 UTC (rev 164905)
@@ -133,7 +133,7 @@
 
 Client* client() const { return m_client; }
 
-#if OS(DARWIN)
+#if !PLATFORM(IOS)
 void setShouldCloseConnectionOnMachExceptions();
 #endif
 
@@ -283,7 +283,6 @@
 // Called on the connection queue.
 void receiveSourceEventHandler();
 void initializeDeadNameSource();
-void exceptionSourceEventHandler();
 
 mach_port_t m_sendPort;
 dispatch_source_t m_deadNameSource;
@@ -291,10 +290,14 @@
 mach_port_t m_receivePort;
 dispatch_source_t m_receivePortDataAvailableSource;
 
+#if !PLATFORM(IOS)
+void exceptionSourceEventHandler();
+
 // If setShouldCloseConnectionOnMachExceptions has been called, this has
 // the exception port that exceptions from the other end will be sent on.
 mach_port_t m_exceptionPort;
 dispatch_source_t m_exceptionPortDataAvailableSource;
+#endif
 
 xpc_connection_t m_xpcConnection;
 


Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp (164904 => 164905)

--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp	2014-03-01 04:01:06 UTC (rev 164904)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp	2014-03-01 04:10:24 UTC (rev 164905)
@@ -65,12 +65,14 @@
 m_receivePortDataAvailableSource = 0;
 m_receivePort = MACH_PORT_NULL;
 
+#if !PLATFORM(IOS)
 if (m_exceptionPort) {
 dispatch_source_cancel(m_exceptionPortDataAvailableSource);
 dispatch_release(m_exceptionPortDataAvailableSource);
 m_exceptionPortDataAvailableSource = 0;
 m_exceptionPort = MACH_PORT_NULL;
 }
+#endif
 
 if (m_xpcConnection) {
 xpc_release(m_xpcConnection);
@@ -80,7 +82,10 @@
 
 void Connection::platformInitialize(Identifier identifier)
 {
+#if !PLATFORM(IOS)
 m_exceptionPort = MACH_PORT_NULL;
+m_exceptionPortDataAvailableSource = nullptr;
+#endif
 
 if (m_isServer) {
 m_receivePort = identifier.port;
@@ -92,7 +97,6 @@
 
 m_deadNameSource = nullptr;
 m_receivePortDataAvailableSource = nullptr;
-m_exceptionPortDataAvailableSource = nullptr;
 
 m_xpcConnection = identifier.xpcConnection;
 // FIXME: Instead of explicitly retaining the connection here, Identifier::xpcConnection
@@ -149,6 +153,7 @@
 // Register the data available handler.
 m_receivePortDataAvailableSource = createDataAvailableSource(m_receivePort, m_connectionQueue.get(), bind(Connection::receiveSourceEventHandler, this));
 
+#if !PLATFORM(IOS)
 // If we have an exception port, register the data available handler and send over the port to the other end.
 if (m_exceptionPort) {
 m_exceptionPortDataAvailableSource = createDataAvailableSource(m_exceptionPort, m_connectionQueue.get(), bind(Connection::exceptionSourceEventHandler, this));
@@ -158,6 +163,7 @@
 
 sendMessage(std::move(encoder));
 }
+#endif
 
 ref();
 

[webkit-changes] [164817] trunk/Source/WebKit/mac

[psolanki]

Title: [164817] trunk/Source/WebKit/mac








Revision 164817
Author psola...@apple.com
Date 2014-02-27 11:11:52 -0800 (Thu, 27 Feb 2014)


Log Message
Assertion failure at CachedResource.h:196: ASSERT(!m_purgeableData)
https://bugs.webkit.org/show_bug.cgi?id=129349
rdar://problem/14871837

Reviewed by Joseph Pecoraro.

The code for clearing out memory mapped notification callbacks is only needed when loading
PDFs. And in such cases, we always have dataSourceDelegate object. So make this code
conditional on its presence so that we don't trigger the assert for non-PDF main resources.

* WebView/WebDataSource.mm:
(-[WebDataSource dealloc]):

Modified Paths

trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebDataSource.mm




Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (164816 => 164817)

--- trunk/Source/WebKit/mac/ChangeLog	2014-02-27 19:00:33 UTC (rev 164816)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-02-27 19:11:52 UTC (rev 164817)
@@ -1,3 +1,18 @@
+2014-02-27  Pratik Solanki  psola...@apple.com
+
+Assertion failure at CachedResource.h:196: ASSERT(!m_purgeableData)
+https://bugs.webkit.org/show_bug.cgi?id=129349
+rdar://problem/14871837
+
+Reviewed by Joseph Pecoraro.
+
+The code for clearing out memory mapped notification callbacks is only needed when loading
+PDFs. And in such cases, we always have dataSourceDelegate object. So make this code
+conditional on its presence so that we don't trigger the assert for non-PDF main resources.
+
+* WebView/WebDataSource.mm:
+(-[WebDataSource dealloc]):
+
 2014-02-26  Andy Estes  aes...@apple.com
 
 [iOS] Support network state notification using CPNetworkObserver


Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (164816 => 164817)

--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm	2014-02-27 19:00:33 UTC (rev 164816)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm	2014-02-27 19:11:52 UTC (rev 164817)
@@ -481,7 +481,11 @@
 --WebDataSourceCount;
 
 #if ENABLE(DISK_IMAGE_CACHE)  PLATFORM(IOS)
-if (_private) {
+// The code to remove memory mapped notification is only needed when we are viewing a PDF file.
+// In such a case, WebPDFViewPlaceholder sets itself as the dataSourceDelegate. Guard the access
+// to mainResourceData with this nil check so that we avoid assertions due to the resource being
+// made purgeable.
+if (_private  [self dataSourceDelegate]) {
 RefPtrResourceBuffer mainResourceBuffer = toPrivate(_private)-loader-mainResourceData();
 if (mainResourceBuffer) {
 RefPtrSharedBuffer mainResourceData = mainResourceBuffer-sharedBuffer();






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [164737] trunk/Source/WebKit2

[psolanki]

Title: [164737] trunk/Source/WebKit2








Revision 164737
Author psola...@apple.com
Date 2014-02-26 12:39:06 -0800 (Wed, 26 Feb 2014)


Log Message
[iOS][WebKit2] Adopt SPI for managing tabs
https://bugs.webkit.org/show_bug.cgi?id=129188
rdar://problem/15939827

Reviewed by Gavin Barraclough.

Call into assertions SPI to mark tabs as foreground and background.

* Configurations/WebKit2.xcconfig:
* Platform/IPC/Connection.h:
(IPC::Connection::xpcConnection): Expose the xpc_connection_t.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::viewStateDidChange):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::didFinishLaunching):
* UIProcess/WebProcessProxy.h:
(WebKit::WebProcessProxy::updateProcessState):
* UIProcess/ios/WebProcessProxyIOS.mm:
(WebKit::WebProcessProxy::updateProcessState): Added. This goes through the list of
WebPageProxies and sets the process state to foreground if one of them is in a window.
Otherwise, it sets it to background.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Configurations/WebKit2.xcconfig
trunk/Source/WebKit2/Platform/IPC/Connection.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp
trunk/Source/WebKit2/UIProcess/WebProcessProxy.h
trunk/Source/WebKit2/UIProcess/ios/WebProcessProxyIOS.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (164736 => 164737)

--- trunk/Source/WebKit2/ChangeLog	2014-02-26 20:18:30 UTC (rev 164736)
+++ trunk/Source/WebKit2/ChangeLog	2014-02-26 20:39:06 UTC (rev 164737)
@@ -1,3 +1,27 @@
+2014-02-26  Pratik Solanki  psola...@apple.com
+
+[iOS][WebKit2] Adopt SPI for managing tabs
+https://bugs.webkit.org/show_bug.cgi?id=129188
+rdar://problem/15939827
+
+Reviewed by Gavin Barraclough.
+
+Call into assertions SPI to mark tabs as foreground and background.
+
+* Configurations/WebKit2.xcconfig:
+* Platform/IPC/Connection.h:
+(IPC::Connection::xpcConnection): Expose the xpc_connection_t.
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::viewStateDidChange):
+* UIProcess/WebProcessProxy.cpp:
+(WebKit::WebProcessProxy::didFinishLaunching):
+* UIProcess/WebProcessProxy.h:
+(WebKit::WebProcessProxy::updateProcessState):
+* UIProcess/ios/WebProcessProxyIOS.mm:
+(WebKit::WebProcessProxy::updateProcessState): Added. This goes through the list of
+WebPageProxies and sets the process state to foreground if one of them is in a window.
+Otherwise, it sets it to background.
+
 2014-02-26  Commit Queue  commit-qu...@webkit.org
 
 Unreviewed, rolling out r164725 and r164731.


Modified: trunk/Source/WebKit2/Configurations/WebKit2.xcconfig (164736 => 164737)

--- trunk/Source/WebKit2/Configurations/WebKit2.xcconfig	2014-02-26 20:18:30 UTC (rev 164736)
+++ trunk/Source/WebKit2/Configurations/WebKit2.xcconfig	2014-02-26 20:39:06 UTC (rev 164737)
@@ -30,7 +30,7 @@
 DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
 
 FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));
-FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework WebKit -lMobileGestalt;
+FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework WebKit -lMobileGestalt -lassertion_extension;
 FRAMEWORK_AND_LIBRARY_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator) -framework IOSurface;
 FRAMEWORK_AND_LIBRARY_LDFLAGS_macosx = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface;
 


Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (164736 => 164737)

--- trunk/Source/WebKit2/Platform/IPC/Connection.h	2014-02-26 20:18:30 UTC (rev 164736)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h	2014-02-26 20:39:06 UTC (rev 164737)
@@ -113,6 +113,8 @@
 xpc_connection_t xpcConnection;
 };
 static bool identifierIsNull(Identifier identifier) { return identifier.port == MACH_PORT_NULL; }
+xpc_connection_t xpcConnection() { return m_xpcConnection; }
+
 #elif USE(UNIX_DOMAIN_SOCKETS)
 typedef int Identifier;
 static bool identifierIsNull(Identifier identifier) { return !identifier; }


Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (164736 => 164737)

--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2014-02-26 20:18:30 UTC (rev 164736)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2014-02-26 20:39:06 UTC (rev 164737)
@@ -1025,6 +1025,9 @@
 }
 #endif
 
+if (changed  ViewState::IsInWindow)
+

[webkit-changes] [164758] trunk/Source/WebKit2

[psolanki]

Title: [164758] trunk/Source/WebKit2








Revision 164758
Author psola...@apple.com
Date 2014-02-26 16:52:48 -0800 (Wed, 26 Feb 2014)


Log Message
[iOS][Webkit2] Enable codesigning entitlement for web process
https://bugs.webkit.org/show_bug.cgi?id=129401
rdar://problem/16173873

Reviewed by Geoffrey Garen.

* Configurations/WebContent-iOS.entitlements:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Configurations/WebContent-iOS.entitlements




Diff

Modified: trunk/Source/WebKit2/ChangeLog (164757 => 164758)

--- trunk/Source/WebKit2/ChangeLog	2014-02-27 00:19:19 UTC (rev 164757)
+++ trunk/Source/WebKit2/ChangeLog	2014-02-27 00:52:48 UTC (rev 164758)
@@ -1,3 +1,13 @@
+2014-02-26  Pratik Solanki  psola...@apple.com
+
+[iOS][Webkit2] Enable codesigning entitlement for web process
+https://bugs.webkit.org/show_bug.cgi?id=129401
+rdar://problem/16173873
+
+Reviewed by Geoffrey Garen.
+
+* Configurations/WebContent-iOS.entitlements:
+
 2014-02-26  Anders Carlsson  ander...@apple.com
 
 Give VisitedLinkProviders an identifier and send them to the web process


Modified: trunk/Source/WebKit2/Configurations/WebContent-iOS.entitlements (164757 => 164758)

--- trunk/Source/WebKit2/Configurations/WebContent-iOS.entitlements	2014-02-27 00:19:19 UTC (rev 164757)
+++ trunk/Source/WebKit2/Configurations/WebContent-iOS.entitlements	2014-02-27 00:52:48 UTC (rev 164758)
@@ -4,5 +4,7 @@
 dict
 keycom.apple.private.allow-explicit-graphics-priority/key
 true/
+keydynamic-codesigning/key
+true/
 /dict
 /plist






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [164435] trunk/Source/WebCore

[psolanki]

Title: [164435] trunk/Source/WebCore








Revision 164435
Author psola...@apple.com
Date 2014-02-20 10:23:24 -0800 (Thu, 20 Feb 2014)


Log Message
ASSERT in FrameLoader::shouldInterruptLoadForXFrameOptions
https://bugs.webkit.org/show_bug.cgi?id=129081
rdar://problem/16026440

Reviewed by Alexey Proskuryakov.

Do not assert if the server sends us a malformed X-Frame-Options header.

* loader/FrameLoader.cpp:
(WebCore::FrameLoader::shouldInterruptLoadForXFrameOptions):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/FrameLoader.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (164434 => 164435)

--- trunk/Source/WebCore/ChangeLog	2014-02-20 18:15:42 UTC (rev 164434)
+++ trunk/Source/WebCore/ChangeLog	2014-02-20 18:23:24 UTC (rev 164435)
@@ -1,3 +1,16 @@
+2014-02-19  Pratik Solanki  psola...@apple.com
+
+ASSERT in FrameLoader::shouldInterruptLoadForXFrameOptions
+https://bugs.webkit.org/show_bug.cgi?id=129081
+rdar://problem/16026440
+
+Reviewed by Alexey Proskuryakov.
+
+Do not assert if the server sends us a malformed X-Frame-Options header.
+
+* loader/FrameLoader.cpp:
+(WebCore::FrameLoader::shouldInterruptLoadForXFrameOptions):
+
 2014-02-20  Krzysztof Czech  k.cz...@samsung.com
 
 AX: Use auto to reduce some code in loops


Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (164434 => 164435)

--- trunk/Source/WebCore/loader/FrameLoader.cpp	2014-02-20 18:15:42 UTC (rev 164434)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp	2014-02-20 18:23:24 UTC (rev 164435)
@@ -3068,10 +3068,11 @@
 case XFrameOptionsInvalid:
 m_frame.document()-addConsoleMessage(MessageSource::JS, MessageLevel::Error, Invalid 'X-Frame-Options' header encountered when loading ' + url.stringCenterEllipsizedToLength() + ': ' + content + ' is not a recognized directive. The header will be ignored., requestIdentifier);
 return false;
-default:
-ASSERT_NOT_REACHED();
+case XFrameOptionsNone:
 return false;
 }
+ASSERT_NOT_REACHED();
+return false;
 }
 
 void FrameLoader::loadProvisionalItemFromCachedPage()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [164199] trunk/Source/WebCore

[psolanki]

Title: [164199] trunk/Source/WebCore








Revision 164199
Author psola...@apple.com
Date 2014-02-16 16:50:37 -0800 (Sun, 16 Feb 2014)


Log Message
[iOS] WebKit crashes if text is copied to pasteboard with style containing text-shadow
https://bugs.webkit.org/show_bug.cgi?id=12
rdar://problem/16065699

Reviewed by Anders Carlsson.

Use the correct class on iOS so that we don't crash.

* platform/mac/HTMLConverter.mm:
(_shadowForShadowStyle):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/HTMLConverter.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (164198 => 164199)

--- trunk/Source/WebCore/ChangeLog	2014-02-16 22:59:55 UTC (rev 164198)
+++ trunk/Source/WebCore/ChangeLog	2014-02-17 00:50:37 UTC (rev 164199)
@@ -1,3 +1,16 @@
+2014-02-16  Pratik Solanki  psola...@apple.com
+
+[iOS] WebKit crashes if text is copied to pasteboard with style containing text-shadow
+https://bugs.webkit.org/show_bug.cgi?id=12
+rdar://problem/16065699
+
+Reviewed by Anders Carlsson.
+
+Use the correct class on iOS so that we don't crash.
+
+* platform/mac/HTMLConverter.mm:
+(_shadowForShadowStyle):
+
 2014-02-16  Andreas Kling  akl...@apple.com
 
 Atomicize frequently identical ResourceResponse string members.


Modified: trunk/Source/WebCore/platform/mac/HTMLConverter.mm (164198 => 164199)

--- trunk/Source/WebCore/platform/mac/HTMLConverter.mm	2014-02-16 22:59:55 UTC (rev 164198)
+++ trunk/Source/WebCore/platform/mac/HTMLConverter.mm	2014-02-17 00:50:37 UTC (rev 164199)
@@ -137,6 +137,7 @@
 #define PlatformNSTextTab   getNSTextTabClass()
 #define PlatformColor   UIColor
 #define PlatformColorClass  getUIColorClass()
+#define PlatformNSColorClassgetNSColorClass()
 #define PlatformFontUIFont
 #define PlatformFontClass   getUIFontClass()
 #else
@@ -150,6 +151,7 @@
 #define PlatformNSTextTab   NSTextTab
 #define PlatformColor   NSColor
 #define PlatformColorClass  NSColor
+#define PlatformNSColorClassNSColor
 #define PlatformFontNSFont
 #define PlatformFontClass   NSFont
 
@@ -274,7 +276,6 @@
 
 @interface NSColor : UIColor
 + (id)colorWithCalibratedRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha;
-+ (id)colorWithCalibratedWhite:(CGFloat)white alpha:(CGFloat)alpha;
 @end
 
 @interface UIFont
@@ -880,7 +881,7 @@
 CGFloat green = [[components objectAtIndex:1] floatValue] / 255;
 CGFloat blue = [[components objectAtIndex:2] floatValue] / 255;
 CGFloat alpha = ([components count] = 4) ? [[components objectAtIndex:3] floatValue] / 255 : 1;
-NSColor *shadowColor = [PlatformColorClass colorWithCalibratedRed:red green:green blue:blue alpha:alpha];
+NSColor *shadowColor = [PlatformNSColorClass colorWithCalibratedRed:red green:green blue:blue alpha:alpha];
 NSSize shadowOffset;
 CGFloat shadowBlurRadius;
 firstRange = [shadowStyle rangeOfString:@px];






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [163588] trunk/Source/WebKit2

[psolanki]

Title: [163588] trunk/Source/WebKit2








Revision 163588
Author psola...@apple.com
Date 2014-02-06 17:33:53 -0800 (Thu, 06 Feb 2014)


Log Message
[iOS] WebKit2 can't access the GPU
https://bugs.webkit.org/show_bug.cgi?id=128345
rdar://problem/15976084

Reviewed by Tim Horton.

Add an entitlement to allow web process to access GPU.

* Configurations/WebContent-iOS.entitlements: Added.
* Configurations/WebContentService.Development.xcconfig:
* Configurations/WebContentService.xcconfig:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig
trunk/Source/WebKit2/Configurations/WebContentService.xcconfig


Added Paths

trunk/Source/WebKit2/Configurations/WebContent-iOS.entitlements




Diff

Modified: trunk/Source/WebKit2/ChangeLog (163587 => 163588)

--- trunk/Source/WebKit2/ChangeLog	2014-02-07 01:30:53 UTC (rev 163587)
+++ trunk/Source/WebKit2/ChangeLog	2014-02-07 01:33:53 UTC (rev 163588)
@@ -1,5 +1,19 @@
 2014-02-06  Pratik Solanki  psola...@apple.com
 
+[iOS] WebKit2 can't access the GPU
+https://bugs.webkit.org/show_bug.cgi?id=128345
+rdar://problem/15976084
+
+Reviewed by Tim Horton.
+
+Add an entitlement to allow web process to access GPU.
+
+* Configurations/WebContent-iOS.entitlements: Added.
+* Configurations/WebContentService.Development.xcconfig:
+* Configurations/WebContentService.xcconfig:
+
+2014-02-06  Pratik Solanki  psola...@apple.com
+
 [iOS][WebKit2] Remove JoinExistingSession from plist
 https://bugs.webkit.org/show_bug.cgi?id=128318
 rdar://problem/15971612


Added: trunk/Source/WebKit2/Configurations/WebContent-iOS.entitlements (0 => 163588)

--- trunk/Source/WebKit2/Configurations/WebContent-iOS.entitlements	(rev 0)
+++ trunk/Source/WebKit2/Configurations/WebContent-iOS.entitlements	2014-02-07 01:33:53 UTC (rev 163588)
@@ -0,0 +1,8 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE plist PUBLIC -//Apple//DTD PLIST 1.0//EN http://www.apple.com/DTDs/PropertyList-1.0.dtd
+plist version=1.0
+dict
+keycom.apple.private.allow-explicit-graphics-priority/key
+true/
+/dict
+/plist


Modified: trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig (163587 => 163588)

--- trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig	2014-02-07 01:30:53 UTC (rev 163587)
+++ trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig	2014-02-07 01:33:53 UTC (rev 163588)
@@ -28,5 +28,7 @@
 INFOPLIST_FILE_macosx = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist;
 INFOPLIST_FILE_iphoneos = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist;
 
+CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/WebContent-iOS.entitlements
+
 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
 OTHER_LDFLAGS_macosx = -framework AppKit;


Modified: trunk/Source/WebKit2/Configurations/WebContentService.xcconfig (163587 => 163588)

--- trunk/Source/WebKit2/Configurations/WebContentService.xcconfig	2014-02-07 01:30:53 UTC (rev 163587)
+++ trunk/Source/WebKit2/Configurations/WebContentService.xcconfig	2014-02-07 01:33:53 UTC (rev 163588)
@@ -29,5 +29,7 @@
 INFOPLIST_FILE_macosx = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
 INFOPLIST_FILE_iphoneos = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
 
+CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/WebContent-iOS.entitlements
+
 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
 OTHER_LDFLAGS_macosx = -framework AppKit;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [163587] trunk/Source/WebKit2

[psolanki]

Title: [163587] trunk/Source/WebKit2








Revision 163587
Author psola...@apple.com
Date 2014-02-06 17:30:53 -0800 (Thu, 06 Feb 2014)


Log Message
[iOS][WebKit2] Remove JoinExistingSession from plist
https://bugs.webkit.org/show_bug.cgi?id=128318
rdar://problem/15971612

Reviewed by Tim Horton.

Remove JoinExistingSession key that is not available on iOS.

* NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist:
* NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist:
* WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist:
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist
trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist
trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist
trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist




Diff

Modified: trunk/Source/WebKit2/ChangeLog (163586 => 163587)

--- trunk/Source/WebKit2/ChangeLog	2014-02-07 01:29:33 UTC (rev 163586)
+++ trunk/Source/WebKit2/ChangeLog	2014-02-07 01:30:53 UTC (rev 163587)
@@ -1,3 +1,18 @@
+2014-02-06  Pratik Solanki  psola...@apple.com
+
+[iOS][WebKit2] Remove JoinExistingSession from plist
+https://bugs.webkit.org/show_bug.cgi?id=128318
+rdar://problem/15971612
+
+Reviewed by Tim Horton.
+
+Remove JoinExistingSession key that is not available on iOS.
+
+* NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist:
+* NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist:
+* WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist:
+* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist:
+
 2014-02-06  Anders Carlsson  ander...@apple.com
 
 Fix build.


Modified: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist (163586 => 163587)

--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist	2014-02-07 01:29:33 UTC (rev 163586)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist	2014-02-07 01:30:53 UTC (rev 163587)
@@ -34,8 +34,6 @@
 	dict
 		keyServiceType/key
 		stringApplication/string
-		keyJoinExistingSession/key
-		true/
 		keyRunLoopType/key
 		stringNSRunLoop/string
 		key_MultipleInstances/key


Modified: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist (163586 => 163587)

--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist	2014-02-07 01:29:33 UTC (rev 163586)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist	2014-02-07 01:30:53 UTC (rev 163587)
@@ -34,8 +34,6 @@
 	dict
 		keyServiceType/key
 		stringApplication/string
-		keyJoinExistingSession/key
-		true/
 		keyRunLoopType/key
 		stringNSRunLoop/string
 		key_MultipleInstances/key


Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist (163586 => 163587)

--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist	2014-02-07 01:29:33 UTC (rev 163586)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist	2014-02-07 01:30:53 UTC (rev 163587)
@@ -28,8 +28,6 @@
 	stringWebContentServiceInitializer/string
 	keyXPCService/key
 	dict
-		keyJoinExistingSession/key
-		true/
 		keyServiceType/key
 		stringApplication/string
 		keyRunLoopType/key


Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist (163586 => 163587)

--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist	2014-02-07 01:29:33 UTC (rev 163586)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist	2014-02-07 01:30:53 UTC (rev 163587)
@@ -30,8 +30,6 @@
 	stringWebContentServiceInitializer/string
 	keyXPCService/key
 	dict
-		keyJoinExistingSession/key
-		true/
 		keyServiceType/key
 		stringApplication/string
 		keyRunLoopType/key






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [155071] trunk/Source/WebCore

[psolanki]

Title: [155071] trunk/Source/WebCore








Revision 155071
Author psola...@apple.com
Date 2013-09-04 15:16:01 -0700 (Wed, 04 Sep 2013)


Log Message
Document::updateHoverActiveState() should allow for deferred style recalcs
https://bugs.webkit.org/show_bug.cgi?id=120700

Reviewed by Simon Fraser.

Add an extra argument to Document::updateHoverActiveState() to specify if a style recalc
should be done. The default value keeps the current behavior of doing a style recalc. iOS
touch handling code will pass in DeferRecalcStyleIfNeeded to avoid the work.

No new tests because no functional changes.

* dom/Document.cpp:
(WebCore::Document::updateHoverActiveState):
* dom/Document.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Document.cpp
trunk/Source/WebCore/dom/Document.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (155070 => 155071)

--- trunk/Source/WebCore/ChangeLog	2013-09-04 22:14:50 UTC (rev 155070)
+++ trunk/Source/WebCore/ChangeLog	2013-09-04 22:16:01 UTC (rev 155071)
@@ -1,3 +1,20 @@
+2013-09-04  Pratik Solanki  psola...@apple.com
+
+Document::updateHoverActiveState() should allow for deferred style recalcs
+https://bugs.webkit.org/show_bug.cgi?id=120700
+
+Reviewed by Simon Fraser.
+
+Add an extra argument to Document::updateHoverActiveState() to specify if a style recalc
+should be done. The default value keeps the current behavior of doing a style recalc. iOS
+touch handling code will pass in DeferRecalcStyleIfNeeded to avoid the work.
+
+No new tests because no functional changes.
+
+* dom/Document.cpp:
+(WebCore::Document::updateHoverActiveState):
+* dom/Document.h:
+
 2013-09-04  Tim Horton  timothy_hor...@apple.com
 
 [mac] PDFDocumentImage should use PDFKit to draw


Modified: trunk/Source/WebCore/dom/Document.cpp (155070 => 155071)

--- trunk/Source/WebCore/dom/Document.cpp	2013-09-04 22:14:50 UTC (rev 155070)
+++ trunk/Source/WebCore/dom/Document.cpp	2013-09-04 22:16:01 UTC (rev 155071)
@@ -5765,7 +5765,7 @@
 return 0;
 }
 
-void Document::updateHoverActiveState(const HitTestRequest request, Element* innerElement, const PlatformMouseEvent* event)
+void Document::updateHoverActiveState(const HitTestRequest request, Element* innerElement, const PlatformMouseEvent* event, StyleResolverUpdateFlag updateFlag)
 {
 ASSERT(!request.readOnly());
 
@@ -5911,7 +5911,9 @@
 }
 }
 
-updateStyleIfNeeded();
+ASSERT(updateFlag == RecalcStyleIfNeeded || updateFlag == DeferRecalcStyleIfNeeded);
+if (updateFlag == RecalcStyleIfNeeded)
+updateStyleIfNeeded();
 }
 
 bool Document::haveStylesheetsLoaded() const


Modified: trunk/Source/WebCore/dom/Document.h (155070 => 155071)

--- trunk/Source/WebCore/dom/Document.h	2013-09-04 22:14:50 UTC (rev 155070)
+++ trunk/Source/WebCore/dom/Document.h	2013-09-04 22:16:01 UTC (rev 155071)
@@ -675,7 +675,7 @@
 void hoveredElementDidDetach(Element*);
 void elementInActiveChainDidDetach(Element*);
 
-void updateHoverActiveState(const HitTestRequest, Element*, const PlatformMouseEvent* = 0);
+void updateHoverActiveState(const HitTestRequest, Element*, const PlatformMouseEvent* = 0, StyleResolverUpdateFlag = RecalcStyleIfNeeded);
 
 // Updates for :target (CSS3 selector).
 void setCSSTarget(Element*);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [154823] trunk/Source/WebCore

[psolanki]

Title: [154823] trunk/Source/WebCore








Revision 154823
Author psola...@apple.com
Date 2013-08-29 11:01:31 -0700 (Thu, 29 Aug 2013)


Log Message
SharedBuffer m_segments and m_dataArray must be exclusive
https://bugs.webkit.org/show_bug.cgi?id=77715

Patch by Pratik Solanki pratik.sola...@gmail.com on 2013-08-29
Reviewed by Benjamin Poulain.

When USE(NETWORK_CFDATA_ARRAY_CALLBACK) is enabled, we use m_dataArray to hold the incoming
data. We do not use m_segments. Since they are exclusive in practice, do not define or use
m_segments when NETWORK_CFDATA_ARRAY_CALLBACK is enabled.

No new tests because no functional changes.

* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::append):
(WebCore::SharedBuffer::clear):
(WebCore::SharedBuffer::copy):
(WebCore::SharedBuffer::buffer):
(WebCore::SharedBuffer::getSomeData):
* platform/SharedBuffer.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/SharedBuffer.cpp
trunk/Source/WebCore/platform/SharedBuffer.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (154822 => 154823)

--- trunk/Source/WebCore/ChangeLog	2013-08-29 17:54:22 UTC (rev 154822)
+++ trunk/Source/WebCore/ChangeLog	2013-08-29 18:01:31 UTC (rev 154823)
@@ -1,3 +1,24 @@
+2013-08-29  Pratik Solanki  pratik.sola...@gmail.com
+
+SharedBuffer m_segments and m_dataArray must be exclusive
+https://bugs.webkit.org/show_bug.cgi?id=77715
+
+Reviewed by Benjamin Poulain.
+
+When USE(NETWORK_CFDATA_ARRAY_CALLBACK) is enabled, we use m_dataArray to hold the incoming
+data. We do not use m_segments. Since they are exclusive in practice, do not define or use
+m_segments when NETWORK_CFDATA_ARRAY_CALLBACK is enabled.
+
+No new tests because no functional changes.
+
+* platform/SharedBuffer.cpp:
+(WebCore::SharedBuffer::append):
+(WebCore::SharedBuffer::clear):
+(WebCore::SharedBuffer::copy):
+(WebCore::SharedBuffer::buffer):
+(WebCore::SharedBuffer::getSomeData):
+* platform/SharedBuffer.h:
+
 2013-08-29  Daniel Bates  daba...@apple.com
 
 [iOS] Upstream changes to WebCore/style


Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (154822 => 154823)

--- trunk/Source/WebCore/platform/SharedBuffer.cpp	2013-08-29 17:54:22 UTC (rev 154822)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp	2013-08-29 18:01:31 UTC (rev 154823)
@@ -171,7 +171,8 @@
 return;
 
 maybeTransferPlatformData();
-
+
+#if !USE(NETWORK_CFDATA_ARRAY_CALLBACK)
 unsigned positionInSegment = offsetInSegment(m_size - m_buffer.size());
 m_size += length;
 
@@ -204,6 +205,12 @@
 m_segments.append(segment);
 bytesToCopy = min(length, segmentSize);
 }
+#else
+m_size += length;
+if (m_buffer.isEmpty())
+m_buffer.reserveInitialCapacity(length);
+m_buffer.append(data, length);
+#endif
 }
 
 void SharedBuffer::append(const Vectorchar data)
@@ -215,17 +222,18 @@
 {
 clearPlatformData();
 
+#if !USE(NETWORK_CFDATA_ARRAY_CALLBACK)
 for (unsigned i = 0; i  m_segments.size(); ++i)
 freeSegment(m_segments[i]);
 
 m_segments.clear();
+#else
+m_dataArray.clear();
+#endif
+
 m_size = 0;
-
 m_buffer.clear();
 m_purgeableBuffer.clear();
-#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
-m_dataArray.clear();
-#endif
 }
 
 PassRefPtrSharedBuffer SharedBuffer::copy() const
@@ -239,8 +247,13 @@
 clone-m_size = m_size;
 clone-m_buffer.reserveCapacity(m_size);
 clone-m_buffer.append(m_buffer.data(), m_buffer.size());
+#if !USE(NETWORK_CFDATA_ARRAY_CALLBACK)
 for (unsigned i = 0; i  m_segments.size(); ++i)
 clone-m_buffer.append(m_segments[i], segmentSize);
+#else
+for (unsigned i = 0; i  m_dataArray.size(); ++i)
+clone-append(m_dataArray[i].get());
+#endif
 return clone;
 }
 
@@ -257,6 +270,7 @@
 m_buffer.resize(m_size);
 char* destination = m_buffer.data() + bufferSize;
 unsigned bytesLeft = m_size - bufferSize;
+#if !USE(NETWORK_CFDATA_ARRAY_CALLBACK)
 for (unsigned i = 0; i  m_segments.size(); ++i) {
 unsigned bytesToCopy = min(bytesLeft, segmentSize);
 memcpy(destination, m_segments[i], bytesToCopy);
@@ -265,7 +279,7 @@
 freeSegment(m_segments[i]);
 }
 m_segments.clear();
-#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
+#else
 copyDataArrayAndClear(destination, bytesLeft);
 #endif
 }
@@ -294,6 +308,7 @@
 }
  
 position -= consecutiveSize;
+#if !USE(NETWORK_CFDATA_ARRAY_CALLBACK)
 unsigned segments = m_segments.size();
 unsigned maxSegmentedSize = segments * segmentSize;
 unsigned segment = segmentIndex(position);
@@ -305,13 +320,10 @@
 someData = m_segments[segment] + positionInSegment;
 return segment == segments - 1 ? segmentedSize - position : segmentSize - positionInSegment;
 }
-#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
-ASSERT(maxSegmentedSize 

[webkit-changes] [154766] trunk/Source/WebCore

[psolanki]

Title: [154766] trunk/Source/WebCore








Revision 154766
Author psola...@apple.com
Date 2013-08-28 12:24:50 -0700 (Wed, 28 Aug 2013)


Log Message
Document::elementSheet() should return a reference
https://bugs.webkit.org/show_bug.cgi?id=120433

Reviewed by Andreas Kling.

Since elementSheet() always retruns a valid pointer, we can simply return a reference
instead. Also rename m_elemSheet to m_elementSheet.

* css/CSSParser.cpp:
(WebCore::CSSParser::parseInlineStyleDeclaration):
* css/PropertySetCSSStyleDeclaration.cpp:
(WebCore::InlineCSSStyleDeclaration::parentStyleSheet):
* dom/Document.cpp:
(WebCore::Document::~Document):
(WebCore::Document::recalcStyle):
(WebCore::Document::updateBaseURL):
(WebCore::Document::elementSheet):
* dom/Document.h:
* dom/StyledElement.cpp:
(WebCore::StyledElement::setInlineStyleFromString):
(WebCore::StyledElement::setInlineStyleProperty):
(WebCore::StyledElement::addSubresourceAttributeURLs):
(WebCore::StyledElement::addPropertyToPresentationAttributeStyle):
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyleSheetForInlineStyle::getStyleAttributeRanges):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSParser.cpp
trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp
trunk/Source/WebCore/dom/Document.cpp
trunk/Source/WebCore/dom/Document.h
trunk/Source/WebCore/dom/StyledElement.cpp
trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (154765 => 154766)

--- trunk/Source/WebCore/ChangeLog	2013-08-28 19:00:01 UTC (rev 154765)
+++ trunk/Source/WebCore/ChangeLog	2013-08-28 19:24:50 UTC (rev 154766)
@@ -1,3 +1,31 @@
+2013-08-28  Pratik Solanki  psola...@apple.com
+
+Document::elementSheet() should return a reference
+https://bugs.webkit.org/show_bug.cgi?id=120433
+
+Reviewed by Andreas Kling.
+
+Since elementSheet() always retruns a valid pointer, we can simply return a reference
+instead. Also rename m_elemSheet to m_elementSheet.
+
+* css/CSSParser.cpp:
+(WebCore::CSSParser::parseInlineStyleDeclaration):
+* css/PropertySetCSSStyleDeclaration.cpp:
+(WebCore::InlineCSSStyleDeclaration::parentStyleSheet):
+* dom/Document.cpp:
+(WebCore::Document::~Document):
+(WebCore::Document::recalcStyle):
+(WebCore::Document::updateBaseURL):
+(WebCore::Document::elementSheet):
+* dom/Document.h:
+* dom/StyledElement.cpp:
+(WebCore::StyledElement::setInlineStyleFromString):
+(WebCore::StyledElement::setInlineStyleProperty):
+(WebCore::StyledElement::addSubresourceAttributeURLs):
+(WebCore::StyledElement::addPropertyToPresentationAttributeStyle):
+* inspector/InspectorStyleSheet.cpp:
+(WebCore::InspectorStyleSheetForInlineStyle::getStyleAttributeRanges):
+
 2013-08-28  Ryosuke Niwa  rn...@webkit.org
 
 REGRESSION(r154586): Past names map should only be used when named item is empty


Modified: trunk/Source/WebCore/css/CSSParser.cpp (154765 => 154766)

--- trunk/Source/WebCore/css/CSSParser.cpp	2013-08-28 19:00:01 UTC (rev 154765)
+++ trunk/Source/WebCore/css/CSSParser.cpp	2013-08-28 19:24:50 UTC (rev 154766)
@@ -1423,9 +1423,9 @@
 
 PassRefPtrImmutableStylePropertySet CSSParser::parseInlineStyleDeclaration(const String string, Element* element)
 {
-CSSParserContext context = element-document()-elementSheet()-contents()-parserContext();
+CSSParserContext context = element-document()-elementSheet().contents()-parserContext();
 context.mode = strictToCSSParserMode(element-isHTMLElement()  !element-document()-inQuirksMode());
-return CSSParser(context).parseDeclaration(string, element-document()-elementSheet()-contents());
+return CSSParser(context).parseDeclaration(string, element-document()-elementSheet().contents());
 }
 
 PassRefPtrImmutableStylePropertySet CSSParser::parseDeclaration(const String string, StyleSheetContents* contextStyleSheet)


Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (154765 => 154766)

--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp	2013-08-28 19:00:01 UTC (rev 154765)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp	2013-08-28 19:24:50 UTC (rev 154766)
@@ -366,7 +366,7 @@
 
 CSSStyleSheet* InlineCSSStyleDeclaration::parentStyleSheet() const
 {
-return m_parentElement ? m_parentElement-document()-elementSheet() : 0;
+return m_parentElement ? m_parentElement-document()-elementSheet() : 0;
 }
 
 } // namespace WebCore


Modified: trunk/Source/WebCore/dom/Document.cpp (154765 => 154766)

--- trunk/Source/WebCore/dom/Document.cpp	2013-08-28 19:00:01 UTC (rev 154765)
+++ trunk/Source/WebCore/dom/Document.cpp	2013-08-28 19:24:50 UTC (rev 154766)
@@ -593,8 +593,8 @@
 
 m_styleSheetCollection.clear();
 
-if (m_elemSheet)
-m_elemSheet-clearOwnerNode();
+if (m_elementSheet)
+

[webkit-changes] [154618] trunk/Source

[psolanki]

Title: [154618] trunk/Source








Revision 154618
Author psola...@apple.com
Date 2013-08-26 10:57:00 -0700 (Mon, 26 Aug 2013)


Log Message
PageGroup::groupSettings() should return a reference
https://bugs.webkit.org/show_bug.cgi?id=120319

Reviewed by Andreas Kling.

PageGroup::m_groupSettings is never NULL so we can just return a reference from groupSettings().

Source/WebCore:

* Modules/indexeddb/IDBFactory.cpp:
* page/PageGroup.h:
(WebCore::PageGroup::groupSettings):
* storage/StorageNamespaceImpl.cpp:
(WebCore::StorageNamespaceImpl::localStorageNamespace):
* workers/DefaultSharedWorkerRepository.cpp:
(WebCore::SharedWorkerProxy::groupSettings):
* workers/WorkerMessagingProxy.cpp:
(WebCore::WorkerMessagingProxy::startWorkerGlobalScope):

Source/WebKit/blackberry:

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::didChangeSettings):

Source/WebKit/gtk:

* webkit/webkitwebdatabase.cpp:
(webkit_set_web_database_directory_path):

Source/WebKit2:

* WebProcess/Storage/StorageNamespaceImpl.cpp:
(WebKit::StorageNamespaceImpl::createLocalStorageNamespace):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp
trunk/Source/WebCore/page/PageGroup.h
trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp
trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp
trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp
trunk/Source/WebKit/blackberry/Api/WebPage.cpp
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/gtk/ChangeLog
trunk/Source/WebKit/gtk/webkit/webkitwebdatabase.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (154617 => 154618)

--- trunk/Source/WebCore/ChangeLog	2013-08-26 17:55:41 UTC (rev 154617)
+++ trunk/Source/WebCore/ChangeLog	2013-08-26 17:57:00 UTC (rev 154618)
@@ -1,3 +1,22 @@
+2013-08-26  Pratik Solanki  psola...@apple.com
+
+PageGroup::groupSettings() should return a reference
+https://bugs.webkit.org/show_bug.cgi?id=120319
+
+Reviewed by Andreas Kling.
+
+PageGroup::m_groupSettings is never NULL so we can just return a reference from groupSettings().
+
+* Modules/indexeddb/IDBFactory.cpp:
+* page/PageGroup.h:
+(WebCore::PageGroup::groupSettings):
+* storage/StorageNamespaceImpl.cpp:
+(WebCore::StorageNamespaceImpl::localStorageNamespace):
+* workers/DefaultSharedWorkerRepository.cpp:
+(WebCore::SharedWorkerProxy::groupSettings):
+* workers/WorkerMessagingProxy.cpp:
+(WebCore::WorkerMessagingProxy::startWorkerGlobalScope):
+
 2013-08-26  Andreas Kling  akl...@apple.com
 
 WebCore: Let Page create the main Frame.


Modified: trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp (154617 => 154618)

--- trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp	2013-08-26 17:55:41 UTC (rev 154617)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp	2013-08-26 17:57:00 UTC (rev 154618)
@@ -86,7 +86,7 @@
 ASSERT(isContextValid(context));
 if (context-isDocument()) {
 Document* document = toDocument(context);
-return document-page()-group().groupSettings()-indexedDBDatabasePath();
+return document-page()-group().groupSettings().indexedDBDatabasePath();
 }
 #if ENABLE(WORKERS)
 WorkerGlobalScope* workerGlobalScope = static_castWorkerGlobalScope*(context);


Modified: trunk/Source/WebCore/page/PageGroup.h (154617 => 154618)

--- trunk/Source/WebCore/page/PageGroup.h	2013-08-26 17:55:41 UTC (rev 154617)
+++ trunk/Source/WebCore/page/PageGroup.h	2013-08-26 17:57:00 UTC (rev 154618)
@@ -108,7 +108,7 @@
 const UserScriptMap* userScripts() const { return m_userScripts.get(); }
 const UserStyleSheetMap* userStyleSheets() const { return m_userStyleSheets.get(); }
 
-GroupSettings* groupSettings() const { return m_groupSettings.get(); }
+GroupSettings groupSettings() const { return *m_groupSettings; }
 
 #if ENABLE(VIDEO_TRACK)
 void captionPreferencesChanged();
@@ -135,7 +135,7 @@
 OwnPtrUserScriptMap m_userScripts;
 OwnPtrUserStyleSheetMap m_userStyleSheets;
 
-OwnPtrGroupSettings m_groupSettings;
+const OwnPtrGroupSettings m_groupSettings;
 
 #if ENABLE(VIDEO_TRACK)
 OwnPtrCaptionUserPreferences m_captionPreferences;


Modified: trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp (154617 => 154618)

--- trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp	2013-08-26 17:55:41 UTC (rev 154617)
+++ trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp	2013-08-26 17:57:00 UTC (rev 154618)
@@ -57,7 +57,7 @@
 // at this point we're stuck with it.
 Page* page = *pageGroup-pages().begin();
 const String path = page-settings().localStorageDatabasePath();
-unsigned quota = pageGroup-groupSettings()-localStorageQuotaBytes();
+unsigned quota = 

[webkit-changes] [154645] trunk/Source/WebCore

[psolanki]

Title: [154645] trunk/Source/WebCore








Revision 154645
Author psola...@apple.com
Date 2013-08-26 14:54:39 -0700 (Mon, 26 Aug 2013)


Log Message
Page::console() should return a reference
https://bugs.webkit.org/show_bug.cgi?id=120320

Reviewed by Darin Adler.

Page::m_console is never NULL so console() can just return a reference.

* css/CSSParser.cpp:
(WebCore::CSSParser::logError):
* dom/Document.cpp:
(WebCore::Document::addConsoleMessage):
(WebCore::Document::addMessage):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::pageConsole):
* page/Page.h:
(WebCore::Page::console):
* xml/XSLStyleSheetLibxslt.cpp:
(WebCore::XSLStyleSheet::parseString):
* xml/XSLTProcessorLibxslt.cpp:
(WebCore::docLoaderFunc):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSParser.cpp
trunk/Source/WebCore/dom/Document.cpp
trunk/Source/WebCore/page/DOMWindow.cpp
trunk/Source/WebCore/page/Page.h
trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp
trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (154644 => 154645)

--- trunk/Source/WebCore/ChangeLog	2013-08-26 21:53:05 UTC (rev 154644)
+++ trunk/Source/WebCore/ChangeLog	2013-08-26 21:54:39 UTC (rev 154645)
@@ -1,3 +1,26 @@
+2013-08-26  Pratik Solanki  psola...@apple.com
+
+Page::console() should return a reference
+https://bugs.webkit.org/show_bug.cgi?id=120320
+
+Reviewed by Darin Adler.
+
+Page::m_console is never NULL so console() can just return a reference.
+
+* css/CSSParser.cpp:
+(WebCore::CSSParser::logError):
+* dom/Document.cpp:
+(WebCore::Document::addConsoleMessage):
+(WebCore::Document::addMessage):
+* page/DOMWindow.cpp:
+(WebCore::DOMWindow::pageConsole):
+* page/Page.h:
+(WebCore::Page::console):
+* xml/XSLStyleSheetLibxslt.cpp:
+(WebCore::XSLStyleSheet::parseString):
+* xml/XSLTProcessorLibxslt.cpp:
+(WebCore::docLoaderFunc):
+
 2013-08-26  Rob Buis  rwlb...@webkit.org
 
 Lonely stop crashes


Modified: trunk/Source/WebCore/css/CSSParser.cpp (154644 => 154645)

--- trunk/Source/WebCore/css/CSSParser.cpp	2013-08-26 21:53:05 UTC (rev 154644)
+++ trunk/Source/WebCore/css/CSSParser.cpp	2013-08-26 21:54:39 UTC (rev 154645)
@@ -11717,8 +11717,8 @@
 void CSSParser::logError(const String message, int lineNumber)
 {
 // FIXME: http://webkit.org/b/114313 CSS Parser ConsoleMessage errors should include column numbers
-PageConsole* console = m_styleSheet-singleOwnerDocument()-page()-console();
-console-addMessage(CSSMessageSource, WarningMessageLevel, message, m_styleSheet-baseURL().string(), lineNumber + 1, 0);
+PageConsole console = m_styleSheet-singleOwnerDocument()-page()-console();
+console.addMessage(CSSMessageSource, WarningMessageLevel, message, m_styleSheet-baseURL().string(), lineNumber + 1, 0);
 }
 
 StyleRuleKeyframes* CSSParser::createKeyframesRule(const String name, PassOwnPtrVectorRefPtrStyleKeyframe   popKeyframes)


Modified: trunk/Source/WebCore/dom/Document.cpp (154644 => 154645)

--- trunk/Source/WebCore/dom/Document.cpp	2013-08-26 21:53:05 UTC (rev 154644)
+++ trunk/Source/WebCore/dom/Document.cpp	2013-08-26 21:54:39 UTC (rev 154645)
@@ -4749,7 +4749,7 @@
 }
 
 if (Page* page = this-page())
-page-console()-addMessage(source, level, message, requestIdentifier, this);
+page-console().addMessage(source, level, message, requestIdentifier, this);
 }
 
 void Document::addMessage(MessageSource source, MessageLevel level, const String message, const String sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtrScriptCallStack callStack, ScriptState* state, unsigned long requestIdentifier)
@@ -4760,7 +4760,7 @@
 }
 
 if (Page* page = this-page())
-page-console()-addMessage(source, level, message, sourceURL, lineNumber, columnNumber, callStack, state, requestIdentifier);
+page-console().addMessage(source, level, message, sourceURL, lineNumber, columnNumber, callStack, state, requestIdentifier);
 }
 
 SecurityOrigin* Document::topOrigin() const


Modified: trunk/Source/WebCore/page/DOMWindow.cpp (154644 => 154645)

--- trunk/Source/WebCore/page/DOMWindow.cpp	2013-08-26 21:53:05 UTC (rev 154644)
+++ trunk/Source/WebCore/page/DOMWindow.cpp	2013-08-26 21:54:39 UTC (rev 154645)
@@ -691,7 +691,7 @@
 {
 if (!isCurrentlyDisplayedInFrame())
 return 0;
-return m_frame-page() ? m_frame-page()-console() : 0;
+return m_frame-page() ? m_frame-page()-console() : 0;
 }
 
 DOMApplicationCache* DOMWindow::applicationCache() const


Modified: trunk/Source/WebCore/page/Page.h (154644 => 154645)

--- trunk/Source/WebCore/page/Page.h	2013-08-26 21:53:05 UTC (rev 154644)
+++ trunk/Source/WebCore/page/Page.h	2013-08-26 21:54:39 UTC (rev 154645)
@@ -394,7 +394,7 @@
 PageThrottler* pageThrottler() { return m_pageThrottler.get(); }
 PassOwnPtrPageActivityAssertionToken 

[webkit-changes] [154533] trunk/Source/WebCore

[psolanki]

Title: [154533] trunk/Source/WebCore








Revision 154533
Author psola...@apple.com
Date 2013-08-23 17:13:49 -0700 (Fri, 23 Aug 2013)


Log Message
MediaQuery::expressions() should return a reference
https://webkit.org/b/120215

Reviewed by Anders Carlsson.

m_expressions is never NULL so we can just return a reference.

* css/MediaList.cpp:
(WebCore::reportMediaQueryWarningIfNeeded):
* css/MediaQuery.cpp:
(WebCore::MediaQuery::MediaQuery):
* css/MediaQuery.h:
(WebCore::MediaQuery::expressions):
* css/MediaQueryEvaluator.cpp:
(WebCore::MediaQueryEvaluator::eval):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/MediaList.cpp
trunk/Source/WebCore/css/MediaQuery.cpp
trunk/Source/WebCore/css/MediaQuery.h
trunk/Source/WebCore/css/MediaQueryEvaluator.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (154532 => 154533)

--- trunk/Source/WebCore/ChangeLog	2013-08-23 23:57:01 UTC (rev 154532)
+++ trunk/Source/WebCore/ChangeLog	2013-08-24 00:13:49 UTC (rev 154533)
@@ -1,3 +1,21 @@
+2013-08-23  Pratik Solanki  psola...@apple.com
+
+MediaQuery::expressions() should return a reference
+https://webkit.org/b/120215
+
+Reviewed by Anders Carlsson.
+
+m_expressions is never NULL so we can just return a reference.
+
+* css/MediaList.cpp:
+(WebCore::reportMediaQueryWarningIfNeeded):
+* css/MediaQuery.cpp:
+(WebCore::MediaQuery::MediaQuery):
+* css/MediaQuery.h:
+(WebCore::MediaQuery::expressions):
+* css/MediaQueryEvaluator.cpp:
+(WebCore::MediaQueryEvaluator::eval):
+
 2013-08-23  Ryosuke Niwa  rn...@webkit.org
 
 Build fix after r154515.


Modified: trunk/Source/WebCore/css/MediaList.cpp (154532 => 154533)

--- trunk/Source/WebCore/css/MediaList.cpp	2013-08-23 23:57:01 UTC (rev 154532)
+++ trunk/Source/WebCore/css/MediaList.cpp	2013-08-24 00:13:49 UTC (rev 154533)
@@ -328,9 +328,9 @@
 const MediaQuery* query = mediaQueries[i].get();
 String mediaType = query-mediaType();
 if (!query-ignored()  !equalIgnoringCase(mediaType, print)) {
-const VectorOwnPtrMediaQueryExp * exps = query-expressions();
-for (size_t j = 0; j  exps-size(); ++j) {
-const MediaQueryExp* exp = exps-at(j).get();
+const VectorOwnPtrMediaQueryExp expressions = query-expressions();
+for (size_t j = 0; j  expressions.size(); ++j) {
+const MediaQueryExp* exp = expressions.at(j).get();
 if (exp-mediaFeature() == MediaFeatureNames::resolutionMediaFeature || exp-mediaFeature() == MediaFeatureNames::max_resolutionMediaFeature || exp-mediaFeature() == MediaFeatureNames::min_resolutionMediaFeature) {
 CSSValue* cssValue =  exp-value();
 if (cssValue  cssValue-isPrimitiveValue()) {


Modified: trunk/Source/WebCore/css/MediaQuery.cpp (154532 => 154533)

--- trunk/Source/WebCore/css/MediaQuery.cpp	2013-08-23 23:57:01 UTC (rev 154532)
+++ trunk/Source/WebCore/css/MediaQuery.cpp	2013-08-24 00:13:49 UTC (rev 154533)
@@ -79,14 +79,14 @@
 }
 
 
-MediaQuery::MediaQuery(Restrictor r, const String mediaType, PassOwnPtrVectorOwnPtrMediaQueryExp   exprs)
+MediaQuery::MediaQuery(Restrictor r, const String mediaType, PassOwnPtrExpressionVector exprs)
 : m_restrictor(r)
 , m_mediaType(mediaType.lower())
 , m_expressions(exprs)
 , m_ignored(false)
 {
 if (!m_expressions) {
-m_expressions = adoptPtr(new VectorOwnPtrMediaQueryExp );
+m_expressions = adoptPtr(new ExpressionVector);
 return;
 }
 
@@ -110,7 +110,7 @@
 MediaQuery::MediaQuery(const MediaQuery o)
 : m_restrictor(o.m_restrictor)
 , m_mediaType(o.m_mediaType)
-, m_expressions(adoptPtr(new VectorOwnPtrMediaQueryExp (o.m_expressions-size(
+, m_expressions(adoptPtr(new ExpressionVector(o.m_expressions-size(
 , m_ignored(o.m_ignored)
 , m_serializationCache(o.m_serializationCache)
 {


Modified: trunk/Source/WebCore/css/MediaQuery.h (154532 => 154533)

--- trunk/Source/WebCore/css/MediaQuery.h	2013-08-23 23:57:01 UTC (rev 154532)
+++ trunk/Source/WebCore/css/MediaQuery.h	2013-08-24 00:13:49 UTC (rev 154533)
@@ -44,13 +44,13 @@
 Only, Not, None
 };
 
-typedef VectorOwnPtrMediaQueryExp  ExpressionVector;
+typedef VectorOwnPtrMediaQueryExp ExpressionVector;
 
-MediaQuery(Restrictor, const String mediaType, PassOwnPtrExpressionVector exprs);
+MediaQuery(Restrictor, const String mediaType, PassOwnPtrVectorOwnPtrMediaQueryExp exprs);
 ~MediaQuery();
 
 Restrictor restrictor() const { return m_restrictor; }
-const VectorOwnPtrMediaQueryExp * expressions() const { return m_expressions.get(); }
+const VectorOwnPtrMediaQueryExp expressions() const { return *m_expressions; }
 String mediaType() const { return m_mediaType; }
 bool operator==(const MediaQuery other) const;
 String cssText() const;


Modified: 

[webkit-changes] [154347] trunk/Source/WebCore

[psolanki]

Title: [154347] trunk/Source/WebCore








Revision 154347
Author psola...@apple.com
Date 2013-08-20 11:50:21 -0700 (Tue, 20 Aug 2013)


Log Message
https://webkit.org/b/119875 localeToScriptCodeForFontSelection should use hash tables with larger default capacity

Reviewed by Darin Adler.

The two static hash tables used in this file have 106 and 198 entries. Set a minimumTableSize for
these hash tables so we don't have to expand them during initialization.

No new tests because no functional changes.

* platform/text/LocaleToScriptMappingDefault.cpp:
(WebCore::scriptNameToCode):
(WebCore::localeToScriptCodeForFontSelection):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (154346 => 154347)

--- trunk/Source/WebCore/ChangeLog	2013-08-20 18:47:23 UTC (rev 154346)
+++ trunk/Source/WebCore/ChangeLog	2013-08-20 18:50:21 UTC (rev 154347)
@@ -1,3 +1,18 @@
+2013-08-20  Pratik Solanki  psola...@apple.com
+
+https://webkit.org/b/119875 localeToScriptCodeForFontSelection should use hash tables with larger default capacity
+
+Reviewed by Darin Adler.
+
+The two static hash tables used in this file have 106 and 198 entries. Set a minimumTableSize for
+these hash tables so we don't have to expand them during initialization.
+
+No new tests because no functional changes.
+
+* platform/text/LocaleToScriptMappingDefault.cpp:
+(WebCore::scriptNameToCode):
+(WebCore::localeToScriptCodeForFontSelection):
+
 2013-08-20  Eric Carlson  eric.carl...@apple.com
 
 https://webkit.org/b/120068 Media controls can be attached lazily


Modified: trunk/Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp (154346 => 154347)

--- trunk/Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp	2013-08-20 18:47:23 UTC (rev 154346)
+++ trunk/Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp	2013-08-20 18:50:21 UTC (rev 154347)
@@ -37,357 +37,367 @@
 
 namespace WebCore {
 
+struct ScriptNameCode {
+const char* name;
+UScriptCode code;
+};
+
+// This generally maps an ISO 15924 script code to its UScriptCode, but certain families of script codes are
+// treated as a single script for assigning a per-script font in Settings. For example, hira is mapped to
+// USCRIPT_KATAKANA_OR_HIRAGANA instead of USCRIPT_HIRAGANA, since we want all Japanese scripts to be rendered
+// using the same font setting.
+static const ScriptNameCode scriptNameCodeList[] = {
+{ zyyy, USCRIPT_COMMON },
+{ qaai, USCRIPT_INHERITED },
+{ arab, USCRIPT_ARABIC },
+{ armn, USCRIPT_ARMENIAN },
+{ beng, USCRIPT_BENGALI },
+{ bopo, USCRIPT_BOPOMOFO },
+{ cher, USCRIPT_CHEROKEE },
+{ copt, USCRIPT_COPTIC },
+{ cyrl, USCRIPT_CYRILLIC },
+{ dsrt, USCRIPT_DESERET },
+{ deva, USCRIPT_DEVANAGARI },
+{ ethi, USCRIPT_ETHIOPIC },
+{ geor, USCRIPT_GEORGIAN },
+{ goth, USCRIPT_GOTHIC },
+{ grek, USCRIPT_GREEK },
+{ gujr, USCRIPT_GUJARATI },
+{ guru, USCRIPT_GURMUKHI },
+{ hani, USCRIPT_HAN },
+{ hang, USCRIPT_HANGUL },
+{ hebr, USCRIPT_HEBREW },
+{ hira, USCRIPT_KATAKANA_OR_HIRAGANA },
+{ knda, USCRIPT_KANNADA },
+{ kana, USCRIPT_KATAKANA_OR_HIRAGANA },
+{ khmr, USCRIPT_KHMER },
+{ laoo, USCRIPT_LAO },
+{ latn, USCRIPT_LATIN },
+{ mlym, USCRIPT_MALAYALAM },
+{ mong, USCRIPT_MONGOLIAN },
+{ mymr, USCRIPT_MYANMAR },
+{ ogam, USCRIPT_OGHAM },
+{ ital, USCRIPT_OLD_ITALIC },
+{ orya, USCRIPT_ORIYA },
+{ runr, USCRIPT_RUNIC },
+{ sinh, USCRIPT_SINHALA },
+{ syrc, USCRIPT_SYRIAC },
+{ taml, USCRIPT_TAMIL },
+{ telu, USCRIPT_TELUGU },
+{ thaa, USCRIPT_THAANA },
+{ thai, USCRIPT_THAI },
+{ tibt, USCRIPT_TIBETAN },
+{ cans, USCRIPT_CANADIAN_ABORIGINAL },
+{ yiii, USCRIPT_YI },
+{ tglg, USCRIPT_TAGALOG },
+{ hano, USCRIPT_HANUNOO },
+{ buhd, USCRIPT_BUHID },
+{ tagb, USCRIPT_TAGBANWA },
+{ brai, USCRIPT_BRAILLE },
+{ cprt, USCRIPT_CYPRIOT },
+{ limb, USCRIPT_LIMBU },
+{ linb, USCRIPT_LINEAR_B },
+{ osma, USCRIPT_OSMANYA },
+{ shaw, USCRIPT_SHAVIAN },
+{ tale, USCRIPT_TAI_LE },
+{ ugar, USCRIPT_UGARITIC },
+{ hrkt, USCRIPT_KATAKANA_OR_HIRAGANA },
+{ bugi, USCRIPT_BUGINESE },
+{ glag, USCRIPT_GLAGOLITIC },
+{ khar, USCRIPT_KHAROSHTHI },
+{ sylo, USCRIPT_SYLOTI_NAGRI },
+{ talu, USCRIPT_NEW_TAI_LUE },
+{ tfng, USCRIPT_TIFINAGH },
+{ xpeo, USCRIPT_OLD_PERSIAN },
+{ bali, USCRIPT_BALINESE },
+{ batk, USCRIPT_BATAK },
+{ blis, USCRIPT_BLISSYMBOLS },
+{ brah, USCRIPT_BRAHMI },
+{ cham, USCRIPT_CHAM },
+{ cirt, USCRIPT_CIRTH },
+{ cyrs, USCRIPT_OLD_CHURCH_SLAVONIC_CYRILLIC },
+{ egyd, USCRIPT_DEMOTIC_EGYPTIAN },
+{ egyh, USCRIPT_HIERATIC_EGYPTIAN },
+{ egyp, USCRIPT_EGYPTIAN_HIEROGLYPHS },
+{ 

[webkit-changes] [154291] trunk/Source/WebCore

[psolanki]

Title: [154291] trunk/Source/WebCore








Revision 154291
Author psola...@apple.com
Date 2013-08-19 12:43:47 -0700 (Mon, 19 Aug 2013)


Log Message
https://webkit.org/b/120019 Document::visitedLinkState() should return a reference

Reviewed by Andreas Kling.

Document::m_visitedLinkState is never NULL so we can just return a reference. Also make it a const.

* css/StyleResolver.cpp:
(WebCore::StyleResolver::State::initElement):
* dom/Document.h:
(WebCore::Document::visitedLinkState):
* history/CachedPage.cpp:
(WebCore::CachedPage::restore):
* page/Page.cpp:
(WebCore::Page::allVisitedStateChanged):
(WebCore::Page::visitedStateChanged):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/StyleResolver.cpp
trunk/Source/WebCore/dom/Document.h
trunk/Source/WebCore/history/CachedPage.cpp
trunk/Source/WebCore/page/Page.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (154290 => 154291)

--- trunk/Source/WebCore/ChangeLog	2013-08-19 19:40:13 UTC (rev 154290)
+++ trunk/Source/WebCore/ChangeLog	2013-08-19 19:43:47 UTC (rev 154291)
@@ -1,3 +1,21 @@
+2013-08-19  Pratik Solanki  psola...@apple.com
+
+https://webkit.org/b/120019 Document::visitedLinkState() should return a reference
+
+Reviewed by Andreas Kling.
+
+Document::m_visitedLinkState is never NULL so we can just return a reference. Also make it a const.
+
+* css/StyleResolver.cpp:
+(WebCore::StyleResolver::State::initElement):
+* dom/Document.h:
+(WebCore::Document::visitedLinkState):
+* history/CachedPage.cpp:
+(WebCore::CachedPage::restore):
+* page/Page.cpp:
+(WebCore::Page::allVisitedStateChanged):
+(WebCore::Page::visitedStateChanged):
+
 2013-08-19  Ryosuke Niwa  rn...@webkit.org
 
 ASSERTION FAILED: !node || node-isShadowRoot() in WebCore::EventRetargeter::eventTargetRespectingTargetRules


Modified: trunk/Source/WebCore/css/StyleResolver.cpp (154290 => 154291)

--- trunk/Source/WebCore/css/StyleResolver.cpp	2013-08-19 19:40:13 UTC (rev 154290)
+++ trunk/Source/WebCore/css/StyleResolver.cpp	2013-08-19 19:43:47 UTC (rev 154291)
@@ -409,7 +409,7 @@
 {
 m_element = e;
 m_styledElement = e  e-isStyledElement() ? static_castStyledElement*(e) : 0;
-m_elementLinkState = e ? e-document()-visitedLinkState()-determineLinkState(e) : NotInsideLink;
+m_elementLinkState = e ? e-document()-visitedLinkState().determineLinkState(e) : NotInsideLink;
 }
 
 inline void StyleResolver::initElement(Element* e)


Modified: trunk/Source/WebCore/dom/Document.h (154290 => 154291)

--- trunk/Source/WebCore/dom/Document.h	2013-08-19 19:40:13 UTC (rev 154290)
+++ trunk/Source/WebCore/dom/Document.h	2013-08-19 19:43:47 UTC (rev 154291)
@@ -651,7 +651,7 @@
 void resetLinkColor();
 void resetVisitedLinkColor();
 void resetActiveLinkColor();
-VisitedLinkState* visitedLinkState() const { return m_visitedLinkState.get(); }
+VisitedLinkState visitedLinkState() const { return *m_visitedLinkState; }
 
 MouseEventWithHitTestResults prepareMouseEvent(const HitTestRequest, const LayoutPoint, const PlatformMouseEvent);
 
@@ -1350,7 +1350,7 @@
 Color m_linkColor;
 Color m_visitedLinkColor;
 Color m_activeLinkColor;
-OwnPtrVisitedLinkState m_visitedLinkState;
+const OwnPtrVisitedLinkState m_visitedLinkState;
 
 bool m_visuallyOrdered;
 ReadyState m_readyState;


Modified: trunk/Source/WebCore/history/CachedPage.cpp (154290 => 154291)

--- trunk/Source/WebCore/history/CachedPage.cpp	2013-08-19 19:40:13 UTC (rev 154290)
+++ trunk/Source/WebCore/history/CachedPage.cpp	2013-08-19 19:43:47 UTC (rev 154291)
@@ -90,7 +90,7 @@
 
 if (m_needStyleRecalcForVisitedLinks) {
 for (Frame* frame = page-mainFrame(); frame; frame = frame-tree()-traverseNext())
-frame-document()-visitedLinkState()-invalidateStyleForAllLinks();
+frame-document()-visitedLinkState().invalidateStyleForAllLinks();
 }
 
 #if USE(ACCELERATED_COMPOSITING)


Modified: trunk/Source/WebCore/page/Page.cpp (154290 => 154291)

--- trunk/Source/WebCore/page/Page.cpp	2013-08-19 19:40:13 UTC (rev 154290)
+++ trunk/Source/WebCore/page/Page.cpp	2013-08-19 19:43:47 UTC (rev 154291)
@@ -1072,7 +1072,7 @@
 if (page-m_group != group)
 continue;
 for (Frame* frame = page-m_mainFrame.get(); frame; frame = frame-tree()-traverseNext())
-frame-document()-visitedLinkState()-invalidateStyleForAllLinks();
+frame-document()-visitedLinkState().invalidateStyleForAllLinks();
 }
 }
 
@@ -1088,7 +1088,7 @@
 if (page-m_group != group)
 continue;
 for (Frame* frame = page-m_mainFrame.get(); frame; frame = frame-tree()-traverseNext())
-frame-document()-visitedLinkState()-invalidateStyleForLink(linkHash);
+frame-document()-visitedLinkState().invalidateStyleForLink(linkHash);
 }
 }
 

[webkit-changes] [153340] trunk/Source/WebCore

[psolanki]

Title: [153340] trunk/Source/WebCore








Revision 153340
Author psola...@apple.com
Date 2013-07-25 13:19:28 -0700 (Thu, 25 Jul 2013)


Log Message
Unreviewed build fix after r15.

* platform/network/cf/ResourceResponseCFNet.cpp: Remove toTimeT since it is no longer called.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (153339 => 153340)

--- trunk/Source/WebCore/ChangeLog	2013-07-25 19:36:44 UTC (rev 153339)
+++ trunk/Source/WebCore/ChangeLog	2013-07-25 20:19:28 UTC (rev 153340)
@@ -1,3 +1,9 @@
+2013-07-25  Pratik Solanki  psola...@apple.com
+
+Unreviewed build fix after r15.
+
+* platform/network/cf/ResourceResponseCFNet.cpp: Remove toTimeT since it is no longer called.
+
 2013-07-25  Christophe Dumez  ch.du...@sisa.samsung.com
 
 Unreviewed EFL build fix after r153315.


Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp (153339 => 153340)

--- trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp	2013-07-25 19:36:44 UTC (rev 153339)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp	2013-07-25 20:19:28 UTC (rev 153340)
@@ -69,13 +69,6 @@
 return dot  0  dot  length - 1;
 }
 
-static time_t toTimeT(CFAbsoluteTime time)
-{
-static const double maxTimeAsDouble = std::numeric_limitstime_t::max();
-static const double minTimeAsDouble = std::numeric_limitstime_t::min();
-return static_casttime_t(min(max(minTimeAsDouble, time + kCFAbsoluteTimeIntervalSince1970), maxTimeAsDouble));
-}
-
 void ResourceResponse::platformLazyInit(InitLevel initLevel)
 {
 if (m_initLevel  initLevel)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes