Changeset 220759 in webkit
- Timestamp:
- Aug 15, 2017 2:08:21 PM (7 years ago)
- Location:
- trunk/Source
- Files:
-
- 1 added
- 19 edited
- 8 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r220758 r220759 2258 2258 platform/SharedBuffer.cpp 2259 2259 platform/SharedBufferChunkReader.cpp 2260 platform/SleepDisabler.cpp2261 2260 platform/StaticPasteboard.cpp 2262 platform/SystemSleepListener.cpp2263 2261 platform/Theme.cpp 2264 2262 platform/ThreadGlobalData.cpp -
trunk/Source/WebCore/ChangeLog
r220758 r220759 1 2017-08-15 Don Olmstead <don.olmstead@sony.com> 2 3 [PAL] Move Sleep classes into PAL 4 https://bugs.webkit.org/show_bug.cgi?id=175456 5 6 Reviewed by Ryosuke Niwa. 7 8 No new tests. No change in behavior. 9 10 * CMakeLists.txt: 11 * PlatformMac.cmake: 12 * WebCore.xcodeproj/project.pbxproj: 13 * html/HTMLMediaElement.cpp: 14 * html/HTMLMediaElement.h: 15 * platform/audio/PlatformMediaSessionManager.cpp: 16 * platform/audio/PlatformMediaSessionManager.h: 17 * platform/mac/WebVideoFullscreenController.h: 18 * platform/mac/WebVideoFullscreenController.mm: 19 1 20 2017-08-15 Youenn Fablet <youenn@apple.com> 2 21 -
trunk/Source/WebCore/PAL/ChangeLog
r220734 r220759 1 2017-08-15 Don Olmstead <don.olmstead@sony.com> 2 3 [PAL] Move Sleep classes into PAL 4 https://bugs.webkit.org/show_bug.cgi?id=175456 5 6 Reviewed by Ryosuke Niwa. 7 8 * PAL.xcodeproj/project.pbxproj: 9 * pal/CMakeLists.txt: 10 * pal/PlatformMac.cmake: 11 * pal/system/SleepDisabler.cpp: Renamed from Source/WebCore/platform/SleepDisabler.cpp. 12 * pal/system/SleepDisabler.h: Renamed from Source/WebCore/platform/SleepDisabler.h. 13 * pal/system/SystemSleepListener.cpp: Renamed from Source/WebCore/platform/SystemSleepListener.cpp. 14 * pal/system/SystemSleepListener.h: Renamed from Source/WebCore/platform/SystemSleepListener.h. 15 * pal/system/cocoa/SleepDisablerCocoa.cpp: Renamed from Source/WebCore/platform/cocoa/SleepDisablerCocoa.cpp. 16 * pal/system/cocoa/SleepDisablerCocoa.h: Renamed from Source/WebCore/platform/cocoa/SleepDisablerCocoa.h. 17 * pal/system/mac/SystemSleepListenerMac.h: Renamed from Source/WebCore/platform/mac/SystemSleepListenerMac.h. 18 * pal/system/mac/SystemSleepListenerMac.mm: Renamed from Source/WebCore/platform/mac/SystemSleepListenerMac.mm. 19 1 20 2017-08-14 Simon Fraser <simon.fraser@apple.com> 2 21 -
trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
r220506 r220759 68 68 A3788E9C1F05B78200679425 /* SoundNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3788E9B1F05B78200679425 /* SoundNone.cpp */; }; 69 69 A3788E9E1F05B78E00679425 /* SoundMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3788E9D1F05B78E00679425 /* SoundMac.mm */; }; 70 A3AB6E521F3D1DC5009C14B1 /* SleepDisabler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3AB6E511F3D1DC5009C14B1 /* SleepDisabler.cpp */; }; 71 A3AB6E561F3D1DDB009C14B1 /* SleepDisabler.h in Headers */ = {isa = PBXBuildFile; fileRef = A3AB6E531F3D1DDB009C14B1 /* SleepDisabler.h */; }; 72 A3AB6E571F3D1DDB009C14B1 /* SystemSleepListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3AB6E541F3D1DDB009C14B1 /* SystemSleepListener.cpp */; }; 73 A3AB6E581F3D1DDB009C14B1 /* SystemSleepListener.h in Headers */ = {isa = PBXBuildFile; fileRef = A3AB6E551F3D1DDB009C14B1 /* SystemSleepListener.h */; }; 74 A3AB6E601F3D1E39009C14B1 /* SleepDisablerCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3AB6E5E1F3D1E39009C14B1 /* SleepDisablerCocoa.cpp */; }; 75 A3AB6E611F3D1E39009C14B1 /* SleepDisablerCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = A3AB6E5F1F3D1E39009C14B1 /* SleepDisablerCocoa.h */; }; 76 A3AB6E641F3D217F009C14B1 /* SystemSleepListenerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = A3AB6E621F3D217F009C14B1 /* SystemSleepListenerMac.h */; }; 77 A3AB6E651F3D217F009C14B1 /* SystemSleepListenerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3AB6E631F3D217F009C14B1 /* SystemSleepListenerMac.mm */; }; 70 78 /* End PBXBuildFile section */ 71 79 … … 133 141 A3788E9B1F05B78200679425 /* SoundNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SoundNone.cpp; path = system/SoundNone.cpp; sourceTree = "<group>"; }; 134 142 A3788E9D1F05B78E00679425 /* SoundMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SoundMac.mm; path = system/mac/SoundMac.mm; sourceTree = "<group>"; }; 143 A3AB6E511F3D1DC5009C14B1 /* SleepDisabler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SleepDisabler.cpp; path = system/SleepDisabler.cpp; sourceTree = "<group>"; }; 144 A3AB6E531F3D1DDB009C14B1 /* SleepDisabler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SleepDisabler.h; path = system/SleepDisabler.h; sourceTree = "<group>"; }; 145 A3AB6E541F3D1DDB009C14B1 /* SystemSleepListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SystemSleepListener.cpp; path = system/SystemSleepListener.cpp; sourceTree = "<group>"; }; 146 A3AB6E551F3D1DDB009C14B1 /* SystemSleepListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SystemSleepListener.h; path = system/SystemSleepListener.h; sourceTree = "<group>"; }; 147 A3AB6E5E1F3D1E39009C14B1 /* SleepDisablerCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SleepDisablerCocoa.cpp; path = system/cocoa/SleepDisablerCocoa.cpp; sourceTree = "<group>"; }; 148 A3AB6E5F1F3D1E39009C14B1 /* SleepDisablerCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SleepDisablerCocoa.h; path = system/cocoa/SleepDisablerCocoa.h; sourceTree = "<group>"; }; 149 A3AB6E621F3D217F009C14B1 /* SystemSleepListenerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SystemSleepListenerMac.h; path = system/mac/SystemSleepListenerMac.h; sourceTree = "<group>"; }; 150 A3AB6E631F3D217F009C14B1 /* SystemSleepListenerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SystemSleepListenerMac.mm; path = system/mac/SystemSleepListenerMac.mm; sourceTree = "<group>"; }; 135 151 C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CopyPALHeaders.xcconfig; sourceTree = "<group>"; }; 136 152 /* End PBXFileReference section */ … … 295 311 isa = PBXGroup; 296 312 children = ( 313 A3AB6E5D1F3D1E28009C14B1 /* cocoa */, 297 314 A3788EA01F05B7E200679425 /* mac */, 315 A3AB6E511F3D1DC5009C14B1 /* SleepDisabler.cpp */, 316 A3AB6E531F3D1DDB009C14B1 /* SleepDisabler.h */, 298 317 A3788E971F05B6CE00679425 /* Sound.h */, 299 318 A3788E9B1F05B78200679425 /* SoundNone.cpp */, 319 A3AB6E541F3D1DDB009C14B1 /* SystemSleepListener.cpp */, 320 A3AB6E551F3D1DDB009C14B1 /* SystemSleepListener.h */, 300 321 ); 301 322 name = system; … … 306 327 children = ( 307 328 A3788E9D1F05B78E00679425 /* SoundMac.mm */, 329 A3AB6E621F3D217F009C14B1 /* SystemSleepListenerMac.h */, 330 A3AB6E631F3D217F009C14B1 /* SystemSleepListenerMac.mm */, 308 331 ); 309 332 name = mac; 333 sourceTree = "<group>"; 334 }; 335 A3AB6E5D1F3D1E28009C14B1 /* cocoa */ = { 336 isa = PBXGroup; 337 children = ( 338 A3AB6E5E1F3D1E39009C14B1 /* SleepDisablerCocoa.cpp */, 339 A3AB6E5F1F3D1E39009C14B1 /* SleepDisablerCocoa.h */, 340 ); 341 name = cocoa; 310 342 sourceTree = "<group>"; 311 343 }; … … 317 349 buildActionMask = 2147483647; 318 350 files = ( 351 A3AB6E561F3D1DDB009C14B1 /* SleepDisabler.h in Headers */, 352 A3AB6E611F3D1E39009C14B1 /* SleepDisablerCocoa.h in Headers */, 319 353 0C2DA13E1F3BEB4900DBC317 /* AVKitSPI.h in Headers */, 320 354 0C2DA06D1F33CA8400DBC317 /* CFLocaleSPI.h in Headers */, 321 355 0C2DA06E1F33CA8400DBC317 /* CFNetworkConnectionCacheSPI.h in Headers */, 356 A3AB6E641F3D217F009C14B1 /* SystemSleepListenerMac.h in Headers */, 322 357 0C2DA06F1F33CA8400DBC317 /* CFNetworkSPI.h in Headers */, 323 358 0C2DA13F1F3BEB4900DBC317 /* CFNSURLConnectionSPI.h in Headers */, … … 352 387 0C2DA1531F3BEB4900DBC317 /* NSURLDownloadSPI.h in Headers */, 353 388 0C2DA1541F3BEB4900DBC317 /* NSURLFileTypeMappingsSPI.h in Headers */, 389 A3AB6E581F3D1DDB009C14B1 /* SystemSleepListener.h in Headers */, 354 390 0C2DA1551F3BEB4900DBC317 /* PassKitSPI.h in Headers */, 355 391 0C2DA1561F3BEB4900DBC317 /* pthreadSPI.h in Headers */, … … 446 482 buildActionMask = 2147483647; 447 483 files = ( 484 A3AB6E651F3D217F009C14B1 /* SystemSleepListenerMac.mm in Sources */, 448 485 1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */, 486 A3AB6E521F3D1DC5009C14B1 /* SleepDisabler.cpp in Sources */, 487 A3AB6E601F3D1E39009C14B1 /* SleepDisablerCocoa.cpp in Sources */, 449 488 A30D41251F0DD12D00B71954 /* KillRingMac.mm in Sources */, 450 489 A30D41221F0DD0EA00B71954 /* KillRingNone.cpp in Sources */, 451 490 A3788E9E1F05B78E00679425 /* SoundMac.mm in Sources */, 452 491 A3788E9C1F05B78200679425 /* SoundNone.cpp in Sources */, 492 A3AB6E571F3D1DDB009C14B1 /* SystemSleepListener.cpp in Sources */, 453 493 ); 454 494 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/PAL/pal/CMakeLists.txt
r219560 r220759 1 1 set(PAL_SOURCES 2 system/SleepDisabler.cpp 3 system/SystemSleepListener.cpp 2 4 ) 3 5 -
trunk/Source/WebCore/PAL/pal/PlatformMac.cmake
r219213 r220759 2 2 crypto/commoncrypto/CryptoDigestCommonCrypto.cpp 3 3 4 system/cocoa/SleepDisablerCocoa.cpp 5 4 6 system/mac/SoundMac.mm 7 system/mac/SystemSleepListenerMac.mm 5 8 6 9 text/mac/KillRingMac.mm -
trunk/Source/WebCore/PAL/pal/system/SleepDisabler.cpp
r220758 r220759 21 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 24 */ 25 25 … … 27 27 #include "SleepDisabler.h" 28 28 29 namespace WebCore{29 namespace PAL { 30 30 31 31 #if !PLATFORM(COCOA) … … 45 45 } 46 46 47 } 47 } // namespace PAL -
trunk/Source/WebCore/PAL/pal/system/SleepDisabler.h
r220758 r220759 21 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 24 */ 25 25 26 26 #pragma once 27 27 28 namespace WebCore{28 namespace PAL { 29 29 30 30 class SleepDisabler { … … 35 35 }; 36 36 static std::unique_ptr<SleepDisabler> create(const char*, Type); 37 WEBCORE_EXPORT virtual ~SleepDisabler();37 PAL_EXPORT virtual ~SleepDisabler(); 38 38 39 39 Type type() const { return m_type; } 40 40 41 41 protected: 42 WEBCORE_EXPORT SleepDisabler(const char*, Type);42 PAL_EXPORT SleepDisabler(const char*, Type); 43 43 Type m_type; 44 44 }; -
trunk/Source/WebCore/PAL/pal/system/SystemSleepListener.cpp
r220758 r220759 27 27 #include "SystemSleepListener.h" 28 28 29 namespace WebCore{29 namespace PAL { 30 30 31 31 #if !PLATFORM(MAC) … … 41 41 } 42 42 43 } 43 } // namespace PAL -
trunk/Source/WebCore/PAL/pal/system/SystemSleepListener.h
r220758 r220759 24 24 */ 25 25 26 #ifndef SystemSleepListener_h 27 #define SystemSleepListener_h 26 #pragma once 28 27 29 namespace WebCore{28 namespace PAL { 30 29 31 30 class SystemSleepListener { … … 45 44 protected: 46 45 SystemSleepListener(Client&); 47 46 48 47 Client& m_client; 49 48 }; 50 49 51 } 52 53 54 #endif // SystemSleepListener_h 50 } // namespace PAL -
trunk/Source/WebCore/PAL/pal/system/cocoa/SleepDisablerCocoa.cpp
r220758 r220759 32 32 #include <wtf/RetainPtr.h> 33 33 34 namespace WebCore{34 namespace PAL { 35 35 36 36 std::unique_ptr<SleepDisabler> SleepDisabler::create(const char* reason, Type type) … … 66 66 } 67 67 68 } 68 } // namespace PAL 69 69 70 70 #endif // PLATFORM(COCOA) -
trunk/Source/WebCore/PAL/pal/system/cocoa/SleepDisablerCocoa.h
r220758 r220759 28 28 #if PLATFORM(COCOA) 29 29 30 #include "SleepDisabler.h"30 #include <pal/system/SleepDisabler.h> 31 31 32 namespace WebCore{32 namespace PAL { 33 33 34 34 class SleepDisablerCocoa : public SleepDisabler { … … 41 41 }; 42 42 43 } 43 } // namespace PAL 44 44 45 45 #endif // PLATFORM(COCOA) -
trunk/Source/WebCore/PAL/pal/system/mac/SystemSleepListenerMac.h
r220758 r220759 24 24 */ 25 25 26 #ifndef SystemSleepListenerMac_h 27 #define SystemSleepListenerMac_h 26 #pragma once 28 27 29 28 #if PLATFORM(MAC) 30 29 31 #include "SystemSleepListener.h" 32 30 #include <pal/system/SystemSleepListener.h> 33 31 #include <wtf/WeakPtr.h> 34 32 35 namespace WebCore{33 namespace PAL { 36 34 37 35 class SystemSleepListenerMac : public SystemSleepListener { … … 48 46 }; 49 47 50 } 48 } // namespace PAL 51 49 52 50 #endif // PLATFORM(MAC) 53 54 #endif // SystemSleepListenerMac_h -
trunk/Source/WebCore/PAL/pal/system/mac/SystemSleepListenerMac.mm
r220758 r220759 29 29 #if PLATFORM(MAC) 30 30 31 #import <AppKit/AppKit.h> 31 32 #import <wtf/MainThread.h> 32 33 33 namespace WebCore{34 namespace PAL { 34 35 35 36 std::unique_ptr<SystemSleepListener> SystemSleepListener::create(Client& client) … … 71 72 } 72 73 73 } 74 } // namespace PAL 74 75 75 76 #endif // PLATFORM(MAC) -
trunk/Source/WebCore/PlatformMac.cmake
r219867 r220759 317 317 platform/cocoa/SearchPopupMenuCocoa.mm 318 318 platform/cocoa/SharedBufferCocoa.mm 319 platform/cocoa/SleepDisablerCocoa.cpp320 319 platform/cocoa/SystemVersion.mm 321 320 platform/cocoa/TelephoneNumberDetectorCocoa.cpp … … 504 503 platform/mac/StringUtilities.mm 505 504 platform/mac/SuddenTermination.mm 506 platform/mac/SystemSleepListenerMac.mm507 505 platform/mac/ThemeMac.mm 508 506 platform/mac/ThreadCheck.mm … … 727 725 728 726 platform/PlatformExportMacros.h 729 platform/SleepDisabler.h730 727 731 728 platform/audio/AudioHardwareListener.h -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r220758 r220759 2741 2741 5D5975B71963637B00D00878 /* UserAgent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5D5975B61963637B00D00878 /* UserAgent.mm */; }; 2742 2742 5D874F130D161D3200796C3B /* NetscapePlugInStreamLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93E227DD0AF589AD00D48324 /* NetscapePlugInStreamLoader.cpp */; }; 2743 5D8C4DBF1428222C0026CE72 /* SleepDisablerCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D8C4DBD1428222C0026CE72 /* SleepDisablerCocoa.cpp */; };2744 5D8C4DC01428222C0026CE72 /* SleepDisablerCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D8C4DBE1428222C0026CE72 /* SleepDisablerCocoa.h */; };2745 2743 5D925B670F64D4DD00B847F0 /* ScrollAlignment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D925B650F64D4DD00B847F0 /* ScrollAlignment.cpp */; }; 2746 2744 5D925B680F64D4DD00B847F0 /* ScrollAlignment.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D925B660F64D4DD00B847F0 /* ScrollAlignment.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 6164 6162 CD5209E41B0BD8380077184E /* MediaPlayerEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5209E31B0BD8380077184E /* MediaPlayerEnums.h */; settings = {ATTRIBUTES = (Private, ); }; }; 6165 6163 CD5209E61B0BD9E10077184E /* HTMLMediaElementEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5209E51B0BD9E10077184E /* HTMLMediaElementEnums.h */; settings = {ATTRIBUTES = (Private, ); }; }; 6166 CD52481A18E200ED0008A07D /* SleepDisabler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD52481818E200ED0008A07D /* SleepDisabler.cpp */; };6167 CD52481B18E200ED0008A07D /* SleepDisabler.h in Headers */ = {isa = PBXBuildFile; fileRef = CD52481918E200ED0008A07D /* SleepDisabler.h */; settings = {ATTRIBUTES = (Private, ); }; };6168 6164 CD525BA31EE0B10700788DF5 /* FourCC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD525BA11EE0B10700788DF5 /* FourCC.cpp */; }; 6169 6165 CD525BA41EE0B10700788DF5 /* FourCC.h in Headers */ = {isa = PBXBuildFile; fileRef = CD525BA21EE0B10700788DF5 /* FourCC.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 6228 6224 CD9DE18117AAD6A400EA386D /* DOMURLMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD9DE17E17AAD64E00EA386D /* DOMURLMediaSource.cpp */; }; 6229 6225 CD9DE18217AAD6A400EA386D /* DOMURLMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9DE17F17AAD64E00EA386D /* DOMURLMediaSource.h */; }; 6230 CDA07FBD18E0A16A004699FA /* SystemSleepListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA07FBB18E0A16A004699FA /* SystemSleepListener.cpp */; };6231 CDA07FBE18E0A16A004699FA /* SystemSleepListener.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA07FBC18E0A16A004699FA /* SystemSleepListener.h */; settings = {ATTRIBUTES = (Private, ); }; };6232 CDA07FC118E0A22B004699FA /* SystemSleepListenerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA07FBF18E0A22B004699FA /* SystemSleepListenerMac.mm */; };6233 CDA07FC218E0A22B004699FA /* SystemSleepListenerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA07FC018E0A22B004699FA /* SystemSleepListenerMac.h */; };6234 6226 CDA29A091CBD99F400901CCF /* PlaybackSessionInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A081CBD99F400901CCF /* PlaybackSessionInterface.h */; settings = {ATTRIBUTES = (Private, ); }; }; 6235 6227 CDA29A0B1CBD9A7400901CCF /* PlaybackSessionModel.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A0A1CBD9A7400901CCF /* PlaybackSessionModel.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 10566 10558 5D5975B219635F1100D00878 /* SystemVersion.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SystemVersion.mm; sourceTree = "<group>"; }; 10567 10559 5D5975B61963637B00D00878 /* UserAgent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UserAgent.mm; sourceTree = "<group>"; }; 10568 5D8C4DBD1428222C0026CE72 /* SleepDisablerCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SleepDisablerCocoa.cpp; sourceTree = "<group>"; };10569 5D8C4DBE1428222C0026CE72 /* SleepDisablerCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SleepDisablerCocoa.h; sourceTree = "<group>"; };10570 10560 5D925B650F64D4DD00B847F0 /* ScrollAlignment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollAlignment.cpp; sourceTree = "<group>"; }; 10571 10561 5D925B660F64D4DD00B847F0 /* ScrollAlignment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollAlignment.h; sourceTree = "<group>"; }; … … 14730 14720 CD5209E31B0BD8380077184E /* MediaPlayerEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerEnums.h; sourceTree = "<group>"; }; 14731 14721 CD5209E51B0BD9E10077184E /* HTMLMediaElementEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLMediaElementEnums.h; sourceTree = "<group>"; }; 14732 CD52481818E200ED0008A07D /* SleepDisabler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SleepDisabler.cpp; sourceTree = "<group>"; };14733 CD52481918E200ED0008A07D /* SleepDisabler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SleepDisabler.h; sourceTree = "<group>"; };14734 14722 CD525BA11EE0B10700788DF5 /* FourCC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FourCC.cpp; sourceTree = "<group>"; }; 14735 14723 CD525BA21EE0B10700788DF5 /* FourCC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FourCC.h; sourceTree = "<group>"; }; … … 14802 14790 CD9DE17F17AAD64E00EA386D /* DOMURLMediaSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DOMURLMediaSource.h; sourceTree = "<group>"; }; 14803 14791 CD9DE18017AAD64E00EA386D /* DOMURLMediaSource.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = DOMURLMediaSource.idl; sourceTree = "<group>"; }; 14804 CDA07FBB18E0A16A004699FA /* SystemSleepListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemSleepListener.cpp; sourceTree = "<group>"; };14805 CDA07FBC18E0A16A004699FA /* SystemSleepListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemSleepListener.h; sourceTree = "<group>"; };14806 CDA07FBF18E0A22B004699FA /* SystemSleepListenerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SystemSleepListenerMac.mm; sourceTree = "<group>"; };14807 CDA07FC018E0A22B004699FA /* SystemSleepListenerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemSleepListenerMac.h; sourceTree = "<group>"; };14808 14792 CDA29A081CBD99F400901CCF /* PlaybackSessionInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaybackSessionInterface.h; sourceTree = "<group>"; }; 14809 14793 CDA29A0A1CBD9A7400901CCF /* PlaybackSessionModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaybackSessionModel.h; sourceTree = "<group>"; }; … … 19203 19187 ECA680C81E67730B00731D20 /* StringUtilities.mm */, 19204 19188 93B2D8170F9920EE006AE6B2 /* SuddenTermination.mm */, 19205 CDA07FC018E0A22B004699FA /* SystemSleepListenerMac.h */,19206 CDA07FBF18E0A22B004699FA /* SystemSleepListenerMac.mm */,19207 19189 BCE659E50EA92FB2007E4533 /* ThemeMac.h */, 19208 19190 BCE659E80EA92FFA007E4533 /* ThemeMac.mm */, … … 21302 21284 0E7058ED1BC5BC190045A507 /* SearchPopupMenuCocoa.mm */, 21303 21285 1A4A95510B4EDCFF002D8C3C /* SharedBufferCocoa.mm */, 21304 5D8C4DBD1428222C0026CE72 /* SleepDisablerCocoa.cpp */,21305 5D8C4DBE1428222C0026CE72 /* SleepDisablerCocoa.h */,21306 21286 5D5975B119635F1100D00878 /* SystemVersion.h */, 21307 21287 5D5975B219635F1100D00878 /* SystemVersion.mm */, … … 24217 24197 1A4A954C0B4EDCCB002D8C3C /* SharedBuffer.h */, 24218 24198 93309EA0099EB78C0056E581 /* SharedTimer.h */, 24219 CD52481818E200ED0008A07D /* SleepDisabler.cpp */,24220 CD52481918E200ED0008A07D /* SleepDisabler.h */,24221 24199 F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */, 24222 24200 F433E9041DBBDBC200EF0D14 /* StaticPasteboard.cpp */, … … 24224 24202 93B2D8150F9920D2006AE6B2 /* SuddenTermination.h */, 24225 24203 97627B9714FB5424002CDCA1 /* Supplementable.h */, 24226 CDA07FBB18E0A16A004699FA /* SystemSleepListener.cpp */,24227 CDA07FBC18E0A16A004699FA /* SystemSleepListener.h */,24228 24204 7CC564B618BABEA6001B9652 /* TelephoneNumberDetector.h */, 24229 24205 BCE65D310EAD1211007E4533 /* Theme.cpp */, … … 29545 29521 9444CBD41D860C8B0073A074 /* SizesCalcParser.h in Headers */, 29546 29522 49E911CD0EF86D47009D0CAF /* SkewTransformOperation.h in Headers */, 29547 CD52481B18E200ED0008A07D /* SleepDisabler.h in Headers */,29548 5D8C4DC01428222C0026CE72 /* SleepDisablerCocoa.h in Headers */,29549 29523 4150F9F112B6E0E70008C860 /* SliderThumbElement.h in Headers */, 29550 29524 9B532EA41BA928570038A827 /* SlotAssignment.h in Headers */, … … 29937 29911 26FAE4CF1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.h in Headers */, 29938 29912 0F03C0741884695E00A5F8CA /* SystemMemory.h in Headers */, 29939 CDA07FBE18E0A16A004699FA /* SystemSleepListener.h in Headers */,29940 CDA07FC218E0A22B004699FA /* SystemSleepListenerMac.h in Headers */,29941 29913 5D5975B319635F1100D00878 /* SystemVersion.h in Headers */, 29942 29914 A8CFF0510A154F09000A4234 /* TableLayout.h in Headers */, … … 33409 33381 9444CBD31D860C8B0073A074 /* SizesCalcParser.cpp in Sources */, 33410 33382 49E911CC0EF86D47009D0CAF /* SkewTransformOperation.cpp in Sources */, 33411 CD52481A18E200ED0008A07D /* SleepDisabler.cpp in Sources */,33412 5D8C4DBF1428222C0026CE72 /* SleepDisablerCocoa.cpp in Sources */,33413 33383 4150F9F212B6E0E70008C860 /* SliderThumbElement.cpp in Sources */, 33414 33384 9B532EA31BA928570038A827 /* SlotAssignment.cpp in Sources */, … … 33690 33660 26FAE4CE1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.cpp in Sources */, 33691 33661 E45390AE0EAFF4B5003695C8 /* SystemMemoryIOS.cpp in Sources */, 33692 CDA07FBD18E0A16A004699FA /* SystemSleepListener.cpp in Sources */,33693 CDA07FC118E0A22B004699FA /* SystemSleepListenerMac.mm in Sources */,33694 33662 5D5975B419635F1100D00878 /* SystemVersion.mm in Sources */, 33695 33663 463EB6221B8789E00096ED51 /* TagCollection.cpp in Sources */, -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r220723 r220759 86 86 #include "Settings.h" 87 87 #include "ShadowRoot.h" 88 #include "SleepDisabler.h"89 88 #include "TimeRanges.h" 90 89 #include "UserContentController.h" 91 90 #include "UserGestureIndicator.h" 92 91 #include <limits> 92 #include <pal/system/SleepDisabler.h> 93 93 #include <runtime/Uint8Array.h> 94 94 #include <wtf/Algorithms.h> … … 6370 6370 m_sleepDisabler = nullptr; 6371 6371 else if (shouldDisableSleep != SleepType::None) { 6372 auto type = shouldDisableSleep == SleepType::Display ? SleepDisabler::Type::Display :SleepDisabler::Type::System;6372 auto type = shouldDisableSleep == SleepType::Display ? PAL::SleepDisabler::Type::Display : PAL::SleepDisabler::Type::System; 6373 6373 if (!m_sleepDisabler || m_sleepDisabler->type() != type) 6374 m_sleepDisabler = SleepDisabler::create("com.apple.WebCore: HTMLMediaElement playback", type);6374 m_sleepDisabler = PAL::SleepDisabler::create("com.apple.WebCore: HTMLMediaElement playback", type); 6375 6375 } 6376 6376 -
trunk/Source/WebCore/html/HTMLMediaElement.h
r220621 r220759 60 60 #endif 61 61 62 namespace PAL { 63 class SleepDisabler; 64 } 65 62 66 namespace WebCore { 63 67 … … 68 72 class DOMError; 69 73 class DeferredPromise; 70 class SleepDisabler;71 74 class Event; 72 75 class HTMLSourceElement; … … 1065 1068 RefPtr<MediaController> m_mediaController; 1066 1069 1067 std::unique_ptr< SleepDisabler> m_sleepDisabler;1070 std::unique_ptr<PAL::SleepDisabler> m_sleepDisabler; 1068 1071 1069 1072 WeakPtr<const MediaResourceLoader> m_lastMediaResourceLoaderForTesting; -
trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp
r220454 r220759 59 59 60 60 PlatformMediaSessionManager::PlatformMediaSessionManager() 61 : m_systemSleepListener( SystemSleepListener::create(*this))61 : m_systemSleepListener(PAL::SystemSleepListener::create(*this)) 62 62 { 63 63 resetRestrictions(); -
trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h
r218615 r220759 30 30 #include "PlatformMediaSession.h" 31 31 #include "RemoteCommandListener.h" 32 #include "SystemSleepListener.h"33 32 #include <map> 33 #include <pal/system/SystemSleepListener.h> 34 34 #include <wtf/Vector.h> 35 35 … … 41 41 class RemoteCommandListener; 42 42 43 class PlatformMediaSessionManager : private RemoteCommandListenerClient, private SystemSleepListener::Client, private AudioHardwareListener::Client {43 class PlatformMediaSessionManager : private RemoteCommandListenerClient, private PAL::SystemSleepListener::Client, private AudioHardwareListener::Client { 44 44 WTF_MAKE_FAST_ALLOCATED; 45 45 public: … … 136 136 void audioOutputDeviceChanged() override; 137 137 138 // SystemSleepListener138 // PAL::SystemSleepListener 139 139 void systemWillSleep() override; 140 140 void systemDidWake() override; … … 143 143 mutable Vector<PlatformMediaSession*> m_sessions; 144 144 std::unique_ptr<RemoteCommandListener> m_remoteCommandListener; 145 std::unique_ptr< SystemSleepListener> m_systemSleepListener;145 std::unique_ptr<PAL::SystemSleepListener> m_systemSleepListener; 146 146 RefPtr<AudioHardwareListener> m_audioHardwareListener; 147 147 -
trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.h
r217371 r220759 32 32 #import <wtf/RefPtr.h> 33 33 34 namespace PAL { 35 class SleepDisabler; 36 } 37 34 38 namespace WebCore { 35 class SleepDisabler;36 39 class HTMLVideoElement; 37 40 } … … 55 58 BOOL _forceDisableAnimation; 56 59 57 std::unique_ptr< WebCore::SleepDisabler> _displaySleepDisabler;60 std::unique_ptr<PAL::SleepDisabler> _displaySleepDisabler; 58 61 } 59 62 -
trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm
r220248 r220759 35 35 #import <Carbon/Carbon.h> 36 36 #import <WebCore/HTMLVideoElement.h> 37 #import <WebCore/SleepDisabler.h>38 37 #import <objc/runtime.h> 38 #import <pal/system/SleepDisabler.h> 39 39 #import <wtf/RetainPtr.h> 40 40 #import <wtf/SoftLinking.h> … … 367 367 if (rate && !_isEndingFullscreen) { 368 368 if (!_displaySleepDisabler) 369 _displaySleepDisabler = SleepDisabler::create("com.apple.WebCore - Fullscreen video",SleepDisabler::Type::Display);369 _displaySleepDisabler = PAL::SleepDisabler::create("com.apple.WebCore - Fullscreen video", PAL::SleepDisabler::Type::Display); 370 370 } else 371 371 #endif -
trunk/Source/WebKit/ChangeLog
r220758 r220759 1 2017-08-15 Don Olmstead <don.olmstead@sony.com> 2 3 [PAL] Move Sleep classes into PAL 4 https://bugs.webkit.org/show_bug.cgi?id=175456 5 6 Reviewed by Ryosuke Niwa. 7 8 * UIProcess/mac/WKFullScreenWindowController.h: 9 * UIProcess/mac/WKFullScreenWindowController.mm: 10 1 11 2017-08-15 Youenn Fablet <youenn@apple.com> 2 12 -
trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.h
r217371 r220759 35 35 36 36 namespace WebCore { 37 class SleepDisabler;38 37 class IntRect; 39 38 } -
trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm
r218813 r220759 41 41 #import <WebCore/IntRect.h> 42 42 #import <WebCore/LocalizedStrings.h> 43 #import <WebCore/SleepDisabler.h>44 43 #import <WebCore/WebCoreFullScreenPlaceholderView.h> 45 44 #import <WebCore/WebCoreFullScreenWindow.h> 45 #import <pal/system/SleepDisabler.h> 46 46 #import <wtf/BlockObjCExceptions.h> 47 47 -
trunk/Source/WebKitLegacy/mac/ChangeLog
r220758 r220759 1 2017-08-15 Don Olmstead <don.olmstead@sony.com> 2 3 [PAL] Move Sleep classes into PAL 4 https://bugs.webkit.org/show_bug.cgi?id=175456 5 6 Reviewed by Ryosuke Niwa. 7 8 * WebView/WebFullScreenController.h: 9 1 10 2017-08-15 Youenn Fablet <youenn@apple.com> 2 11 -
trunk/Source/WebKitLegacy/mac/WebView/WebFullScreenController.h
r217371 r220759 34 34 @class WebView; 35 35 namespace WebCore { 36 class SleepDisabler;37 36 class Element; 38 37 class RenderBox;
Note: See TracChangeset
for help on using the changeset viewer.