Changeset 176738 in webkit

Timestamp:

Dec 3, 2014, 12:16:02 PM (12 years ago)

Author:

dburkart@apple.com

Message:

Merged r176681. rdar://problems/19067172

Location:

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

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebViewData.h (modified) (1 diff)

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

@@ +1 @@
+2014-12-03  Dana Burkart  <dburkart@apple.com>
+
+        Merge r176681. <rdar://problem/19067172>
+
+    2014-12-02  Timothy Horton  <timothy_horton@apple.com>
+
+            Fix the build.
+
+            * WebView/WebViewData.h:
+
+
 2014-12-03  Dana Burkart  <dburkart@apple.com>
 

branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebViewData.h

@@ -148 +148 @@
     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;