diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 19:35:24 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 19:35:24 +0000 |
| commit | 3d6293398e26ec2e70f839c4cbba56ba43481f62 (patch) | |
| tree | 22fe75c93b51361c4139c5a5625eb54209c7f4b6 /webkit/build | |
| parent | 468114936d12d25f5dcd3a97be5ab091761b7561 (diff) | |
| download | chromium_src-3d6293398e26ec2e70f839c4cbba56ba43481f62.zip chromium_src-3d6293398e26ec2e70f839c4cbba56ba43481f62.tar.gz chromium_src-3d6293398e26ec2e70f839c4cbba56ba43481f62.tar.bz2 | |
Kill our forked copy of MIMETypeRegistry.cpp by moving the customized methods
into MimeTypeRegistryChromium.cpp, and stop building MIMETypeRegistry.cpp. It
turns out that there just isn't enough of that file that we have in common to
make it worth sharing.
R=dglazkov
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 12 |
2 files changed, 4 insertions, 9 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 367cdbb..4f9a1ef3 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -407,7 +407,6 @@ input_files = [ '$WEBCORE_DIR/platform/Length.cpp', '$WEBCORE_DIR/platform/LinkHash.cpp', '$WEBCORE_DIR/platform/Logging.cpp', - '$PORT_DIR/platform/MIMETypeRegistry.cpp', '$WEBCORE_DIR/platform/Scrollbar.cpp', '$WEBCORE_DIR/platform/ScrollbarThemeComposite.cpp', '$WEBCORE_DIR/platform/ScrollView.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index d7cf4c4..b082719 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -930,10 +930,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\FontFastPath.cpp" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\Font.cpp" > </File> @@ -974,6 +970,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\FontFastPath.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\FontSelector.h" > </File> @@ -1046,10 +1046,6 @@ > </File> <File - RelativePath="..\..\port\platform\MIMETypeRegistry.cpp" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\MIMETypeRegistry.h" > </File> |