Changeset 228328 in webkit

Timestamp:

Feb 9, 2018 10:40:08 AM (6 years ago)

Author:

pvollan@apple.com

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.

Location:

trunk/Source/WebKitLegacy/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebVideoFullscreenController.h (modified) (1 diff)
• WebView/WebVideoFullscreenHUDWindowController.mm (modified) (2 diffs)
• WebView/WebWindowAnimation.h (modified) (2 diffs)
• WebView/WebWindowAnimation.mm (modified) (2 diffs)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2018-02-09  Per Arne Vollan  <pvollan@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  <pvollan@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebView/WebVideoFullscreenController.h

@@ -45 +45 @@
 @class CALayer;
 
-WEBCORE_EXPORT @interface WebVideoFullscreenController : NSWindowController {
+@interface WebVideoFullscreenController : NSWindowController {
 @private
     RefPtr<WebCore::HTMLVideoElement> _videoElement; // (retain)

trunk/Source/WebKitLegacy/mac/WebView/WebVideoFullscreenHUDWindowController.mm

@@ -45 +45 @@
 #define QTHUDTimeline getQTHUDTimelineClass()
 
-
-namespace WebCore {
-
 enum class MediaUIControl {
     Timeline,
@@ -59 +56 @@
 };
 
-}
-
-using WebCore::MediaUIControl;
 using WebCore::HTMLVideoElement;
 using WebCore::narrowPrecisionToFloat;
+
 @interface WebVideoFullscreenHUDWindowController (Private) <NSWindowDelegate>
 

trunk/Source/WebKitLegacy/mac/WebView/WebWindowAnimation.h

@@ -26 +26 @@
 #import <Cocoa/Cocoa.h>
 
-WEBCORE_EXPORT @interface WebWindowScaleAnimation : NSAnimation {
+@interface WebWindowScaleAnimation : NSAnimation {
 @private
     NSRect _initialFrame, _finalFrame, _realFrame;
@@ -44 +44 @@
 
 
-WEBCORE_EXPORT @interface WebWindowFadeAnimation : NSAnimation {
+@interface WebWindowFadeAnimation : NSAnimation {
 @private
     CGFloat _initialAlpha, _finalAlpha;

trunk/Source/WebKitLegacy/mac/WebView/WebWindowAnimation.mm

@@ -33 +33 @@
 #import <wtf/MathExtras.h>
 
-namespace WebCore {
-
 static const CGFloat slowMotionFactor = 10;
 
@@ -59 +57 @@
 }
 
-}
-
-using WebCore::WebWindowAnimationDurationFromDuration;
 using WebCore::narrowPrecisionToFloat;
-using WebCore::scaledRect;
-using WebCore::squaredDistance;
+
 @implementation WebWindowScaleAnimation