Unreviewed fixing API tests.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Apr 2015 22:49:15 +0000 (22:49 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Apr 2015 22:49:15 +0000 (22:49 +0000)
* contentextensions/ContentExtensionsBackend.cpp:
(WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad):
* platform/URL.cpp:
(WebCore::URL::init):
* platform/URL.h:
(WebCore::URL::protocolIsData):
(WebCore::URL::protocolIsJavaScript): Deleted.
Revert part of r182492 that changed URL.h.

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

Source/WebCore/ChangeLog
Source/WebCore/contentextensions/ContentExtensionsBackend.cpp
Source/WebCore/platform/URL.cpp
Source/WebCore/platform/URL.h

index f7f2bf3..c26fe7a 100644 (file)
@@ -1,3 +1,16 @@
+2015-04-07  Alex Christensen  <achristensen@webkit.org>
+
+        Unreviewed fixing API tests.
+
+        * contentextensions/ContentExtensionsBackend.cpp:
+        (WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad):
+        * platform/URL.cpp:
+        (WebCore::URL::init):
+        * platform/URL.h:
+        (WebCore::URL::protocolIsData):
+        (WebCore::URL::protocolIsJavaScript): Deleted.
+        Revert part of r182492 that changed URL.h.
+
 2015-04-07  Anders Carlsson  <andersca@apple.com>
 
         More work on making the application cache storage be per page
index 1ed76b7..11d7423 100644 (file)
@@ -77,7 +77,7 @@ Vector<Action> ContentExtensionsBackend::actionsForResourceLoad(const ResourceLo
     double addedTimeStart = monotonicallyIncreasingTime();
 #endif
     if (resourceLoadInfo.resourceURL.protocolIsData()
-        || resourceLoadInfo.resourceURL.protocolIsJavaScript())
+        || resourceLoadInfo.resourceURL.protocolIs("javascript"))
         return Vector<Action>();
 
     const String& urlString = resourceLoadInfo.resourceURL.string();
index 1d1199c..d19e38e 100644 (file)
@@ -470,7 +470,7 @@ void URL::init(const URL& base, const String& relative, const TextEncoding& enco
     // For compatibility with Win IE, treat backslashes as if they were slashes,
     // as long as we're not dealing with javascript: or data: URLs.
     String rel = relative;
-    if (rel.contains('\\') && !(WebCore::protocolIsJavaScript(rel) || protocolIs(rel, "data")))
+    if (rel.contains('\\') && !(protocolIsJavaScript(rel) || protocolIs(rel, "data")))
         rel = substituteBackslashes(rel);
 
     bool allASCII = rel.containsOnlyASCII();
index 1b92c70..a638d78 100644 (file)
@@ -127,7 +127,6 @@ public:
     // terminated ASCII argument. The argument must be lower-case.
     WEBCORE_EXPORT bool protocolIs(const char*) const;
     bool protocolIsData() const { return protocolIs("data"); }
-    bool protocolIsJavaScript() const { return protocolIs("javascript"); }
     bool protocolIsInHTTPFamily() const;
     WEBCORE_EXPORT bool isLocalFile() const;
     bool isBlankURL() const;