Title: [135945] trunk/Source/WebCore
- Revision
- 135945
- Author
- d...@apple.com
- Date
- 2012-11-27 16:42:25 -0800 (Tue, 27 Nov 2012)
Log Message
Attempted build fix for my last commit. The private member variable
is only used on MAC (at the moment) so guard it with #if PLATFORM.
I did this rather than having another constructor, because I expect
other platforms will follow the MAC code soon.
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement):
* html/shadow/MediaControlElements.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135944 => 135945)
--- trunk/Source/WebCore/ChangeLog 2012-11-28 00:40:26 UTC (rev 135944)
+++ trunk/Source/WebCore/ChangeLog 2012-11-28 00:42:25 UTC (rev 135945)
@@ -1,3 +1,14 @@
+2012-11-27 Dean Jackson <d...@apple.com>
+
+ Attempted build fix for my last commit. The private member variable
+ is only used on MAC (at the moment) so guard it with #if PLATFORM.
+ I did this rather than having another constructor, because I expect
+ other platforms will follow the MAC code soon.
+
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement):
+ * html/shadow/MediaControlElements.h:
+
2012-11-14 Jer Noble <jer.no...@apple.com>
Add a new shared class WebCoreFullScreenPlaceholderView, for use in WebKit and WebKit2.
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (135944 => 135945)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2012-11-28 00:40:26 UTC (rev 135944)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2012-11-28 00:42:25 UTC (rev 135945)
@@ -911,8 +911,13 @@
inline MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement(Document* document, MediaControls* controls)
: MediaControlInputElement(document, MediaShowClosedCaptionsButton)
+#if PLATFORM(MAC)
, m_controls(controls)
+#endif
{
+#if !PLATFORM(MAC)
+ UNUSED_PARAM(controls);
+#endif
}
PassRefPtr<MediaControlToggleClosedCaptionsButtonElement> MediaControlToggleClosedCaptionsButtonElement::create(Document* document, MediaControls* controls)
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.h (135944 => 135945)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.h 2012-11-28 00:40:26 UTC (rev 135944)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.h 2012-11-28 00:42:25 UTC (rev 135945)
@@ -393,7 +393,9 @@
MediaControlToggleClosedCaptionsButtonElement(Document*, MediaControls*);
virtual const AtomicString& shadowPseudoId() const;
+#if PLATFORM(MAC)
MediaControls* m_controls;
+#endif
};
// ----------------------------
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
