Title: [182500] trunk/Source/WebCore
- Revision
- 182500
- Author
- [email protected]
- Date
- 2015-04-07 15:49:15 -0700 (Tue, 07 Apr 2015)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (182499 => 182500)
--- trunk/Source/WebCore/ChangeLog 2015-04-07 22:37:11 UTC (rev 182499)
+++ trunk/Source/WebCore/ChangeLog 2015-04-07 22:49:15 UTC (rev 182500)
@@ -1,3 +1,16 @@
+2015-04-07 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
More work on making the application cache storage be per page
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp (182499 => 182500)
--- trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-04-07 22:37:11 UTC (rev 182499)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-04-07 22:49:15 UTC (rev 182500)
@@ -77,7 +77,7 @@
double addedTimeStart = monotonicallyIncreasingTime();
#endif
if (resourceLoadInfo.resourceURL.protocolIsData()
- || resourceLoadInfo.resourceURL.protocolIsJavaScript())
+ || resourceLoadInfo.resourceURL.protocolIs("_javascript_"))
return Vector<Action>();
const String& urlString = resourceLoadInfo.resourceURL.string();
Modified: trunk/Source/WebCore/platform/URL.cpp (182499 => 182500)
--- trunk/Source/WebCore/platform/URL.cpp 2015-04-07 22:37:11 UTC (rev 182499)
+++ trunk/Source/WebCore/platform/URL.cpp 2015-04-07 22:49:15 UTC (rev 182500)
@@ -470,7 +470,7 @@
// 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();
Modified: trunk/Source/WebCore/platform/URL.h (182499 => 182500)
--- trunk/Source/WebCore/platform/URL.h 2015-04-07 22:37:11 UTC (rev 182499)
+++ trunk/Source/WebCore/platform/URL.h 2015-04-07 22:49:15 UTC (rev 182500)
@@ -127,7 +127,6 @@
// 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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
