Title: [104244] trunk/Source
- Revision
- 104244
- Author
- [email protected]
- Date
- 2012-01-05 16:39:16 -0800 (Thu, 05 Jan 2012)
Log Message
Unreviewed, rolling out r104231.
http://trac.webkit.org/changeset/104231
https://bugs.webkit.org/show_bug.cgi?id=75668
Breaks the Qt build (Requested by abarth on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-01-05
Source/WebCore:
* platform/SchemeRegistry.cpp:
* platform/SchemeRegistry.h:
Source/WebKit/qt:
* Api/qwebpage.cpp:
(QWebPage::acceptNavigationRequest):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (104243 => 104244)
--- trunk/Source/WebCore/ChangeLog 2012-01-06 00:36:16 UTC (rev 104243)
+++ trunk/Source/WebCore/ChangeLog 2012-01-06 00:39:16 UTC (rev 104244)
@@ -1,3 +1,14 @@
+2012-01-05 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r104231.
+ http://trac.webkit.org/changeset/104231
+ https://bugs.webkit.org/show_bug.cgi?id=75668
+
+ Breaks the Qt build (Requested by abarth on #webkit).
+
+ * platform/SchemeRegistry.cpp:
+ * platform/SchemeRegistry.h:
+
2012-01-05 Beth Dakin <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=75654
Modified: trunk/Source/WebCore/platform/SchemeRegistry.cpp (104243 => 104244)
--- trunk/Source/WebCore/platform/SchemeRegistry.cpp 2012-01-06 00:36:16 UTC (rev 104243)
+++ trunk/Source/WebCore/platform/SchemeRegistry.cpp 2012-01-06 00:39:16 UTC (rev 104244)
@@ -26,7 +26,7 @@
#include "config.h"
#include "SchemeRegistry.h"
-namespace Platform {
+namespace WebCore {
static URLSchemesMap& localURLSchemes()
{
@@ -273,4 +273,4 @@
return schemesAllowingDatabaseAccessInPrivateBrowsing().contains(scheme);
}
-} // namespace Platform
+} // namespace WebCore
Modified: trunk/Source/WebCore/platform/SchemeRegistry.h (104243 => 104244)
--- trunk/Source/WebCore/platform/SchemeRegistry.h 2012-01-06 00:36:16 UTC (rev 104243)
+++ trunk/Source/WebCore/platform/SchemeRegistry.h 2012-01-06 00:39:16 UTC (rev 104244)
@@ -26,11 +26,11 @@
#ifndef SchemeRegistry_h
#define SchemeRegistry_h
+#include "PlatformString.h"
#include <wtf/HashSet.h>
#include <wtf/text/StringHash.h>
-#include <wtf/text/WTFString.h>
-namespace Platform {
+namespace WebCore {
typedef HashSet<String, CaseFoldingHash> URLSchemesMap;
@@ -82,6 +82,4 @@
} // namespace WebCore
-using Platform::SchemeRegistry;
-
#endif // SchemeRegistry_h
Modified: trunk/Source/WebKit/qt/Api/qwebpage.cpp (104243 => 104244)
--- trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-01-06 00:36:16 UTC (rev 104243)
+++ trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-01-06 00:39:16 UTC (rev 104244)
@@ -2667,7 +2667,7 @@
return true;
case DelegateExternalLinks:
- if (SchemeRegistry::shouldTreatURLSchemeAsLocal(request.url().scheme()))
+ if (WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal(request.url().scheme()))
return true;
emit linkClicked(request.url());
return false;
Modified: trunk/Source/WebKit/qt/ChangeLog (104243 => 104244)
--- trunk/Source/WebKit/qt/ChangeLog 2012-01-06 00:36:16 UTC (rev 104243)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-01-06 00:39:16 UTC (rev 104244)
@@ -1,3 +1,14 @@
+2012-01-05 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r104231.
+ http://trac.webkit.org/changeset/104231
+ https://bugs.webkit.org/show_bug.cgi?id=75668
+
+ Breaks the Qt build (Requested by abarth on #webkit).
+
+ * Api/qwebpage.cpp:
+ (QWebPage::acceptNavigationRequest):
+
2012-01-05 Adam Barth <[email protected]>
Introduce Platform namespace for WebCore/platform
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
