Changeset 207304 in webkit

Timestamp:

Oct 13, 2016 1:03:45 PM (8 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r207297. rdar://problem/28756748

Location:

tags/Safari-603.1.9

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/URLParser.cpp (modified) (10 diffs)
• Source/WebCore/platform/URLParser.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (2 diffs)
• Tools/WebKitTestRunner/ios/mainIOS.mm (modified) (2 diffs)
• Tools/WebKitTestRunner/mac/main.mm (modified) (2 diffs)

tags/Safari-603.1.9/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-13  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r207297. rdar://problem/28756748
+
+    2016-10-13  Alex Christensen  <achristensen@webkit.org>
+
+            Disable URLParser for non-Safari iOS and Mac apps for now
+            https://bugs.webkit.org/show_bug.cgi?id=163397
+
+            Reviewed by Tim Horton.
+
+            r207268 was an awful hack, and it was insufficient.
+            Disable the URLParser for other apps for now.  Hopefully we can enable it everywhere soon.
+
+            No change in behavior for testing infrastructure.
+            Old URLs were well tested before making the switch, and nothing has changed for them.
+
+            * platform/URLParser.cpp:
+            (WebCore::URLParser::parse):
+            (WebCore::URLParser::parseHostAndPort):
+            (WebCore::URLParser::setEnabled):
+            (WebCore::URLParser::enabled):
+            * platform/URLParser.h:
+
 2016-10-13  Matthew Hanson  <matthew_hanson@apple.com>
 

tags/Safari-603.1.9/Source/WebCore/platform/URLParser.cpp

@@ -1129 +1129 @@
 void URLParser::parse(const CharacterType* input, const unsigned length, const URL& base, const TextEncoding& encoding)
 {
-#if PLATFORM(MAC)
-    static bool isMail = MacApplication::isAppleMail();
-#else
-    static bool isMail = false;
-#endif
-    
     URL_PARSER_LOG("Parsing URL <%s> base <%s> encoding <%s>", String(input, length).utf8().data(), base.string().utf8().data(), encoding.name());
     m_url = { };
@@ -1461 +1455 @@
                         m_url.m_userEnd = currentPosition(authorityOrHostBegin);
                         m_url.m_passwordEnd = m_url.m_userEnd;
-                        if (!parseHostAndPort(iterator, isMail)) {
+                        if (!parseHostAndPort(iterator)) {
                             failure();
                             return;
@@ -1483 +1477 @@
                 LOG_STATE("Host");
                 if (*c == '/' || *c == '?' || *c == '#') {
-                    if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c), isMail)) {
+                    if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c))) {
                         failure();
                         return;
@@ -1654 +1648 @@
                         break;
                     }
-                    if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c), isMail)) {
+                    if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c))) {
                         failure();
                         return;
@@ -1874 +1868 @@
             m_url.m_portEnd = m_url.m_userStart;
             m_url.m_pathEnd = m_url.m_userStart + 2;
-        } else if (!parseHostAndPort(authorityOrHostBegin, isMail)) {
+        } else if (!parseHostAndPort(authorityOrHostBegin)) {
             failure();
             return;
         } else {
-            if (LIKELY(!isMail || m_urlIsSpecial)) {
-                syntaxViolation(c);
-                appendToASCIIBuffer('/');
-                m_url.m_pathEnd = m_url.m_portEnd + 1;
-            } else
-                m_url.m_pathEnd = m_url.m_portEnd;
+            syntaxViolation(c);
+            appendToASCIIBuffer('/');
+            m_url.m_pathEnd = m_url.m_portEnd + 1;
         }
         m_url.m_pathAfterLastSlash = m_url.m_pathEnd;
@@ -1891 +1882 @@
     case State::Host:
         LOG_FINAL_STATE("Host");
-        if (!parseHostAndPort(authorityOrHostBegin, isMail)) {
+        if (!parseHostAndPort(authorityOrHostBegin)) {
             failure();
             return;
         }
-        if (LIKELY(!isMail || m_urlIsSpecial)) {
-            syntaxViolation(c);
-            appendToASCIIBuffer('/');
-            m_url.m_pathEnd = m_url.m_portEnd + 1;
-        } else
-            m_url.m_pathEnd = m_url.m_portEnd;
+        syntaxViolation(c);
+        appendToASCIIBuffer('/');
+        m_url.m_pathEnd = m_url.m_portEnd + 1;
         m_url.m_pathAfterLastSlash = m_url.m_pathEnd;
         m_url.m_queryEnd = m_url.m_pathEnd;
@@ -1954 +1942 @@
         }
 
-        if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c), isMail)) {
+        if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c))) {
             failure();
             return;
@@ -2569 +2557 @@
 
 template<typename CharacterType>
-bool URLParser::parseHostAndPort(CodePointIterator<CharacterType> iterator, const bool& isMail)
+bool URLParser::parseHostAndPort(CodePointIterator<CharacterType> iterator)
 {
     if (iterator.atEnd())
@@ -2619 +2607 @@
         for (; hostIterator != iterator; ++hostIterator) {
             if (LIKELY(!isTabOrNewline(*hostIterator))) {
-                if (UNLIKELY(isMail && !m_urlIsSpecial))
-                    appendToASCIIBuffer(*hostIterator);
-                else {
-                    if (UNLIKELY(isASCIIUpper(*hostIterator)))
-                        syntaxViolation(hostIterator);
-                    appendToASCIIBuffer(toASCIILower(*hostIterator));
-                }
+                if (UNLIKELY(isASCIIUpper(*hostIterator)))
+                    syntaxViolation(hostIterator);
+                appendToASCIIBuffer(toASCIILower(*hostIterator));
             } else
                 syntaxViolation(hostIterator);
@@ -2804 +2788 @@
 }
 
-static bool urlParserEnabled = true;
+enum class URLParserEnabled {
+    Undetermined,
+    Yes,
+    No
+};
+
+static URLParserEnabled urlParserEnabled = URLParserEnabled::Undetermined;
 
 void URLParser::setEnabled(bool enabled)
 {
-    urlParserEnabled = enabled;
+    urlParserEnabled = enabled ? URLParserEnabled::Yes : URLParserEnabled::No;
 }
 
 bool URLParser::enabled()
 {
-    return urlParserEnabled;
+    if (urlParserEnabled == URLParserEnabled::Undetermined) {
+#if PLATFORM(MAC)
+        urlParserEnabled = MacApplication::isSafari() ? URLParserEnabled::Yes : URLParserEnabled::No;
+#elif PLATFORM(IOS)
+        urlParserEnabled = IOSApplication::isMobileSafari() ? URLParserEnabled::Yes : URLParserEnabled::No;
+#else
+        urlParserEnabled = URLParserEnabled::Yes;
+#endif
+    }
+    return urlParserEnabled == URLParserEnabled::Yes;
 }
 

tags/Safari-603.1.9/Source/WebCore/platform/URLParser.h

@@ -61 +61 @@
     template<typename CharacterType> void parse(const CharacterType*, const unsigned length, const URL&, const TextEncoding&);
     template<typename CharacterType> void parseAuthority(CodePointIterator<CharacterType>);
-    template<typename CharacterType> bool parseHostAndPort(CodePointIterator<CharacterType>, const bool& isMail);
+    template<typename CharacterType> bool parseHostAndPort(CodePointIterator<CharacterType>);
     template<typename CharacterType> bool parsePort(CodePointIterator<CharacterType>&);
 

tags/Safari-603.1.9/Tools/ChangeLog

@@ +1 @@
+2016-10-13  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r207297. rdar://problem/28756748
+
+    2016-10-13  Alex Christensen  <achristensen@webkit.org>
+
+            Disable URLParser for non-Safari iOS and Mac apps for now
+            https://bugs.webkit.org/show_bug.cgi?id=163397
+
+            Reviewed by Tim Horton.
+
+            * DumpRenderTree/mac/DumpRenderTree.mm:
+            (DumpRenderTreeMain):
+            * WebKitTestRunner/ios/mainIOS.mm:
+            (main):
+            * WebKitTestRunner/mac/main.mm:
+            (main):
+
 2016-10-11  Sam Weinig  <sam@webkit.org>
 

tags/Safari-603.1.9/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -59 +59 @@
 #import <JavaScriptCore/TestRunnerUtils.h>
 #import <WebCore/LogInitialization.h>
+#import <WebCore/URLParser.h>
 #import <WebKit/DOMElement.h>
 #import <WebKit/DOMExtensions.h>
@@ -1410 +1411 @@
 int DumpRenderTreeMain(int argc, const char *argv[])
 {
+    WebCore::URLParser::setEnabled(true);
     atexit(atexitFunction);
 

tags/Safari-603.1.9/Tools/WebKitTestRunner/ios/mainIOS.mm

@@ -30 +30 @@
 #import "UIKitSPI.h"
 #import <UIKit/UIKit.h>
+#import <WebCore/URLParser.h>
 
 static int _argc;
@@ -65 +66 @@
 int main(int argc, const char* argv[])
 {
+    WebCore::URLParser::setEnabled(true);
     _argc = argc;
     _argv = argv;

tags/Safari-603.1.9/Tools/WebKitTestRunner/mac/main.mm

@@ -30 +30 @@
 #import "PlatformWebView.h"
 #import "TestController.h"
+#import <WebCore/URLParser.h>
 
 static void setDefaultsToConsistentValuesForTesting()
@@ -56 +57 @@
 int main(int argc, const char* argv[])
 {
+    WebCore::URLParser::setEnabled(true);
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     [NSApplication sharedApplication];