Diff
Modified: trunk/Source/WebKit/ChangeLog (116163 => 116164)
--- trunk/Source/WebKit/ChangeLog 2012-05-04 20:54:50 UTC (rev 116163)
+++ trunk/Source/WebKit/ChangeLog 2012-05-04 20:59:02 UTC (rev 116164)
@@ -1,3 +1,14 @@
+2012-05-03 Jer Noble <[email protected]>
+
+ Move WebKitFullScreenListener into its own file.
+ https://bugs.webkit.org/show_bug.cgi?id=85640
+
+ Reviewed by Maciej Stachowiak .
+
+ Pull WebKitFullScreenListener into its own file.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2012-05-03 Raphael Kubo da Costa <[email protected]>
[CMake] Rewrite FindCairo.cmake.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (116163 => 116164)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2012-05-04 20:54:50 UTC (rev 116163)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2012-05-04 20:59:02 UTC (rev 116164)
@@ -367,6 +367,8 @@
C0B88E8B10A08F3D00FBB3F5 /* WebFrameLoadDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = C0B88E8A10A08F3D00FBB3F5 /* WebFrameLoadDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
C0C5B3EE1177A4A0002B0AEF /* WebUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = C0C5B3EC1177A4A0002B0AEF /* WebUserContentURLPattern.h */; settings = {ATTRIBUTES = (Private, ); }; };
C0C5B3EF1177A4A0002B0AEF /* WebUserContentURLPattern.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0C5B3ED1177A4A0002B0AEF /* WebUserContentURLPattern.mm */; };
+ CD8BFCE715531224005AFB25 /* WebKitFullScreenListener.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD8BFCE515531224005AFB25 /* WebKitFullScreenListener.mm */; };
+ CD8BFCE815531224005AFB25 /* WebKitFullScreenListener.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8BFCE615531224005AFB25 /* WebKitFullScreenListener.h */; };
CD8EAC7311CAC9A300774075 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD8EAC7211CAC9A300774075 /* IOKit.framework */; };
CDA62AE2125F87C2007FD118 /* WebFullScreenController.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA62AE0125F87C2007FD118 /* WebFullScreenController.h */; };
CDA62AE3125F87C2007FD118 /* WebFullScreenController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA62AE1125F87C2007FD118 /* WebFullScreenController.mm */; };
@@ -698,6 +700,8 @@
C0B88E8A10A08F3D00FBB3F5 /* WebFrameLoadDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameLoadDelegatePrivate.h; sourceTree = "<group>"; };
C0C5B3EC1177A4A0002B0AEF /* WebUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebUserContentURLPattern.h; sourceTree = "<group>"; };
C0C5B3ED1177A4A0002B0AEF /* WebUserContentURLPattern.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebUserContentURLPattern.mm; sourceTree = "<group>"; };
+ CD8BFCE515531224005AFB25 /* WebKitFullScreenListener.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebKitFullScreenListener.mm; sourceTree = "<group>"; };
+ CD8BFCE615531224005AFB25 /* WebKitFullScreenListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitFullScreenListener.h; sourceTree = "<group>"; };
CD8EAC7211CAC9A300774075 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
CDA62AE0125F87C2007FD118 /* WebFullScreenController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFullScreenController.h; sourceTree = "<group>"; };
CDA62AE1125F87C2007FD118 /* WebFullScreenController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFullScreenController.mm; sourceTree = "<group>"; };
@@ -1319,6 +1323,8 @@
931633EE0AEDFFAE0062B92D /* WebFrameLoaderClient.mm */,
9391F273121B38BD00EBF7E8 /* WebFrameNetworkingContext.h */,
9391F274121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm */,
+ CD8BFCE515531224005AFB25 /* WebKitFullScreenListener.mm */,
+ CD8BFCE615531224005AFB25 /* WebKitFullScreenListener.h */,
BC7F884910C8775A00D6133D /* WebGeolocationClient.h */,
BC7F884A10C8775A00D6133D /* WebGeolocationClient.mm */,
51494CD40C7EBDE0004178C5 /* WebIconDatabaseClient.h */,
@@ -1650,6 +1656,7 @@
312E2FE514E48182007CCA18 /* WebNotification.h in Headers */,
312E2FE914E48215007CCA18 /* WebNotificationInternal.h in Headers */,
CEDA12DC152CBE6800D9E08D /* WebAlternativeTextClient.h in Headers */,
+ CD8BFCE815531224005AFB25 /* WebKitFullScreenListener.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2038,6 +2045,7 @@
41F4485010338E8C0030E55E /* WebWorkersPrivate.mm in Sources */,
312E2FE614E48182007CCA18 /* WebNotification.mm in Sources */,
CEDA12DB152CBE6800D9E08D /* WebAlternativeTextClient.mm in Sources */,
+ CD8BFCE715531224005AFB25 /* WebKitFullScreenListener.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/Source/WebKit/mac/ChangeLog (116163 => 116164)
--- trunk/Source/WebKit/mac/ChangeLog 2012-05-04 20:54:50 UTC (rev 116163)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-05-04 20:59:02 UTC (rev 116164)
@@ -1,3 +1,20 @@
+2012-05-04 Jer Noble <[email protected]>
+
+ Move WebKitFullScreenListener into its own file.
+ https://bugs.webkit.org/show_bug.cgi?id=85640
+
+ Reviewed by Maciej Stachowiak.
+
+ Move WebKitFullScreenListener into its own file, so it can be used by multiple classes.
+
+ * WebCoreSupport/WebKitFullScreenListener.h: Added.
+ * WebCoreSupport/WebKitFullScreenListener.mm: Added.
+ (-[WebKitFullScreenListener webkitWillEnterFullScreen]):
+ (-[WebKitFullScreenListener webkitDidEnterFullScreen]):
+ (-[WebKitFullScreenListener webkitWillExitFullScreen]):
+ (-[WebKitFullScreenListener webkitDidExitFullScreen]):
+ * WebCoreSupport/WebChromeClient.mm:
+
2012-05-04 Brady Eidson <[email protected]>
<rdar://problem/11312853> and https://bugs.webkit.org/show_bug.cgi?id=85635
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (116163 => 116164)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2012-05-04 20:54:50 UTC (rev 116163)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2012-05-04 20:59:02 UTC (rev 116164)
@@ -38,6 +38,7 @@
#import "WebFrameView.h"
#import "WebHTMLViewInternal.h"
#import "WebHistoryInternal.h"
+#import "WebKitFullScreenListener.h"
#import "WebKitPrefix.h"
#import "WebKitSystemInterface.h"
#import "WebNSURLRequestExtras.h"
@@ -128,18 +129,6 @@
using namespace WebCore;
-#if ENABLE(FULLSCREEN_API)
-
-@interface WebKitFullScreenListener : NSObject <WebKitFullScreenListener>
-{
- RefPtr<Element> _element;
-}
-
-- (id)initWithElement:(Element*)element;
-@end
-
-#endif
-
WebChromeClient::WebChromeClient(WebView *webView)
: m_webView(webView)
{
@@ -956,41 +945,4 @@
CallUIDelegate(m_webView, selector, (id)renderer);
}
-@implementation WebKitFullScreenListener
-
-- (id)initWithElement:(Element*)element
-{
- if (!(self = [super init]))
- return nil;
-
- _element = element;
- return self;
-}
-
-- (void)webkitWillEnterFullScreen
-{
- if (_element)
- _element->document()->webkitWillEnterFullScreenForElement(_element.get());
-}
-
-- (void)webkitDidEnterFullScreen
-{
- if (_element)
- _element->document()->webkitDidEnterFullScreenForElement(_element.get());
-}
-
-- (void)webkitWillExitFullScreen
-{
- if (_element)
- _element->document()->webkitWillExitFullScreenForElement(_element.get());
-}
-
-- (void)webkitDidExitFullScreen
-{
- if (_element)
- _element->document()->webkitDidExitFullScreenForElement(_element.get());
-}
-
-@end
-
#endif
Added: trunk/Source/WebKit/mac/WebCoreSupport/WebKitFullScreenListener.h (0 => 116164)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebKitFullScreenListener.h (rev 0)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebKitFullScreenListener.h 2012-05-04 20:59:02 UTC (rev 116164)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2012 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebKitFullScreenListener_h
+#define WebKitFullScreenListener_h
+
+#import "WebUIDelegatePrivate.h"
+#import <wtf/RefPtr.h>
+
+#if ENABLE(FULLSCREEN_API)
+
+namespace WebCore {
+class Element;
+}
+
+@interface WebKitFullScreenListener : NSObject <WebKitFullScreenListener> {
+ RefPtr<WebCore::Element> _element;
+}
+
+- (id)initWithElement:(WebCore::Element*)element;
+@end
+
+#endif
+
+#endif // WebFullScreenListener_h
Added: trunk/Source/WebKit/mac/WebCoreSupport/WebKitFullScreenListener.mm (0 => 116164)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebKitFullScreenListener.mm (rev 0)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebKitFullScreenListener.mm 2012-05-04 20:59:02 UTC (rev 116164)
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2012 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "WebKitFullScreenListener.h"
+
+#import <WebCore/Element.h>
+
+#if ENABLE(FULLSCREEN_API)
+
+using namespace WebCore;
+
+@implementation WebKitFullScreenListener
+
+- (id)initWithElement:(Element*)element
+{
+ if (!(self = [super init]))
+ return nil;
+
+ _element = element;
+ return self;
+}
+
+- (void)webkitWillEnterFullScreen
+{
+ if (_element)
+ _element->document()->webkitWillEnterFullScreenForElement(_element.get());
+}
+
+- (void)webkitDidEnterFullScreen
+{
+ if (_element)
+ _element->document()->webkitDidEnterFullScreenForElement(_element.get());
+}
+
+- (void)webkitWillExitFullScreen
+{
+ if (_element)
+ _element->document()->webkitWillExitFullScreenForElement(_element.get());
+}
+
+- (void)webkitDidExitFullScreen
+{
+ if (_element)
+ _element->document()->webkitDidExitFullScreenForElement(_element.get());
+}
+
+@end
+#endif
