Skip to content
Permalink
Browse files
Follow-up fixes after moving WebVideoFullscreenController from WebCor…
…e 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.


Canonical link: https://commits.webkit.org/198459@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@228328 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
pvollan committed Feb 9, 2018
1 parent 4bcf626 commit d191299bab288247318ef04f37d7f4ace9265674
@@ -1,3 +1,21 @@
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>

Unreviewed 32-bit build fix after <https://trac.webkit.org/changeset/228308>.
@@ -44,7 +44,7 @@ class HTMLVideoElement;
@class WebWindowFadeAnimation;
@class CALayer;

WEBCORE_EXPORT @interface WebVideoFullscreenController : NSWindowController {
@interface WebVideoFullscreenController : NSWindowController {
@private
RefPtr<WebCore::HTMLVideoElement> _videoElement; // (retain)
id <WebVideoFullscreenControllerDelegate> _delegate; // (assign)
@@ -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;
@@ -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 @@ WEBCORE_EXPORT @interface WebWindowScaleAnimation : NSAnimation {
@end


WEBCORE_EXPORT @interface WebWindowFadeAnimation : NSAnimation {
@interface WebWindowFadeAnimation : NSAnimation {
@private
CGFloat _initialAlpha, _finalAlpha;
NSWindow *_window; // (assign)
@@ -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 @@ static CGFloat squaredDistance(NSPoint point1, NSPoint point2)
return deltaX * deltaX + deltaY * deltaY;
}

}

using WebCore::WebWindowAnimationDurationFromDuration;
using WebCore::narrowPrecisionToFloat;
using WebCore::scaledRect;
using WebCore::squaredDistance;

@implementation WebWindowScaleAnimation

- (id)init

0 comments on commit d191299

Please sign in to comment.