Title: [185441] branches/safari-600.1.4.16-branch/Source/WebKit/mac
- Revision
- 185441
- Author
- [email protected]
- Date
- 2015-06-10 17:45:39 -0700 (Wed, 10 Jun 2015)
Log Message
Merged r185436. rdar://problem/21309911
Modified Paths
Diff
Modified: branches/safari-600.1.4.16-branch/Source/WebKit/mac/ChangeLog (185440 => 185441)
--- branches/safari-600.1.4.16-branch/Source/WebKit/mac/ChangeLog 2015-06-11 00:40:17 UTC (rev 185440)
+++ branches/safari-600.1.4.16-branch/Source/WebKit/mac/ChangeLog 2015-06-11 00:45:39 UTC (rev 185441)
@@ -1,3 +1,21 @@
+2015-06-10 Babak Shafiei <[email protected]>
+
+ Merge r185436.
+
+ 2015-06-10 Jon Honeycutt <[email protected]>
+
+ Meta refresh preference is not respected on fast path WebView
+ initialization
+
+ <https://bugs.webkit.org/show_bug.cgi?id=145861>
+ <rdar://problem/21309911>
+
+ Reviewed by Brady Eidson.
+
+ * WebView/WebView.mm:
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+ Set the WebCore setting from the WebPreferences preference.
+
2015-06-08 Babak Shafiei <[email protected]>
Merge r183682.
Modified: branches/safari-600.1.4.16-branch/Source/WebKit/mac/WebView/WebView.mm (185440 => 185441)
--- branches/safari-600.1.4.16-branch/Source/WebKit/mac/WebView/WebView.mm 2015-06-11 00:40:17 UTC (rev 185440)
+++ branches/safari-600.1.4.16-branch/Source/WebKit/mac/WebView/WebView.mm 2015-06-11 00:45:39 UTC (rev 185441)
@@ -1194,6 +1194,9 @@
// FIXME: this is a workaround for <rdar://problem/11820090> Quoted text changes in size when replying to certain email
_private->page->settings().setMinimumFontSize([_private->preferences minimumFontSize]);
+ // This is a workaround for <rdar://problem/21309911>.
+ _private->page->settings().setMetaRefreshEnabled([_private->preferences metaRefreshEnabled]);
+
[self setGroupName:groupName];
#if ENABLE(REMOTE_INSPECTOR)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
