Skip to site navigation (Press enter)

[webkit-changes] [171452] branches/safari-600.1-branch/Source/WebKit/mac

dburkart Wed, 23 Jul 2014 00:16:27 -0700

Title: [171452] branches/safari-600.1-branch/Source/WebKit/mac

Revision: 171452
Author: [email protected]
Date: 2014-07-23 00:16:12 -0700 (Wed, 23 Jul 2014)

Log Message

Merge r171338


Modified Paths

branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog
branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebView.mm

Diff

Modified: branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog (171451 => 171452)


--- branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog	2014-07-23 07:14:46 UTC (rev 171451)
+++ branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog	2014-07-23 07:16:12 UTC (rev 171452)
@@ -1,5 +1,16 @@
 2014-07-22 Dana Burkart <[email protected]>
     
+        Merge r171338.
+
+    2014-07-21  Pratik Solanki  <[email protected]>
+
+            Unreviewed iOS build fix after r171321.
+
+            * WebView/WebView.mm:
+            (-[WebView _preferencesChanged:]):
+
+2014-07-22 Dana Burkart <[email protected]>
+    
         Merge r171321.
 
     2014-07-21  Beth Dakin  <[email protected]>

Modified: branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebView.mm (171451 => 171452)


--- branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebView.mm	2014-07-23 07:14:46 UTC (rev 171451)
+++ branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebView.mm	2014-07-23 07:16:12 UTC (rev 171452)
@@ -2298,7 +2298,7 @@
     settings.setPlugInSnapshottingEnabled([preferences plugInSnapshottingEnabled]);
 
     settings.setFixedPositionCreatesStackingContext(true);
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
     settings.setAcceleratedCompositingForFixedPositionEnabled(true);
 #endif

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes