Title: [149196] trunk/Source/WebKit2
Revision
149196
Author
a...@apple.com
Date
2013-04-26 10:51:13 -0700 (Fri, 26 Apr 2013)

Log Message

        Blobs are not associated with connection when there are no sandbox extensions
        https://bugs.webkit.org/show_bug.cgi?id=115264

        Reviewed by Brady Eidson.

        Covered by multiple fast/files tests when using NetworkProcess.

        * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
        (WebKit::NetworkBlobRegistry::registerBlobURL): Fixed a logic error.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (149195 => 149196)


--- trunk/Source/WebKit2/ChangeLog	2013-04-26 17:41:17 UTC (rev 149195)
+++ trunk/Source/WebKit2/ChangeLog	2013-04-26 17:51:13 UTC (rev 149196)
@@ -1,3 +1,15 @@
+2013-04-26  Alexey Proskuryakov  <a...@apple.com>
+
+        Blobs are not associated with connection when there are no sandbox extensions
+        https://bugs.webkit.org/show_bug.cgi?id=115264
+
+        Reviewed by Brady Eidson.
+
+        Covered by multiple fast/files tests when using NetworkProcess.
+
+        * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
+        (WebKit::NetworkBlobRegistry::registerBlobURL): Fixed a logic error.
+
 2013-04-25  Andy Estes  <aes...@apple.com>
 
         [WebKit2] Loading a resource from a custom protocol in a synchronous XHR times out

Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (149195 => 149196)


--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp	2013-04-26 17:41:17 UTC (rev 149195)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp	2013-04-26 17:51:13 UTC (rev 149196)
@@ -75,13 +75,12 @@
 {
     blobRegistry().registerBlobURL(url, srcURL);
     SandboxExtensionMap::iterator iter = m_sandboxExtensions.find(srcURL.string());
-    if (iter != m_sandboxExtensions.end()) {
+    if (iter != m_sandboxExtensions.end())
         m_sandboxExtensions.add(url.string(), iter->value);
 
-        ASSERT(m_blobsForConnection.contains(connection));
-        ASSERT(m_blobsForConnection.find(connection)->value.contains(srcURL));
-        m_blobsForConnection.find(connection)->value.add(url);
-    }
+    ASSERT(m_blobsForConnection.contains(connection));
+    ASSERT(m_blobsForConnection.find(connection)->value.contains(srcURL));
+    m_blobsForConnection.find(connection)->value.add(url);
 }
 
 void NetworkBlobRegistry::unregisterBlobURL(NetworkConnectionToWebProcess* connection, const WebCore::KURL& url)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to