Merge 100408

Source/WebCore/html/shadow/MediaControlElements.h

 /*
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 55 matching lines @@
     MediaControlsPanel,
     MediaVolumeSliderContainer,
     MediaVolumeSlider,
     MediaVolumeSliderThumb,
     MediaVolumeSliderMuteButton,
 };
 
 HTMLMediaElement* toParentMediaElement(Node*);
 inline HTMLMediaElement* toParentMediaElement(RenderObject* renderer) { return toParentMediaElement(renderer->node()); }
 
+MediaControlElementType mediaControlElementType(Node*);
+
 // ----------------------------
 
 class MediaControlElement : public HTMLDivElement {
 public:
     void hide();
     void show();
 
     virtual MediaControlElementType displayType() const = 0;
 
     HTMLMediaElement* mediaElement() const { return m_mediaElement; }
@@ skipping 391 matching lines @@
     virtual const AtomicString& shadowPseudoId() const;
 };
  
 // ----------------------------
 
 } // namespace WebCore
 
 #endif // ENABLE(VIDEO)
 
 #endif // MediaControlElements_h