Title: [226856] branches/safari-605-branch/Source/WebCore
Revision
226856
Author
jmarc...@apple.com
Date
2018-01-11 20:52:53 -0800 (Thu, 11 Jan 2018)

Log Message

Cherry-pick r226721. rdar://problem/36429159

Modified Paths

Diff

Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (226855 => 226856)


--- branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 04:52:50 UTC (rev 226855)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog	2018-01-12 04:52:53 UTC (rev 226856)
@@ -1,5 +1,23 @@
 2018-01-11  Jason Marcell  <jmarc...@apple.com>
 
+        Cherry-pick r226721. rdar://problem/36429159
+
+    2018-01-10  Antti Koivisto  <an...@apple.com>
+
+            REGRESSION(r225650): The scores of MotionMark tests Multiply and Leaves dropped by 8%
+            https://bugs.webkit.org/show_bug.cgi?id=181460
+            <rdar://problem/36379776>
+
+            Reviewed by Ryosuke Niwa.
+
+            * css/parser/CSSParser.cpp:
+            (WebCore::CSSParserContext::CSSParserContext):
+
+            Don't do the expensive security origin test if the sheet base URL and document URL are identical.
+            This is true for inline style and inline stylesheets.
+
+2018-01-11  Jason Marcell  <jmarc...@apple.com>
+
         Cherry-pick r226705. rdar://problem/36429137
 
     2018-01-10  Youenn Fablet  <you...@apple.com>

Modified: branches/safari-605-branch/Source/WebCore/css/parser/CSSParser.cpp (226855 => 226856)


--- branches/safari-605-branch/Source/WebCore/css/parser/CSSParser.cpp	2018-01-12 04:52:50 UTC (rev 226855)
+++ branches/safari-605-branch/Source/WebCore/css/parser/CSSParser.cpp	2018-01-12 04:52:53 UTC (rev 226856)
@@ -78,7 +78,7 @@
     , mode(document.inQuirksMode() ? HTMLQuirksMode : HTMLStandardMode)
     , isHTMLDocument(document.isHTMLDocument())
     , cssGridLayoutEnabled(document.isCSSGridLayoutEnabled())
-    , hasDocumentSecurityOrigin(document.securityOrigin().canRequest(baseURL))
+    , hasDocumentSecurityOrigin(document.baseURL() == baseURL || document.securityOrigin().canRequest(baseURL))
 {
     needsSiteSpecificQuirks = document.settings().needsSiteSpecificQuirks();
     enforcesCSSMIMETypeInNoQuirksMode = document.settings().enforceCSSMIMETypeInNoQuirksMode();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to