Title: [228328] trunk/Source/WebKitLegacy/mac
- Revision
- 228328
- Author
- pvol...@apple.com
- Date
- 2018-02-09 10:40:08 -0800 (Fri, 09 Feb 2018)
Log Message
Follow-up fixes after moving WebVideoFullscreenController from WebCore to WebKitLegacy.
https://bugs.webkit.org/show_bug.cgi?id=182641
Reviewed by Dan Bernstein.
Remove incorrect use of WEBCORE_EXPORT and namespace WebCore after the files were moved in
https://trac.webkit.org/changeset/228308.
* WebView/WebVideoFullscreenController.h:
* WebView/WebVideoFullscreenHUDWindowController.mm:
* WebView/WebWindowAnimation.h:
* WebView/WebWindowAnimation.mm:
(WebCore::WebWindowAnimationDurationFromDuration): Deleted.
(WebCore::scaledRect): Deleted.
(WebCore::squaredDistance): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (228327 => 228328)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-02-09 18:31:29 UTC (rev 228327)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-02-09 18:40:08 UTC (rev 228328)
@@ -1,5 +1,23 @@
2018-02-09 Per Arne Vollan <pvol...@apple.com>
+ Follow-up fixes after moving WebVideoFullscreenController from WebCore to WebKitLegacy.
+ https://bugs.webkit.org/show_bug.cgi?id=182641
+
+ Reviewed by Dan Bernstein.
+
+ Remove incorrect use of WEBCORE_EXPORT and namespace WebCore after the files were moved in
+ https://trac.webkit.org/changeset/228308.
+
+ * WebView/WebVideoFullscreenController.h:
+ * WebView/WebVideoFullscreenHUDWindowController.mm:
+ * WebView/WebWindowAnimation.h:
+ * WebView/WebWindowAnimation.mm:
+ (WebCore::WebWindowAnimationDurationFromDuration): Deleted.
+ (WebCore::scaledRect): Deleted.
+ (WebCore::squaredDistance): Deleted.
+
+2018-02-09 Per Arne Vollan <pvol...@apple.com>
+
Unreviewed 32-bit build fix after <https://trac.webkit.org/changeset/228308>.
* WebView/WebWindowAnimation.mm:
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebVideoFullscreenController.h (228327 => 228328)
--- trunk/Source/WebKitLegacy/mac/WebView/WebVideoFullscreenController.h 2018-02-09 18:31:29 UTC (rev 228327)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebVideoFullscreenController.h 2018-02-09 18:40:08 UTC (rev 228328)
@@ -44,7 +44,7 @@
@class WebWindowFadeAnimation;
@class CALayer;
-WEBCORE_EXPORT @interface WebVideoFullscreenController : NSWindowController {
+@interface WebVideoFullscreenController : NSWindowController {
@private
RefPtr<WebCore::HTMLVideoElement> _videoElement; // (retain)
id <WebVideoFullscreenControllerDelegate> _delegate; // (assign)
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm (228327 => 228328)
--- trunk/Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm 2018-02-09 18:31:29 UTC (rev 228327)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm 2018-02-09 18:40:08 UTC (rev 228328)
@@ -44,9 +44,6 @@
#define QTHUDSlider getQTHUDSliderClass()
#define QTHUDTimeline getQTHUDTimelineClass()
-
-namespace WebCore {
-
enum class MediaUIControl {
Timeline,
Slider,
@@ -58,11 +55,9 @@
VolumeDownButton,
};
-}
-
-using WebCore::MediaUIControl;
using WebCore::HTMLVideoElement;
using WebCore::narrowPrecisionToFloat;
+
@interface WebVideoFullscreenHUDWindowController (Private) <NSWindowDelegate>
- (void)updateTime;
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebWindowAnimation.h (228327 => 228328)
--- trunk/Source/WebKitLegacy/mac/WebView/WebWindowAnimation.h 2018-02-09 18:31:29 UTC (rev 228327)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebWindowAnimation.h 2018-02-09 18:40:08 UTC (rev 228328)
@@ -25,7 +25,7 @@
#import <Cocoa/Cocoa.h>
-WEBCORE_EXPORT @interface WebWindowScaleAnimation : NSAnimation {
+@interface WebWindowScaleAnimation : NSAnimation {
@private
NSRect _initialFrame, _finalFrame, _realFrame;
NSWindow *_window; // (assign)
@@ -43,7 +43,7 @@
@end
-WEBCORE_EXPORT @interface WebWindowFadeAnimation : NSAnimation {
+@interface WebWindowFadeAnimation : NSAnimation {
@private
CGFloat _initialAlpha, _finalAlpha;
NSWindow *_window; // (assign)
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebWindowAnimation.mm (228327 => 228328)
--- trunk/Source/WebKitLegacy/mac/WebView/WebWindowAnimation.mm 2018-02-09 18:31:29 UTC (rev 228327)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebWindowAnimation.mm 2018-02-09 18:40:08 UTC (rev 228328)
@@ -32,8 +32,6 @@
#import <wtf/Assertions.h>
#import <wtf/MathExtras.h>
-namespace WebCore {
-
static const CGFloat slowMotionFactor = 10;
static NSTimeInterval WebWindowAnimationDurationFromDuration(NSTimeInterval duration)
@@ -58,12 +56,8 @@
return deltaX * deltaX + deltaY * deltaY;
}
-}
+using WebCore::narrowPrecisionToFloat;
-using WebCore::WebWindowAnimationDurationFromDuration;
-using WebCore::narrowPrecisionToFloat;
-using WebCore::scaledRect;
-using WebCore::squaredDistance;
@implementation WebWindowScaleAnimation
- (id)init
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
