Title: [178646] trunk/Source/WebCore
- Revision
- 178646
- Author
- o...@webkit.org
- Date
- 2015-01-19 07:27:57 -0800 (Mon, 19 Jan 2015)
Log Message
REGRESSION(r178486): It broke the !ENABLE(VIDEO) build
https://bugs.webkit.org/show_bug.cgi?id=140611
Reviewed by Eric Carlson.
* testing/Internals.cpp:
(WebCore::Internals::elementIsBlockingDisplaySleep):
* testing/Internals.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (178645 => 178646)
--- trunk/Source/WebCore/ChangeLog 2015-01-19 14:23:43 UTC (rev 178645)
+++ trunk/Source/WebCore/ChangeLog 2015-01-19 15:27:57 UTC (rev 178646)
@@ -1,3 +1,14 @@
+2015-01-19 Csaba Osztrogonác <o...@webkit.org>
+
+ REGRESSION(r178486): It broke the !ENABLE(VIDEO) build
+ https://bugs.webkit.org/show_bug.cgi?id=140611
+
+ Reviewed by Eric Carlson.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::elementIsBlockingDisplaySleep):
+ * testing/Internals.h:
+
2015-01-19 Sergio Villar Senin <svil...@igalia.com>
[CSS Grid Layout] Tracks shrink sometimes with indefinite remaining space
Modified: trunk/Source/WebCore/testing/Internals.cpp (178645 => 178646)
--- trunk/Source/WebCore/testing/Internals.cpp 2015-01-19 14:23:43 UTC (rev 178645)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-01-19 15:27:57 UTC (rev 178646)
@@ -2419,6 +2419,13 @@
MediaSessionManager::sharedManager().didReceiveRemoteControlCommand(command);
}
+
+bool Internals::elementIsBlockingDisplaySleep(Element* element) const
+{
+ HTMLMediaElement* mediaElement = downcast<HTMLMediaElement>(element);
+ return mediaElement ? mediaElement->isDisablingSleep() : false;
+}
+
#endif // ENABLE(VIDEO)
void Internals::simulateSystemSleep() const
@@ -2435,11 +2442,6 @@
#endif
}
-bool Internals::elementIsBlockingDisplaySleep(Element* element) const
-{
- HTMLMediaElement* mediaElement = downcast<HTMLMediaElement>(element);
- return mediaElement ? mediaElement->isDisablingSleep() : false;
-}
void Internals::installMockPageOverlay(const String& overlayType, ExceptionCode& ec)
{
Modified: trunk/Source/WebCore/testing/Internals.h (178645 => 178646)
--- trunk/Source/WebCore/testing/Internals.h 2015-01-19 14:23:43 UTC (rev 178645)
+++ trunk/Source/WebCore/testing/Internals.h 2015-01-19 15:27:57 UTC (rev 178646)
@@ -347,11 +347,11 @@
void applicationWillEnterBackground() const;
void setMediaSessionRestrictions(const String& mediaType, const String& restrictions, ExceptionCode&);
void postRemoteControlCommand(const String&, ExceptionCode&);
+ bool elementIsBlockingDisplaySleep(Element*) const;
#endif
void simulateSystemSleep() const;
void simulateSystemWake() const;
- bool elementIsBlockingDisplaySleep(Element*) const;
void installMockPageOverlay(const String& overlayType, ExceptionCode&);
String pageOverlayLayerTreeAsText(ExceptionCode&) const;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
