2009-08-14 Maxime Simon <simon.maxime@gmail.com>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Aug 2009 20:52:09 +0000 (20:52 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Aug 2009 20:52:09 +0000 (20:52 +0000)
        Reviewed by Oliver Hunt.

        [Haiku] Fix RenderThemeHaiku build.
        https://bugs.webkit.org/show_bug.cgi?id=28307

        * platform/haiku/RenderThemeHaiku.cpp: Included RenderThemeHaiku.h
        instead of RenderTheme.h.
        (WebCore::RenderThemeHaiku::paintCheckbox): Removed the wrong 'virtual'
        before the function.
        (WebCore::RenderThemeHaiku::paintRadio): Removed the wrong 'virtual'
        before the function.
        * platform/haiku/RenderThemeHaiku.h: Corrected wrong function definitions.

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

WebCore/ChangeLog
WebCore/platform/haiku/RenderThemeHaiku.cpp
WebCore/platform/haiku/RenderThemeHaiku.h

index 5be26f7..c465292 100644 (file)
@@ -2,6 +2,21 @@
 
         Reviewed by Oliver Hunt.
 
+        [Haiku] Fix RenderThemeHaiku build.
+        https://bugs.webkit.org/show_bug.cgi?id=28307
+
+        * platform/haiku/RenderThemeHaiku.cpp: Included RenderThemeHaiku.h
+        instead of RenderTheme.h.
+        (WebCore::RenderThemeHaiku::paintCheckbox): Removed the wrong 'virtual'
+        before the function.
+        (WebCore::RenderThemeHaiku::paintRadio): Removed the wrong 'virtual'
+        before the function.
+        * platform/haiku/RenderThemeHaiku.h: Corrected wrong function definitions.
+
+2009-08-14  Maxime Simon  <simon.maxime@gmail.com>
+
+        Reviewed by Oliver Hunt.
+
         [Haiku] Adding SharedBufferHaiku to WebCore.
         https://bugs.webkit.org/show_bug.cgi?id=28309
 
index ea9679e..4327795 100644 (file)
@@ -26,7 +26,7 @@
  */
 
 #include "config.h"
-#include "RenderTheme.h"
+#include "RenderThemeHaiku.h"
 
 #include "GraphicsContext.h"
 #include "NotImplemented.h"
@@ -107,7 +107,7 @@ void RenderThemeHaiku::systemFont(int propId, FontDescription&) const
     notImplemented();
 }
 
-virtual bool RenderThemeHaiku::paintCheckbox(RenderObject*, const RenderObject::PaintInfo& info, const IntRect& intRect)
+bool RenderThemeHaiku::paintCheckbox(RenderObject*, const RenderObject::PaintInfo& info, const IntRect& intRect)
 {
     if (info.context->paintingDisabled())
         return false;
@@ -139,7 +139,7 @@ void RenderThemeHaiku::setCheckboxSize(RenderStyle* style) const
         style->setHeight(Length(size, Fixed));
 }
 
-virtual bool RenderThemeHaiku::paintRadio(RenderObject*, const RenderObject::PaintInfo& info, const IntRect& intRect)
+bool RenderThemeHaiku::paintRadio(RenderObject*, const RenderObject::PaintInfo& info, const IntRect& intRect)
 {
     if (info.context->paintingDisabled())
         return false;
index aa0423a..7daebc4 100644 (file)
@@ -32,7 +32,7 @@ namespace WebCore {
     class RenderThemeHaiku : public RenderTheme {
     private:
         RenderThemeHaiku();
-        ~RenderThemeHaiku();
+        virtual ~RenderThemeHaiku();
 
     public:
         static PassRefPtr<RenderTheme> create();
@@ -55,14 +55,14 @@ namespace WebCore {
         virtual void systemFont(int propId, FontDescription&) const;
 
     protected:
-        virtual paintCheckbox(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
+        virtual bool paintCheckbox(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
         virtual void setCheckboxSize(RenderStyle*) const;
 
         virtual bool paintRadio(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
         virtual void setRadioSize(RenderStyle*) const;
 
         virtual void adjustMenuListStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
-        virtual bool RenderThemeHaiku::paintMenuList(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
+        virtual bool paintMenuList(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
     };
 
 } // namespace WebCore