Changeset 111251 in webkit

Timestamp:

Mar 19, 2012 2:35:16 PM (12 years ago)

Author:

abarth@webkit.org

Message:

Remove PLATFORM(TORCHMOBILE) ifdef from MainResourceLoader.cpp
​https://bugs.webkit.org/show_bug.cgi?id=81549

Reviewed by Eric Seidel.

This appears to be the only PLATFORM(TORCHMOBILE) ifdef in WebCore. I
don't believe this ifdef is needed anymore.

• loader/MainResourceLoader.cpp:

(WebCore::shouldLoadAsEmptyDocument):
(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/MainResourceLoader.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-19  Adam Barth  <abarth@webkit.org>
+
+        Remove PLATFORM(TORCHMOBILE) ifdef from MainResourceLoader.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=81549
+
+        Reviewed by Eric Seidel.
+
+        This appears to be the only PLATFORM(TORCHMOBILE) ifdef in WebCore.  I
+        don't believe this ifdef is needed anymore.
+
+        * loader/MainResourceLoader.cpp:
+        (WebCore::shouldLoadAsEmptyDocument):
+        (WebCore):
+
 2012-03-19  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -62 +62 @@
 namespace WebCore {
 
+static bool shouldLoadAsEmptyDocument(const KURL& url)
+{
+    return url.isEmpty() || SchemeRegistry::shouldLoadURLSchemeAsEmptyDocument(url.protocol());
+}
+
 MainResourceLoader::MainResourceLoader(Frame* frame)
     : ResourceLoader(frame, ResourceLoaderOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForCrossOriginCredentials, SkipSecurityCheck))
@@ -235 +240 @@
         frameLoader()->policyChecker()->checkNavigationPolicy(newRequest, callContinueAfterNavigationPolicy, this);
     }
-}
-
-static bool shouldLoadAsEmptyDocument(const KURL& url)
-{
-#if PLATFORM(TORCHMOBILE)
-    return url.isEmpty() || (url.protocolIs("about") && equalIgnoringRef(url, blankURL()));
-#else 
-    return url.isEmpty() || SchemeRegistry::shouldLoadURLSchemeAsEmptyDocument(url.protocol());
-#endif
 }