Move port/page/chromium to WebCore/page/chromium, Win and Linux build

R=darin

Review URL: http://codereview.chromium.org/16802

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

5 files changed, 37 insertions, 41 deletions

diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index 4312f96..9fd227d 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -28,11 +28,6 @@ input_files = [
     '$PORT_DIR/bridge/chromium/PluginsChromium.cpp',

 

     '$PORT_DIR/page/Location.cpp',

-    '$PORT_DIR/page/chromium/AccessibilityObjectChromium.cpp',

-    '$PORT_DIR/page/chromium/AXObjectCacheChromium.cpp',

-    '$PORT_DIR/page/chromium/DragControllerChromium.cpp',

-    '$PORT_DIR/page/chromium/EventHandlerChromium.cpp',

-    '$PORT_DIR/page/chromium/FrameChromium.cpp',

 

     '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',

     '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp',

@@ -51,13 +46,6 @@ if env.Bit('mac'):
     '$PORT_DIR/rendering/RenderThemeMac.mm',

   ])

 

-  # Remove from the list files that haven't yet been made portable to Mac.

-  to_be_ported_files = [

-    '$PORT_DIR/page/chromium/AXObjectCacheChromium.cpp',

-    '$PORT_DIR/page/chromium/EventHandlerChromium.cpp',

-  ]

-  input_files = list(set(input_files) - set(to_be_ported_files))

-

 if env.get('KJS'):

   input_files.extend([

     '$PORT_DIR/bridge/KJSBridge.cpp',

diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 7ededc7..32dcd43 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -397,6 +397,12 @@ input_files = [
     '$WEBCORE_DIR/page/animation/ImplicitAnimation.cpp',
     '$WEBCORE_DIR/page/animation/KeyframeAnimation.cpp',
 
+    '$WEBCORE_DIR/page/chromium/AccessibilityObjectChromium.cpp',
+    '$WEBCORE_DIR/page/chromium/AXObjectCacheChromium.cpp',
+    '$WEBCORE_DIR/page/chromium/DragControllerChromium.cpp',
+    '$WEBCORE_DIR/page/chromium/EventHandlerChromium.cpp',
+    '$WEBCORE_DIR/page/chromium/FrameChromium.cpp',
+
     '$WEBCORE_DIR/platform/Arena.cpp',
     '$WEBCORE_DIR/platform/ContextMenu.cpp',
     '$WEBCORE_DIR/platform/DeprecatedPtrListImpl.cpp',
@@ -927,6 +933,8 @@ if env.Bit('mac'):
   remove_files = [
     # Missing WebCore::FrameView::printPanScrollIcon
     '$WEBCORE_DIR/page/EventHandler.cpp',
+    '$WEBCORE_DIR/page/chromium/AXObjectCacheChromium.cpp',
+    '$WEBCORE_DIR/page/chromium/EventHandlerChromium.cpp',
   ]
   for remove in remove_files:
     input_files.remove(remove)
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 49f7640..6d91b6b 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -521,6 +521,34 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="chromium"
+				>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\page\chromium\AccessibilityObjectChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\page\chromium\AXObjectCacheChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\page\chromium\ChromeClientChromium.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\page\chromium\DragControllerChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\page\chromium\EventHandlerChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\page\chromium\FrameChromium.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="loader"
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index 34f5039..7350d47 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -143,34 +143,6 @@
 				RelativePath="..\..\port\page\Location.cpp"
 				>
 			</File>
-			<Filter
-				Name="chromium"
-				>
-				<File
-					RelativePath="..\..\port\page\chromium\AccessibilityObjectChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\page\chromium\AXObjectCacheChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\page\chromium\ChromeClientChromium.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\page\chromium\DragControllerChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\page\chromium\EventHandlerChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\page\chromium\FrameChromium.cpp"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="inspector"
diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops
index 42b21d1..6b8eed2 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;..\..\port\bridge;..\..\port\page\chromium;&quot;..\..\port\platform\image-decoders&quot;;&quot;..\..\port\platform\image-decoders\bmp&quot;;&quot;..\..\port\platform\image-decoders\gif&quot;;&quot;..\..\port\platform\image-decoders\ico&quot;;&quot;..\..\port\platform\image-decoders\jpeg&quot;;&quot;..\..\port\platform\image-decoders\png&quot;;&quot;..\..\port\platform\image-decoders\xbm&quot;;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\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\platform\animation;..\..\..\third_party\WebKit\WebCore\platform\chromium;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms;..\..\..\third_party\WebKit\WebCore\platform\graphics\skia;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\network\chromium;..\..\..\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;&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;..\..\..\third_party\WebKit\WebCore\inspector;..\..\..\third_party\sqlite"
+		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;..\..\pending;..\..\port\bridge;&quot;..\..\port\platform\image-decoders&quot;;&quot;..\..\port\platform\image-decoders\bmp&quot;;&quot;..\..\port\platform\image-decoders\gif&quot;;&quot;..\..\port\platform\image-decoders\ico&quot;;&quot;..\..\port\platform\image-decoders\jpeg&quot;;&quot;..\..\port\platform\image-decoders\png&quot;;&quot;..\..\port\platform\image-decoders\xbm&quot;;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\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\page\chromium;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\platform\animation;..\..\..\third_party\WebKit\WebCore\platform\chromium;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms;..\..\..\third_party\WebKit\WebCore\platform\graphics\skia;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\network\chromium;..\..\..\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;&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;..\..\..\third_party\WebKit\WebCore\inspector;..\..\..\third_party\sqlite"
 	/>
 </VisualStudioPropertySheet>