Bug 68421 – Stop calling UpdateSystemActivity in places where we hold power assertions that achieve the same effect

• Component: Media
• Status: RESOLVED FIXED

[Mark Rowe (bdash)]

In a couple of locations related to fullscreen media playback we periodically call UpdateSystemActivity.  There’s no need to do this on SnowLeopard and newer as the power assertion that we hold to prevent display sleep also prevents the screensaver kicking in.  It doesn’t prevent the screensaver on Leopard though, so we’ll still need to call UpdateSystemActivity in that case.

[Mark Rowe (bdash)]

Created attachment 107961 [details]
Patch v1

[WebKit Review Bot]

Attachment 107961 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1

Source/WebCore/platform/mac/WebVideoFullscreenController.h:34:  Code inside a namespace should not be indented.  [whitespace/indent] [4]
Source/WebCore/platform/mac/DisplaySleepDisabler.cpp:27:  You should add a blank line after implementation file's own header.  [build/include_order] [4]
Source/WebKit/mac/WebView/WebFullScreenController.h:34:  Code inside a namespace should not be indented.  [whitespace/indent] [4]
Total errors found: 3 in 13 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Mark Rowe (bdash)]

Comment on attachment 107961 [details]
Patch v1

View in context: https://bugs.webkit.org/attachment.cgi?id=107961&action=review

> Source/WebCore/platform/mac/DisplaySleepDisabler.cpp:56
> +void DisplaySleepDisabler::systemActivityTimerFired(Timer<DisplaySleepDisabler>* timer)

I nuked the unused variable name from here.

Comment on attachment 107961 [details]
Patch v1

View in context: https://bugs.webkit.org/attachment.cgi?id=107961&action=review

> Source/WebCore/ChangeLog:27
> +        (-[WebVideoFullscreenController setupVideoOverlay:]): Remove the now-unnecessary explicit use of the WebCore namespace..

..

> Source/WebCore/platform/mac/DisplaySleepDisabler.cpp:27
> +#include "DisplaySleepDisabler.h"

Missing blank line after this.

> Source/WebCore/platform/mac/DisplaySleepDisabler.cpp:42
> +    RetainPtr<CFStringRef> reasonCF(AdoptCF, CFStringCreateWithCString(0, reason, kCFStringEncodingUTF8));

I prefer kCFAllocatorDefault

> Source/WebCore/platform/mac/DisplaySleepDisabler.cpp:44
> +#else

Does this branch need an UNUSED_PARAM(reason)?

> Source/WebCore/platform/mac/DisplaySleepDisabler.cpp:56
> +void DisplaySleepDisabler::systemActivityTimerFired(Timer<DisplaySleepDisabler>* timer)

No need to name the unused parameter here.

[Mark Rowe (bdash)]

Landed in r95513.