summaryrefslogtreecommitdiffstats
path: root/webkit/build
diff options
context:
space:
mode:
authordglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-22 19:37:34 +0000
committerdglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-22 19:37:34 +0000
commit5531c25bf144183612d4bf9f6746a7a682eb7904 (patch)
tree47c4d2697421202bffec41c9716eb6e9e48f5257 /webkit/build
parent6e724957d7412d8f99c764405b575c010055f88e (diff)
downloadchromium_src-5531c25bf144183612d4bf9f6746a7a682eb7904.zip
chromium_src-5531c25bf144183612d4bf9f6746a7a682eb7904.tar.gz
chromium_src-5531c25bf144183612d4bf9f6746a7a682eb7904.tar.bz2
Move port/plugins/chromium to WebCore/plugins
Review URL: http://codereview.chromium.org/16421 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
-rw-r--r--webkit/build/WebCore/SConscript2
-rw-r--r--webkit/build/WebCore/WebCore.vcproj12
-rw-r--r--webkit/build/port/port.vcproj12
3 files changed, 14 insertions, 12 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 9889946..ab3abce 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -503,6 +503,8 @@ input_files = [
'$WEBCORE_DIR/plugins/PluginArray.cpp',
'$WEBCORE_DIR/plugins/PluginData.cpp',
+ '$WEBCORE_DIR/plugins/chromium/PluginDataChromium.cpp',
+
'$WEBCORE_DIR/rendering/AutoTableLayout.cpp',
'$WEBCORE_DIR/rendering/bidi.cpp',
'$WEBCORE_DIR/rendering/break_lines.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 3dcf2ff..6b9303a 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -6793,6 +6793,18 @@
RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginStream.h"
>
</File>
+ <Filter
+ Name="plugins"
+ >
+ <Filter
+ Name="chromium"
+ >
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\chromium\PluginDataChromium.cpp"
+ >
+ </File>
+ </Filter>
+ </Filter>
</Filter>
<Filter
Name="version"
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index 8e2a2dc..1e278e0 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -1326,18 +1326,6 @@
</Filter>
</Filter>
<Filter
- Name="plugins"
- >
- <Filter
- Name="chromium"
- >
- <File
- RelativePath="..\..\port\plugins\chromium\PluginDataChromium.cpp"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
Name="rendering"
>
<File