Title: [111251] trunk/Source/WebCore
- Revision
- 111251
- Author
- [email protected]
- Date
- 2012-03-19 14:35:16 -0700 (Mon, 19 Mar 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (111250 => 111251)
--- trunk/Source/WebCore/ChangeLog 2012-03-19 21:34:25 UTC (rev 111250)
+++ trunk/Source/WebCore/ChangeLog 2012-03-19 21:35:16 UTC (rev 111251)
@@ -1,3 +1,17 @@
+2012-03-19 Adam Barth <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r111207.
Modified: trunk/Source/WebCore/loader/MainResourceLoader.cpp (111250 => 111251)
--- trunk/Source/WebCore/loader/MainResourceLoader.cpp 2012-03-19 21:34:25 UTC (rev 111250)
+++ trunk/Source/WebCore/loader/MainResourceLoader.cpp 2012-03-19 21:35:16 UTC (rev 111251)
@@ -61,6 +61,11 @@
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))
, m_dataLoadTimer(this, &MainResourceLoader::handleDataLoadNow)
@@ -236,15 +241,6 @@
}
}
-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
-}
-
void MainResourceLoader::continueAfterContentPolicy(PolicyAction contentPolicy, const ResourceResponse& r)
{
KURL url = ""
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
