diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-13 20:21:00 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-13 20:21:00 +0000 |
| commit | 760d03d9bdf2b69e9f526869a5513fbcae80017e (patch) | |
| tree | 43d326a0d2251b23cde0c91e27a60f2da07e298d /webkit | |
| parent | 92edabb7765613f4027947140d4e93473a7c766d (diff) | |
| download | chromium_src-760d03d9bdf2b69e9f526869a5513fbcae80017e.zip chromium_src-760d03d9bdf2b69e9f526869a5513fbcae80017e.tar.gz chromium_src-760d03d9bdf2b69e9f526869a5513fbcae80017e.tar.bz2 | |
Second part of the new merge. Just adds FloatQuad.h/cpp to WebCore build.
Could use some help from mac-folk on the xcode equivalent change.
Review URL: http://codereview.chromium.org/10866
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 8 | ||||
| -rw-r--r-- | webkit/webkit.xcodeproj/project.pbxproj | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index daf2607..ac4950b 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -413,6 +413,7 @@ input_files = [ '$WEBCORE_DIR/platform/graphics/Color.cpp', '$WEBCORE_DIR/platform/graphics/FloatPoint.cpp', '$WEBCORE_DIR/platform/graphics/FloatPoint3D.cpp', + '$WEBCORE_DIR/platform/graphics/FloatQuad.cpp', '$WEBCORE_DIR/platform/graphics/FloatRect.cpp', '$WEBCORE_DIR/platform/graphics/FloatSize.cpp', '$WEBCORE_DIR/platform/graphics/Font.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 8586a05..0fc40e6 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -1217,6 +1217,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\FloatQuad.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\FloatQuad.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\FloatRect.cpp" > </File> diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index f656f33..1c725d2 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -465,6 +465,7 @@ AB332F3E0E9548900020F882 /* AccessibilityObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82761F810E3FAC700030D324 /* AccessibilityObject.cpp */; }; AB332F4D0E95497E0020F882 /* AnimationController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB332F4B0E95497E0020F882 /* AnimationController.cpp */; }; AB451D9D0EC21EDE0037A496 /* ColorSkia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E90050D7F3CC1001ECF42 /* ColorSkia.cpp */; }; + AB59A1620ECCBD560059F5F3 /* FloatQuad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB59A1600ECCBD560059F5F3 /* FloatQuad.cpp */; }; AB8FE8A50E9BCD3E0051E7B4 /* GKURL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8FE8A40E9BCD3E0051E7B4 /* GKURL.cpp */; }; ABBD23820EB7A8D200BEC658 /* StyleInheritedData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23810EB7A8D200BEC658 /* StyleInheritedData.cpp */; }; ABBD23A20EB7A95B00BEC658 /* StyleMarqueeData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABBD23930EB7A95B00BEC658 /* StyleMarqueeData.cpp */; }; @@ -3976,6 +3977,8 @@ AB332F4B0E95497E0020F882 /* AnimationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AnimationController.cpp; path = animation/AnimationController.cpp; sourceTree = "<group>"; }; AB332F4C0E95497E0020F882 /* AnimationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationController.h; path = animation/AnimationController.h; sourceTree = "<group>"; }; AB50EA1C0E9AB12B00FDD61B /* EmptyClients.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmptyClients.h; sourceTree = "<group>"; }; + AB59A1600ECCBD560059F5F3 /* FloatQuad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FloatQuad.cpp; sourceTree = "<group>"; }; + AB59A1610ECCBD560059F5F3 /* FloatQuad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FloatQuad.h; sourceTree = "<group>"; }; AB8FE8A40E9BCD3E0051E7B4 /* GKURL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GKURL.cpp; sourceTree = "<group>"; }; ABA23E6B0E9FC43700C96905 /* Navigator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Navigator.cpp; sourceTree = "<group>"; }; ABBD23810EB7A8D200BEC658 /* StyleInheritedData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleInheritedData.cpp; sourceTree = "<group>"; }; @@ -5658,6 +5661,8 @@ 7B5E8FA20D7F3CC1001ECF42 /* graphics */ = { isa = PBXGroup; children = ( + AB59A1600ECCBD560059F5F3 /* FloatQuad.cpp */, + AB59A1610ECCBD560059F5F3 /* FloatQuad.h */ 7B5E8FB30D7F3CC1001ECF42 /* cg */, 7B5E90030D7F3CC1001ECF42 /* mac */, AB6A3CE40EC2202B00159689 /* skia */, @@ -8605,6 +8610,7 @@ E45624C30E268E87005E4685 /* FloatPoint.cpp in Sources */, E45624C40E268E87005E4685 /* FloatPoint3D.cpp in Sources */, E45626830E268E87005E4685 /* FloatPointCG.cpp in Sources */, + AB59A1620ECCBD560059F5F3 /* FloatQuad.cpp in Sources */ E45624C50E268E87005E4685 /* FloatRect.cpp in Sources */, E45626840E268E87005E4685 /* FloatRectCG.cpp in Sources */, E45624C60E268E87005E4685 /* FloatSize.cpp in Sources */, |