diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 04:09:03 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 04:09:03 +0000 |
commit | 5ff6885209ae478cdbb34d975d7f7a7959f14e8e (patch) | |
tree | a96c8d93869d6e05bb1b3f31af743aa9dfe5f089 /webkit/port/page | |
parent | 8e44632ef6673e72c0a07f08d45e340d888962b1 (diff) | |
download | chromium_src-5ff6885209ae478cdbb34d975d7f7a7959f14e8e.zip chromium_src-5ff6885209ae478cdbb34d975d7f7a7959f14e8e.tar.gz chromium_src-5ff6885209ae478cdbb34d975d7f7a7959f14e8e.tar.bz2 |
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
Diffstat (limited to 'webkit/port/page')
-rw-r--r-- | webkit/port/page/chromium/AccessibilityObjectWrapper.h (renamed from webkit/port/page/AccessibilityObjectWrapperWin.h) | 18 | ||||
-rw-r--r-- | webkit/port/page/chromium/DragControllerChromium.cpp | 4 | ||||
-rw-r--r-- | webkit/port/page/chromium/EventHandlerChromium.cpp | 5 |
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); |