161970 2016-09-14 09:46:58 -0700 URLParser: Add fast path for hosts containing no non-ASCII or percent characters 2016-09-14 12:37:32 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen dbates oldest_to_newest 1229590 0 achristensen 2016-09-14 09:46:58 -0700 URLParser: Add fast path for hosts containing no non-ASCII or percent characters 1229593 1 288826 achristensen 2016-09-14 09:48:59 -0700 Created attachment 288826 Patch 1229629 2 288826 dbates 2016-09-14 10:42:01 -0700 Comment on attachment 288826 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=288826&action=review > Source/WebCore/platform/URLParser.cpp:748 > + if (!isASCII(*c) || *c == '%') I suggest that we define a static inline helper function, say isPercentEncodedOrASCII(), that takes a character c and returns the result of evaluating "!isASCII(c) || c == '%'" instead of repeating the "!isASCII(*c) || *c == '%'" check throughout the code. > Source/WebCore/platform/URLParser.h:51 > + bool m_hostHasPercentOrNonASCII { false }; Maybe a better name for this variable would be m_hostHasPercentEncodedOrNonASCIICharacter? 1229677 3 achristensen 2016-09-14 12:37:32 -0700 https://trac.webkit.org/changeset/205922 288826 2016-09-14 09:48:59 -0700 2016-09-14 10:42:01 -0700 Patch bug-161970-20160914094625.patch text/plain 4804 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNTkwOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE2LTA5LTE0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVVJMUGFyc2Vy OiBBZGQgZmFzdCBwYXRoIGZvciBob3N0cyBjb250YWluaW5nIG5vIG5vbi1BU0NJSSBvciBwZXJj ZW50IGNoYXJhY3RlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE2MTk3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9V UkxQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VVJMUGFyc2VyOjpwYXJzZSk6CisgICAg ICAgIChXZWJDb3JlOjpVUkxQYXJzZXI6OnBhcnNlSG9zdCk6CisgICAgICAgICogcGxhdGZvcm0v VVJMUGFyc2VyLmg6CisgICAgICAgIFdoZW4gcGFyc2luZyB0aGUgaG9zdCBvZiBhIFVSTCwgaWYg aXQgY29udGFpbnMgbm9uLUFTQ0lJIGNoYXJhY3RlcnMgb3IgcGVyY2VudC1lbmNvZGVkIHZhbHVl cywKKyAgICAgICAgd2UgbmVlZCB0byBkbyBhZGRpdGlvbmFsIGVuY29kaW5nLiAgTWFueSBVUkxz LCBpbmNsdWRpbmcgYWxsIGFscmVhZHktcGFyc2VkIFVSTHMsIGRvIG5vdCBoYXZlCisgICAgICAg IHN1Y2ggY2hhcmFjdGVycyBpbiB0aGVpciBob3N0LCBhbmQgdGhlcmVmb3JlIGRvIG5vdCBuZWVk IHRoZSBhZGRpdGlvbmFsIGVuY29kaW5nLiAgU2tpcHBpbmcKKyAgICAgICAgdGhlIGFkZGl0aW9u YWwgZW5jb2Rpbmcgc2lnbmlmaWNhbnRseSBzcGVlZHMgdXAgbXkgVVJMIHBhcnNpbmcgYmVuY2ht YXJrLgorCiAyMDE2LTA5LTEzICBEYXZlIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAg ICAgIFtDU1MgUGFyc2VyXSBFbmFibGUgdGhlIG5ldyBzaXplcyBwYXJzZXIgYnkgZGVmYXVsdApJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMUGFyc2VyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkxQYXJzZXIuY3BwCShyZXZpc2lvbiAyMDU4OTMp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkxQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC03MTYsNiArNzE2LDcgQEAgVVJMIFVSTFBhcnNlcjo6cGFyc2UoY29uc3QgU3RyaW5nJiBp bnB1dAogICAgICAgICAgICAgICAgICAgICAgICAgKytjOwogICAgICAgICAgICAgICAgICAgICBh dXRob3JpdHlPckhvc3RCZWdpbiA9IGM7CiAgICAgICAgICAgICAgICAgICAgIHN0YXRlID0gU3Rh dGU6Okhvc3Q7CisgICAgICAgICAgICAgICAgICAgIG1faG9zdEhhc1BlcmNlbnRPck5vbkFTQ0lJ ID0gZmFsc2U7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgICAgICBib29sIGlzU2xhc2ggPSAqYyA9PSAnLycgfHwgKG1fdXJsSXNTcGVj aWFsICYmICpjID09ICdcXCcpOwpAQCAtNzMxLDYgKzczMiw4IEBAIFVSTCBVUkxQYXJzZXI6OnBh cnNlKGNvbnN0IFN0cmluZyYgaW5wdXQKICAgICAgICAgICAgICAgICAgICAgc3RhdGUgPSBTdGF0 ZTo6UGF0aDsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgICAgIGlmICghaXNBU0NJSSgqYykgfHwgKmMgPT0gJyUnKQorICAgICAgICAg ICAgICAgICAgICBtX2hvc3RIYXNQZXJjZW50T3JOb25BU0NJSSA9IHRydWU7CiAgICAgICAgICAg ICAgICAgKytjOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CkBAIC03NDIsNiAr NzQ1LDggQEAgVVJMIFVSTFBhcnNlcjo6cGFyc2UoY29uc3QgU3RyaW5nJiBpbnB1dAogICAgICAg ICAgICAgICAgIHN0YXRlID0gU3RhdGU6OlBhdGg7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoIWlzQVNDSUkoKmMpIHx8ICpjID09ICclJykK KyAgICAgICAgICAgICAgICBtX2hvc3RIYXNQZXJjZW50T3JOb25BU0NJSSA9IHRydWU7CiAgICAg ICAgICAgICArK2M7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBTdGF0ZTo6Rmls ZToKQEAgLTg3Miw2ICs4NzcsOCBAQCBVUkwgVVJMUGFyc2VyOjpwYXJzZShjb25zdCBTdHJpbmcm IGlucHV0CiAgICAgICAgICAgICAgICAgc3RhdGUgPSBTdGF0ZTo6UGF0aFN0YXJ0OwogICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKCFpc0FTQ0lJ KCpjKSB8fCAqYyA9PSAnJScpCisgICAgICAgICAgICAgICAgbV9ob3N0SGFzUGVyY2VudE9yTm9u QVNDSUkgPSB0cnVlOwogICAgICAgICAgICAgKytjOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIGNhc2UgU3RhdGU6OlBhdGhTdGFydDoKQEAgLTE1MzYsNiArMTU0Myw0MCBAQCBib29sIFVS TFBhcnNlcjo6cGFyc2VIb3N0KFN0cmluZ1ZpZXc6OkNvCiAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKICAgICAgICAgfQogICAgIH0KKyAgICAKKyAgICBpZiAoIW1faG9zdEhhc1BlcmNlbnRPck5v bkFTQ0lJKSB7CisgICAgICAgIGF1dG8gaG9zdEl0ZXJhdG9yID0gaXRlcmF0b3I7CisgICAgICAg IGZvciAoOyBpdGVyYXRvciAhPSBlbmQ7ICsraXRlcmF0b3IpIHsKKyAgICAgICAgICAgIGlmIChp c1RhYk9yTmV3bGluZSgqaXRlcmF0b3IpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAg ICAgICAgICAgaWYgKCppdGVyYXRvciA9PSAnOicpCisgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgIH0KKyAgICAgICAgaWYgKGF1dG8gYWRkcmVzcyA9IHBhcnNlSVB2NEhvc3QoaG9zdEl0 ZXJhdG9yLCBpdGVyYXRvcikpIHsKKyAgICAgICAgICAgIHNlcmlhbGl6ZUlQdjQoYWRkcmVzcy52 YWx1ZSgpLCBtX2J1ZmZlcik7CisgICAgICAgICAgICBtX3VybC5tX2hvc3RFbmQgPSBtX2J1ZmZl ci5sZW5ndGgoKTsKKyAgICAgICAgICAgIGlmIChpdGVyYXRvciA9PSBlbmQpIHsKKyAgICAgICAg ICAgICAgICBtX3VybC5tX3BvcnRFbmQgPSBtX2J1ZmZlci5sZW5ndGgoKTsKKyAgICAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgICsraXRlcmF0b3I7 CisgICAgICAgICAgICByZXR1cm4gcGFyc2VQb3J0KGl0ZXJhdG9yLCBlbmQpOworICAgICAgICB9 CisgICAgICAgIGZvciAoOyBob3N0SXRlcmF0b3IgIT0gaXRlcmF0b3I7ICsraG9zdEl0ZXJhdG9y KSB7CisgICAgICAgICAgICBpZiAoIWlzVGFiT3JOZXdsaW5lKCpob3N0SXRlcmF0b3IpKQorICAg ICAgICAgICAgICAgIG1fYnVmZmVyLmFwcGVuZCh0b0FTQ0lJTG93ZXIoKmhvc3RJdGVyYXRvcikp OworICAgICAgICB9CisgICAgICAgIG1fdXJsLm1faG9zdEVuZCA9IG1fYnVmZmVyLmxlbmd0aCgp OworICAgICAgICBpZiAoaG9zdEl0ZXJhdG9yICE9IGVuZCkgeworICAgICAgICAgICAgQVNTRVJU KCpob3N0SXRlcmF0b3IgPT0gJzonKTsKKyAgICAgICAgICAgICsraG9zdEl0ZXJhdG9yOworICAg ICAgICAgICAgd2hpbGUgKGhvc3RJdGVyYXRvciAhPSBlbmQgJiYgaXNUYWJPck5ld2xpbmUoKmhv c3RJdGVyYXRvcikpCisgICAgICAgICAgICAgICAgKytob3N0SXRlcmF0b3I7CisgICAgICAgICAg ICByZXR1cm4gcGFyc2VQb3J0KGhvc3RJdGVyYXRvciwgZW5kKTsKKyAgICAgICAgfQorICAgICAg ICBtX3VybC5tX3BvcnRFbmQgPSBtX2J1ZmZlci5sZW5ndGgoKTsKKyAgICAgICAgcmV0dXJuIHRy dWU7CisgICAgfQogCiAgICAgLy8gRklYTUU6IFdlIHByb2JhYmx5IGRvbid0IG5lZWQgdG8gbWFr ZSBzbyBtYW55IGJ1ZmZlcnMgYW5kIFN0cmluZyBjb3BpZXMuCiAgICAgU3RyaW5nQnVpbGRlciB1 dGY4RW5jb2RlZDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTFBhcnNlci5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTFBhcnNlci5oCShyZXZpc2lv biAyMDU4OTMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkxQYXJzZXIuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDgsNiArNDgsNyBAQCBwcml2YXRlOgogICAgIFVSTCBtX3VybDsKICAgICBT dHJpbmdCdWlsZGVyIG1fYnVmZmVyOwogICAgIGJvb2wgbV91cmxJc1NwZWNpYWwgeyBmYWxzZSB9 OworICAgIGJvb2wgbV9ob3N0SGFzUGVyY2VudE9yTm9uQVNDSUkgeyBmYWxzZSB9OwogICAgIHZv aWQgcGFyc2VBdXRob3JpdHkoU3RyaW5nVmlldzo6Q29kZVBvaW50czo6SXRlcmF0b3ImLCBjb25z dCBTdHJpbmdWaWV3OjpDb2RlUG9pbnRzOjpJdGVyYXRvciYgZW5kKTsKICAgICBib29sIHBhcnNl SG9zdChTdHJpbmdWaWV3OjpDb2RlUG9pbnRzOjpJdGVyYXRvciYsIGNvbnN0IFN0cmluZ1ZpZXc6 OkNvZGVQb2ludHM6Okl0ZXJhdG9yJiBlbmQpOwogICAgIGJvb2wgcGFyc2VQb3J0KFN0cmluZ1Zp ZXc6OkNvZGVQb2ludHM6Okl0ZXJhdG9yJiwgY29uc3QgU3RyaW5nVmlldzo6Q29kZVBvaW50czo6 SXRlcmF0b3ImIGVuZCk7Cg==