Title: [215240] trunk/Source/WebKit/mac
- Revision
- 215240
- Author
- [email protected]
- Date
- 2017-04-11 10:34:01 -0700 (Tue, 11 Apr 2017)
Log Message
[iOS] Simple HTML documents should allow non-markup _javascript_
https://bugs.webkit.org/show_bug.cgi?id=170734
Reviewed by Sam Weinig.
* WebView/WebView.mm:
(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]): Enabled scripting
but disabled scripting markup.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (215239 => 215240)
--- trunk/Source/WebKit/mac/ChangeLog 2017-04-11 17:27:10 UTC (rev 215239)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-04-11 17:34:01 UTC (rev 215240)
@@ -1,3 +1,14 @@
+2017-04-11 Dan Bernstein <[email protected]>
+
+ [iOS] Simple HTML documents should allow non-markup _javascript_
+ https://bugs.webkit.org/show_bug.cgi?id=170734
+
+ Reviewed by Sam Weinig.
+
+ * WebView/WebView.mm:
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]): Enabled scripting
+ but disabled scripting markup.
+
2017-04-10 Alex Christensen <[email protected]>
Revert r215217
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (215239 => 215240)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2017-04-11 17:27:10 UTC (rev 215239)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2017-04-11 17:34:01 UTC (rev 215240)
@@ -1736,6 +1736,9 @@
_private->page->settings().setFontFallbackPrefersPictographs(true);
_private->page->settings().setPictographFontFamily("AppleColorEmoji");
+ _private->page->settings().setScriptMarkupEnabled(false);
+ _private->page->settings().setScriptEnabled(true);
+
// FIXME: this is a workaround for <rdar://problem/11518688> REGRESSION: Quoted text font changes when replying to certain email
_private->page->settings().setStandardFontFamily([_private->preferences standardFontFamily]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
