Title: [117703] trunk/Source/WebKit2
- Revision
- 117703
- Author
- [email protected]
- Date
- 2012-05-19 17:19:26 -0700 (Sat, 19 May 2012)
Log Message
Use USE_APPKIT and USE_SECURITY_FRAMEWORK in a few more places
https://bugs.webkit.org/show_bug.cgi?id=86951
Reviewed by Dan Bernstein.
* UIProcess/WebProcessProxy.messages.in: Change #if PLATFORM(MAC) to
the more specific #if USE(SECURITY_FRAMEWORK).
* UIProcess/mac/WebPageProxyMac.mm: Wrap some uses of AppKit classes
with #if USE(APPKIT).
* UIProcess/mac/WebPopupMenuProxyMac.h: Ditto.
* UIProcess/mac/WebPopupMenuProxyMac.mm: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (117702 => 117703)
--- trunk/Source/WebKit2/ChangeLog 2012-05-19 23:36:46 UTC (rev 117702)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-20 00:19:26 UTC (rev 117703)
@@ -1,3 +1,17 @@
+2012-05-19 Andy Estes <[email protected]>
+
+ Use USE_APPKIT and USE_SECURITY_FRAMEWORK in a few more places
+ https://bugs.webkit.org/show_bug.cgi?id=86951
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/WebProcessProxy.messages.in: Change #if PLATFORM(MAC) to
+ the more specific #if USE(SECURITY_FRAMEWORK).
+ * UIProcess/mac/WebPageProxyMac.mm: Wrap some uses of AppKit classes
+ with #if USE(APPKIT).
+ * UIProcess/mac/WebPopupMenuProxyMac.h: Ditto.
+ * UIProcess/mac/WebPopupMenuProxyMac.mm: Ditto.
+
2012-05-18 Anders Carlsson <[email protected]>
REGRESSION (r108181): corruption after scrolling
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in (117702 => 117703)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2012-05-19 23:36:46 UTC (rev 117702)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2012-05-20 00:19:26 UTC (rev 117703)
@@ -32,7 +32,7 @@
PluginSyncMessageSendTimedOut(WTF::String pluginPath)
#endif
-#if PLATFORM(MAC)
+#if USE(SECURITY_FRAMEWORK)
SecItemRequest(uint64_t requestID, WebKit::SecItemRequestData request) DispatchOnConnectionQueue
SecKeychainItemRequest(uint64_t requestID, WebKit::SecKeychainItemRequestData request) DispatchOnConnectionQueue
#endif
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (117702 => 117703)
--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2012-05-19 23:36:46 UTC (rev 117702)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2012-05-20 00:19:26 UTC (rev 117703)
@@ -42,9 +42,11 @@
#import <WebKitSystemInterface.h>
#import <wtf/text/StringConcatenate.h>
+#if USE(APPKIT)
@interface NSApplication (Details)
- (void)speakString:(NSString *)string;
@end
+#endif
#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, process()->connection())
@@ -121,6 +123,8 @@
return makeString("Mozilla/5.0 (Macintosh; " PROCESSOR " Mac OS X ", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko) ", applicationNameForUserAgent);
}
+#if USE(APPKIT)
+
void WebPageProxy::getIsSpeaking(bool& isSpeaking)
{
isSpeaking = [NSApp isSpeaking];
@@ -140,6 +144,8 @@
{
[[NSWorkspace sharedWorkspace] showSearchResultsForQueryString:nsStringFromWebCoreString(string)];
}
+
+#endif // USE(APPKIT)
CGContextRef WebPageProxy::containingWindowGraphicsContext()
{
@@ -358,7 +364,7 @@
}
void WebPageProxy::setSmartInsertDeleteEnabled(bool isSmartInsertDeleteEnabled)
-{
+{
if (m_isSmartInsertDeleteEnabled == isSmartInsertDeleteEnabled)
return;
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h (117702 => 117703)
--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h 2012-05-19 23:36:46 UTC (rev 117702)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h 2012-05-20 00:19:26 UTC (rev 117703)
@@ -26,6 +26,8 @@
#ifndef WebPopupMenuProxyMac_h
#define WebPopupMenuProxyMac_h
+#if USE(APPKIT)
+
#include "WebPopupMenuProxy.h"
#include <wtf/RetainPtr.h>
@@ -58,4 +60,6 @@
} // namespace WebKit
+#endif // USE(APPKIT)
+
#endif // WebPopupMenuProxyMac_h
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm (117702 => 117703)
--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2012-05-19 23:36:46 UTC (rev 117702)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2012-05-20 00:19:26 UTC (rev 117703)
@@ -26,6 +26,8 @@
#import "config.h"
#import "WebPopupMenuProxyMac.h"
+#if USE(APPKIT)
+
#import "NativeWebMouseEvent.h"
#import "PageClientImpl.h"
#import "PlatformPopupMenuData.h"
@@ -176,3 +178,5 @@
}
} // namespace WebKit
+
+#endif // USE(APPKIT)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
