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

3 files changed, 21 insertions, 41 deletions

diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index a5eacfe..0dc5ef0 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -138,6 +138,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\Collator.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\icu\CollatorICU.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\Deque.h"
 			>
 		</File>
@@ -294,18 +302,10 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\Collator.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\Unicode.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\icu\CollatorICU.cpp"
-			>
-		</File>
-		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\icu\UnicodeIcu.h"
 			>
 		</File>
@@ -329,10 +329,6 @@
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\VectorTraits.h"
 			>
 		</File>
-		<File
-			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\win\MainThreadWin.cpp"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index 4e14bf8..a4e0856 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -183,10 +183,6 @@
 		<Filter
 			Name="page"
 			>
-			<File
-				RelativePath="..\..\port\page\AccessibilityObjectWrapperWin.h"
-				>
-			</File>
 			<Filter
 				Name="chromium"
 				>
@@ -731,18 +727,10 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\port\platform\win\KeyEventWin.cpp"
-					>
-				</File>
-				<File
 					RelativePath="..\..\port\platform\win\PasteboardWin.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\port\platform\win\PlatformMouseEventWin.cpp"
-					>
-				</File>
-				<File
 					RelativePath="..\..\port\platform\win\ScreenWin.cpp"
 					>
 				</File>
@@ -758,10 +746,6 @@
 					RelativePath="..\..\port\platform\win\WCDataObject.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\port\platform\win\WheelEventWin.cpp"
-					>
-				</File>
 			</Filter>
 			<Filter
 				Name="chromium"
@@ -807,6 +791,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\port\platform\chromium\PlatformKeyboardEventChromium.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\port\platform\chromium\PlatformScrollBar.h"
 					>
 				</File>
@@ -951,22 +939,10 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\port\platform\graphics\IntPointWin.cpp"
-					>
-				</File>
-				<File
 					RelativePath="..\..\port\platform\graphics\IntRectSkia.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\port\platform\graphics\IntRectWin.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\IntSizeWin.cpp"
-					>
-				</File>
-				<File
 					RelativePath="..\..\port\platform\graphics\NativeImageSkia.cpp"
 					>
 				</File>
@@ -1062,6 +1038,14 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="chromium"
+					>
+					<File
+						RelativePath="..\..\port\platform\graphics\chromium\PlatformIcon.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="image-decoders"
diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops
index 2e676fc..c123e8b 100644
--- a/webkit/build/webkit_common_includes.vsprops
+++ b/webkit/build/webkit_common_includes.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;..\..\pending\;..\..\pending\kjs;..\..\pending\wtf;..\..\port\bridge;..\..\port\css;..\..\port\dom;..\..\port\history;..\..\port\loader;..\..\port\page;..\..\port\page\chromium;..\..\port\page\win;..\..\port\platform;..\..\port\platform\chromium;..\..\port\platform\win;..\..\port\platform\network\chromium;..\..\port\platform\image-decoders;..\..\port\platform\image-decoders\bmp;..\..\port\platform\image-decoders\gif;..\..\port\platform\image-decoders\ico;..\..\port\platform\image-decoders\jpeg;..\..\port\platform\image-decoders\png;..\..\port\platform\image-decoders\xbm;..\..\port\platform\network;..\..\port\plugins;..\..\port\rendering;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore\;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\port\platform\graphics;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;..\..\..\third_party\WebKit\WebCore;&quot;..\..\..\third_party\WebKit\WebCore\os-win32&quot;;..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;&quot;..\..\..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins"
+		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;..\..\pending\;..\..\pending\kjs;..\..\pending\wtf;..\..\port\bridge;..\..\port\css;..\..\port\dom;..\..\port\history;..\..\port\loader;..\..\port\page;..\..\port\page\chromium;..\..\port\page\win;..\..\port\platform;..\..\port\platform\chromium;..\..\port\platform\win;..\..\port\platform\network\chromium;..\..\port\platform\image-decoders;..\..\port\platform\image-decoders\bmp;..\..\port\platform\image-decoders\gif;..\..\port\platform\image-decoders\ico;..\..\port\platform\image-decoders\jpeg;..\..\port\platform\image-decoders\png;..\..\port\platform\image-decoders\xbm;..\..\port\platform\network;..\..\port\plugins;..\..\port\rendering;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore\;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\port\platform\graphics;..\..\port\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;..\..\..\third_party\WebKit\WebCore;&quot;..\..\..\third_party\WebKit\WebCore\os-win32&quot;;..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;&quot;..\..\..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins"
 	/>
 </VisualStudioPropertySheet>