Disable PLATFORM(WIN) !!

port/platform/chromium/PlatformKeyboardEventChromium.cpp
 - this is KeyEventWin.cpp renamed and mostly deleted.  we just needed to define two static methods.
 - the big switch case goes to event_conversion.cc.

port/platform/chromium/DragDataChromium.cpp
 - yay, no more dropData wrapper!

port/platform/chromium/TemporaryLinkStubs.cpp
 - just stubbing scheduleDispatchFunctionsOnMainThread() for now since i think we should really use an implementation based on MessageLoop, and we don't use background threads in webkit yet.

port/platform/chromium/DragImageChromium.cpp
 - PLATFORM(WIN) to PLATFORM(WIN_OS)

port/platform/chromium/PopupMenuChromium.cpp
 - lots of nice cleanup.  no more dummy HWNDs!

port/platform/chromium/PlatformScrollBarChromium.cpp
port/platform/chromium/ScrollViewChromium.cpp
 - GraphicsContext::getWindowsContext is gone.  just use the skia canvas directly.

port/platform/network/chromium/NetworkStateNotifierChromium.cpp
 - delete the PLATFORM(WIN) stubs

port/platform/win/KeyEventWin.cpp
port/platform/win/PlatformMouseEventWin.cpp
port/platform/graphics/IntPointWin.cpp
port/platform/graphics/IntSizeWin.cpp
port/platform/graphics/IntRectWin.cpp
 - deleted :)

port/platform/win/ScreenWin.cpp
 - compensate for no longer having implicit conversion between RECT and IntRect

port/platform/UniscribeStateTextRun.cpp
 - scriptCache and scriptFontProperties now live on FontPlatformData as discussed with brett and hyatt.

port/platform/graphics/FontCacheWin.cpp
 - getFontLinkInterface() function doesn't exist outside of PLATFORM(WIN)

port/platform/graphics/FontPlatformData.h
port/platform/graphics/FontPlatformDataWin.cpp
 - support storing script{Cache,FontProperties} on FontPlatformData.  need to implement assignment operator and copy constructor.  the script{Cache,FontProperties} objects are not copied per discussion with hyatt.
 - i moved m_isMLangFont into RefCountedHFONT so that we would know how to "destroy" the HFONT.

port/platform/graphics/SimpleFontDataWin.cpp
port/platform/graphics/GlyphPageTreeNodeWin.cpp
 - modified to support changes to FontPlatformData

port/platform/graphics/ImageSkia.cpp
 - getHBITMAP, etc. were never used and are not needed

port/platform/graphics/IconWin.cpp
 - modifications corresponding to my changes to Icon.h.  m_icon is of type PlatformIcon.

port/platform/graphics/GraphicsContextSkia.cpp
 - {get,release}WindowsContext are no longer defined

port/platform/Cursor.h
pending/NetworkStateNotifier.h
pending/PlatformKeyboardEvent.h
 - we no longer need to fork these files.

port/page/chromium/EventHandlerChromium.cpp
 - add #include "Clipboard.h" to support non-WIN_OS

port/page/chromium/AccessibilityObjectWrapper.h
 - changed to no longer be a COM interface

port/page/AccessibilityObjectWrapperWin.h
 - moved to port/page/chromium/AccessibilityObjectWrapper.h

pending/AccessibleBase.cpp
pending/AccessibleBase.h
 - modified to support changes to a11y wrapper class
 - by the way, these files should not be in pending!  will fix that later.

glue/glue_util.cc
glue/glue_util.h
 - add conversion functions for rect structures.

glue/webframe_impl.cc
glue/webplugin_impl.cc
 - use new webkit_glue rect conversion functions.

glue/glue_accessibility.cc
 - add header that is needed to build this file on windows

glue/webview_impl.cc
 - no longer supports auto-conversion between IntPoint and POINT

glue/event_conversion.cc
 - initialize by modifying member variables of the base class directly.
 - moved a static function from KeyEventWin.cpp

R=tony,brettw
BUG=3488
Review URL: http://codereview.chromium.org/7495

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3587 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 9 insertions, 276 deletions

diff --git a/webkit/pending/AccessibleBase.cpp b/webkit/pending/AccessibleBase.cpp
index 73ca027..9f4c320 100644
--- a/webkit/pending/AccessibleBase.cpp
+++ b/webkit/pending/AccessibleBase.cpp
@@ -47,7 +47,6 @@ using namespace WebCore;
 
 AccessibleBase::AccessibleBase(AccessibilityObject* obj)
     : AccessibilityObjectWrapper(obj)
-    , m_refCount(0)
 {
     ASSERT_ARG(obj, obj);
     m_object->setWrapper(this);
@@ -81,12 +80,15 @@ HRESULT STDMETHODCALLTYPE AccessibleBase::QueryInterface(REFIID riid, void** ppv
     return S_OK;
 }
 
+ULONG STDMETHODCALLTYPE AccessibleBase::AddRef(void)
+{
+    ref();
+    return 0;
+}
+
 ULONG STDMETHODCALLTYPE AccessibleBase::Release(void)
 {
-    ASSERT(m_refCount > 0);
-    if (--m_refCount)
-        return m_refCount;
-    delete this;
+    deref();
     return 0;
 }
 
diff --git a/webkit/pending/AccessibleBase.h b/webkit/pending/AccessibleBase.h
index 908ed63..57f867b 100644
--- a/webkit/pending/AccessibleBase.h
+++ b/webkit/pending/AccessibleBase.h
@@ -27,7 +27,7 @@
 #define AccessibleBase_h
 
 #include "AccessibilityObject.h"
-#include "AccessibilityObjectWrapperWin.h"
+#include "AccessibilityObjectWrapper.h"
 
 class AccessibleBase : public IAccessible, public WebCore::AccessibilityObjectWrapper {
 public:
@@ -35,7 +35,7 @@ public:
 
     // IUnknown
     virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
-    virtual ULONG STDMETHODCALLTYPE AddRef(void) { return ++m_refCount; }
+    virtual ULONG STDMETHODCALLTYPE AddRef(void);
     virtual ULONG STDMETHODCALLTYPE Release(void);
 
     // IAccessible
@@ -101,8 +101,6 @@ protected:
 
     static AccessibleBase* wrapper(WebCore::AccessibilityObject*);
 
-    int m_refCount;
-
 private:
     AccessibleBase() { }
 };
diff --git a/webkit/pending/NetworkStateNotifier.h b/webkit/pending/NetworkStateNotifier.h
deleted file mode 100644
index 2c6d456..0000000
--- a/webkit/pending/NetworkStateNotifier.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2008 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
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef NetworkStateNotifier_h
-#define NetworkStateNotifier_h
-
-#if PLATFORM(MAC)
-#include <wtf/RetainPtr.h>
-#include "Timer.h"
-
-typedef const struct __CFArray * CFArrayRef;
-typedef const struct __SCDynamicStore * SCDynamicStoreRef;
-#endif
-
-#if PLATFORM(WIN)
-#include <windows.h>
-#endif
-
-namespace WebCore {
-
-class NetworkStateNotifier {
-public:
-    NetworkStateNotifier();
-    void setNetworkStateChangedFunction(void (*)());
-    
-    bool onLine() const { return m_isOnLine; }
-    
-private:    
-    bool m_isOnLine;
-    void (*m_networkStateChangedFunction)();
-
-    void updateState();
-
-#if PLATFORM(MAC)
-    void networkStateChangeTimerFired(Timer<NetworkStateNotifier>*);
-
-    static void dynamicStoreCallback(SCDynamicStoreRef, CFArrayRef changedKeys, void *info); 
-
-    RetainPtr<SCDynamicStoreRef> m_store;
-    Timer<NetworkStateNotifier> m_networkStateChangeTimer;
-
-#elif PLATFORM(WIN)
-    static void CALLBACK addrChangeCallback(void*, BOOLEAN timedOut);
-    static void callAddressChanged(void*);
-    void addressChanged();
-    
-    void registerForAddressChange();
-    HANDLE m_waitHandle;
-    OVERLAPPED m_overlapped;
-#endif
-};
-
-#if !PLATFORM(MAC) && !PLATFORM(WIN)
-inline NetworkStateNotifier::NetworkStateNotifier()
-    : m_isOnLine(true)
-{    
-}
-
-inline void updateState() { }
-
-#endif
-
-NetworkStateNotifier& networkStateNotifier();
-    
-};
-
-#endif // NetworkStateNotifier_h
diff --git a/webkit/pending/PlatformKeyboardEvent.h b/webkit/pending/PlatformKeyboardEvent.h
deleted file mode 100644
index 7ba9690..0000000
--- a/webkit/pending/PlatformKeyboardEvent.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.  All rights reserved.
- * Copyright (C) 2008 Collabora, Ltd.  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
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef PlatformKeyboardEvent_h
-#define PlatformKeyboardEvent_h
-
-#include "PlatformString.h"
-#include <wtf/Platform.h>
-
-#if PLATFORM(MAC)
-#include <wtf/RetainPtr.h>
-#ifdef __OBJC__
-@class NSEvent;
-#else
-class NSEvent;
-#endif
-#endif
-
-#if PLATFORM(WIN)
-typedef struct HWND__ *HWND;
-typedef unsigned WPARAM;
-typedef long LPARAM;
-#endif
-
-#if PLATFORM(GTK)
-typedef struct _GdkEventKey GdkEventKey;
-#endif
-
-#if PLATFORM(QT)
-QT_BEGIN_NAMESPACE
-class QKeyEvent;
-QT_END_NAMESPACE
-#endif
-
-#if PLATFORM(WX)
-class wxKeyEvent;
-#endif
-
-namespace WebCore {
-
-    class PlatformKeyboardEvent {
-    public:
-        enum Type {
-            // KeyDown is sent by platforms such as Mac OS X, gtk and Qt, and has information about both physical pressed key, and its translation.
-            // For DOM processing, it needs to be disambiguated as RawKeyDown or Char event.
-            KeyDown,
-
-            // KeyUp is sent by all platforms.
-            KeyUp,
-
-            // These events are sent by platforms such as Windows and wxWidgets. RawKeyDown only has information about a physical key, and Char
-            // only has information about a character it was translated into.
-            RawKeyDown,
-            Char
-        };
-
-        enum ModifierKey {
-            AltKey = 1 << 0,
-            CtrlKey = 1 << 1,
-            MetaKey = 1 << 2,
-            ShiftKey = 1 << 3,
-        };
-
-        Type type() const { return m_type; }
-        void disambiguateKeyDownEvent(Type, bool backwardCompatibilityMode = false); // Only used on platforms that need it, i.e. those that generate KeyDown events.
-
-        // Text as as generated by processing a virtual key code with a keyboard layout
-        // (in most cases, just a character code, but the layout can emit several
-        // characters in a single keypress event on some platforms).
-        // This may bear no resemblance to the ultimately inserted text if an input method
-        // processes the input.
-        // Will be null for KeyUp and RawKeyDown events.
-        String text() const { return m_text; }
-
-        // Text that would have been generated by the keyboard if no modifiers were pressed
-        // (except for Shift); useful for shortcut (accelerator) key handling.
-        // Otherwise, same as text().
-        String unmodifiedText() const { return m_unmodifiedText; }
-
-        // Most compatible Windows virtual key code associated with the event.
-        // Zero for Char events.
-        int windowsVirtualKeyCode() const { return m_windowsVirtualKeyCode; }
-        void setWindowsVirtualKeyCode(int code) { m_windowsVirtualKeyCode = code; }
-
-        String keyIdentifier() const { return m_keyIdentifier; }
-        bool isAutoRepeat() const { return m_autoRepeat; }
-        void setIsAutoRepeat(bool in) { m_autoRepeat = in; }
-        bool isKeypad() const { return m_isKeypad; }
-        bool shiftKey() const { return m_shiftKey; }
-        bool ctrlKey() const { return m_ctrlKey; }
-        bool altKey() const { return m_altKey; }
-        bool metaKey() const { return m_metaKey; }
-        unsigned modifiers() const {
-            return (altKey() ? AltKey : 0)
-                | (ctrlKey() ? CtrlKey : 0)
-                | (metaKey() ? MetaKey : 0)
-                | (shiftKey() ? ShiftKey : 0);
-        }
-
-        static bool currentCapsLockState();
-
-#if PLATFORM(MAC)
-        PlatformKeyboardEvent(NSEvent*);
-        NSEvent* macEvent() const { return m_macEvent.get(); }
-#endif
-
-#if PLATFORM(WIN)
-        PlatformKeyboardEvent(HWND, WPARAM, LPARAM, Type, bool);
-        bool isSystemKey() const { return m_isSystemKey; }
-#endif
-
-#if PLATFORM(GTK)
-        PlatformKeyboardEvent(GdkEventKey*);
-        GdkEventKey* gdkEventKey() const;
-#endif
-
-#if PLATFORM(QT)
-        PlatformKeyboardEvent(QKeyEvent*);
-        QKeyEvent* qtEvent() const { return m_qtEvent; }
-#endif
-
-#if PLATFORM(WX)
-        PlatformKeyboardEvent(wxKeyEvent&);
-#endif
-
-    private:
-        Type m_type;
-        String m_text;
-        String m_unmodifiedText;
-        String m_keyIdentifier;
-        bool m_autoRepeat;
-        int m_windowsVirtualKeyCode;
-        bool m_isKeypad;
-        bool m_shiftKey;
-        bool m_ctrlKey;
-        bool m_altKey;
-        bool m_metaKey;
-
-#if PLATFORM(MAC)
-        RetainPtr<NSEvent> m_macEvent;
-#endif
-#if PLATFORM(WIN)
-        bool m_isSystemKey;
-#endif
-#if PLATFORM(GTK)
-        GdkEventKey* m_gdkEventKey;
-#endif
-#if PLATFORM(QT)
-        QKeyEvent* m_qtEvent;
-#endif
-    };
-
-} // namespace WebCore
-
-#endif // PlatformKeyboardEvent_h