Changeset 80619 in webkit
- Timestamp:
- Mar 8, 2011 9:19:38 PM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 7 added
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r80612 r80619 1 2011-03-08 Jer Noble <jer.noble@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 WebKit2: Plumb through the FULLSCREEN_API Chrome client calls 6 https://bugs.webkit.org/show_bug.cgi?id=55273 7 8 The FULLSCREEN_API Chrome client calls need to be plumbed through from the 9 WebProcess to the UIProcess. To do this, WebFullScreenManager (and Proxy) 10 classes have been added to WebPage. 11 12 * DerivedSources.make: Added rules necessary to build DerivedSources for new .in files. 13 * DerivedSources.pro: Ditto. 14 * Platform/CoreIPC/MessageID.h: Added message types for WebFullScreenManager. 15 * Shared/API/c/WKBase.h: Added WKFullScreenManagerRef. 16 * Shared/APIObject.h: Added APIType for WebFullScreenManager. 17 * UIProcess/WebFullScreenManagerProxy.cpp: Added. 18 * UIProcess/WebFullScreenManagerProxy.h: Added. 19 * UIProcess/WebFullScreenManagerProxy.messages.in: Added. 20 * UIProcess/WebPageProxy.cpp: 21 (WebKit::WebPageProxy::close): Invalidate and clear m_fullScreenManager. 22 (WebKit::WebPageProxy::processDidCrash): Ditto. 23 (WebKit::WebPageProxy::didReceiveMessage): Pass messages on to WebFullScreenManagerProxy. 24 (WebKit::WebPageProxy::didReceiveSyncMessage): Ditto. 25 (WebKit::WebPageProxy::fullScreenManager): Added. Lazy instantiation of m_fullScreenManager. 26 * UIProcess/WebPageProxy.h: 27 * UIProcess/WebPageProxy.messages.in: 28 * UIProcess/WebUIClient.cpp: 29 * UIProcess/WebUIClient.h: 30 * WebKit2.xcodeproj/project.pbxproj: Added references to new classes in project file. 31 * WebKit2.pro: Ditto. 32 * win/WebKit2.vcproj: Ditto. 33 * WebKit2.pri: Added new directories to include file path. 34 * win/WebKit2Common.vsprops: Ditto. 35 * WebProcess/FullScreen/WebFullScreenManager.cpp: Added. 36 * WebProcess/FullScreen/WebFullScreenManager.h: Added. 37 * WebProcess/FullScreen/WebFullScreenManager.messages.in: Added. 38 * WebProcess/WebCoreSupport/WebChromeClient.cpp: 39 (WebKit::WebChromeClient::supportsFullScreenForElement): Pass through to WebFullScreenManager. 40 (WebKit::WebChromeClient::enterFullScreenForElement): Ditto. 41 (WebKit::WebChromeClient::exitFullScreenForElement): Ditto. 42 * WebProcess/WebPage/WebPage.cpp: 43 (WebKit::WebPage::close): Invalidate and clear m_fullScreenManager. 44 (WebKit::WebPage::fullScreenManager): Lazy instantiation of m_fullScreenManager. 45 (WebKit::WebPage::didReceiveMessage): Pass messages through to WebFullScreenManager. 46 * WebProcess/WebPage/WebPage.h: 47 1 48 2011-03-08 Jer Noble <jer.noble@apple.com> 2 49 -
trunk/Source/WebKit2/DerivedSources.make
r79654 r80619 27 27 $(WebKit2)/WebProcess/Authentication \ 28 28 $(WebKit2)/WebProcess/Cookies \ 29 $(WebKit2)/WebProcess/FullScreen \ 29 30 $(WebKit2)/WebProcess/Geolocation \ 30 31 $(WebKit2)/WebProcess/KeyValueStorage \ … … 56 57 WebDatabaseManager \ 57 58 WebDatabaseManagerProxy \ 59 WebFullScreenManager \ 60 WebFullScreenManagerProxy \ 58 61 WebGeolocationManager \ 59 62 WebGeolocationManagerProxy \ -
trunk/Source/WebKit2/DerivedSources.pro
r80434 r80619 79 79 WebProcess/Authentication \ 80 80 WebProcess/Cookies \ 81 WebProcess/FullScreen \ 81 82 WebProcess/Geolocation \ 82 83 WebProcess/KeyValueStorage \ … … 110 111 WebKeyValueStorageManager.messages.in \ 111 112 WebKeyValueStorageManagerProxy.messages.in \ 113 WebFullScreenManager.messages.in \ 114 WebFullScreenManagerProxy.messages.in \ 112 115 WebPage/WebInspector.messages.in \ 113 116 WebPage/WebPage.messages.in \ -
trunk/Source/WebKit2/Platform/CoreIPC/MessageID.h
r79654 r80619 43 43 MessageClassWebCookieManager, 44 44 MessageClassWebDatabaseManager, 45 MessageClassWebFullScreenManager, 45 46 MessageClassWebGeolocationManagerProxy, 46 47 MessageClassWebInspector, … … 59 60 MessageClassWebCookieManagerProxy, 60 61 MessageClassWebDatabaseManagerProxy, 62 MessageClassWebFullScreenManagerProxy, 61 63 MessageClassWebGeolocationManager, 62 64 MessageClassWebInspectorProxy, -
trunk/Source/WebKit2/Shared/APIObject.h
r80605 r80619 73 73 TypeFrame, 74 74 TypeFramePolicyListener, 75 TypeFullScreenManager, 75 76 TypeGeolocationManager, 76 77 TypeGeolocationPermissionRequest, -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r80609 r80619 298 298 #endif 299 299 300 #if ENABLE(FULLSCREEN_API) 301 if (m_fullScreenManager) { 302 m_fullScreenManager->invalidate(); 303 m_fullScreenManager = 0; 304 } 305 #endif 306 300 307 if (m_openPanelResultListener) { 301 308 m_openPanelResultListener->invalidate(); … … 1258 1265 #endif 1259 1266 1267 #if ENABLE(FULLSCREEN_API) 1268 if (messageID.is<CoreIPC::MessageClassWebFullScreenManagerProxy>()) { 1269 fullScreenManager()->didReceiveMessage(connection, messageID, arguments); 1270 return; 1271 } 1272 #endif 1273 1260 1274 didReceiveWebPageProxyMessage(connection, messageID, arguments); 1261 1275 } … … 1267 1281 if (WebInspectorProxy* inspector = this->inspector()) 1268 1282 inspector->didReceiveSyncWebInspectorProxyMessage(connection, messageID, arguments, reply); 1283 return; 1284 } 1285 #endif 1286 1287 #if ENABLE(FULLSCREEN_API) 1288 if (messageID.is<CoreIPC::MessageClassWebFullScreenManagerProxy>()) { 1289 fullScreenManager()->didReceiveSyncMessage(connection, messageID, arguments, reply); 1269 1290 return; 1270 1291 } … … 1987 2008 } 1988 2009 2010 #endif 2011 2012 #if ENABLE(FULLSCREEN_API) 2013 WebFullScreenManagerProxy* WebPageProxy::fullScreenManager() 2014 { 2015 if (!m_fullScreenManager) 2016 m_fullScreenManager = WebFullScreenManagerProxy::create(this); 2017 return m_fullScreenManager.get(); 2018 } 1989 2019 #endif 1990 2020 … … 2585 2615 m_inspector->invalidate(); 2586 2616 m_inspector = 0; 2617 } 2618 #endif 2619 2620 #if ENABLE(FULLSCREEN_API) 2621 if (m_fullScreenManager) { 2622 m_fullScreenManager->invalidate(); 2623 m_fullScreenManager = 0; 2587 2624 } 2588 2625 #endif -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r80609 r80619 43 43 #include "WebFormClient.h" 44 44 #include "WebFrameProxy.h" 45 #include "WebFullScreenManagerProxy.h" 45 46 #include "WebHistoryClient.h" 46 47 #include "WebInspectorProxy.h" … … 181 182 #if ENABLE(INSPECTOR) 182 183 WebInspectorProxy* inspector(); 184 #endif 185 186 #if ENABLE(FULLSCREEN_API) 187 WebFullScreenManagerProxy* fullScreenManager(); 183 188 #endif 184 189 … … 671 676 #endif 672 677 678 #if ENABLE(FULLSCREEN_API) 679 RefPtr<WebFullScreenManagerProxy> m_fullScreenManager; 680 #endif 681 673 682 HashMap<uint64_t, RefPtr<VoidCallback> > m_voidCallbacks; 674 683 HashMap<uint64_t, RefPtr<DataCallback> > m_dataCallbacks; -
trunk/Source/WebKit2/WebKit2.pri
r80434 r80619 44 44 $$SOURCE_DIR/WebKit2/WebProcess/Downloads \ 45 45 $$SOURCE_DIR/WebKit2/WebProcess/Downloads/qt \ 46 $$SOURCE_DIR/WebKit2/WebProcess/FullScreen \ 46 47 $$SOURCE_DIR/WebKit2/WebProcess/Geolocation \ 47 48 $$SOURCE_DIR/WebKit2/WebProcess/InjectedBundle \ -
trunk/Source/WebKit2/WebKit2.pro
r80434 r80619 34 34 $$WEBKIT2_GENERATED_SOURCES_DIR/WebDatabaseManagerMessages.h \ 35 35 $$WEBKIT2_GENERATED_SOURCES_DIR/WebDatabaseManagerProxyMessages.h \ 36 $$WEBKIT2_GENERATED_SOURCES_DIR/WebFullScreenManagerMessages.h \ 37 $$WEBKIT2_GENERATED_SOURCES_DIR/WebFullScreenManagerProxyMessages.h \ 36 38 $$WEBKIT2_GENERATED_SOURCES_DIR/WebGeolocationManagerMessages.h \ 37 39 $$WEBKIT2_GENERATED_SOURCES_DIR/WebGeolocationManagerProxyMessages.h \ … … 63 65 $$WEBKIT2_GENERATED_SOURCES_DIR/WebDatabaseManagerMessageReceiver.cpp \ 64 66 $$WEBKIT2_GENERATED_SOURCES_DIR/WebDatabaseManagerProxyMessageReceiver.cpp \ 67 $$WEBKIT2_GENERATED_SOURCES_DIR/WebFullScreenManagerMessageReceiver.cpp \ 68 $$WEBKIT2_GENERATED_SOURCES_DIR/WebFullScreenManagerProxyMessageReceiver.cpp \ 65 69 $$WEBKIT2_GENERATED_SOURCES_DIR/WebGeolocationManagerMessageReceiver.cpp \ 66 70 $$WEBKIT2_GENERATED_SOURCES_DIR/WebGeolocationManagerProxyMessageReceiver.cpp \ … … 191 195 UIProcess/WebFramePolicyListenerProxy.h \ 192 196 UIProcess/WebFrameProxy.h \ 197 UIProcess/WebFullScreenManagerProxy.h \ 193 198 UIProcess/WebGeolocationManagerProxy.h \ 194 199 UIProcess/WebGeolocationProvider.h \ … … 215 220 WebProcess/Downloads/Download.h \ 216 221 WebProcess/Downloads/DownloadManager.h \ 222 WebProcess/FullScreen/WebFullScreenManager.h \ 217 223 WebProcess/Geolocation/GeolocationPermissionRequestManager.h \ 218 224 WebProcess/Geolocation/WebGeolocationManager.h \ … … 381 387 UIProcess/WebFramePolicyListenerProxy.cpp \ 382 388 UIProcess/WebFrameProxy.cpp \ 389 UIProcess/WebFullScreenManagerProxy.cpp \ 383 390 UIProcess/WebGeolocationManagerProxy.cpp \ 384 391 UIProcess/WebGeolocationProvider.cpp \ … … 413 420 WebProcess/Downloads/Download.cpp \ 414 421 WebProcess/Downloads/DownloadManager.cpp \ 422 WebProcess/FullScreen/WebFullScreenManager.cpp \ 415 423 WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp \ 416 424 WebProcess/Geolocation/WebGeolocationManager.cpp \ -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r80279 r80619 739 739 C574A58112E66681002DFE98 /* PasteboardTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = C574A57F12E66681002DFE98 /* PasteboardTypes.h */; }; 740 740 C574A58212E66681002DFE98 /* PasteboardTypes.mm in Sources */ = {isa = PBXBuildFile; fileRef = C574A58012E66681002DFE98 /* PasteboardTypes.mm */; }; 741 CD6F75F4131B66D000D6B21E /* WebFullScreenManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA3E131A2E8A00EEDED2 /* WebFullScreenManagerProxy.cpp */; }; 742 CD73BA42131A2E8B00EEDED2 /* WebFullScreenManagerProxy.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CD73BA3F131A2E8A00EEDED2 /* WebFullScreenManagerProxy.h */; }; 743 CD73BA47131ACC9A00EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA45131ACC8800EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp */; }; 744 CD73BA4C131ACD8F00EEDED2 /* WebFullScreenManagerMessages.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CD73BA49131ACD8E00EEDED2 /* WebFullScreenManagerMessages.h */; }; 745 CD73BA4D131ACD8F00EEDED2 /* WebFullScreenManagerProxyMessages.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CD73BA4A131ACD8F00EEDED2 /* WebFullScreenManagerProxyMessages.h */; }; 746 CD73BA4E131ACDB700EEDED2 /* WebFullScreenManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA48131ACD8E00EEDED2 /* WebFullScreenManagerMessageReceiver.cpp */; }; 747 CD73BA53131B645B00EEDED2 /* WebFullScreenManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA37131A29FE00EEDED2 /* WebFullScreenManager.cpp */; }; 741 748 D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */; }; 742 749 D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484311FF4B6500032B39 /* WebPopupMenu.h */; }; … … 816 823 1A64228B12DD024700CAAE2C /* DrawingArea.messages.in in CopyFiles */, 817 824 6546A82C13000164000CEB1C /* InjectedBundlePageResourceLoadClient.h in CopyFiles */, 825 CD73BA42131A2E8B00EEDED2 /* WebFullScreenManagerProxy.h in CopyFiles */, 826 CD73BA4C131ACD8F00EEDED2 /* WebFullScreenManagerMessages.h in CopyFiles */, 827 CD73BA4D131ACD8F00EEDED2 /* WebFullScreenManagerProxyMessages.h in CopyFiles */, 818 828 ); 819 829 runOnlyForDeploymentPostprocessing = 0; … … 1589 1599 C574A57F12E66681002DFE98 /* PasteboardTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PasteboardTypes.h; sourceTree = "<group>"; }; 1590 1600 C574A58012E66681002DFE98 /* PasteboardTypes.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PasteboardTypes.mm; sourceTree = "<group>"; }; 1601 CD73BA37131A29FE00EEDED2 /* WebFullScreenManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebFullScreenManager.cpp; path = FullScreen/WebFullScreenManager.cpp; sourceTree = "<group>"; }; 1602 CD73BA38131A29FE00EEDED2 /* WebFullScreenManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebFullScreenManager.h; path = FullScreen/WebFullScreenManager.h; sourceTree = "<group>"; }; 1603 CD73BA39131A29FE00EEDED2 /* WebFullScreenManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebFullScreenManager.messages.in; path = FullScreen/WebFullScreenManager.messages.in; sourceTree = "<group>"; }; 1604 CD73BA3E131A2E8A00EEDED2 /* WebFullScreenManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFullScreenManagerProxy.cpp; sourceTree = "<group>"; }; 1605 CD73BA3F131A2E8A00EEDED2 /* WebFullScreenManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFullScreenManagerProxy.h; sourceTree = "<group>"; }; 1606 CD73BA40131A2E8A00EEDED2 /* WebFullScreenManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebFullScreenManagerProxy.messages.in; sourceTree = "<group>"; }; 1607 CD73BA45131ACC8800EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFullScreenManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; }; 1608 CD73BA48131ACD8E00EEDED2 /* WebFullScreenManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFullScreenManagerMessageReceiver.cpp; sourceTree = "<group>"; }; 1609 CD73BA49131ACD8E00EEDED2 /* WebFullScreenManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFullScreenManagerMessages.h; sourceTree = "<group>"; }; 1610 CD73BA4A131ACD8F00EEDED2 /* WebFullScreenManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFullScreenManagerProxyMessages.h; sourceTree = "<group>"; }; 1591 1611 D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPopupMenu.cpp; sourceTree = "<group>"; }; 1592 1612 D3B9484311FF4B6500032B39 /* WebPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenu.h; sourceTree = "<group>"; }; … … 2213 2233 isa = PBXGroup; 2214 2234 children = ( 2235 CD73BA3D131A2A2100EEDED2 /* FullScreen */, 2215 2236 512E352A130B559900ABD19A /* ApplicationCache */, 2216 2237 512F588612A8834700629530 /* Authentication */, … … 2316 2337 isa = PBXGroup; 2317 2338 children = ( 2339 CD73BA3E131A2E8A00EEDED2 /* WebFullScreenManagerProxy.cpp */, 2340 CD73BA3F131A2E8A00EEDED2 /* WebFullScreenManagerProxy.h */, 2341 CD73BA40131A2E8A00EEDED2 /* WebFullScreenManagerProxy.messages.in */, 2318 2342 BC032DC410F4387C0058C15A /* API */, 2319 2343 512F588D12A8836F00629530 /* Authentication */, … … 2929 2953 isa = PBXGroup; 2930 2954 children = ( 2955 CD73BA48131ACD8E00EEDED2 /* WebFullScreenManagerMessageReceiver.cpp */, 2956 CD73BA49131ACD8E00EEDED2 /* WebFullScreenManagerMessages.h */, 2957 CD73BA4A131ACD8F00EEDED2 /* WebFullScreenManagerProxyMessages.h */, 2958 CD73BA45131ACC8800EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp */, 2931 2959 1A64230612DD09EB00CAAE2C /* DrawingAreaProxyMessageReceiver.cpp */, 2932 2960 1A64230712DD09EB00CAAE2C /* DrawingAreaProxyMessages.h */, … … 3014 3042 ); 3015 3043 path = webkit2; 3044 sourceTree = "<group>"; 3045 }; 3046 CD73BA3D131A2A2100EEDED2 /* FullScreen */ = { 3047 isa = PBXGroup; 3048 children = ( 3049 CD73BA37131A29FE00EEDED2 /* WebFullScreenManager.cpp */, 3050 CD73BA38131A29FE00EEDED2 /* WebFullScreenManager.h */, 3051 CD73BA39131A29FE00EEDED2 /* WebFullScreenManager.messages.in */, 3052 ); 3053 name = FullScreen; 3016 3054 sourceTree = "<group>"; 3017 3055 }; … … 3977 4015 E1BB16A513201B9B00F49431 /* FullKeyboardAccessWatcher.mm in Sources */, 3978 4016 33AA1066131F060000D4A575 /* WebCookieManagerProxyClient.cpp in Sources */, 4017 CD73BA47131ACC9A00EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp in Sources */, 4018 CD73BA4E131ACDB700EEDED2 /* WebFullScreenManagerMessageReceiver.cpp in Sources */, 4019 CD73BA53131B645B00EEDED2 /* WebFullScreenManager.cpp in Sources */, 4020 CD6F75F4131B66D000D6B21E /* WebFullScreenManagerProxy.cpp in Sources */, 3979 4021 ); 3980 4022 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
r80578 r80619 35 35 #include "WebFrame.h" 36 36 #include "WebFrameLoaderClient.h" 37 #include "WebFullScreenManager.h" 37 38 #include "WebOpenPanelParameters.h" 38 39 #include "WebOpenPanelResultListener.h" … … 705 706 #endif 706 707 708 #if ENABLE(FULLSCREEN_API) 709 bool WebChromeClient::supportsFullScreenForElement(const WebCore::Element* element) 710 { 711 return m_page->fullScreenManager()->supportsFullScreen(); 712 } 713 714 void WebChromeClient::enterFullScreenForElement(WebCore::Element* element) 715 { 716 m_page->fullScreenManager()->enterFullScreenForElement(element); 717 } 718 719 void WebChromeClient::exitFullScreenForElement(WebCore::Element* element) 720 { 721 m_page->fullScreenManager()->exitFullScreenForElement(element); 722 } 723 #endif 724 707 725 void WebChromeClient::dispatchViewportDataDidChange(const ViewportArguments& args) const 708 726 { -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
r80279 r80619 206 206 #endif 207 207 208 #if ENABLE(FULLSCREEN_API) 209 virtual bool supportsFullScreenForElement(const WebCore::Element*); 210 virtual void enterFullScreenForElement(WebCore::Element*); 211 virtual void exitFullScreenForElement(WebCore::Element*); 212 #endif 213 208 214 virtual void dispatchViewportDataDidChange(const WebCore::ViewportArguments&) const; 209 215 -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r80612 r80619 55 55 #include "WebEventConversion.h" 56 56 #include "WebFrame.h" 57 #include "WebFullScreenManager.h" 57 58 #include "WebGeolocationClient.h" 58 59 #include "WebImage.h" … … 353 354 m_inspector = 0; 354 355 #endif 356 #if ENABLE(FULLSCREEN_API) 357 m_fullScreenManager = 0; 358 #endif 355 359 356 360 if (m_activePopupMenu) { … … 1401 1405 #endif 1402 1406 1407 #if ENABLE(FULLSCREEN_API) 1408 WebFullScreenManager* WebPage::fullScreenManager() 1409 { 1410 if (!m_fullScreenManager) 1411 m_fullScreenManager = WebFullScreenManager::create(this); 1412 return m_fullScreenManager.get(); 1413 } 1414 #endif 1415 1403 1416 #if !PLATFORM(MAC) 1404 1417 bool WebPage::handleEditingKeyboardEvent(KeyboardEvent* evt) … … 1772 1785 #endif 1773 1786 1787 #if ENABLE(FULLSCREEN_API) 1788 if (messageID.is<CoreIPC::MessageClassWebFullScreenManager>()) { 1789 fullScreenManager()->didReceiveMessage(connection, messageID, arguments); 1790 return; 1791 } 1792 #endif 1793 1774 1794 didReceiveWebPageMessage(connection, messageID, arguments); 1775 1795 } -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
r80569 r80619 91 91 class WebEvent; 92 92 class WebFrame; 93 class WebFullScreenManager; 93 94 class WebImage; 94 95 class WebInspector; … … 140 141 #if ENABLE(INSPECTOR) 141 142 WebInspector* inspector(); 143 #endif 144 145 #if ENABLE(FULLSCREEN_API) 146 WebFullScreenManager* fullScreenManager(); 142 147 #endif 143 148 … … 541 546 RefPtr<WebInspector> m_inspector; 542 547 #endif 548 #if ENABLE(FULLSCREEN_API) 549 RefPtr<WebFullScreenManager> m_fullScreenManager; 550 #endif 543 551 RefPtr<WebPopupMenu> m_activePopupMenu; 544 552 RefPtr<WebContextMenu> m_contextMenu; -
trunk/Source/WebKit2/win/WebKit2.vcproj
r80609 r80619 2532 2532 </File> 2533 2533 <File 2534 RelativePath="..\UIProcess\WebFullScreenManagerProxy.cpp" 2535 > 2536 </File> 2537 <File 2538 RelativePath="..\UIProcess\WebFullScreenManagerProxy.h" 2539 > 2540 </File> 2541 <File 2534 2542 RelativePath="..\UIProcess\WebGeolocationManagerProxy.cpp" 2535 2543 > … … 3572 3580 </File> 3573 3581 <File 3582 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\WebFullScreenManagerMessageReceiver.cpp" 3583 > 3584 </File> 3585 <File 3586 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\WebFullScreenManagerMessages.h" 3587 > 3588 </File> 3589 <File 3590 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\WebFullScreenManagerProxyMessageReceiver.cpp" 3591 > 3592 </File> 3593 <File 3594 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\WebFullScreenManagerProxyMessages.h" 3595 > 3596 </File> 3597 <File 3574 3598 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\WebGeolocationManagerMessageReceiver.cpp" 3575 3599 > -
trunk/Source/WebKit2/win/WebKit2Common.vsprops
r80395 r80619 7 7 <Tool 8 8 Name="VCCLCompilerTool" 9 AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)\..";"$(ProjectDir)\..\Platform";"$(ProjectDir)\..\Platform\cg";"$(ProjectDir)\..\Platform\CoreIPC";"$(ProjectDir)\..\PluginProcess";"$(ProjectDir)\..\Shared";"$(ProjectDir)\..\Shared\win";"$(ProjectDir)\..\Shared\cf";"$(ProjectDir)\..\Shared\API\c";"$(ProjectDir)\..\Shared\API\c\cf";"$(ProjectDir)\..\Shared\API\c\win";"$(ProjectDir)\..\Shared\CoreIPCSupport";"$(ProjectDir)\..\Shared\Plugins";"$(ProjectDir)\..\Shared\Plugins\Netscape";"$(ProjectDir)\..\UIProcess";"$(ProjectDir)\..\UIProcess\API\C";"$(ProjectDir)\..\UIProcess\API\C\win";"$(ProjectDir)\..\UIProcess\API\cpp";"$(ProjectDir)\..\UIProcess\API\win";"$(ProjectDir)\..\UIProcess\Authentication";"$(ProjectDir)\..\UIProcess\Downloads";"$(ProjectDir)\..\UIProcess\Launcher";"$(ProjectDir)\..\UIProcess\Plugins";"$(ProjectDir)\..\UIProcess\win";"$(ProjectDir)\..\WebProcess";"$(ProjectDir)\..\WebProcess\WebCoreSupport";"$(ProjectDir)\..\WebProcess\WebCoreSupport\win";"$(ProjectDir)\..\WebProcess\WebPage";"$(ProjectDir)\..\WebProcess\WebPage\win";"$(ProjectDir)\..\WebProcess\InjectedBundle";"$(ProjectDir)\..\WebProcess\InjectedBundle\API\c";"$(ProjectDir)\..\WebProcess\InjectedBundle\DOM";"$(ProjectDir)\..\WebProcess\InjectedBundle\win";"$(ProjectDir)\..\WebProcess\Plugins";"$(ProjectDir)\..\WebProcess\Plugins\Netscape";"$(ProjectDir)\..\WebProcess\win";"$(ProjectDir)\..\WebProcess\ApplicationCache";"$(ProjectDir)\..\WebProcess\Authentication";"$(ProjectDir)\..\WebProcess\Cookies";"$(ProjectDir)\..\WebProcess\Downloads";"$(ProjectDir)\..\WebProcess\Downloads\cf";"$(ProjectDir)\..\WebProcess\ Geolocation";"$(ProjectDir)\..\WebProcess\KeyValueStorage";"$(ProjectDir)\..\WebProcess\ResourceCache";"$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(WebKitLibrariesDir)\Include\pthreads";"$(ConfigurationBuildDir)\Include\JavaScriptCore";"$(ConfigurationBuildDir)\Include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\private\JavaScriptCore";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders""9 AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)\..";"$(ProjectDir)\..\Platform";"$(ProjectDir)\..\Platform\cg";"$(ProjectDir)\..\Platform\CoreIPC";"$(ProjectDir)\..\PluginProcess";"$(ProjectDir)\..\Shared";"$(ProjectDir)\..\Shared\win";"$(ProjectDir)\..\Shared\cf";"$(ProjectDir)\..\Shared\API\c";"$(ProjectDir)\..\Shared\API\c\cf";"$(ProjectDir)\..\Shared\API\c\win";"$(ProjectDir)\..\Shared\CoreIPCSupport";"$(ProjectDir)\..\Shared\Plugins";"$(ProjectDir)\..\Shared\Plugins\Netscape";"$(ProjectDir)\..\UIProcess";"$(ProjectDir)\..\UIProcess\API\C";"$(ProjectDir)\..\UIProcess\API\C\win";"$(ProjectDir)\..\UIProcess\API\cpp";"$(ProjectDir)\..\UIProcess\API\win";"$(ProjectDir)\..\UIProcess\Authentication";"$(ProjectDir)\..\UIProcess\Downloads";"$(ProjectDir)\..\UIProcess\Launcher";"$(ProjectDir)\..\UIProcess\Plugins";"$(ProjectDir)\..\UIProcess\win";"$(ProjectDir)\..\WebProcess";"$(ProjectDir)\..\WebProcess\WebCoreSupport";"$(ProjectDir)\..\WebProcess\WebCoreSupport\win";"$(ProjectDir)\..\WebProcess\WebPage";"$(ProjectDir)\..\WebProcess\WebPage\win";"$(ProjectDir)\..\WebProcess\InjectedBundle";"$(ProjectDir)\..\WebProcess\InjectedBundle\API\c";"$(ProjectDir)\..\WebProcess\InjectedBundle\DOM";"$(ProjectDir)\..\WebProcess\InjectedBundle\win";"$(ProjectDir)\..\WebProcess\Plugins";"$(ProjectDir)\..\WebProcess\Plugins\Netscape";"$(ProjectDir)\..\WebProcess\win";"$(ProjectDir)\..\WebProcess\ApplicationCache";"$(ProjectDir)\..\WebProcess\Authentication";"$(ProjectDir)\..\WebProcess\Cookies";"$(ProjectDir)\..\WebProcess\Downloads";"$(ProjectDir)\..\WebProcess\Downloads\cf";"$(ProjectDir)\..\WebProcess\FullScreen";"$(ProjectDir)\..\WebProcess\Geolocation";"$(ProjectDir)\..\WebProcess\KeyValueStorage";"$(ProjectDir)\..\WebProcess\ResourceCache";"$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(WebKitLibrariesDir)\Include\pthreads";"$(ConfigurationBuildDir)\Include\JavaScriptCore";"$(ConfigurationBuildDir)\Include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\private\JavaScriptCore";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders"" 10 10 PreprocessorDefinitions="_USRDLL;WEBKIT_EXPORTS;FRAMEWORK_NAME=WebKit;BUILDING_WEBKIT" 11 11 UsePrecompiledHeader="2"
Note: See TracChangeset
for help on using the changeset viewer.