Unreviewed, rolling out r117206.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 May 2012 07:22:51 +0000 (07:22 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 May 2012 07:22:51 +0000 (07:22 +0000)
http://trac.webkit.org/changeset/117206
https://bugs.webkit.org/show_bug.cgi?id=86583

breaks chromium browser_tests (Requested by bashi1 on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-05-16

* loader/MainResourceLoader.cpp:
(WebCore::MainResourceLoader::continueAfterContentPolicy):
* loader/archive/mhtml/MHTMLArchive.cpp:
(WebCore::MHTMLArchive::create):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@117226 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/loader/MainResourceLoader.cpp
Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp

index c38628623f024f6b8db7a3b5af444e0be1c4d610..50004b32ef93230ca152d7a553dcc4d9f315f4d3 100644 (file)
@@ -1,3 +1,17 @@
+2012-05-16  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r117206.
+        http://trac.webkit.org/changeset/117206
+        https://bugs.webkit.org/show_bug.cgi?id=86583
+
+        breaks chromium browser_tests (Requested by bashi1 on
+        #webkit).
+
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::continueAfterContentPolicy):
+        * loader/archive/mhtml/MHTMLArchive.cpp:
+        (WebCore::MHTMLArchive::create):
+
 2012-05-16  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         REGRESSION(r105057): Infinite loop inside SVGTextLayoutEngine::currentLogicalCharacterMetrics
index cdfe13cd03b9e239b0d1c5fd85046e48513e2361..dc93460b3ddf4187427a707af9ff791c3ade1991 100644 (file)
@@ -267,7 +267,7 @@ void MainResourceLoader::continueAfterContentPolicy(PolicyAction contentPolicy,
     case PolicyUse: {
         // Prevent remote web archives from loading because they can claim to be from any domain and thus avoid cross-domain security checks (4120255).
         bool isRemoteWebArchive = (equalIgnoringCase("application/x-webarchive", mimeType) || equalIgnoringCase("multipart/related", mimeType))
-            && !m_substituteData.isValid() && !SchemeRegistry::shouldTreatURLSchemeAsLocal(url);
+            && !m_substituteData.isValid() && !url.isLocalFile();
         if (!frameLoader()->client()->canShowMIMEType(mimeType) || isRemoteWebArchive) {
             frameLoader()->policyChecker()->cannotShowMIMEType(r);
             // Check reachedTerminalState since the load may have already been cancelled inside of _handleUnimplementablePolicyWithErrorCode::.
index aeb3388c86aab01495853128ed30c8640d1b2b45..cc85445a86bed8f4cf26ba39726a7c759b6b2920 100644 (file)
@@ -41,7 +41,6 @@
 #include "Page.h"
 #include "PageSerializer.h"
 #include "QuotedPrintable.h"
-#include "SchemeRegistry.h"
 #include "SharedBuffer.h"
 
 #include <wtf/CryptographicallyRandomNumber.h>
@@ -104,7 +103,7 @@ PassRefPtr<MHTMLArchive> MHTMLArchive::create()
 PassRefPtr<MHTMLArchive> MHTMLArchive::create(const KURL& url, SharedBuffer* data)
 {
     // For security reasons we only load MHTML pages from the local file system.
-    if (!SchemeRegistry::shouldTreatURLSchemeAsLocal(url))
+    if (!url.isLocalFile())
         return 0;
 
     MHTMLParser parser(data);