3 files changed, 12 insertions, 15 deletions
diff --git a/webkit/port/page/AccessibilityObjectWrapperWin.h b/webkit/port/page/chromium/AccessibilityObjectWrapper.h
index c6612795..12cd146 100644
--- a/webkit/port/page/AccessibilityObjectWrapperWin.h
+++ b/webkit/port/page/chromium/AccessibilityObjectWrapper.h
@@ -23,9 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-
-#ifndef AccessibilityObjectWrapperWin_h
-#define AccessibilityObjectWrapperWin_h
+#ifndef AccessibilityObjectWrapper_h
+#define AccessibilityObjectWrapper_h
 
 #include <oleacc.h>
 
@@ -33,19 +32,16 @@ namespace WebCore {
 
     class AccessibilityObject;
  
-    class AccessibilityObjectWrapper : public IUnknown {
+    class AccessibilityObjectWrapper : public RefCounted<AccessibilityObjectWrapper> {
     public:
-        // IUnknown
-        virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) = 0;        
-        virtual ULONG STDMETHODCALLTYPE AddRef(void) = 0;
-        virtual ULONG STDMETHODCALLTYPE Release(void) = 0;
-
+        virtual ~AccessibilityObjectWrapper() {}
         virtual void detach() = 0;
         bool attached() const { return m_object; }
         AccessibilityObject* accessibilityObject() const { return m_object; }
 
     protected:
-        AccessibilityObjectWrapper(AccessibilityObject* obj) : m_object(obj) { }
+        AccessibilityObjectWrapper(AccessibilityObject* obj)
+            : RefCounted<AccessibilityObjectWrapper>(0), m_object(obj) { }
         AccessibilityObjectWrapper() : m_object(0) { }
 
         AccessibilityObject* m_object;
@@ -53,4 +49,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // AccessibilityObjectWrapperWin_h
+#endif // AccessibilityObjectWrapper_h
diff --git a/webkit/port/page/chromium/DragControllerChromium.cpp b/webkit/port/page/chromium/DragControllerChromium.cpp
index ac73890..23ad070 100644
--- a/webkit/port/page/chromium/DragControllerChromium.cpp
+++ b/webkit/port/page/chromium/DragControllerChromium.cpp
@@ -30,7 +30,7 @@
 #include "SelectionController.h"
 #include <wtf/RefPtr.h>
 
-#if PLATFORM(WIN)
+#if PLATFORM(WIN_OS)
 #include <windows.h>
 #endif
 
@@ -56,7 +56,7 @@ DragOperation DragController::dragOperation(DragData* dragData)
 bool DragController::isCopyKeyDown() {
     // TODO(darin): This should not be OS specific.  Delegate to the embedder
     // instead.
-#if PLATFORM(WIN)
+#if PLATFORM(WIN_OS)
     return ::GetAsyncKeyState(VK_CONTROL);
 #else
     return false;
diff --git a/webkit/port/page/chromium/EventHandlerChromium.cpp b/webkit/port/page/chromium/EventHandlerChromium.cpp
index fe95bad..ef4d732 100644
--- a/webkit/port/page/chromium/EventHandlerChromium.cpp
+++ b/webkit/port/page/chromium/EventHandlerChromium.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "EventHandler.h"
 
+#include "Clipboard.h"
 #include "Cursor.h"
 #include "FloatPoint.h"
 #include "FocusController.h"
@@ -42,7 +43,7 @@
 #include "SelectionController.h"
 #include "NotImplemented.h"
 
-#if PLATFORM(WIN)
+#if PLATFORM(WIN_OS)
 #include "ClipboardWin.h"
 #include "WCDataObject.h"
 #endif
@@ -139,7 +140,7 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const
 
 PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
 {
-#if PLATFORM(WIN)
+#if PLATFORM(WIN_OS)
     COMPtr<WCDataObject> dataObject;
     WCDataObject::createInstance(&dataObject);
     return ClipboardWin::create(true, dataObject.get(), ClipboardWritable);