summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-26 00:15:53 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-26 00:15:53 +0000
commitfd00c2f8eb4195745199821f373b018b090b4c50 (patch)
tree9fcea18d4009c45495896730516e316a60ff9c1d /webkit
parentf07f3211fd8012a313ec62d4dfe8d4410059b239 (diff)
downloadchromium_src-fd00c2f8eb4195745199821f373b018b090b4c50.zip
chromium_src-fd00c2f8eb4195745199821f373b018b090b4c50.tar.gz
chromium_src-fd00c2f8eb4195745199821f373b018b090b4c50.tar.bz2
Move RGBColor.{h,cpp} into port/bindings/v8 since they are specific to the V8
bindings ;-) R=dglazkov Review URL: http://codereview.chromium.org/12658 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6012 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/SConscript.port2
-rw-r--r--webkit/build/V8Bindings/SConscript1
-rw-r--r--webkit/build/V8Bindings/V8Bindings.vcproj24
-rw-r--r--webkit/build/port/port.vcproj8
-rw-r--r--webkit/port/bindings/v8/RGBColor.cpp (renamed from webkit/port/css/RGBColor.cpp)0
-rw-r--r--webkit/port/bindings/v8/RGBColor.h (renamed from webkit/port/css/RGBColor.h)1
-rw-r--r--webkit/webkit.xcodeproj/project.pbxproj20
7 files changed, 23 insertions, 33 deletions
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index 5fecb65..7ca98b9 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -27,8 +27,6 @@ elif env['PLATFORM'] == 'posix':
input_files = [
'$PORT_DIR/bridge/chromium/PluginsChromium.cpp',
- '$PORT_DIR/css/RGBColor.cpp',
-
'$PORT_DIR/history/BackForwardList.cpp',
'$PORT_DIR/history/CachedPage.cpp',
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index 9d904cb..30b9083 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -327,6 +327,7 @@ inputs = [
'$PORT_DIR/bindings/v8/JSXPathNSResolver.cpp',
'$PORT_DIR/bindings/v8/np_v8object.cpp',
'$PORT_DIR/bindings/v8/npruntime.cpp',
+ '$PORT_DIR/bindings/v8/RGBColor.cpp',
'$PORT_DIR/bindings/v8/ScriptCallContextV8.cpp',
'$PORT_DIR/bindings/v8/v8_custom.cpp',
'$PORT_DIR/bindings/v8/v8_events.cpp',
diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index 527d5b4..cb38118 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -2435,18 +2435,18 @@
<Filter
Name="interpreter"
>
- <File
- RelativePath="..\..\port\bindings\v8\interpreter\CallFrame.h"
- >
- </File>
+ <File
+ RelativePath="..\..\port\bindings\v8\interpreter\CallFrame.h"
+ >
+ </File>
</Filter>
<Filter
Name="runtime"
>
- <File
- RelativePath="..\..\port\bindings\v8\runtime\JSLock.h"
- >
- </File>
+ <File
+ RelativePath="..\..\port\bindings\v8\runtime\JSLock.h"
+ >
+ </File>
</Filter>
<File
RelativePath="..\..\port\bindings\v8\dom_wrapper_map.h"
@@ -2497,6 +2497,14 @@
>
</File>
<File
+ RelativePath="..\..\port\bindings\v8\RGBColor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\port\bindings\v8\RGBColor.h"
+ >
+ </File>
+ <File
RelativePath="..\..\port\bindings\v8\ScheduledAction.h"
>
</File>
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index f2976ed..2e0a027 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -147,14 +147,6 @@
RelativePath="..\..\port\css\quirks-overrides.css"
>
</File>
- <File
- RelativePath="..\..\port\css\RGBColor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\port\css\RGBColor.h"
- >
- </File>
</Filter>
<Filter
Name="page"
diff --git a/webkit/port/css/RGBColor.cpp b/webkit/port/bindings/v8/RGBColor.cpp
index 601b5c1..601b5c1 100644
--- a/webkit/port/css/RGBColor.cpp
+++ b/webkit/port/bindings/v8/RGBColor.cpp
diff --git a/webkit/port/css/RGBColor.h b/webkit/port/bindings/v8/RGBColor.h
index e537e8d..c1e7f4a 100644
--- a/webkit/port/css/RGBColor.h
+++ b/webkit/port/bindings/v8/RGBColor.h
@@ -26,4 +26,3 @@ class RGBColor : public RefCounted<RGBColor> {
} // namespace WebCore
#endif // RGBColor_h
-
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index a1a9a34..854eef7 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -458,6 +458,7 @@
82761E970E3FA26F0030D324 /* TextCodecMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E91C50D7F3CC2001ECF42 /* TextCodecMac.cpp */; };
82F14D610ED230E700B36428 /* webcursor_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 82F14D600ED230E700B36428 /* webcursor_mac.mm */; };
934CC0040EBFE0E000A658F2 /* chromium_bridge_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 934CC0030EBFE0E000A658F2 /* chromium_bridge_impl.cc */; };
+ 934CC2280EDCC37600A658F2 /* RGBColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 934CC2270EDCC37600A658F2 /* RGBColor.cpp */; };
93BF8E990EA6B0E50030F05C /* AuthenticationChallengeChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BF8E600EA6AED30030F05C /* AuthenticationChallengeChromium.cpp */; };
93BF8E9A0EA6B0EA0030F05C /* CookieJarChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BF8E610EA6AED30030F05C /* CookieJarChromium.cpp */; };
93BF8E9B0EA6B0EF0030F05C /* DNSChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BF8E620EA6AED30030F05C /* DNSChromium.cpp */; };
@@ -1253,7 +1254,6 @@
E45627EA0E2694B8005E4685 /* BMPImageDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82C260690DCBA013005CFE91 /* BMPImageDecoder.cpp */; };
E45627EB0E2694B8005E4685 /* ICOImageDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82C260710DCBA02A005CFE91 /* ICOImageDecoder.cpp */; };
E45627EC0E2694B8005E4685 /* XBMImageDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82C260770DCBA03E005CFE91 /* XBMImageDecoder.cpp */; };
- E45627ED0E2694B8005E4685 /* RGBColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B42A5E80DE213C700659DE0 /* RGBColor.cpp */; };
E45627EE0E2694B8005E4685 /* CachedPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B14AA450DE323CD00F4E646 /* CachedPage.cpp */; };
E45627EF0E2694B8005E4685 /* BackForwardList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8BCA0D7F3B39001ECF42 /* BackForwardList.cpp */; };
E45628370E269DBB005E4685 /* feed_preview.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8254050F0D92E3DA0006B936 /* feed_preview.cc */; };
@@ -2316,8 +2316,6 @@
7B2B0A4D0E3143EC00D4C6B7 /* PNGImageDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PNGImageDecoder.cpp; sourceTree = "<group>"; };
7B2B0A4E0E3143EC00D4C6B7 /* PNGImageDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PNGImageDecoder.h; sourceTree = "<group>"; };
7B2FB8860D81A9C90050E907 /* WebCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCorePrefix.h; sourceTree = "<group>"; };
- 7B42A5E80DE213C700659DE0 /* RGBColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RGBColor.cpp; sourceTree = "<group>"; };
- 7B42A5E90DE213C700659DE0 /* RGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RGBColor.h; sourceTree = "<group>"; };
7B5E85AE0D7F28CD001ECF42 /* libwtf.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwtf.a; sourceTree = BUILT_PRODUCTS_DIR; };
7B5E85B40D7F28F5001ECF42 /* AlwaysInline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlwaysInline.h; sourceTree = "<group>"; };
7B5E85B50D7F28F5001ECF42 /* ASCIICType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASCIICType.h; sourceTree = "<group>"; };
@@ -3967,6 +3965,8 @@
82C260770DCBA03E005CFE91 /* XBMImageDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMImageDecoder.cpp; sourceTree = "<group>"; };
82F14D600ED230E700B36428 /* webcursor_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = webcursor_mac.mm; sourceTree = "<group>"; };
934CC0030EBFE0E000A658F2 /* chromium_bridge_impl.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chromium_bridge_impl.cc; sourceTree = "<group>"; };
+ 934CC2270EDCC37600A658F2 /* RGBColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RGBColor.cpp; sourceTree = "<group>"; };
+ 934CC2290EDCC38400A658F2 /* RGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RGBColor.h; sourceTree = "<group>"; };
93BF8E5F0EA6AED30030F05C /* AuthenticationChallenge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AuthenticationChallenge.h; path = chromium/AuthenticationChallenge.h; sourceTree = "<group>"; };
93BF8E600EA6AED30030F05C /* AuthenticationChallengeChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AuthenticationChallengeChromium.cpp; path = chromium/AuthenticationChallengeChromium.cpp; sourceTree = "<group>"; };
93BF8E610EA6AED30030F05C /* CookieJarChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CookieJarChromium.cpp; path = chromium/CookieJarChromium.cpp; sourceTree = "<group>"; };
@@ -4502,6 +4502,8 @@
7B0095D80DAFF0DC00F72082 /* npruntime_impl.h */,
7B0095D90DAFF0DC00F72082 /* npruntime_internal.h */,
7B0095DA0DAFF0DC00F72082 /* npruntime_priv.h */,
+ 934CC2270EDCC37600A658F2 /* RGBColor.cpp */,
+ 934CC2290EDCC38400A658F2 /* RGBColor.h */,
B5B0D41C0EC8FE6300EA3314 /* runtime */,
E40063600EA907510055B38E /* ScriptCallContextV8.cpp */,
E40060D90EA69E0B0055B38E /* ScriptController.h */,
@@ -4591,15 +4593,6 @@
path = png;
sourceTree = "<group>";
};
- 7B42A5E70DE213AE00659DE0 /* css */ = {
- isa = PBXGroup;
- children = (
- 7B42A5E80DE213C700659DE0 /* RGBColor.cpp */,
- 7B42A5E90DE213C700659DE0 /* RGBColor.h */,
- );
- path = css;
- sourceTree = "<group>";
- };
7B5E77540D7F22D8001ECF42 = {
isa = PBXGroup;
children = (
@@ -6667,7 +6660,6 @@
isa = PBXGroup;
children = (
7B9375970D91902E008B9587 /* bridge */,
- 7B42A5E70DE213AE00659DE0 /* css */,
7B14AA440DE323A000F4E646 /* history */,
E4A970880E3614F200E8EF3B /* page */,
822B1BE60DC778FF005C9A96 /* platform */,
@@ -8160,6 +8152,7 @@
7B0095F10DAFF0DD00F72082 /* JSXPathNSResolver.cpp in Sources */,
7B0095F30DAFF0DD00F72082 /* np_v8object.cpp in Sources */,
7B0095F50DAFF0DD00F72082 /* npruntime.cpp in Sources */,
+ 934CC2280EDCC37600A658F2 /* RGBColor.cpp in Sources */,
7B0091390DAFEFBE00F72082 /* SVGElementFactory.cpp in Sources */,
7B00913B0DAFEFBE00F72082 /* SVGNames.cpp in Sources */,
7B00913E0DAFEFBE00F72082 /* UserAgentStyleSheetsData.cpp in Sources */,
@@ -9392,7 +9385,6 @@
7B2B0A650E3143EC00D4C6B7 /* PNGImageDecoder.cpp in Sources */,
E473F6600EAE00A6006C2098 /* PopupMenuChromium.cpp in Sources */,
4D11C5520E9AC23100EF7617 /* RenderThemeMac.mm in Sources */,
- E45627ED0E2694B8005E4685 /* RGBColor.cpp in Sources */,
E40063610EA907510055B38E /* ScriptCallContextV8.cpp in Sources */,
E40060DB0EA69E0B0055B38E /* ScriptController.cpp in Sources */,
E473F6620EAE00D5006C2098 /* ScrollView.cpp in Sources */,