Title: [176738] branches/safari-600.3-branch/Source/WebKit/mac
- Revision
- 176738
- Author
- [email protected]
- Date
- 2014-12-03 12:16:02 -0800 (Wed, 03 Dec 2014)
Log Message
Merged r176681. rdar://problems/19067172
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (176737 => 176738)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-03 20:15:51 UTC (rev 176737)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-03 20:16:02 UTC (rev 176738)
@@ -1,5 +1,16 @@
2014-12-03 Dana Burkart <[email protected]>
+ Merge r176681. <rdar://problem/19067172>
+
+ 2014-12-02 Timothy Horton <[email protected]>
+
+ Fix the build.
+
+ * WebView/WebViewData.h:
+
+
+2014-12-03 Dana Burkart <[email protected]>
+
Merge r176680. <rdar://problem/19067172>
2014-12-02 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebViewData.h (176737 => 176738)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebViewData.h 2014-12-03 20:15:51 UTC (rev 176737)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebViewData.h 2014-12-03 20:16:02 UTC (rev 176738)
@@ -147,10 +147,12 @@
WebInspector *inspector;
WebNodeHighlight *currentNodeHighlight;
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+#if PLATFORM(MAC)
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
WebActionMenuController *actionMenuController;
+#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
std::unique_ptr<WebCore::TextIndicatorWindow> textIndicatorWindow;
-#endif
+#endif // PLATFORM(MAC)
BOOL allowsUndo;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
