Changeset 55946 in webkit
- Timestamp:
- Mar 12, 2010 5:39:03 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r55945 r55946 1 2010-03-12 Beth Dakin <bdakin@apple.com> 2 3 Reviewed by Simon Fraser. 4 5 Fix for https://bugs.webkit.org/show_bug.cgi?id=34942 Fullscreen 6 API naming is inconsistent 7 -and corresponding- 8 <rdar://problem/7729165> 9 10 This patch changes all occurrences of "fullScreen" to the more 11 popular "fullscreen." webkitEnterFullScreen and 12 webkitExitFullScreen have been maintained for now for backwards 13 compatibility. 14 15 * html/HTMLVideoElement.cpp: 16 (WebCore::HTMLVideoElement::webkitEnterFullscreen): 17 (WebCore::HTMLVideoElement::webkitExitFullscreen): 18 * html/HTMLVideoElement.h: 19 (WebCore::HTMLVideoElement::webkitEnterFullScreen): 20 (WebCore::HTMLVideoElement::webkitExitFullScreen): 21 * html/HTMLVideoElement.idl: 22 * platform/graphics/mac/MediaPlayerProxy.h: 23 1 24 2010-03-12 James Robinson <jamesr@chromium.org> 2 25 -
trunk/WebCore/html/HTMLVideoElement.cpp
r55682 r55946 215 215 } 216 216 217 void HTMLVideoElement::webkitEnterFull Screen(bool isUserGesture, ExceptionCode& ec)217 void HTMLVideoElement::webkitEnterFullscreen(bool isUserGesture, ExceptionCode& ec) 218 218 { 219 219 if (isFullscreen()) … … 230 230 } 231 231 232 void HTMLVideoElement::webkitExitFull Screen()232 void HTMLVideoElement::webkitExitFullscreen() 233 233 { 234 234 if (isFullscreen()) -
trunk/WebCore/html/HTMLVideoElement.h
r55682 r55946 50 50 void setPoster(const String&); 51 51 52 // fullscreen53 void webkitEnterFull Screen(bool isUserGesture, ExceptionCode&);54 void webkitExitFull Screen();52 // Fullscreen 53 void webkitEnterFullscreen(bool isUserGesture, ExceptionCode&); 54 void webkitExitFullscreen(); 55 55 bool webkitSupportsFullscreen(); 56 56 bool webkitDisplayingFullscreen(); 57 58 // FIXME: Maintain "FullScreen" capitalization scheme for backwards compatibility. 59 // https://bugs.webkit.org/show_bug.cgi?id=36081 60 void webkitEnterFullScreen(bool isUserGesture, ExceptionCode& ec) { webkitEnterFullscreen(isUserGesture, ec); } 61 void webkitExitFullScreen() { webkitExitFullscreen(); } 57 62 58 63 bool shouldDisplayPosterImage() const { return m_shouldDisplayPosterImage; } -
trunk/WebCore/html/HTMLVideoElement.idl
r54182 r55946 34 34 readonly attribute boolean webkitSupportsFullscreen; 35 35 readonly attribute boolean webkitDisplayingFullscreen; 36 37 [NeedsUserGestureCheck] void webkitEnterFullscreen() 38 raises (DOMException); 39 void webkitExitFullscreen(); 36 40 37 41 [NeedsUserGestureCheck] void webkitEnterFullScreen() -
trunk/WebCore/platform/graphics/mac/MediaPlayerProxy.h
r41042 r55946 41 41 MediaPlayerNotificationStopUsingNetwork, 42 42 43 MediaPlayerNotificationEnteredFull Screen,44 MediaPlayerNotificationExitedFull Screen,43 MediaPlayerNotificationEnteredFullscreen, 44 MediaPlayerNotificationExitedFullscreen, 45 45 46 46 MediaPlayerNotificationReadyForInspection, -
trunk/WebKit/mac/ChangeLog
r55931 r55946 1 2010-03-12 Beth Dakin <bdakin@apple.com> 2 3 Reviewed by Simon Fraser. 4 5 Fix for https://bugs.webkit.org/show_bug.cgi?id=34942 Fullscreen 6 API naming is inconsistent 7 -and corresponding- 8 <rdar://problem/7729165> 9 10 This patch changes all occurrences of "fullScreen" to the more 11 popular "fullscreen." 12 13 * Plugins/Hosted/NetscapePluginHostProxy.h: 14 (WebKit::NetscapePluginHostProxy::isFullscreenWindowShowing): 15 * Plugins/Hosted/NetscapePluginHostProxy.mm: 16 (WebKit::NetscapePluginHostProxy::NetscapePluginHostProxy): 17 (WebKit::NetscapePluginHostProxy::didEnterFullscreen): 18 (WebKit::NetscapePluginHostProxy::didExitFullscreen): 19 (WebKit::NetscapePluginHostProxy::setFullscreenWindowIsShowing): 20 (WKPCSetFullscreenWindowIsShowing): 21 * Plugins/Hosted/WebKitPluginClient.defs: 22 * Plugins/WebNetscapePluginView.mm: 23 (-[WebNetscapePluginView _workaroundSilverlightFullscreenBug:]): 24 (-[WebNetscapePluginView _createPlugin]): 25 (-[WebNetscapePluginView _destroyPlugin]): 26 * WebView/WebVideoFullscreenHUDWindowController.mm: 27 (-[WebVideoFullscreenHUDWindowController windowDidLoad]): 28 1 29 2010-03-12 Andy Estes <aestes@apple.com> 2 30 -
trunk/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.h
r53178 r55946 55 55 void setMenuBarVisible(bool); 56 56 57 bool isFull ScreenWindowShowing() const { return m_fullScreenWindowIsShowing; }58 void setFull ScreenWindowIsShowing(bool);57 bool isFullscreenWindowShowing() const { return m_fullscreenWindowIsShowing; } 58 void setFullscreenWindowIsShowing(bool); 59 59 60 60 void setModal(bool); … … 74 74 void endModal(); 75 75 76 void didEnterFull Screen() const;77 void didExitFull Screen() const;76 void didEnterFullscreen() const; 77 void didExitFullscreen() const; 78 78 79 79 static void deadNameNotificationCallback(CFMachPortRef, void *msg, CFIndex size, void *info); … … 97 97 unsigned m_isModal; 98 98 bool m_menuBarIsVisible; 99 bool m_full ScreenWindowIsShowing;99 bool m_fullscreenWindowIsShowing; 100 100 const ProcessSerialNumber m_pluginHostPSN; 101 101 -
trunk/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm
r54783 r55946 96 96 , m_isModal(false) 97 97 , m_menuBarIsVisible(true) 98 , m_full ScreenWindowIsShowing(false)98 , m_fullscreenWindowIsShowing(false) 99 99 , m_pluginHostPSN(pluginHostPSN) 100 100 , m_processingRequests(0) … … 203 203 } 204 204 205 void NetscapePluginHostProxy::didEnterFull Screen() const205 void NetscapePluginHostProxy::didEnterFullscreen() const 206 206 { 207 207 SetFrontProcess(&m_pluginHostPSN); 208 208 } 209 209 210 void NetscapePluginHostProxy::didExitFull Screen() const210 void NetscapePluginHostProxy::didExitFullscreen() const 211 211 { 212 212 // If the plug-in host is the current application then we should bring ourselves to the front when it exits full-screen mode. … … 224 224 } 225 225 226 void NetscapePluginHostProxy::setFull ScreenWindowIsShowing(bool isShowing)227 { 228 if (m_full ScreenWindowIsShowing == isShowing)226 void NetscapePluginHostProxy::setFullscreenWindowIsShowing(bool isShowing) 227 { 228 if (m_fullscreenWindowIsShowing == isShowing) 229 229 return; 230 230 231 m_full ScreenWindowIsShowing = isShowing;232 if (m_full ScreenWindowIsShowing)233 didEnterFull Screen();231 m_fullscreenWindowIsShowing = isShowing; 232 if (m_fullscreenWindowIsShowing) 233 didEnterFullscreen(); 234 234 else 235 didExitFull Screen();235 didExitFullscreen(); 236 236 237 237 } … … 893 893 } 894 894 895 kern_return_t WKPCSetFull ScreenWindowIsShowing(mach_port_t clientPort, boolean_t fullScreenWindowIsShowing)896 { 897 NetscapePluginHostProxy* hostProxy = pluginProxyMap().get(clientPort); 898 if (!hostProxy) 899 return KERN_FAILURE; 900 901 hostProxy->setFull ScreenWindowIsShowing(fullScreenWindowIsShowing);895 kern_return_t WKPCSetFullscreenWindowIsShowing(mach_port_t clientPort, boolean_t fullscreenWindowIsShowing) 896 { 897 NetscapePluginHostProxy* hostProxy = pluginProxyMap().get(clientPort); 898 if (!hostProxy) 899 return KERN_FAILURE; 900 901 hostProxy->setFullscreenWindowIsShowing(fullscreenWindowIsShowing); 902 902 903 903 return KERN_SUCCESS; -
trunk/WebKit/mac/Plugins/Hosted/WebKitPluginClient.defs
r54783 r55946 235 235 panelData :data_t); 236 236 237 simpleroutine PCSetFull ScreenWindowIsShowing(clientPort :mach_port_t;237 simpleroutine PCSetFullscreenWindowIsShowing(clientPort :mach_port_t; 238 238 isShowing :boolean_t); 239 239 -
trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm
r55824 r55946 83 83 #define LoginWindowDidSwitchToUserNotification @"WebLoginWindowDidSwitchToUserNotification" 84 84 #define WKNVSupportsCompositingCoreAnimationPluginsBool 74656 /* TRUE if the browser supports hardware compositing of Core Animation plug-ins */ 85 static const int WKNVSilverlightFull ScreenPerformanceIssueFixed = 7288546; /* TRUE if Siverlight addressed its underlying bug in <rdar://problem/7288546> */85 static const int WKNVSilverlightFullscreenPerformanceIssueFixed = 7288546; /* TRUE if Siverlight addressed its underlying bug in <rdar://problem/7288546> */ 86 86 87 87 using namespace WebCore; … … 2311 2311 // 2) Enough Silverlight users update to the new Silverlight. 2312 2312 // For now, we'll distinguish older broken versions of Silverlight by asking the plug-in if it resolved its full screen badness. 2313 - (void)_workaroundSilverlightFull ScreenBug:(BOOL)initializedPlugin2313 - (void)_workaroundSilverlightFullscreenBug:(BOOL)initializedPlugin 2314 2314 { 2315 2315 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) 2316 2316 ASSERT(_isSilverlight); 2317 NPBool isFull ScreenPerformanceIssueFixed = 0;2317 NPBool isFullscreenPerformanceIssueFixed = 0; 2318 2318 NPPluginFuncs *pluginFuncs = [_pluginPackage.get() pluginFuncs]; 2319 if (pluginFuncs->getvalue && pluginFuncs->getvalue(plugin, static_cast<NPPVariable>(WKNVSilverlightFull ScreenPerformanceIssueFixed), &isFullScreenPerformanceIssueFixed) == NPERR_NO_ERROR && isFullScreenPerformanceIssueFixed)2319 if (pluginFuncs->getvalue && pluginFuncs->getvalue(plugin, static_cast<NPPVariable>(WKNVSilverlightFullscreenPerformanceIssueFixed), &isFullscreenPerformanceIssueFixed) == NPERR_NO_ERROR && isFullscreenPerformanceIssueFixed) 2320 2320 return; 2321 2321 … … 2358 2358 [[self class] setCurrentPluginView:nil]; 2359 2359 if (_isSilverlight) 2360 [self _workaroundSilverlightFull ScreenBug:YES];2360 [self _workaroundSilverlightFullscreenBug:YES]; 2361 2361 LOG(Plugins, "NPP_New: %d", npErr); 2362 2362 return npErr; … … 2368 2368 2369 2369 if (_isSilverlight) 2370 [self _workaroundSilverlightFull ScreenBug:NO];2370 [self _workaroundSilverlightFullscreenBug:NO]; 2371 2371 2372 2372 NPError npErr; -
trunk/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
r54182 r55946 347 347 static const CGFloat volumeUpButtonLeftMargin = 4; 348 348 static const CGFloat volumeControlsTopMargin = 13; 349 static const CGFloat exitFull ScreenButtonWidth = 25;350 static const CGFloat exitFull ScreenButtonHeight = 21;351 static const CGFloat exitFull ScreenButtonTopMargin = 11;349 static const CGFloat exitFullscreenButtonWidth = 25; 350 static const CGFloat exitFullscreenButtonHeight = 21; 351 static const CGFloat exitFullscreenButtonTopMargin = 11; 352 352 static const CGFloat timelineWidth = 315; 353 353 static const CGFloat timelineHeight = 14; … … 381 381 [contentView addSubview:_playButton]; 382 382 383 CGFloat closeToRight = windowWidth - horizontalMargin - exitFull ScreenButtonWidth;384 NSControl *exitFullscreenButton = createControlWithMediaUIControlType(WKMediaUIControlExitFullscreenButton, NSMakeRect(closeToRight, windowHeight - exitFull ScreenButtonTopMargin - exitFullScreenButtonHeight, exitFullScreenButtonWidth, exitFullScreenButtonHeight));383 CGFloat closeToRight = windowWidth - horizontalMargin - exitFullscreenButtonWidth; 384 NSControl *exitFullscreenButton = createControlWithMediaUIControlType(WKMediaUIControlExitFullscreenButton, NSMakeRect(closeToRight, windowHeight - exitFullscreenButtonTopMargin - exitFullscreenButtonHeight, exitFullscreenButtonWidth, exitFullscreenButtonHeight)); 385 385 [exitFullscreenButton setAction:@selector(exitFullscreen:)]; 386 386 [exitFullscreenButton setTarget:self]; -
trunk/WebKit/win/ChangeLog
r55942 r55946 1 2010-03-12 Beth Dakin <bdakin@apple.com> 2 3 Reviewed by Simon Fraser. 4 5 Fix for https://bugs.webkit.org/show_bug.cgi?id=34942 Fullscreen 6 API naming is inconsistent 7 -and corresponding- 8 <rdar://problem/7729165> 9 10 This patch changes all occurrences of "fullScreen" to the more 11 popular "fullscreen." 12 13 * FullscreenVideoController.cpp: 14 (FullscreenVideoController::onMouseDown): 15 (FullscreenVideoController::onMouseMove): 16 (FullscreenVideoController::onMouseUp): 17 * FullscreenVideoController.h: 18 (FullscreenVideoController::fullscreenToHUDCoordinates): 19 1 20 2010-03-12 Beth Dakin <bdakin@apple.com> 2 21 -
trunk/WebKit/win/FullscreenVideoController.cpp
r55942 r55946 514 514 void FullscreenVideoController::onMouseDown(const IntPoint& point) 515 515 { 516 IntPoint convertedPoint(full ScreenToHUDCoordinates(point));516 IntPoint convertedPoint(fullscreenToHUDCoordinates(point)); 517 517 518 518 // Don't bother hit testing if we're outside the bounds of the window … … 553 553 void FullscreenVideoController::onMouseMove(const IntPoint& point) 554 554 { 555 IntPoint convertedPoint(full ScreenToHUDCoordinates(point));555 IntPoint convertedPoint(fullscreenToHUDCoordinates(point)); 556 556 557 557 if (m_hitWidget) { … … 568 568 void FullscreenVideoController::onMouseUp(const IntPoint& point) 569 569 { 570 IntPoint convertedPoint(full ScreenToHUDCoordinates(point));570 IntPoint convertedPoint(fullscreenToHUDCoordinates(point)); 571 571 m_movingWindow = false; 572 572 -
trunk/WebKit/win/FullscreenVideoController.h
r52998 r55946 129 129 void endScrubbing(); 130 130 131 WebCore::IntPoint full ScreenToHUDCoordinates(const WebCore::IntPoint& point) const131 WebCore::IntPoint fullscreenToHUDCoordinates(const WebCore::IntPoint& point) const 132 132 { 133 133 return WebCore::IntPoint(point.x()- m_hudPosition.x(), point.y() - m_hudPosition.y());
Note: See TracChangeset
for help on using the changeset viewer.