Changeset 89271 in webkit


Ignore:
Timestamp:
Jun 20, 2011 12:29:39 PM (13 years ago)
Author:
jer.noble@apple.com
Message:

2011-06-01 Jer Noble <​jer.noble@apple.com>

Reviewed by Eric Carlson.

Move Full Screen Controllers into WebCore.

Remove dependency on QTKit from wekitExitFullscreen()
​https://bugs.webkit.org/show_bug.cgi?id=61843

No new tests; the existing media full screen tests are sufficient.

  • WebCore.exp.in: Add new exports.
  • WebCore.xcodeproj/project.pbxproj: Add references to moved files.
  • platform/mac/WebCoreSystemInterface.h: Add new WCSI interfaces to WKSI functions.
  • platform/mac/WebCoreSystemInterface.mm:
  • platform/mac/WebVideoFullscreenController.h: Renamed from Source/WebKit/mac/WebView/WebVideoFullscreenController.h.
  • platform/mac/WebVideoFullscreenController.mm: Renamed from Source/WebKit/mac/WebView/WebVideoFullscreenController.mm.

The following functions have had UNUSED_PARAM added:
(-[WebVideoFullscreenController applicationDidResignActive:]):
(-[WebVideoFullscreenController applicationDidChangeScreenParameters:]):
(-[WebVideoFullscreenWindow mouseMoved:]):

Source/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.h.

  • platform/mac/WebVideoFullscreenHUDWindowController.mm: Renamed from Source/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm.

The following functions have had UNUSED_PARAM added:
(-[WebVideoFullscreenHUDWindow cancelOperation:]):
(-[WebVideoFullscreenHUDWindowController timelinePositionChanged:]):
(-[WebVideoFullscreenHUDWindowController setVolumeToZero:]):
(-[WebVideoFullscreenHUDWindowController setVolumeToMaximum:]):
(-[WebVideoFullscreenHUDWindowController togglePlaying:]):
(-[WebVideoFullscreenHUDWindowController mouseEntered:]):
(-[WebVideoFullscreenHUDWindowController mouseExited:]):
(-[WebVideoFullscreenHUDWindowController rewind:]):
(-[WebVideoFullscreenHUDWindowController fastForward:]):
(-[WebVideoFullscreenHUDWindowController windowDidExpose:]):
(-[WebVideoFullscreenHUDWindowController windowDidClose:]):

The following functions have had WKSI calls converted to WCSI ones:
(createControlWithMediaUIControlType):
(createTimeTextField):

  • platform/mac/WebWindowAnimation.h: Renamed from Source/WebKit/mac/WebView/WebWindowAnimation.h.
  • platform/mac/WebWindowAnimation.mm: Renamed from Source/WebKit/mac/WebView/WebWindowAnimation.m. (WebWindowAnimationDurationFromDuration):

The following functions have had WKSI calls converted to WCSI ones:
(-[WebWindowScaleAnimation setCurrentProgress:]):
(-[WebWindowFadeAnimation initWithDuration:window:initialAlpha:finalAlpha:]):

2011-06-01 Jer Noble <​jer.noble@apple.com>

Reviewed by Eric Carlson.

Move Full Screen Controllers into WebCore.

Remove dependency on QTKit from wekitExitFullscreen()
​https://bugs.webkit.org/show_bug.cgi?id=61843

WebVideoFullscreenController, WebVideoFullscreenHUDController, and WebWindowAnimation
have been moved into WebCore.

  • WebKit.xcodeproj/project.pbxproj:

2011-06-01 Jer Noble <​jer.noble@apple.com>

Reviewed by Eric Carlson.

Move Full Screen Controllers into WebCore.

Remove dependency on QTKit from wekitExitFullscreen()
​https://bugs.webkit.org/show_bug.cgi?id=61843

WebVideoFullscreenController, WebVideoFullscreenHUDController, and WebWindowAnimation
have been moved into WebCore.

  • WebCoreSupport/WebSystemInterface.mm: (InitWebCoreSystemInterface): Add support for four WKSI functions in WCSI.
  • WebView/WebFullScreenController.mm: Remove unused #include.
  • WebView/WebView.mm: Change the include location of

WebVideoFullscreenController.h

Location:
trunk/Source
Files:
11 edited
6 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r89269 r89271  
     12011-06-01  Jer Noble  <jer.noble@apple.com>
     2
     3        Reviewed by Eric Carlson.
     4
     5        Move Full Screen Controllers into WebCore.
     6
     7        Remove dependency on QTKit from wekitExitFullscreen()
     8        https://bugs.webkit.org/show_bug.cgi?id=61843
     9
     10        No new tests; the existing media full screen tests are sufficient.
     11
     12        * WebCore.exp.in: Add new exports.
     13        * WebCore.xcodeproj/project.pbxproj: Add references to moved files.
     14        * platform/mac/WebCoreSystemInterface.h: Add new WCSI interfaces to WKSI functions.
     15        * platform/mac/WebCoreSystemInterface.mm:
     16        * platform/mac/WebVideoFullscreenController.h: Renamed from Source/WebKit/mac/WebView/WebVideoFullscreenController.h.
     17        * platform/mac/WebVideoFullscreenController.mm: Renamed from Source/WebKit/mac/WebView/WebVideoFullscreenController.mm.
     18       
     19        The following functions have had UNUSED_PARAM added:
     20        (-[WebVideoFullscreenController applicationDidResignActive:]):
     21        (-[WebVideoFullscreenController applicationDidChangeScreenParameters:]):
     22        (-[WebVideoFullscreenWindow mouseMoved:]):
     23
     24Source/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.h.
     25        * platform/mac/WebVideoFullscreenHUDWindowController.mm: Renamed from Source/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm.
     26       
     27        The following functions have had UNUSED_PARAM added:
     28        (-[WebVideoFullscreenHUDWindow cancelOperation:]):
     29        (-[WebVideoFullscreenHUDWindowController timelinePositionChanged:]):
     30        (-[WebVideoFullscreenHUDWindowController setVolumeToZero:]):
     31        (-[WebVideoFullscreenHUDWindowController setVolumeToMaximum:]):
     32        (-[WebVideoFullscreenHUDWindowController togglePlaying:]):
     33        (-[WebVideoFullscreenHUDWindowController mouseEntered:]):
     34        (-[WebVideoFullscreenHUDWindowController mouseExited:]):
     35        (-[WebVideoFullscreenHUDWindowController rewind:]):
     36        (-[WebVideoFullscreenHUDWindowController fastForward:]):
     37        (-[WebVideoFullscreenHUDWindowController windowDidExpose:]):
     38        (-[WebVideoFullscreenHUDWindowController windowDidClose:]):
     39
     40        The following functions have had WKSI calls converted to WCSI ones:
     41        (createControlWithMediaUIControlType):
     42        (createTimeTextField):
     43       
     44        * platform/mac/WebWindowAnimation.h: Renamed from Source/WebKit/mac/WebView/WebWindowAnimation.h.
     45        * platform/mac/WebWindowAnimation.mm: Renamed from Source/WebKit/mac/WebView/WebWindowAnimation.m.
     46        (WebWindowAnimationDurationFromDuration):
     47
     48        The following functions have had WKSI calls converted to WCSI ones:
     49        (-[WebWindowScaleAnimation setCurrentProgress:]):
     50        (-[WebWindowFadeAnimation initWithDuration:window:initialAlpha:finalAlpha:]):
     51
    1522011-06-20  Mark Pilgrim  <pilgrim@chromium.org>
    253

  • trunk/Source/WebCore/WebCore.exp.in

    r89230 r89271  
    13491349_wkCreateCTLineWithUniCharProvider
    13501350_wkCreateCustomCFReadStream
     1351_wkCreateMediaUIBackgroundView
     1352_wkCreateMediaUIControl
    13511353_wkCreateNSURLConnectionDelegateProxy
    13521354_wkCreatePrivateStorageSession
    … …  
    14191421_wkSignalCFReadStreamHasBytes
    14201422_wkSignedPublicKeyAndChallengeString
     1423_wkWindowSetAlpha
     1424_wkWindowSetScaledFrame
    14211425
    14221426#if ENABLE(DOM_STORAGE)
    … …  
    18301834__ZNK7WebCore16HTMLMediaElement12playbackRateEv
    18311835__ZNK7WebCore16HTMLMediaElement8durationEv
     1836__ZN7WebCore16HTMLMediaElement16returnToRealtimeEv
     1837__ZNK7WebCore16HTMLMediaElement12isFullscreenEv
     1838.objc_class_name_WebVideoFullscreenController
    18321839#endif
    18331840

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r89220 r89271  
    53395339                CA3BF67C10D99BAE00E6CE53 /* ScrollAnimator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA3BF67B10D99BAE00E6CE53 /* ScrollAnimator.cpp */; };
    53405340                CA3BF67E10D99BAE00E6CE53 /* ScrollAnimator.h in Headers */ = {isa = PBXBuildFile; fileRef = CA3BF67D10D99BAE00E6CE53 /* ScrollAnimator.h */; };
     5341                CD82030A1395AB6A00F956C6 /* WebVideoFullscreenController.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8203061395AB6A00F956C6 /* WebVideoFullscreenController.h */; settings = {ATTRIBUTES = (Private, ); }; };
     5342                CD82030B1395AB6A00F956C6 /* WebVideoFullscreenController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD8203071395AB6A00F956C6 /* WebVideoFullscreenController.mm */; };
     5343                CD82030C1395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8203081395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.h */; settings = {ATTRIBUTES = (Private, ); }; };
     5344                CD82030D1395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD8203091395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.mm */; };
     5345                CD8203101395ACE700F956C6 /* WebWindowAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = CD82030E1395ACE700F956C6 /* WebWindowAnimation.h */; };
     5346                CD8203111395ACE700F956C6 /* WebWindowAnimation.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD82030F1395ACE700F956C6 /* WebWindowAnimation.mm */; };
    53415347                CDEA7C841276230400B846DD /* RenderFullScreen.h in Headers */ = {isa = PBXBuildFile; fileRef = CDEA7C821276230400B846DD /* RenderFullScreen.h */; };
    53425348                CDEA7C851276230400B846DD /* RenderFullScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDEA7C831276230400B846DD /* RenderFullScreen.cpp */; };
    … …  
    1196111967                CA3BF67D10D99BAE00E6CE53 /* ScrollAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollAnimator.h; sourceTree = "<group>"; };
    1196211968                CD4E0AFA11F7BC27009D3811 /* fullscreen.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = fullscreen.css; sourceTree = "<group>"; };
     11969                CD8203061395AB6A00F956C6 /* WebVideoFullscreenController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenController.h; sourceTree = "<group>"; };
     11970                CD8203071395AB6A00F956C6 /* WebVideoFullscreenController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenController.mm; sourceTree = "<group>"; };
     11971                CD8203081395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenHUDWindowController.h; sourceTree = "<group>"; };
     11972                CD8203091395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenHUDWindowController.mm; sourceTree = "<group>"; };
     11973                CD82030E1395ACE700F956C6 /* WebWindowAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebWindowAnimation.h; sourceTree = "<group>"; };
     11974                CD82030F1395ACE700F956C6 /* WebWindowAnimation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebWindowAnimation.mm; sourceTree = "<group>"; };
    1196311975                CDBD93BA1333BD4B002570E3 /* fullscreenQuickTime.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = fullscreenQuickTime.css; sourceTree = "<group>"; };
    1196411976                CDEA7C821276230400B846DD /* RenderFullScreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderFullScreen.h; sourceTree = "<group>"; };
    … …  
    1424114253                        isa = PBXGroup;
    1424214254                        children = (
     14255                                CD82030E1395ACE700F956C6 /* WebWindowAnimation.h */,
     14256                                CD82030F1395ACE700F956C6 /* WebWindowAnimation.mm */,
     14257                                CD8203061395AB6A00F956C6 /* WebVideoFullscreenController.h */,
     14258                                CD8203071395AB6A00F956C6 /* WebVideoFullscreenController.mm */,
     14259                                CD8203081395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.h */,
     14260                                CD8203091395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.mm */,
    1424314261                                51E1ECAD0C91C54600DC255B /* AutodrainedPool.mm */,
    1424414262                                65A640F00533BB1F0085E777 /* BlockExceptions.h */,
    … …  
    2292022938                                767F99C011A119560080C51D /* WebSocketHandshakeResponse.h in Headers */,
    2292122939                                0FCF332D0F2B9A25004B6795 /* WebTiledLayer.h in Headers */,
     22940                                CD82030A1395AB6A00F956C6 /* WebVideoFullscreenController.h in Headers */,
     22941                                CD82030C1395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.h in Headers */,
     22942                                CD8203101395ACE700F956C6 /* WebWindowAnimation.h in Headers */,
    2292222943                                F55B3DE01251F12D003EF269 /* WeekInputType.h in Headers */,
    2292322944                                85031B510A44EFC700F992E0 /* WheelEvent.h in Headers */,
    … …  
    2567825699                                767F99BE11A1194A0080C51D /* WebSocketHandshakeResponse.cpp in Sources */,
    2567925700                                0FCF332C0F2B9A25004B6795 /* WebTiledLayer.mm in Sources */,
     25701                                CD82030B1395AB6A00F956C6 /* WebVideoFullscreenController.mm in Sources */,
     25702                                CD82030D1395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.mm in Sources */,
     25703                                CD8203111395ACE700F956C6 /* WebWindowAnimation.mm in Sources */,
    2568025704                                F55B3DDF1251F12D003EF269 /* WeekInputType.cpp in Sources */,
    2568125705                                85031B500A44EFC700F992E0 /* WheelEvent.cpp in Sources */,

  • trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h

    r88316 r89271  
    7171@class NSArray;
    7272@class NSButtonCell;
     73@class NSControl;
    7374@class NSData;
    7475@class NSDate;
    … …  
    8687@class NSURLResponse;
    8788@class NSView;
     89@class NSWindow;
    8890@class QTMovie;
    8991@class QTMovieView;
    … …  
    9294class NSArray;
    9395class NSButtonCell;
     96class NSControl;
    9497class NSData;
    9598class NSDate;
    … …  
    108111class NSURLResponse;
    109112class NSView;
     113class NSWindow;
    110114class QTMovie;
    111115class QTMovieView;
    … …  
    152156extern BOOL (*wkHitTestMediaUIPart)(int part, int themeStyle, CGRect bounds, CGPoint point);
    153157extern void (*wkMeasureMediaUIPart)(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize);
     158extern NSView *(*wkCreateMediaUIBackgroundView)(void);
     159extern NSControl *(*wkCreateMediaUIControl)(int);
     160extern void (*wkWindowSetAlpha)(NSWindow *, float);
     161extern void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect);
    154162extern BOOL (*wkMediaControllerThemeAvailable)(int themeStyle);
    155163extern void (*wkPopupMenu)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*);

  • trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm

    r87328 r89271  
    4747void (*wkDrawMediaUIPart)(int part, int themeStyle, CGContextRef context, CGRect rect, unsigned state);
    4848void (*wkMeasureMediaUIPart)(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize);
     49NSView *(*wkCreateMediaUIBackgroundView)(void);
     50NSControl *(*wkCreateMediaUIControl)(int);
     51void (*wkWindowSetAlpha)(NSWindow *, float);
     52void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect);
    4953BOOL (*wkMediaControllerThemeAvailable)(int themeStyle);
    5054NSString* (*wkGetPreferredExtensionForMIMEType)(NSString*);

  • trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.h

    r89270 r89271  
    5353    uint32_t _idleSystemSleepAssertion;
    5454    NSTimer *_tickleTimer;
    55     SystemUIMode _savedUIMode;
    56     SystemUIOptions _savedUIOptions;
     55    uint32_t _savedUIMode;
     56    uint32_t _savedUIOptions;
    5757}
    5858

  • trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm

    r89270 r89271  
    2424 */
    2525
     26#import "config.h"
     27
    2628#if ENABLE(VIDEO)
    2729
    2830#import "WebVideoFullscreenController.h"
    2931
    30 #import "WebTypesInternal.h"
    3132#import "WebVideoFullscreenHUDWindowController.h"
    3233#import "WebWindowAnimation.h"
     34#import <HIToolbox/MacApplication.h>
    3335#import <IOKit/pwr_mgt/IOPMLib.h>
    3436#import <OSServices/Power.h>
    … …  
    222224- (void)applicationDidResignActive:(NSNotification*)notification
    223225{   
     226    UNUSED_PARAM(notification);
    224227    // Check to see if the fullscreenWindow is on the active space; this function is available
    225228    // on 10.6 and later, so default to YES if the function is not available:
    … …  
    328331- (void)applicationDidChangeScreenParameters:(NSNotification*)notification
    329332{
     333    UNUSED_PARAM(notification);
    330334    // The user may have changed the main screen by moving the menu bar, or they may have changed
    331335    // the Dock's size or location, or they may have changed the fullscreen screen's dimensions. 
    … …  
    606610- (void)mouseMoved:(NSEvent *)theEvent
    607611{
     612    UNUSED_PARAM(theEvent);
    608613    [[self windowController] fadeHUDIn];
    609614}

  • trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm

    r89270 r89271  
    2323 */
    2424
     25#import "config.h"
     26
    2527#if ENABLE(VIDEO)
    2628
    2729#import "WebVideoFullscreenHUDWindowController.h"
    2830
    29 #import "WebKitSystemInterface.h"
    30 #import "WebTypesInternal.h"
     31#import "WebCoreSystemInterface.h"
    3132#import <JavaScriptCore/RetainPtr.h>
    3233#import <JavaScriptCore/UnusedParam.h>
    3334#import <WebCore/HTMLMediaElement.h>
     35#import <WebKitSystemInterface.h>
    3436
    3537using namespace WebCore;
    … …  
    103105- (void)cancelOperation:(id)sender
    104106{
     107    UNUSED_PARAM(sender);
    105108    [[self windowController] exitFullscreen:self];
    106109}
    … …  
    293296{
    294297#ifdef HAVE_MEDIA_CONTROL
    295     NSControl *control = WKCreateMediaUIControl(controlType);
     298    NSControl *control = wkCreateMediaUIControl(controlType);
    296299    [control setFrame:frame];
    297300    return control;
    298301#else
    299     if (controlType == WKMediaUIControlSlider)
     302    if (controlType == wkMediaUIControlSlider)
    300303        return [[NSSlider alloc] initWithFrame:frame];
    301304    return [[NSControl alloc] initWithFrame:frame];
    … …  
    342345
    343346#ifdef HAVE_MEDIA_CONTROL
    344     NSView *background = WKCreateMediaUIBackgroundView();
     347    NSView *background = wkCreateMediaUIBackgroundView();
    345348#else
    346349    NSView *background = [[NSView alloc] init];
    … …  
    390393
    391394#ifdef HAVE_MEDIA_CONTROL
    392     _timeline = WKCreateMediaUIControl(WKMediaUIControlTimeline);
     395    _timeline = wkCreateMediaUIControl(WKMediaUIControlTimeline);
    393396#else
    394397    _timeline = [[NSSlider alloc] init];
    … …  
    438441- (void)timelinePositionChanged:(id)sender
    439442{
     443    UNUSED_PARAM(sender);
    440444    [self setCurrentTime:[_timeline floatValue]];
    441445    if (!_isScrubbing) {
    … …  
    476480- (void)volumeChanged:(id)sender
    477481{
     482    UNUSED_PARAM(sender);
    478483    [self setVolume:[_volumeSlider doubleValue]];
    479484}
    … …  
    481486- (void)setVolumeToZero:(id)sender
    482487{
     488    UNUSED_PARAM(sender);
    483489    [self setVolume:0];
    484490}
    … …  
    486492- (void)setVolumeToMaximum:(id)sender
    487493{
     494    UNUSED_PARAM(sender);
    488495    [self setVolume:[self maxVolume]];
    489496}
    … …  
    544551- (void)togglePlaying:(id)sender
    545552{
     553    UNUSED_PARAM(sender);
    546554    [self setPlaying:![self playing]];
    547555}
    … …  
    608616- (void)mouseEntered:(NSEvent *)theEvent
    609617{
     618    UNUSED_PARAM(theEvent);
    610619    // Make sure the HUD won't be hidden from now
    611620    _mouseIsInHUD = YES;
    … …  
    615624- (void)mouseExited:(NSEvent *)theEvent
    616625{
     626    UNUSED_PARAM(theEvent);
    617627    _mouseIsInHUD = NO;
    618628    [self fadeWindowIn];
    … …  
    621631- (void)rewind:(id)sender
    622632{
     633    UNUSED_PARAM(sender);
    623634    if (![_delegate mediaElement])
    624635        return;
    … …  
    628639- (void)fastForward:(id)sender
    629640{
     641    UNUSED_PARAM(sender);
    630642    if (![_delegate mediaElement])
    631643        return;
    … …  
    634646- (void)exitFullscreen:(id)sender
    635647{
     648    UNUSED_PARAM(sender);
    636649    if (_isEndingFullscreen)
    637650        return;
    … …  
    644657- (void)windowDidExpose:(NSNotification *)notification
    645658{
     659    UNUSED_PARAM(notification);
    646660    [self scheduleTimeUpdate];
    647661}
    … …  
    649663- (void)windowDidClose:(NSNotification *)notification
    650664{
     665    UNUSED_PARAM(notification);
    651666    [self unscheduleTimeUpdate];
    652667}

  • trunk/Source/WebCore/platform/mac/WebWindowAnimation.mm

    r89270 r89271  
    2424 */
    2525
     26#import "config.h"
     27
    2628#import "WebWindowAnimation.h"
    27 #import "WebKitSystemInterface.h"
     29#import "WebCoreSystemInterface.h"
    2830#import <wtf/Assertions.h>
     31#import <wtf/UnusedParam.h>
    2932
    3033static const CGFloat slowMotionFactor = 10.;
    … …  
    111114
    112115    NSRect currentRect = [self currentFrame];
    113     WKWindowSetScaledFrame(_window, currentRect, _realFrame);
     116    wkWindowSetScaledFrame(_window, currentRect, _realFrame);
    114117    [_subAnimation setCurrentProgress:progress];
    115118}
    … …  
    177180- (id)initWithDuration:(NSTimeInterval)duration window:(NSWindow *)window initialAlpha:(CGFloat)initialAlpha finalAlpha:(CGFloat)finalAlpha
    178181{
     182    UNUSED_PARAM(duration);
    179183    self = [self init];
    180184    if (!self)
    … …  
    204208    [super setCurrentProgress:progress];
    205209
    206     WKWindowSetAlpha(_window, [self currentAlpha]);
     210    wkWindowSetAlpha(_window, [self currentAlpha]);
    207211}
    208212

  • trunk/Source/WebKit/ChangeLog

    r88968 r89271  
     12011-06-01  Jer Noble  <jer.noble@apple.com>
     2
     3        Reviewed by Eric Carlson.
     4
     5        Move Full Screen Controllers into WebCore.
     6
     7        Remove dependency on QTKit from wekitExitFullscreen()
     8        https://bugs.webkit.org/show_bug.cgi?id=61843
     9
     10        WebVideoFullscreenController, WebVideoFullscreenHUDController, and WebWindowAnimation
     11        have been moved into WebCore.
     12
     13        * WebKit.xcodeproj/project.pbxproj:
     14
    1152011-06-15  David Kilzer  <ddkilzer@apple.com>
    216

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r88968 r89271  
    2121                0F30985F11ECFE4500F559DF /* WebRenderLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F30985D11ECFE4400F559DF /* WebRenderLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
    2222                0F30986011ECFE4500F559DF /* WebRenderLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F30985E11ECFE4500F559DF /* WebRenderLayer.mm */; };
    23                 0FD3B0F21076C3E900039B96 /* WebVideoFullscreenController.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD3B0EE1076C3E900039B96 /* WebVideoFullscreenController.h */; };
    24                 0FD3B0F31076C3E900039B96 /* WebVideoFullscreenController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FD3B0EF1076C3E900039B96 /* WebVideoFullscreenController.mm */; };
    25                 0FD3B0F41076C3E900039B96 /* WebVideoFullscreenHUDWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD3B0F01076C3E900039B96 /* WebVideoFullscreenHUDWindowController.h */; };
    26                 0FD3B0F51076C3E900039B96 /* WebVideoFullscreenHUDWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FD3B0F11076C3E900039B96 /* WebVideoFullscreenHUDWindowController.mm */; };
    27                 0FD3B0F81076C3F700039B96 /* WebWindowAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD3B0F61076C3F700039B96 /* WebWindowAnimation.h */; };
    28                 0FD3B0F91076C3F700039B96 /* WebWindowAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FD3B0F71076C3F700039B96 /* WebWindowAnimation.m */; };
    2923                14D8252F0AF955090004F057 /* WebChromeClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 14D8252D0AF955090004F057 /* WebChromeClient.h */; };
    3024                14D825300AF955090004F057 /* WebChromeClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 14D8252E0AF955090004F057 /* WebChromeClient.mm */; };
    … …  
    405399                0F30985D11ECFE4400F559DF /* WebRenderLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebRenderLayer.h; sourceTree = "<group>"; };
    406400                0F30985E11ECFE4500F559DF /* WebRenderLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebRenderLayer.mm; sourceTree = "<group>"; };
    407                 0FD3B0EE1076C3E900039B96 /* WebVideoFullscreenController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenController.h; sourceTree = "<group>"; };
    408                 0FD3B0EF1076C3E900039B96 /* WebVideoFullscreenController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenController.mm; sourceTree = "<group>"; };
    409                 0FD3B0F01076C3E900039B96 /* WebVideoFullscreenHUDWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenHUDWindowController.h; sourceTree = "<group>"; };
    410                 0FD3B0F11076C3E900039B96 /* WebVideoFullscreenHUDWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenHUDWindowController.mm; sourceTree = "<group>"; };
    411                 0FD3B0F61076C3F700039B96 /* WebWindowAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebWindowAnimation.h; sourceTree = "<group>"; };
    412                 0FD3B0F71076C3F700039B96 /* WebWindowAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebWindowAnimation.m; sourceTree = "<group>"; };
    413401                14D8252D0AF955090004F057 /* WebChromeClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebChromeClient.h; sourceTree = "<group>"; };
    414402                14D8252E0AF955090004F057 /* WebChromeClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebChromeClient.mm; sourceTree = "<group>"; };
    … …  
    12551243                                515E27CC0458C86500CA2D3A /* WebUIDelegate.h */,
    12561244                                65A7D44A0568AB2600E70EF6 /* WebUIDelegatePrivate.h */,
    1257                                 0FD3B0EE1076C3E900039B96 /* WebVideoFullscreenController.h */,
    1258                                 0FD3B0EF1076C3E900039B96 /* WebVideoFullscreenController.mm */,
    1259                                 0FD3B0F01076C3E900039B96 /* WebVideoFullscreenHUDWindowController.h */,
    1260                                 0FD3B0F11076C3E900039B96 /* WebVideoFullscreenHUDWindowController.mm */,
    12611245                                51A8B579042834F700CA2D3A /* WebView.h */,
    12621246                                51A8B57A042834F700CA2D3A /* WebView.mm */,
    … …  
    12661250                                930D02BB06275F640076701E /* WebViewInternal.h */,
    12671251                                51A8B57D0428353A00CA2D3A /* WebViewPrivate.h */,
    1268                                 0FD3B0F61076C3F700039B96 /* WebWindowAnimation.h */,
    1269                                 0FD3B0F71076C3F700039B96 /* WebWindowAnimation.m */,
    12701252                        );
    12711253                        name = WebView;
    … …  
    16291611                                939810150824BF01008DF038 /* WebURLsWithTitles.h in Headers */,
    16301612                                C0C5B3EE1177A4A0002B0AEF /* WebUserContentURLPattern.h in Headers */,
    1631                                 0FD3B0F21076C3E900039B96 /* WebVideoFullscreenController.h in Headers */,
    1632                                 0FD3B0F41076C3E900039B96 /* WebVideoFullscreenHUDWindowController.h in Headers */,
    16331613                                939810700824BF01008DF038 /* WebView.h in Headers */,
    16341614                                BC2E464D0FD8A96800A9D9DE /* WebViewData.h in Headers */,
    … …  
    16361616                                9398109B0824BF01008DF038 /* WebViewInternal.h in Headers */,
    16371617                                939810710824BF01008DF038 /* WebViewPrivate.h in Headers */,
    1638                                 0FD3B0F81076C3F700039B96 /* WebWindowAnimation.h in Headers */,
    16391618                                41F4484F10338E8C0030E55E /* WebWorkersPrivate.h in Headers */,
    16401619                                A5DEFC0B11D5331C00885273 /* WebSecurityOriginInternal.h in Headers */,
    … …  
    20091988                                939810BE0824BF01008DF038 /* WebURLsWithTitles.m in Sources */,
    20101989                                C0C5B3EF1177A4A0002B0AEF /* WebUserContentURLPattern.mm in Sources */,
    2011                                 0FD3B0F31076C3E900039B96 /* WebVideoFullscreenController.mm in Sources */,
    2012                                 0FD3B0F51076C3E900039B96 /* WebVideoFullscreenHUDWindowController.mm in Sources */,
    20131990                                939811070824BF01008DF038 /* WebView.mm in Sources */,
    20141991                                BC2E464E0FD8A96800A9D9DE /* WebViewData.mm in Sources */,
    20151992                                BC97E7E210963D260010D361 /* WebViewEventHandling.mm in Sources */,
    20161993                                939810E80824BF01008DF038 /* WebViewFactory.mm in Sources */,
    2017                                 0FD3B0F91076C3F700039B96 /* WebWindowAnimation.m in Sources */,
    20181994                                41F4485010338E8C0030E55E /* WebWorkersPrivate.mm in Sources */,
    20191995                                A5DEFC0A11D5331C00885273 /* WebSecurityOrigin.mm in Sources */,

  • trunk/Source/WebKit/mac/ChangeLog

    r89216 r89271  
     12011-06-01  Jer Noble  <jer.noble@apple.com>
     2
     3        Reviewed by Eric Carlson.
     4
     5        Move Full Screen Controllers into WebCore.
     6
     7        Remove dependency on QTKit from wekitExitFullscreen()
     8        https://bugs.webkit.org/show_bug.cgi?id=61843
     9
     10        WebVideoFullscreenController, WebVideoFullscreenHUDController, and WebWindowAnimation
     11        have been moved into WebCore.
     12
     13        * WebCoreSupport/WebSystemInterface.mm:
     14        (InitWebCoreSystemInterface): Add support for four WKSI functions in WCSI.
     15        * WebView/WebFullScreenController.mm: Remove unused #include.
     16        * WebView/WebView.mm: Change the include location of
     17            WebVideoFullscreenController.h
     18
    1192011-06-18  Dimitri Glazkov  <dglazkov@chromium.org>
    220

  • trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm

    r87328 r89271  
    7070    INIT(InitializeMaximumHTTPConnectionCountPerHost);
    7171    INIT(MeasureMediaUIPart);
     72    INIT(CreateMediaUIBackgroundView);
     73    INIT(CreateMediaUIControl);
     74    INIT(WindowSetAlpha);
     75    INIT(WindowSetScaledFrame);
    7276    INIT(MediaControllerThemeAvailable);
    7377    INIT(PopupMenu);

  • trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm

    r87003 r89271  
    3030#import "WebNSWindowExtras.h"
    3131#import "WebPreferencesPrivate.h"
    32 #import "WebWindowAnimation.h"
    3332#import "WebViewInternal.h"
    3433#import <IOKit/pwr_mgt/IOPMLib.h>

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r89207 r89271  
    104104#import "WebUIDelegate.h"
    105105#import "WebUIDelegatePrivate.h"
    106 #import "WebVideoFullscreenController.h"
    107106#import <CoreFoundation/CFSet.h>
    108107#import <Foundation/NSURLConnection.h>
    … …  
    162161#import <WebCore/WebCoreObjCExtras.h>
    163162#import <WebCore/WebCoreView.h>
     163#import <WebCore/WebVideoFullscreenController.h>
    164164#import <WebCore/Widget.h>
    165165#import <WebKit/DOM.h>
Note: See TracChangeset for help on using the changeset viewer.