summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-23 20:25:30 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-23 20:25:30 +0000
commitec47a7e253b7e1634e7ef67d0c05e4b45fae4793 (patch)
tree91424a6118ba76190a9011de83dae4bbfe704d3f
parent7e1fde6a79fbc323f22a132dba6777dcd3464218 (diff)
downloadchromium_src-ec47a7e253b7e1634e7ef67d0c05e4b45fae4793.zip
chromium_src-ec47a7e253b7e1634e7ef67d0c05e4b45fae4793.tar.gz
chromium_src-ec47a7e253b7e1634e7ef67d0c05e4b45fae4793.tar.bz2
Remove TextBoundariesChrome.cpp (CL 2 of 2)
BUG=5814 Review URL: http://codereview.chromium.org/16237 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7431 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/build/WebCore/SConscript1
-rw-r--r--webkit/build/WebCore/WebCore.vcproj4
-rw-r--r--webkit/webkit.xcodeproj/project.pbxproj4
4 files changed, 3 insertions, 8 deletions
diff --git a/DEPS b/DEPS
index f68ffc2..0fbcdb0 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@63",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@7422",
+ "/trunk/deps/third_party/WebKit@7429",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@7121",
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 32dcd43..abe816f 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -479,7 +479,6 @@ input_files = [
'$WEBCORE_DIR/platform/chromium/SSLKeyGeneratorChromium.cpp',
'$WEBCORE_DIR/platform/chromium/SystemTimeChromium.cpp',
'$WEBCORE_DIR/platform/chromium/TemporaryLinkStubs.cpp',
- '$WEBCORE_DIR/platform/chromium/TextBoundariesChromium.cpp',
'$WEBCORE_DIR/platform/chromium/TextBreakIteratorInternalICUChromium.cpp',
'$WEBCORE_DIR/platform/chromium/WidgetChromium.cpp',
'$WEBCORE_DIR/platform/chromium/ScrollbarThemeChromium.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 6d91b6b..6997b95 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -2329,10 +2329,6 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\TextBoundariesChromium.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\TextBreakIteratorInternalICUChromium.cpp"
>
</File>
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 68aca3f..8ad45d3 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -39,6 +39,7 @@
/* Begin PBXBuildFile section */
040BA91F0F0077E800BFA8E5 /* FormDataBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 040BA91E0F0077E800BFA8E5 /* FormDataBuilder.cpp */; };
+ 049C0F6F0F00D7CA005BBE56 /* TextBoundariesICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E91DC0D7F3CC3001ECF42 /* TextBoundariesICU.cpp */; };
04C3AFC30EF1E43D0046D578 /* NavigatorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04C3AFC20EF1E43D0046D578 /* NavigatorBase.cpp */; };
04C3AFC60EF1E45F0046D578 /* WorkerNavigator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04C3AFC50EF1E45F0046D578 /* WorkerNavigator.cpp */; };
4103039F0EFB0F7C008832CA /* CachedPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4103039E0EFB0F7C008832CA /* CachedPage.cpp */; };
@@ -511,7 +512,6 @@
93AF529F0F002F680073C62D /* SSLKeyGeneratorChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF52840F002F680073C62D /* SSLKeyGeneratorChromium.cpp */; };
93AF52A00F002F680073C62D /* SystemTimeChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF52850F002F680073C62D /* SystemTimeChromium.cpp */; };
93AF52A10F002F680073C62D /* TemporaryLinkStubs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF52860F002F680073C62D /* TemporaryLinkStubs.cpp */; };
- 93AF52A20F002F680073C62D /* TextBoundariesChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF52870F002F680073C62D /* TextBoundariesChromium.cpp */; };
93AF52A30F002F680073C62D /* TextBreakIteratorInternalICUChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF52880F002F680073C62D /* TextBreakIteratorInternalICUChromium.cpp */; };
93AF52A40F002F680073C62D /* WidgetChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF52890F002F680073C62D /* WidgetChromium.cpp */; };
93AF52AA0F002FC80073C62D /* IconChromiumMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF52A70F002FC80073C62D /* IconChromiumMac.cpp */; };
@@ -9279,7 +9279,6 @@
E45623E30E268E87005E4685 /* TagNodeList.cpp in Sources */,
93AF52A10F002F680073C62D /* TemporaryLinkStubs.cpp in Sources */,
E45623E40E268E87005E4685 /* Text.cpp in Sources */,
- 93AF52A20F002F680073C62D /* TextBoundariesChromium.cpp in Sources */,
93AF52A30F002F680073C62D /* TextBreakIteratorInternalICUChromium.cpp in Sources */,
E456253D0E268E87005E4685 /* TextBreakIteratorICU.cpp in Sources */,
E45625370E268E87005E4685 /* TextBreakIteratorInternalICUMac.mm in Sources */,
@@ -9372,6 +9371,7 @@
E45626700E268E87005E4685 /* XSLTProcessor.cpp in Sources */,
E45626710E268E87005E4685 /* XSLTUnicodeSort.cpp in Sources */,
040BA91F0F0077E800BFA8E5 /* FormDataBuilder.cpp in Sources */,
+ 049C0F6F0F00D7CA005BBE56 /* TextBoundariesICU.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};