2008-10-22 Darin Fisher <darin@chromium.org>

        Reviewed by Eric Seidel.

        A little more PLATFORM(CHROMIUM) in WebCore
        https://bugs.webkit.org/show_bug.cgi?id=21758

        * page/AccessibilityObject.h:
        * platform/graphics/Icon.h:

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 74b39e6b6963683cc804b7739f017c00283f901c..ca942ba46c48d92c60be14bd9dd94d5811ea09c5 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2008-10-22  Darin Fisher  <darin@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        A little more PLATFORM(CHROMIUM) in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=21758
+
+        * page/AccessibilityObject.h:
+        * platform/graphics/Icon.h:
+
 2008-10-21  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Darin Adler.

diff --git a/WebCore/page/AccessibilityObject.h b/WebCore/page/AccessibilityObject.h
index a2ddf37501087e6102fcee481c8e3e84aee7eb11..947757ab1c7b01dd711df2aa0ecc58454d065c3d 100644 (file)
--- a/WebCore/page/AccessibilityObject.h
+++ b/WebCore/page/AccessibilityObject.h
@@ -40,6 +40,8 @@
 #elif PLATFORM(WIN)
 #include "AccessibilityObjectWrapperWin.h"
 #include "COMPtr.h"
+#elif PLATFORM(CHROMIUM)
+#include "AccessibilityObjectWrapper.h"
 #endif
 
 typedef struct _NSRange NSRange;
@@ -407,6 +409,8 @@ protected:
     COMPtr<AccessibilityObjectWrapper> m_wrapper;
 #elif PLATFORM(GTK)
     AtkObject* m_wrapper;
+#elif PLATFORM(CHROMIUM)
+    RefPtr<AccessibilityObjectWrapper> m_wrapper;
 #endif
 };
 

diff --git a/WebCore/platform/graphics/Icon.h b/WebCore/platform/graphics/Icon.h
index 2f98b21316467f043d5564be5af9f1b650de1395..f70b5b0be013e2d8e21e5ee5e0efa88b6379f18c 100644 (file)
--- a/WebCore/platform/graphics/Icon.h
+++ b/WebCore/platform/graphics/Icon.h
@@ -38,6 +38,8 @@ typedef struct HICON__* HICON;
 #include <QIcon>
 #elif PLATFORM(GTK)
 typedef struct _GdkPixbuf GdkPixbuf;
+#elif PLATFORM(CHROMIUM)
+#include "PlatformIcon.h"
 #endif
 
 namespace WebCore {
@@ -70,6 +72,9 @@ private:
 #elif PLATFORM(GTK)
     Icon();
     GdkPixbuf* m_icon;
+#elif PLATFORM(CHROMIUM)
+    Icon(const PlatformIcon&);
+    PlatformIcon m_icon;
 #endif
 };