diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 21:58:28 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 21:58:28 +0000 |
| commit | b38b3a0232a7f35cb89730ff08650adb3b12f430 (patch) | |
| tree | 29586e879cc51b157a797b0af5527ff1d1eda4b3 /webkit/build/WebCore | |
| parent | 8b29bcad34e03a319993dc38fc50a33d10a7da9d (diff) | |
| download | chromium_src-b38b3a0232a7f35cb89730ff08650adb3b12f430.zip chromium_src-b38b3a0232a7f35cb89730ff08650adb3b12f430.tar.gz chromium_src-b38b3a0232a7f35cb89730ff08650adb3b12f430.tar.bz2 | |
Resubmit r3612 and r3613 this time with mac fixes (thanks mark!).
Review URL: http://codereview.chromium.org/7675
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/WebCore')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 5 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 44 |
2 files changed, 45 insertions, 4 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 8a0f9e8..4cc20d1 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -363,6 +363,7 @@ input_files = [ '$WEBCORE_DIR/page/FrameView.cpp', '$WEBCORE_DIR/page/History.cpp', '$WEBCORE_DIR/page/MouseEventWithHitTestResults.cpp', + '$WEBCORE_DIR/page/Navigator.cpp', '$WEBCORE_DIR/page/Page.cpp', '$WEBCORE_DIR/page/PageGroup.cpp', '$WEBCORE_DIR/page/Screen.cpp', @@ -454,6 +455,10 @@ input_files = [ '$WEBCORE_DIR/platform/text/TextStream.cpp', '$WEBCORE_DIR/platform/text/UnicodeRange.cpp', + '$WEBCORE_DIR/plugins/MimeType.cpp', + '$WEBCORE_DIR/plugins/MimeTypeArray.cpp', + '$WEBCORE_DIR/plugins/Plugin.cpp.cpp', + '$WEBCORE_DIR/plugins/PluginArray.cpp', '$WEBCORE_DIR/plugins/PluginData.cpp', '$WEBCORE_DIR/rendering/AutoTableLayout.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index fb61b6b..7a41044 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -369,6 +369,14 @@ RelativePath="..\..\..\third_party\WebKit\WebCore\page\MouseEventWithHitTestResults.h" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\Navigator.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\Navigator.h" + > + </File> <File RelativePath="..\..\..\third_party\WebKit\WebCore\page\Page.cpp" > @@ -386,10 +394,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\page\Plugin.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\page\Screen.cpp" > </File> @@ -5986,10 +5990,42 @@ Name="plugins" > <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\MimeType.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\MimeType.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\MimeTypeArray.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\MimeTypeArray.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\npfunctions.h" > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\Plugin.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\Plugin.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginArray.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginArray.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginData.cpp" > </File> |