Changeset 185441 in webkit

Timestamp:

Jun 10, 2015, 5:45:39 PM (11 years ago)

Author:

bshafiei@apple.com

Message:

Merged r185436. rdar://problem/21309911

Location:

branches/safari-600.1.4.16-branch/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (1 diff)

branches/safari-600.1.4.16-branch/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2015-06-10  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r185436.
+
+    2015-06-10  Jon Honeycutt  <jhoneycutt@apple.com>
+
+            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  <bshafiei@apple.com>
 

branches/safari-600.1.4.16-branch/Source/WebKit/mac/WebView/WebView.mm

@@ -1195 +1195 @@
     _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];