2011-06-16 Dimitri Glazkov <dglazkov@chromium.org>
authordglazkov@chromium.org <dglazkov@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Jun 2011 17:40:55 +0000 (17:40 +0000)
committerdglazkov@chromium.org <dglazkov@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Jun 2011 17:40:55 +0000 (17:40 +0000)
        [Qt] Build fix after r89039.

        * platform/qt/RenderThemeQt.h: Move decl out of ENABLE(VIDEO) ifdef.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@89040 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/qt/RenderThemeQt.h

index a377ec0..1f5f3ed 100644 (file)
@@ -1,3 +1,9 @@
+2011-06-16  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        [Qt] Build fix after r89039.
+
+        * platform/qt/RenderThemeQt.h: Move decl out of ENABLE(VIDEO) ifdef.
+
 2011-06-15  Dimitri Glazkov  <dglazkov@chromium.org>
 
         Reviewed by Kent Tamura.
 2011-06-15  Dimitri Glazkov  <dglazkov@chromium.org>
 
         Reviewed by Kent Tamura.
index 6d104e6..520a44e 100644 (file)
@@ -160,7 +160,6 @@ protected:
     virtual String formatMediaControlsRemainingTime(float currentTime, float duration) const;
     virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const { return true; }
 private:
     virtual String formatMediaControlsRemainingTime(float currentTime, float duration) const;
     virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const { return true; }
 private:
-    virtual String fileListNameForWidth(const Vector<String>& filenames, const Font&, int width);
 
     void paintMediaBackground(QPainter* painter, const IntRect& r) const;
     double mediaControlsBaselineOpacity() const;
 
     void paintMediaBackground(QPainter* painter, const IntRect& r) const;
     double mediaControlsBaselineOpacity() const;
@@ -169,6 +168,8 @@ private:
     void computeSizeBasedOnStyle(RenderStyle* renderStyle) const;
 
 private:
     void computeSizeBasedOnStyle(RenderStyle* renderStyle) const;
 
 private:
+    virtual String fileListNameForWidth(const Vector<String>& filenames, const Font&, int width);
+
     bool supportsFocus(ControlPart) const;
 
     ControlPart initializeCommonQStyleOptions(QStyleOption&, RenderObject*) const;
     bool supportsFocus(ControlPart) const;
 
     ControlPart initializeCommonQStyleOptions(QStyleOption&, RenderObject*) const;