Bug 140611 – REGRESSION(r178486): It broke the !ENABLE(VIDEO) build

• Component: New Bugs
• Status: RESOLVED FIXED

[Csaba Osztrogonác]

build log:

../../Source/WebCore/testing/Internals.cpp: In member function 'bool WebCore::Internals::elementIsBlockingDisplaySleep(WebCore::Element*) const':
../../Source/WebCore/testing/Internals.cpp:2441:39: error: invalid use of incomplete type 'class WebCore::HTMLMediaElement'
In file included from ../../Source/WebCore/dom/Element.h:29:0,
                 from ../../Source/WebCore/loader/cache/CachedResourceRequest.h:29,
                 from ../../Source/WebCore/loader/cache/CachedResourceLoader.h:32,
                 from ../../Source/WebCore/testing/Internals.cpp:35:
../../Source/WebCore/dom/Document.h:112:7: error: forward declaration of 'class WebCore::HTMLMediaElement'
In file included from ../../Source/WebCore/dom/Node.h:39:0,
                 from ../../Source/WebCore/dom/ContainerNode.h:28,
                 from ../../Source/WebCore/dom/Position.h:29,
                 from ../../Source/WebCore/editing/VisiblePosition.h:30,
                 from ../../Source/WebCore/accessibility/AccessibilityObject.h:37,
                 from ../../Source/WebCore/accessibility/AXObjectCache.h:29,
                 from ../../Source/WebCore/testing/Internals.cpp:30:
../../Source/WTF/wtf/TypeCasts.h: In instantiation of 'typename std::conditional<std::is_const<Source>::value, const Target*, Target*>::type WTF::downcast(Source*) [with Target = WebCore::HTMLMediaElement; Source = WebCore::Element; typename std::conditional<std::is_const<Source>::value, const Target*, Target*>::type = WebCore::HTMLMediaElement*]':
../../Source/WebCore/testing/Internals.cpp:2440:72:   required from here
../../Source/WTF/wtf/TypeCasts.h:81:117: error: invalid static_cast from type 'WebCore::Element*' to type 'std::conditional<false, const WebCore::HTMLMediaElement*, WebCore::HTMLMediaElement*>::type {aka WebCore::HTMLMediaElement*}'
../../Source/WebCore/testing/Internals.cpp:2442:1: error: control reaches end of non-void function [-Werror=return-type]
In file included from ../../Source/WebCore/dom/Node.h:39:0,
                 from ../../Source/WebCore/dom/ContainerNode.h:28,
                 from ../../Source/WebCore/dom/Position.h:29,
                 from ../../Source/WebCore/editing/VisiblePosition.h:30,
                 from ../../Source/WebCore/accessibility/AccessibilityObject.h:37,
                 from ../../Source/WebCore/accessibility/AXObjectCache.h:29,
                 from ../../Source/WebCore/testing/Internals.cpp:30:
../../Source/WTF/wtf/TypeCasts.h: In function 'typename std::conditional<std::is_const<Source>::value, const Target*, Target*>::type WTF::downcast(Source*) [with Target = WebCore::HTMLMediaElement; Source = WebCore::Element; typename std::conditional<std::is_const<Source>::value, const Target*, Target*>::type = WebCore::HTMLMediaElement*]':
../../Source/WTF/wtf/TypeCasts.h:82:1: error: control reaches end of non-void function [-Werror=return-type]
cc1plus: all warnings being treated as errors

[Csaba Osztrogonác]

elementIsBlockingDisplaySleep is guarded in Source/WebCore/testing/Internals.idl:
[Conditional=VIDEO] boolean elementIsBlockingDisplaySleep(Element element);

We should guard its implementation too.

[Csaba Osztrogonác]

Created attachment 244884 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 244884 [details]
Patch

Clearing flags on attachment: 244884

Committed r178646: <http://trac.webkit.org/changeset/178646>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.