Changeset 135945 in webkit

Timestamp:

Nov 27, 2012, 4:42:25 PM (12 years ago)

Author:

dino@apple.com

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/shadow/MediaControlElements.cpp (modified) (1 diff)
• html/shadow/MediaControlElements.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-27  Dean Jackson  <dino@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.noble@apple.com>
 

trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

@@ -912 +912 @@
 inline MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement(Document* document, MediaControls* controls)
     : MediaControlInputElement(document, MediaShowClosedCaptionsButton)
+#if PLATFORM(MAC)
     , m_controls(controls)
-{
+#endif
+{
+#if !PLATFORM(MAC)
+    UNUSED_PARAM(controls);
+#endif
 }
 

trunk/Source/WebCore/html/shadow/MediaControlElements.h

@@ -394 +394 @@
     virtual const AtomicString& shadowPseudoId() const;
 
+#if PLATFORM(MAC)
     MediaControls* m_controls;
+#endif
 };