Changeset 169883 in webkit

Timestamp:

Jun 12, 2014, 12:25:31 AM (12 years ago)

Author:

psolanki@apple.com

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):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/platform/SharedBuffer.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-12  Pratik Solanki  <psolanki@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  <mmaxfield@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1599 +1599 @@
 __ZNK7WebCore12RenderWidget14windowClipRectEv
 __ZNK7WebCore12SharedBuffer11getSomeDataERPKcj
+__ZNK7WebCore12SharedBuffer15hasPlatformDataEv
 __ZNK7WebCore12SharedBuffer4dataEv
 __ZNK7WebCore12SharedBuffer4sizeEv

trunk/Source/WebCore/platform/SharedBuffer.h

@@ -172 +172 @@
 
     void tryReplaceContentsWithPlatformBuffer(SharedBuffer*);
+    bool hasPlatformData() const;
 
 private:
@@ -188 +189 @@
     void clearPlatformData();
     void maybeTransferPlatformData();
-    bool hasPlatformData() const;
 
     void copyBufferAndClear(char* destination, unsigned bytesToCopy) const;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-06-12  Pratik Solanki  <psolanki@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.kim@samsung.com>
 

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

@@ -94 +94 @@
         return;
 
+    if (!buffer->hasPlatformData())
+        return;
+
     RetainPtr<CFDataRef> data = buffer->createCFData();
     if (_CFURLCacheIsResponseDataMemMapped(cache, data.get()) == kCFBooleanFalse)