[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jer.noble at apple.com
jer.noble at apple.com
Wed Dec 22 13:15:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4c46b27b591c085e01d60e159609d85100c24bad
Author: jer.noble at apple.com <jer.noble at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 9 23:22:48 2010 +0000
Use of ENABLE macro in WebUIDelegatePrivate.h breaks use from outside WebKit
<rdar://problem/8412657>
Reviewed by Mark Rowe.
* WebView/WebUIDelegatePrivate.h: Use ENABLE_FULLSCREEN_API instead of ENABLE(FULLSCREEN_API)
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67124 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index bfef372..6d8d20c 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-09 Jer Noble <jer.noble at apple.com>
+
+ Reviewed by Mark Rowe.
+
+ Use of ENABLE macro in WebUIDelegatePrivate.h breaks use from outside WebKit
+ <rdar://problem/8412657>
+
+ * WebView/WebUIDelegatePrivate.h: Use ENABLE_FULLSCREEN_API instead of ENABLE(FULLSCREEN_API)
+
2010-09-08 Darin Adler <darin at apple.com>
Reviewed by Adam Barth.
diff --git a/WebKit/mac/WebView/WebUIDelegatePrivate.h b/WebKit/mac/WebView/WebUIDelegatePrivate.h
index 22752ae..4565a4e 100644
--- a/WebKit/mac/WebView/WebUIDelegatePrivate.h
+++ b/WebKit/mac/WebView/WebUIDelegatePrivate.h
@@ -32,6 +32,10 @@
#define ENABLE_DASHBOARD_SUPPORT 1
#endif
+#if !defined(ENABLE_FULLSCREEN_API)
+#define ENABLE_FULLSCREEN_API 1
+#endif
+
// Mail on Tiger expects the old value for WebMenuItemTagSearchInGoogle
#define WebMenuItemTagSearchInGoogle OldWebMenuItemTagSearchWeb
@@ -95,7 +99,7 @@ enum {
- (void)deny;
@end
-#if ENABLE(FULLSCREEN_API)
+#if ENABLE_FULLSCREEN_API
@protocol WebKitFullScreenListener<NSObject>
- (void)webkitWillEnterFullScreen;
- (void)webkitDidEnterFullScreen;
@@ -173,7 +177,7 @@ enum {
*/
- (void)webView:(WebView *)sender printFrame:(WebFrame *)frame;
-#if ENABLE(FULLSCREEN_API)
+#if ENABLE_FULLSCREEN_API
- (BOOL)webView:(WebView *)sender supportsFullScreenForElement:(DOMElement *)element;
- (void)webView:(WebView *)sender enterFullScreenForElement:(DOMElement *)element;
- (void)webView:(WebView *)sender exitFullScreenForElement:(DOMElement *)element;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list