<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[46211] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/46211">46211</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2009-07-21 21:27:22 -0700 (Tue, 21 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebCore:

2009-07-21  Sam Weinig  &lt;sam@webkit.org&gt;

        Reviewed by Dan Bernstein.

        Fix for https://bugs.webkit.org/show_bug.cgi?id=27242
        JSC bindings should use an auto-bound RGBColor class instead of hand-rolled JSRGBColor

        Move the JSC and Objective-C bindings onto using the RGBColor object instead
        of just an unsigned int. The JSC bindings are now completely autogenerated for
        this class. (Also removes the last lut from WebCore).

        * DerivedSources.make:
        * GNUmakefile.am:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * WebCoreSources.bkl:
        * bindings/js/JSRGBColor.cpp: Removed.
        * bindings/js/JSRGBColor.h: Removed.
        * bindings/objc/DOM.mm:
        (-[DOMRGBColor _color]):
        * bindings/objc/DOMRGBColor.mm:
        (-[DOMRGBColor dealloc]):
        (-[DOMRGBColor finalize]):
        (-[DOMRGBColor red]):
        (-[DOMRGBColor green]):
        (-[DOMRGBColor blue]):
        (-[DOMRGBColor alpha]):
        (-[DOMRGBColor color]):
        * bindings/scripts/CodeGenerator.pm:
        * bindings/scripts/CodeGeneratorJS.pm:
        * bindings/scripts/CodeGeneratorObjC.pm:
        * css/CSSParser.cpp:
        (WebCore::CSSParser::parseColor):
        * css/CSSPrimitiveValue.cpp:
        (WebCore::CSSPrimitiveValue::getRGBColorValue):
        * css/CSSPrimitiveValue.h:
        (WebCore::CSSPrimitiveValue::getRGBA32Value):
        * css/CSSStyleSelector.cpp:
        (WebCore::CSSStyleSelector::getColorFromPrimitiveValue):
        * css/RGBColor.cpp:
        (WebCore::RGBColor::alpha):
        * css/RGBColor.h:
        (WebCore::RGBColor::color):
        (WebCore::RGBColor::RGBColor):
        * css/RGBColor.idl:
        * page/DOMWindow.idl:
        * svg/SVGColor.cpp:
        (WebCore::SVGColor::rgbColor):
        * svg/SVGColor.h:

LayoutTests:

2009-07-21  Sam Weinig  &lt;sam@webkit.org&gt;

        Reviewed by Dan Bernstein.

        Changes for https://bugs.webkit.org/show_bug.cgi?id=27242
        JSC bindings should use an auto-bound RGBColor class instead of hand-rolled JSRGBColor

        * fast/dom/Window/window-properties-expected.txt:
        * fast/dom/dom-constructors-expected.txt:
        * fast/dom/prototype-inheritance-expected.txt:
        * fast/dom/wrapper-classes-expected.txt:
        * fast/js/global-constructors-expected.txt:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomWindowwindowpropertiesexpectedtxt">trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomdomconstructorsexpectedtxt">trunk/LayoutTests/fast/dom/dom-constructors-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomprototypeinheritanceexpectedtxt">trunk/LayoutTests/fast/dom/prototype-inheritance-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomwrapperclassesexpectedtxt">trunk/LayoutTests/fast/dom/wrapper-classes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastjsglobalconstructorsexpectedtxt">trunk/LayoutTests/fast/js/global-constructors-expected.txt</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreDerivedSourcesmake">trunk/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkWebCoreGNUmakefileam">trunk/WebCore/GNUmakefile.am</a></li>
<li><a href="#trunkWebCoreWebCorepro">trunk/WebCore/WebCore.pro</a></li>
<li><a href="#trunkWebCoreWebCorevcprojWebCorevcproj">trunk/WebCore/WebCore.vcproj/WebCore.vcproj</a></li>
<li><a href="#trunkWebCoreWebCorexcodeprojprojectpbxproj">trunk/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkWebCoreWebCoreSourcesbkl">trunk/WebCore/WebCoreSources.bkl</a></li>
<li><a href="#trunkWebCorebindingsobjcDOMmm">trunk/WebCore/bindings/objc/DOM.mm</a></li>
<li><a href="#trunkWebCorebindingsobjcDOMRGBColormm">trunk/WebCore/bindings/objc/DOMRGBColor.mm</a></li>
<li><a href="#trunkWebCorebindingsscriptsCodeGeneratorpm">trunk/WebCore/bindings/scripts/CodeGenerator.pm</a></li>
<li><a href="#trunkWebCorebindingsscriptsCodeGeneratorJSpm">trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkWebCorebindingsscriptsCodeGeneratorObjCpm">trunk/WebCore/bindings/scripts/CodeGeneratorObjC.pm</a></li>
<li><a href="#trunkWebCorecssCSSParsercpp">trunk/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkWebCorecssCSSPrimitiveValuecpp">trunk/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#trunkWebCorecssCSSPrimitiveValueh">trunk/WebCore/css/CSSPrimitiveValue.h</a></li>
<li><a href="#trunkWebCorecssCSSStyleSelectorcpp">trunk/WebCore/css/CSSStyleSelector.cpp</a></li>
<li><a href="#trunkWebCorecssRGBColorcpp">trunk/WebCore/css/RGBColor.cpp</a></li>
<li><a href="#trunkWebCorecssRGBColorh">trunk/WebCore/css/RGBColor.h</a></li>
<li><a href="#trunkWebCorecssRGBColoridl">trunk/WebCore/css/RGBColor.idl</a></li>
<li><a href="#trunkWebCorepageDOMWindowidl">trunk/WebCore/page/DOMWindow.idl</a></li>
<li><a href="#trunkWebCoresvgSVGColorcpp">trunk/WebCore/svg/SVGColor.cpp</a></li>
<li><a href="#trunkWebCoresvgSVGColorh">trunk/WebCore/svg/SVGColor.h</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkWebCorebindingsjsJSRGBColorcpp">trunk/WebCore/bindings/js/JSRGBColor.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSRGBColorh">trunk/WebCore/bindings/js/JSRGBColor.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/LayoutTests/ChangeLog        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2009-07-21  Sam Weinig  &lt;sam@webkit.org&gt;
+
+        Reviewed by Dan Bernstein.
+
+        Changes for https://bugs.webkit.org/show_bug.cgi?id=27242
+        JSC bindings should use an auto-bound RGBColor class instead of hand-rolled JSRGBColor
+
+        * fast/dom/Window/window-properties-expected.txt:
+        * fast/dom/dom-constructors-expected.txt:
+        * fast/dom/prototype-inheritance-expected.txt:
+        * fast/dom/wrapper-classes-expected.txt:
+        * fast/js/global-constructors-expected.txt:
+
</ins><span class="cx"> 2009-07-21  Zoltan Herczeg  &lt;zherczeg@inf.u-szeged.hu&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Gavin Barraclough, RS olliej fix to make the test pass.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowwindowpropertiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -1174,6 +1174,8 @@
</span><span class="cx"> window.ProcessingInstruction.prototype [printed above as window.Node.prototype]
</span><span class="cx"> window.ProgressEvent [object ProgressEventConstructor]
</span><span class="cx"> window.ProgressEvent.prototype [printed above as window.Event.prototype]
</span><ins>+window.RGBColor [object RGBColorConstructor]
+window.RGBColor.prototype [object RGBColorPrototype]
</ins><span class="cx"> window.Range [object RangeConstructor]
</span><span class="cx"> window.Range.END_TO_END [number]
</span><span class="cx"> window.Range.END_TO_START [number]
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomdomconstructorsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/dom-constructors-expected.txt (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/dom-constructors-expected.txt        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/LayoutTests/fast/dom/dom-constructors-expected.txt        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> FAIL TryAllocate('Location') should be exception. Was no constructor.
</span><span class="cx"> FAIL TryAllocate('Navigator') should be exception. Was no constructor.
</span><span class="cx"> FAIL TryAllocate('NodeIterator') should be exception. Was no constructor.
</span><del>-FAIL TryAllocate('RGBColor') should be exception. Was no constructor.
</del><ins>+PASS TryAllocate('RGBColor') is 'exception'
</ins><span class="cx"> FAIL TryAllocate('Screen') should be exception. Was no constructor.
</span><span class="cx"> FAIL TryAllocate('TreeWalker') should be exception. Was no constructor.
</span><span class="cx"> FAIL TryAllocate('XPathExpression') should be exception. Was no constructor.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomprototypeinheritanceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/prototype-inheritance-expected.txt (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/prototype-inheritance-expected.txt        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/LayoutTests/fast/dom/prototype-inheritance-expected.txt        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -129,6 +129,7 @@
</span><span class="cx"> PASS inner.PluginArray.isInner is true
</span><span class="cx"> PASS inner.ProcessingInstruction.isInner is true
</span><span class="cx"> PASS inner.ProgressEvent.isInner is true
</span><ins>+PASS inner.RGBColor.isInner is true
</ins><span class="cx"> PASS inner.Range.isInner is true
</span><span class="cx"> PASS inner.RangeError.isInner is true
</span><span class="cx"> PASS inner.RangeException.isInner is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomwrapperclassesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/wrapper-classes-expected.txt (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/wrapper-classes-expected.txt        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/LayoutTests/fast/dom/wrapper-classes-expected.txt        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -102,8 +102,8 @@
</span><span class="cx"> PASS jsWrapperClass(stylesheet.cssRules.item(0).style.getPropertyCSSValue('color').__proto__) is 'CSSPrimitiveValuePrototype'
</span><span class="cx"> PASS jsWrapperClass(stylesheet.cssRules.item(0).style.getPropertyCSSValue('color').constructor) is 'CSSPrimitiveValueConstructor'
</span><span class="cx"> PASS jsWrapperClass(stylesheet.cssRules.item(0).style.getPropertyCSSValue('color').getRGBColorValue()) is 'RGBColor'
</span><del>-FAIL jsWrapperClass(stylesheet.cssRules.item(0).style.getPropertyCSSValue('color').getRGBColorValue().__proto__) should be RGBColorPrototype. Was Object.
-FAIL jsWrapperClass(stylesheet.cssRules.item(0).style.getPropertyCSSValue('color').getRGBColorValue().constructor) should be RGBColorConstructor. Was Function.
</del><ins>+PASS jsWrapperClass(stylesheet.cssRules.item(0).style.getPropertyCSSValue('color').getRGBColorValue().__proto__) is 'RGBColorPrototype'
+PASS jsWrapperClass(stylesheet.cssRules.item(0).style.getPropertyCSSValue('color').getRGBColorValue().constructor) is 'RGBColorConstructor'
</ins><span class="cx"> PASS jsWrapperClass(stylesheet.cssRules.item(0).style.getPropertyCSSValue('clip').getRectValue()) is 'Rect'
</span><span class="cx"> PASS jsWrapperClass(stylesheet.cssRules.item(0).style.getPropertyCSSValue('clip').getRectValue().__proto__) is 'RectPrototype'
</span><span class="cx"> PASS jsWrapperClass(stylesheet.cssRules.item(0).style.getPropertyCSSValue('clip').getRectValue().constructor) is 'RectConstructor'
</span></span></pre></div>
<a id="trunkLayoutTestsfastjsglobalconstructorsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/js/global-constructors-expected.txt (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/js/global-constructors-expected.txt        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/LayoutTests/fast/js/global-constructors-expected.txt        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -128,6 +128,7 @@
</span><span class="cx"> PASS PluginArray.toString() is '[object PluginArrayConstructor]'
</span><span class="cx"> PASS ProcessingInstruction.toString() is '[object ProcessingInstructionConstructor]'
</span><span class="cx"> PASS ProgressEvent.toString() is '[object ProgressEventConstructor]'
</span><ins>+PASS RGBColor.toString() is '[object RGBColorConstructor]'
</ins><span class="cx"> PASS Range.toString() is '[object RangeConstructor]'
</span><span class="cx"> PASS RangeException.toString() is '[object RangeExceptionConstructor]'
</span><span class="cx"> PASS Rect.toString() is '[object RectConstructor]'
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/ChangeLog        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2009-07-21  Sam Weinig  &lt;sam@webkit.org&gt;
+
+        Reviewed by Dan Bernstein.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=27242
+        JSC bindings should use an auto-bound RGBColor class instead of hand-rolled JSRGBColor
+
+        Move the JSC and Objective-C bindings onto using the RGBColor object instead
+        of just an unsigned int. The JSC bindings are now completely autogenerated for
+        this class. (Also removes the last lut from WebCore).
+
+        * DerivedSources.make:
+        * GNUmakefile.am:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * WebCoreSources.bkl:
+        * bindings/js/JSRGBColor.cpp: Removed.
+        * bindings/js/JSRGBColor.h: Removed.
+        * bindings/objc/DOM.mm:
+        (-[DOMRGBColor _color]):
+        * bindings/objc/DOMRGBColor.mm:
+        (-[DOMRGBColor dealloc]):
+        (-[DOMRGBColor finalize]):
+        (-[DOMRGBColor red]):
+        (-[DOMRGBColor green]):
+        (-[DOMRGBColor blue]):
+        (-[DOMRGBColor alpha]):
+        (-[DOMRGBColor color]):
+        * bindings/scripts/CodeGenerator.pm:
+        * bindings/scripts/CodeGeneratorJS.pm:
+        * bindings/scripts/CodeGeneratorObjC.pm:
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseColor):
+        * css/CSSPrimitiveValue.cpp:
+        (WebCore::CSSPrimitiveValue::getRGBColorValue):
+        * css/CSSPrimitiveValue.h:
+        (WebCore::CSSPrimitiveValue::getRGBA32Value):
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::getColorFromPrimitiveValue):
+        * css/RGBColor.cpp:
+        (WebCore::RGBColor::alpha):
+        * css/RGBColor.h:
+        (WebCore::RGBColor::color):
+        (WebCore::RGBColor::RGBColor):
+        * css/RGBColor.idl:
+        * page/DOMWindow.idl:
+        * svg/SVGColor.cpp:
+        (WebCore::SVGColor::rgbColor):
+        * svg/SVGColor.h:
+
</ins><span class="cx"> 2009-07-21  Jian Li  &lt;jianli@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by David Levin.
</span></span></pre></div>
<a id="trunkWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/DerivedSources.make (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/DerivedSources.make        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/DerivedSources.make        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -393,10 +393,8 @@
</span><span class="cx"> .PHONY : all
</span><span class="cx"> 
</span><span class="cx"> all : \
</span><del>-    $(filter-out JSEventListener.h JSEventTarget.h JSRGBColor.h,$(DOM_CLASSES:%=JS%.h)) \
</del><ins>+    $(filter-out JSEventListener.h JSEventTarget.h,$(DOM_CLASSES:%=JS%.h)) \
</ins><span class="cx">     \
</span><del>-    JSRGBColor.lut.h \
-    \
</del><span class="cx">     JSJavaScriptCallFrame.h \
</span><span class="cx">     \
</span><span class="cx">     CSSGrammar.cpp \
</span><span class="lines">@@ -546,15 +544,6 @@
</span><span class="cx"> 
</span><span class="cx"> # --------
</span><span class="cx"> 
</span><del>-# lookup tables for old-style JavaScript bindings
-
-%.lut.h: %.cpp $(CREATE_HASH_TABLE)
-        $(CREATE_HASH_TABLE) $&lt; -n WebCore &gt; $@
-%Table.cpp: %.cpp $(CREATE_HASH_TABLE)
-        $(CREATE_HASH_TABLE) $&lt; -n WebCore &gt; $@
-
-# --------
-
</del><span class="cx"> # HTML tag and attribute names
</span><span class="cx"> 
</span><span class="cx"> ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_DEFINES)), ENABLE_VIDEO)
</span></span></pre></div>
<a id="trunkWebCoreGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/GNUmakefile.am (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/GNUmakefile.am        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/GNUmakefile.am        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -63,9 +63,7 @@
</span><span class="cx"> webcore_built_nosources += \
</span><span class="cx">         DerivedSources/DocTypeStrings.cpp \
</span><span class="cx">         DerivedSources/tokenizer.cpp \
</span><del>-        DerivedSources/ColorData.c \
-        WebCore/bindings/js/JSDOMWindowBase.lut.h \
-        WebCore/bindings/js/JSRGBColor.lut.h
</del><ins>+        DerivedSources/ColorData.c
</ins><span class="cx"> 
</span><span class="cx"> webcore_built_sources += \
</span><span class="cx">         DerivedSources/CSSGrammar.cpp \
</span><span class="lines">@@ -102,6 +100,7 @@
</span><span class="cx">         WebCore/css/CSSVariablesRule.idl \
</span><span class="cx">         WebCore/css/Counter.idl \
</span><span class="cx">         WebCore/css/MediaList.idl \
</span><ins>+        WebCore/css/RGBColor.idl \
</ins><span class="cx">         WebCore/css/Rect.idl \
</span><span class="cx">         WebCore/css/StyleSheet.idl \
</span><span class="cx">         WebCore/css/StyleSheetList.idl \
</span><span class="lines">@@ -584,6 +583,7 @@
</span><span class="cx">         WebCore/css/MediaQueryExp.cpp \
</span><span class="cx">         WebCore/css/MediaQueryExp.h \
</span><span class="cx">         WebCore/css/Pair.h \
</span><ins>+        WebCore/css/RGBColor.h \
</ins><span class="cx">         WebCore/css/Rect.h \
</span><span class="cx">         WebCore/css/ShadowValue.cpp \
</span><span class="cx">         WebCore/css/ShadowValue.h \
</span><span class="lines">@@ -3347,8 +3347,5 @@
</span><span class="cx"> # Clean rules for WebCore
</span><span class="cx"> 
</span><span class="cx"> CLEANFILES += \
</span><del>-        libWebCoreJS.la \
-        WebCore/bindings/js/JSDOMWindowBase.lut.h \
-        WebCore/bindings/js/JSRGBColor.lut.h \
-        WebCore/bindings/js/JSWorkerContextBase.lut.h
</del><ins>+        libWebCoreJS.la
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreWebCorepro"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.pro (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.pro        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/WebCore.pro        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -264,7 +264,6 @@
</span><span class="cx"> 
</span><span class="cx"> DOMLUT_FILES += \
</span><span class="cx">     bindings/js/JSDOMWindowBase.cpp \
</span><del>-    bindings/js/JSRGBColor.cpp \
</del><span class="cx">     bindings/js/JSWorkerContextBase.cpp
</span><span class="cx"> 
</span><span class="cx"> IDL_BINDINGS += \
</span><span class="lines">@@ -285,6 +284,7 @@
</span><span class="cx">     css/CSSVariablesDeclaration.idl \
</span><span class="cx">     css/CSSVariablesRule.idl \
</span><span class="cx">     css/MediaList.idl \
</span><ins>+    css/RGBColor.idl \
</ins><span class="cx">     css/Rect.idl \
</span><span class="cx">     css/StyleSheet.idl \
</span><span class="cx">     css/StyleSheetList.idl \
</span><span class="lines">@@ -516,7 +516,6 @@
</span><span class="cx">     bindings/js/JSNodeListCustom.cpp \
</span><span class="cx">     bindings/js/JSOptionConstructor.cpp \
</span><span class="cx">     bindings/js/JSQuarantinedObjectWrapper.cpp \
</span><del>-    bindings/js/JSRGBColor.cpp \
</del><span class="cx">     bindings/js/JSStyleSheetCustom.cpp \
</span><span class="cx">     bindings/js/JSStyleSheetListCustom.cpp \
</span><span class="cx">     bindings/js/JSTextCustom.cpp \
</span></span></pre></div>
<a id="trunkWebCoreWebCorevcprojWebCorevcproj"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.vcproj/WebCore.vcproj (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.vcproj/WebCore.vcproj        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/WebCore.vcproj/WebCore.vcproj        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -7718,10 +7718,54 @@
</span><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span><span class="cx">                         &lt;File
</span><del>-                                RelativePath=&quot;$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSRGBColor.lut.h&quot;
</del><ins>+                                RelativePath=&quot;$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSRGBColor.cpp&quot;
</ins><span class="cx">                                 &gt;
</span><ins>+                                &lt;FileConfiguration
+                                        Name=&quot;Debug|Win32&quot;
+                                        ExcludedFromBuild=&quot;true&quot;
+                                        &gt;
+                                        &lt;Tool
+                                                Name=&quot;VCCLCompilerTool&quot;
+                                        /&gt;
+                                &lt;/FileConfiguration&gt;
+                                &lt;FileConfiguration
+                                        Name=&quot;Release|Win32&quot;
+                                        ExcludedFromBuild=&quot;true&quot;
+                                        &gt;
+                                        &lt;Tool
+                                                Name=&quot;VCCLCompilerTool&quot;
+                                        /&gt;
+                                &lt;/FileConfiguration&gt;
+                                &lt;FileConfiguration
+                                        Name=&quot;Debug_Internal|Win32&quot;
+                                        ExcludedFromBuild=&quot;true&quot;
+                                        &gt;
+                                        &lt;Tool
+                                                Name=&quot;VCCLCompilerTool&quot;
+                                        /&gt;
+                                &lt;/FileConfiguration&gt;
+                                &lt;FileConfiguration
+                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                        ExcludedFromBuild=&quot;true&quot;
+                                        &gt;
+                                        &lt;Tool
+                                                Name=&quot;VCCLCompilerTool&quot;
+                                        /&gt;
+                                &lt;/FileConfiguration&gt;
+                                &lt;FileConfiguration
+                                        Name=&quot;Release_Cairo|Win32&quot;
+                                        ExcludedFromBuild=&quot;true&quot;
+                                        &gt;
+                                        &lt;Tool
+                                                Name=&quot;VCCLCompilerTool&quot;
+                                        /&gt;
+                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                         &lt;/File&gt;
</span><span class="cx">                         &lt;File
</span><ins>+                                RelativePath=&quot;$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSRGBColor.h&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
</ins><span class="cx">                                 RelativePath=&quot;$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSScreen.cpp&quot;
</span><span class="cx">                                 &gt;
</span><span class="cx">                                 &lt;FileConfiguration
</span><span class="lines">@@ -28598,14 +28642,6 @@
</span><span class="cx">                                         &gt;
</span><span class="cx">                                 &lt;/File&gt;
</span><span class="cx">                                 &lt;File
</span><del>-                                        RelativePath=&quot;..\bindings\js\JSRGBColor.cpp&quot;
-                                        &gt;
-                                &lt;/File&gt;
-                                &lt;File
-                                        RelativePath=&quot;..\bindings\js\JSRGBColor.h&quot;
-                                        &gt;
-                                &lt;/File&gt;
-                                &lt;File
</del><span class="cx">                                         RelativePath=&quot;..\bindings\js\JSSharedWorkerConstructor.cpp&quot;
</span><span class="cx">                                         &gt;
</span><span class="cx">                                 &lt;/File&gt;
</span></span></pre></div>
<a id="trunkWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.xcodeproj/project.pbxproj (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.xcodeproj/project.pbxproj        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/WebCore.xcodeproj/project.pbxproj        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -3900,9 +3900,6 @@
</span><span class="cx">                 BC305C7A0C076BB300CD20F0 /* JSHTMLObjectElement.h in Headers */ = {isa = PBXBuildFile; fileRef = BC305C780C076BB300CD20F0 /* JSHTMLObjectElement.h */; };
</span><span class="cx">                 BC305CA40C0781BB00CD20F0 /* JSHTMLObjectElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC305CA30C0781BB00CD20F0 /* JSHTMLObjectElementCustom.cpp */; };
</span><span class="cx">                 BC33FB1B0F30EE85002CDD7C /* RenderLineBoxList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC33FB1A0F30EE85002CDD7C /* RenderLineBoxList.cpp */; };
</span><del>-                BC3452430D7E00EA0016574A /* JSRGBColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC3452410D7E00EA0016574A /* JSRGBColor.cpp */; };
-                BC3452440D7E00EA0016574A /* JSRGBColor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3452420D7E00EA0016574A /* JSRGBColor.h */; };
-                BC3452560D7E02850016574A /* JSRGBColor.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3452550D7E02850016574A /* JSRGBColor.lut.h */; };
</del><span class="cx">                 BC348BBE0DB7F531004ABAB9 /* JSXMLHttpRequestCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC348BBD0DB7F531004ABAB9 /* JSXMLHttpRequestCustom.cpp */; };
</span><span class="cx">                 BC348BD30DB7F804004ABAB9 /* JSXMLHttpRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC348BD10DB7F804004ABAB9 /* JSXMLHttpRequest.cpp */; };
</span><span class="cx">                 BC348BD40DB7F804004ABAB9 /* JSXMLHttpRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = BC348BD20DB7F804004ABAB9 /* JSXMLHttpRequest.h */; };
</span><span class="lines">@@ -4047,6 +4044,10 @@
</span><span class="cx">                 BC6DADEF0A195FDF00E5CD14 /* WebFontCache.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6DADEE0A195FDF00E5CD14 /* WebFontCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 BC6DADFA0A19602B00E5CD14 /* WebFontCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC6DADF90A19602B00E5CD14 /* WebFontCache.mm */; };
</span><span class="cx">                 BC6DC7A10C1A4BFA004E2017 /* JSHTMLAllCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6DC7A00C1A4BFA004E2017 /* JSHTMLAllCollection.h */; };
</span><ins>+                BC74DA371013F3F7007987AD /* RGBColor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC74DA351013F3F7007987AD /* RGBColor.h */; };
+                BC74DA381013F3F7007987AD /* RGBColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC74DA361013F3F7007987AD /* RGBColor.cpp */; };
+                BC74DA481013F468007987AD /* JSRGBColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC74DA461013F468007987AD /* JSRGBColor.cpp */; };
+                BC74DA491013F468007987AD /* JSRGBColor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC74DA471013F468007987AD /* JSRGBColor.h */; };
</ins><span class="cx">                 BC76AC130DD7AD5C00415F34 /* ParserUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = BC76AC110DD7AD5C00415F34 /* ParserUtilities.h */; };
</span><span class="cx">                 BC772B3B0C4EA91E0083285F /* CSSHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC772B350C4EA91E0083285F /* CSSHelper.cpp */; };
</span><span class="cx">                 BC772B3C0C4EA91E0083285F /* CSSHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = BC772B360C4EA91E0083285F /* CSSHelper.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -8742,9 +8743,6 @@
</span><span class="cx">                 BC305C780C076BB300CD20F0 /* JSHTMLObjectElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLObjectElement.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 BC305CA30C0781BB00CD20F0 /* JSHTMLObjectElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLObjectElementCustom.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 BC33FB1A0F30EE85002CDD7C /* RenderLineBoxList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLineBoxList.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                BC3452410D7E00EA0016574A /* JSRGBColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRGBColor.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                BC3452420D7E00EA0016574A /* JSRGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRGBColor.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                BC3452550D7E02850016574A /* JSRGBColor.lut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRGBColor.lut.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 BC348BA70DB7F1B8004ABAB9 /* XMLHttpRequest.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = XMLHttpRequest.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 BC348BBD0DB7F531004ABAB9 /* JSXMLHttpRequestCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXMLHttpRequestCustom.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 BC348BD10DB7F804004ABAB9 /* JSXMLHttpRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXMLHttpRequest.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -8895,6 +8893,10 @@
</span><span class="cx">                 BC6DADEE0A195FDF00E5CD14 /* WebFontCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFontCache.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 BC6DADF90A19602B00E5CD14 /* WebFontCache.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFontCache.mm; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 BC6DC7A00C1A4BFA004E2017 /* JSHTMLAllCollection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLAllCollection.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><ins>+                BC74DA351013F3F7007987AD /* RGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RGBColor.h; sourceTree = &quot;&lt;group&gt;&quot;; };
+                BC74DA361013F3F7007987AD /* RGBColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RGBColor.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
+                BC74DA461013F468007987AD /* JSRGBColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRGBColor.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
+                BC74DA471013F468007987AD /* JSRGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRGBColor.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</ins><span class="cx">                 BC76AC110DD7AD5C00415F34 /* ParserUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParserUtilities.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 BC772B350C4EA91E0083285F /* CSSHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSHelper.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 BC772B360C4EA91E0083285F /* CSSHelper.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSHelper.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -12516,7 +12518,8 @@
</span><span class="cx">                                 BC3C39B50C0D3D8D005F4D7A /* JSMediaList.h */,
</span><span class="cx">                                 BCFE2F0F0C1B58370020235F /* JSRect.cpp */,
</span><span class="cx">                                 BCFE2F100C1B58370020235F /* JSRect.h */,
</span><del>-                                BC3452550D7E02850016574A /* JSRGBColor.lut.h */,
</del><ins>+                                BC74DA461013F468007987AD /* JSRGBColor.cpp */,
+                                BC74DA471013F468007987AD /* JSRGBColor.h */,
</ins><span class="cx">                                 BCE013980C0BEF180043860A /* JSStyleSheet.cpp */,
</span><span class="cx">                                 BCE013990C0BEF180043860A /* JSStyleSheet.h */,
</span><span class="cx">                                 A84EBD820CB8C97700079609 /* JSStyleSheetList.cpp */,
</span><span class="lines">@@ -13459,17 +13462,14 @@
</span><span class="cx">                 BC1A3793097C6FB10019F3D8 /* js */ = {
</span><span class="cx">                         isa = PBXGroup;
</span><span class="cx">                         children = (
</span><del>-                                A8EDB03C1016849400FE8113 /* DOMObjectWithSVGContext.h */,
-                                415B7C620FF5A767006770F7 /* JSSharedWorkerConstructor.h */,
-                                415B7C540FF598E6006770F7 /* JSAbstractWorkerCustom.cpp */,
-                                415B7C550FF598E6006770F7 /* JSSharedWorkerConstructor.cpp */,
-                                415B7C560FF598E6006770F7 /* JSSharedWorkerCustom.cpp */,
</del><span class="cx">                                 BC4EDEF70C08F414007EDD49 /* Custom */,
</span><span class="cx">                                 14DFB33F0A7DF7630018F769 /* Derived Sources */,
</span><ins>+                                93F8B3060A300FEA00F61AB8 /* CodeGeneratorJS.pm */,
</ins><span class="cx">                                 BCD533630ED6848900887468 /* CachedScriptSourceProvider.h */,
</span><del>-                                93F8B3060A300FEA00F61AB8 /* CodeGeneratorJS.pm */,
</del><ins>+                                A8EDB03C1016849400FE8113 /* DOMObjectWithSVGContext.h */,
</ins><span class="cx">                                 1432E8480C51493F00B1500F /* GCController.cpp */,
</span><span class="cx">                                 1432E8460C51493800B1500F /* GCController.h */,
</span><ins>+                                415B7C540FF598E6006770F7 /* JSAbstractWorkerCustom.cpp */,
</ins><span class="cx">                                 E4EEFFC60D34550C00469A58 /* JSAudioConstructor.cpp */,
</span><span class="cx">                                 E4EEFFC70D34550C00469A58 /* JSAudioConstructor.h */,
</span><span class="cx">                                 E10B93C20B73C291003ED890 /* JSCustomXPathNSResolver.cpp */,
</span><span class="lines">@@ -13510,8 +13510,9 @@
</span><span class="cx">                                 93B70D5009EB0C7C009D8468 /* JSPluginElementFunctions.h */,
</span><span class="cx">                                 C09158880DB4209200E55AF4 /* JSQuarantinedObjectWrapper.cpp */,
</span><span class="cx">                                 C09158890DB4209200E55AF4 /* JSQuarantinedObjectWrapper.h */,
</span><del>-                                BC3452410D7E00EA0016574A /* JSRGBColor.cpp */,
-                                BC3452420D7E00EA0016574A /* JSRGBColor.h */,
</del><ins>+                                415B7C550FF598E6006770F7 /* JSSharedWorkerConstructor.cpp */,
+                                415B7C620FF5A767006770F7 /* JSSharedWorkerConstructor.h */,
+                                415B7C560FF598E6006770F7 /* JSSharedWorkerCustom.cpp */,
</ins><span class="cx">                                 B21127A50B3186770009BE53 /* JSSVGPODTypeWrapper.h */,
</span><span class="cx">                                 498391610F1E8EE100C23782 /* JSWebKitCSSMatrixConstructor.cpp */,
</span><span class="cx">                                 498391620F1E8EE100C23782 /* JSWebKitCSSMatrixConstructor.h */,
</span><span class="lines">@@ -14139,7 +14140,6 @@
</span><span class="cx">                 F523D18402DE42E8018635CA /* css */ = {
</span><span class="cx">                         isa = PBXGroup;
</span><span class="cx">                         children = (
</span><del>-                                93CA4C9C09DF93FA00DF8677 /* maketokenizer */,
</del><span class="cx">                                 A80E6CDA0A1989CA007FB8C5 /* Counter.h */,
</span><span class="cx">                                 930705C709E0C95F00B17FE4 /* Counter.idl */,
</span><span class="cx">                                 A80E6CBB0A1989CA007FB8C5 /* CSSBorderImageValue.cpp */,
</span><span class="lines">@@ -14258,6 +14258,7 @@
</span><span class="cx">                                 93CA4C9909DF93FA00DF8677 /* html.css */,
</span><span class="cx">                                 93CA4C9A09DF93FA00DF8677 /* make-css-file-arrays.pl */,
</span><span class="cx">                                 93CA4C9B09DF93FA00DF8677 /* makeprop.pl */,
</span><ins>+                                93CA4C9C09DF93FA00DF8677 /* maketokenizer */,
</ins><span class="cx">                                 93CA4C9D09DF93FA00DF8677 /* makevalues.pl */,
</span><span class="cx">                                 070DD8F50F01868000727DEB /* mediaControls.css */,
</span><span class="cx">                                 07AFE5900F1446BD00841617 /* mediaControlsQT.css */,
</span><span class="lines">@@ -14276,6 +14277,8 @@
</span><span class="cx">                                 93CA4C9F09DF93FA00DF8677 /* quirks.css */,
</span><span class="cx">                                 BC4368E70C226E32005EFB5F /* Rect.h */,
</span><span class="cx">                                 A80E79960A19BD21007FB8C5 /* Rect.idl */,
</span><ins>+                                BC74DA361013F3F7007987AD /* RGBColor.cpp */,
+                                BC74DA351013F3F7007987AD /* RGBColor.h */,
</ins><span class="cx">                                 858C38EF0AA8FDD100B187A4 /* RGBColor.idl */,
</span><span class="cx">                                 A80E6CCA0A1989CA007FB8C5 /* ShadowValue.cpp */,
</span><span class="cx">                                 A80E6CBE0A1989CA007FB8C5 /* ShadowValue.h */,
</span><span class="lines">@@ -16123,8 +16126,6 @@
</span><span class="cx">                                 65DF320209D1CC60000BE325 /* JSRange.h in Headers */,
</span><span class="cx">                                 D23CA55D0AB0EAAE005108A5 /* JSRangeException.h in Headers */,
</span><span class="cx">                                 BCFE2F120C1B58380020235F /* JSRect.h in Headers */,
</span><del>-                                BC3452440D7E00EA0016574A /* JSRGBColor.h in Headers */,
-                                BC3452560D7E02850016574A /* JSRGBColor.lut.h in Headers */,
</del><span class="cx">                                 BCEC01C30C274DDD009F4EC9 /* JSScreen.h in Headers */,
</span><span class="cx">                                 BC8243290D0CE8A200460C8F /* JSSQLError.h in Headers */,
</span><span class="cx">                                 1AE82FED0CAB07EE002237AE /* JSSQLResultSet.h in Headers */,
</span><span class="lines">@@ -17025,6 +17026,8 @@
</span><span class="cx">                                 15C7708D100D3C6B005BA267 /* ValidityState.h in Headers */,
</span><span class="cx">                                 15C77093100D3CA8005BA267 /* JSValidityState.h in Headers */,
</span><span class="cx">                                 15C770A6100D41CD005BA267 /* DOMValidityState.h in Headers */,
</span><ins>+                                BC74DA371013F3F7007987AD /* RGBColor.h in Headers */,
+                                BC74DA491013F468007987AD /* JSRGBColor.h in Headers */,
</ins><span class="cx">                                 377C4CDF1014E9F600B9AE42 /* PlaceholderDocument.h in Headers */,
</span><span class="cx">                                 2ECF7ADD10162B3800427DE7 /* JSErrorEvent.h in Headers */,
</span><span class="cx">                                 2ECF7AE210162B5800427DE7 /* ErrorEvent.h in Headers */,
</span><span class="lines">@@ -17282,7 +17285,7 @@
</span><span class="cx">                         );
</span><span class="cx">                         runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx">                         shellPath = /bin/sh;
</span><del>-                        shellScript = &quot;mkdir -p \&quot;${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\&quot;\ncd \&quot;${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\&quot;\n\nexport CREATE_HASH_TABLE=\&quot;${JAVASCRIPTCORE_PRIVATE_HEADERS_DIR}/create_hash_table\&quot;\n\n/bin/ln -sfh \&quot;${SRCROOT}\&quot; WebCore\nexport WebCore=\&quot;WebCore\&quot;\n\nif [ \&quot;${ACTION}\&quot; = \&quot;build\&quot; -o \&quot;${ACTION}\&quot; = \&quot;install\&quot; -o \&quot;${ACTION}\&quot; = \&quot;installhdrs\&quot; ]; then\n    make -f \&quot;WebCore/DerivedSources.make\&quot; -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n&quot;;
</del><ins>+                        shellScript = &quot;mkdir -p \&quot;${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\&quot;\ncd \&quot;${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\&quot;\n\n/bin/ln -sfh \&quot;${SRCROOT}\&quot; WebCore\nexport WebCore=\&quot;WebCore\&quot;\n\nif [ \&quot;${ACTION}\&quot; = \&quot;build\&quot; -o \&quot;${ACTION}\&quot; = \&quot;install\&quot; -o \&quot;${ACTION}\&quot; = \&quot;installhdrs\&quot; ]; then\n    make -f \&quot;WebCore/DerivedSources.make\&quot; -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n&quot;;
</ins><span class="cx">                 };
</span><span class="cx"> /* End PBXShellScriptBuildPhase section */
</span><span class="cx"> 
</span><span class="lines">@@ -18212,7 +18215,6 @@
</span><span class="cx">                                 65DF320109D1CC60000BE325 /* JSRange.cpp in Sources */,
</span><span class="cx">                                 D23CA55F0AB0EAB6005108A5 /* JSRangeException.cpp in Sources */,
</span><span class="cx">                                 BCFE2F110C1B58370020235F /* JSRect.cpp in Sources */,
</span><del>-                                BC3452430D7E00EA0016574A /* JSRGBColor.cpp in Sources */,
</del><span class="cx">                                 BCEC01C20C274DDD009F4EC9 /* JSScreen.cpp in Sources */,
</span><span class="cx">                                 514C76370CE9225E007EF3CD /* JSSQLError.cpp in Sources */,
</span><span class="cx">                                 1AE82FEC0CAB07EE002237AE /* JSSQLResultSet.cpp in Sources */,
</span><span class="lines">@@ -19060,6 +19062,8 @@
</span><span class="cx">                                 15C7708E100D3C6B005BA267 /* ValidityState.cpp in Sources */,
</span><span class="cx">                                 15C77094100D3CA8005BA267 /* JSValidityState.cpp in Sources */,
</span><span class="cx">                                 15C770A5100D41CD005BA267 /* DOMValidityState.mm in Sources */,
</span><ins>+                                BC74DA381013F3F7007987AD /* RGBColor.cpp in Sources */,
+                                BC74DA481013F468007987AD /* JSRGBColor.cpp in Sources */,
</ins><span class="cx">                                 377C4CE01014E9F600B9AE42 /* PlaceholderDocument.cpp in Sources */,
</span><span class="cx">                                 2ECF7ADC10162B3800427DE7 /* JSErrorEvent.cpp in Sources */,
</span><span class="cx">                                 2ECF7AE110162B5800427DE7 /* ErrorEvent.cpp in Sources */,
</span></span></pre></div>
<a id="trunkWebCoreWebCoreSourcesbkl"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCoreSources.bkl (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCoreSources.bkl        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/WebCoreSources.bkl        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -125,7 +125,6 @@
</span><span class="cx">         bindings/js/JSPluginCustom.cpp
</span><span class="cx">         bindings/js/JSPluginArrayCustom.cpp
</span><span class="cx">         bindings/js/JSQuarantinedObjectWrapper.cpp
</span><del>-        bindings/js/JSRGBColor.cpp
</del><span class="cx">         bindings/js/JSSQLResultSetRowListCustom.cpp
</span><span class="cx">         bindings/js/JSSQLTransactionCustom.cpp
</span><span class="cx">         bindings/js/JSStorageCustom.cpp
</span><span class="lines">@@ -382,6 +381,7 @@
</span><span class="cx">         DerivedSources/WebCore/JSRange.cpp
</span><span class="cx">         DerivedSources/WebCore/JSRangeException.cpp
</span><span class="cx">         DerivedSources/WebCore/JSRect.cpp
</span><ins>+        DerivedSources/WebCore/JSRGBColor.cpp
</ins><span class="cx">         DerivedSources/WebCore/JSScreen.cpp
</span><span class="cx">         DerivedSources/WebCore/JSStorage.cpp
</span><span class="cx">         DerivedSources/WebCore/JSStorageEvent.cpp
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSRGBColorcpp"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/bindings/js/JSRGBColor.cpp (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSRGBColor.cpp        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/bindings/js/JSRGBColor.cpp        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -1,87 +0,0 @@
</span><del>-/*
- *  Copyright (C) 2000 Harri Porten (porten@kde.org)
- *  Copyright (C) 2001 Peter Kelly (pmk@post.com)
- *  Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
- *  Copyright (C) 2006 James G. Speth (speth@end.com)
- *  Copyright (C) 2006 Samuel Weinig (sam@webkit.org)
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include &quot;config.h&quot;
-#include &quot;JSRGBColor.h&quot;
-
-#include &quot;CSSPrimitiveValue.h&quot;
-#include &quot;JSCSSPrimitiveValue.h&quot;
-
-using namespace JSC;
-
-static JSValue jsRGBColorRed(ExecState*, const Identifier&amp;, const PropertySlot&amp;);
-static JSValue jsRGBColorGreen(ExecState*, const Identifier&amp;, const PropertySlot&amp;);
-static JSValue jsRGBColorBlue(ExecState*, const Identifier&amp;, const PropertySlot&amp;);
-
-/*
-@begin JSRGBColorTable
-  red   jsRGBColorRed        DontDelete|ReadOnly
-  green jsRGBColorGreen      DontDelete|ReadOnly
-  blue  jsRGBColorBlue       DontDelete|ReadOnly
-@end
-*/
-
-#include &quot;JSRGBColor.lut.h&quot;
-
-namespace WebCore {
-
-ASSERT_CLASS_FITS_IN_CELL(JSRGBColor);
-
-const ClassInfo JSRGBColor::s_info = { &quot;RGBColor&quot;, 0, &amp;JSRGBColorTable, 0 };
-
-JSRGBColor::JSRGBColor(ExecState* exec, unsigned color)
-    // FIXME: deprecatedGetDOMStructure uses the prototype off of the wrong global object
-    // This will be fixed when JSRGBColor wraps css/RGBColor instead of being custom.
-    : DOMObject(deprecatedGetDOMStructure&lt;JSRGBColor&gt;(exec))
-    , m_color(color)
-{
-}
-
-bool JSRGBColor::getOwnPropertySlot(ExecState* exec, const Identifier&amp; propertyName, PropertySlot&amp; slot)
-{
-    return getStaticValueSlot&lt;JSRGBColor, DOMObject&gt;(exec, &amp;JSRGBColorTable, this, propertyName, slot);
-}
-
-JSValue getJSRGBColor(ExecState* exec, unsigned color)
-{
-    return new (exec) JSRGBColor(exec, color);
-}
-
-} // namespace WebCore
-
-using namespace WebCore;
-
-JSValue jsRGBColorRed(ExecState* exec, const Identifier&amp;, const PropertySlot&amp; slot)
-{
-    return toJS(exec, CSSPrimitiveValue::create((static_cast&lt;JSRGBColor*&gt;(asObject(slot.slotBase()))-&gt;impl() &gt;&gt; 16) &amp; 0xFF, CSSPrimitiveValue::CSS_NUMBER));
-}
-
-JSValue jsRGBColorGreen(ExecState* exec, const Identifier&amp;, const PropertySlot&amp; slot)
-{
-    return toJS(exec, CSSPrimitiveValue::create((static_cast&lt;JSRGBColor*&gt;(asObject(slot.slotBase()))-&gt;impl() &gt;&gt; 8) &amp; 0xFF, CSSPrimitiveValue::CSS_NUMBER));
-}
-
-JSValue jsRGBColorBlue(ExecState* exec, const Identifier&amp;, const PropertySlot&amp; slot)
-{
-    return toJS(exec, CSSPrimitiveValue::create(static_cast&lt;JSRGBColor*&gt;(asObject(slot.slotBase()))-&gt;impl() &amp; 0xFF, CSSPrimitiveValue::CSS_NUMBER));
-}
-
</del></span></pre></div>
<a id="trunkWebCorebindingsjsJSRGBColorh"></a>
<div class="delfile"><h4>Deleted: trunk/WebCore/bindings/js/JSRGBColor.h (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSRGBColor.h        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/bindings/js/JSRGBColor.h        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-/*
- *  Copyright (C) 2000 Harri Porten (porten@kde.org)
- *  Copyright (C) 2001 Peter Kelly (pmk@post.com)
- *  Copyright (C) 2004, 2006, 2007, 2008 Apple Inc. All rights reserved.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef JSRGBColor_h
-#define JSRGBColor_h
-
-#include &quot;Color.h&quot;
-#include &quot;JSDOMBinding.h&quot;
-
-namespace WebCore {
-
-    // FIXME: JSRGBColor should have a proper prototype and a constructor.
-    class JSRGBColor : public DOMObject {
-    public:
-        JSRGBColor(JSC::ExecState*, unsigned color);
-
-        virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&amp;, JSC::PropertySlot&amp;);
-
-        virtual const JSC::ClassInfo* classInfo() const { return &amp;s_info; }
-        static const JSC::ClassInfo s_info;
-
-        unsigned impl() const { return m_color; }
-
-        static JSC::ObjectPrototype* createPrototype(JSC::ExecState*, JSC::JSGlobalObject* globalObject)
-        {
-            return globalObject-&gt;objectPrototype();
-        }
-
-        static PassRefPtr&lt;JSC::Structure&gt; createStructure(JSC::JSValue prototype)
-        {
-            return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType));
-        }
-
-    private:
-        unsigned m_color;
-    };
-
-    JSC::JSValue getJSRGBColor(JSC::ExecState*, unsigned color);
-
-} // namespace WebCore
-
-#endif // JSRGBColor_h
</del></span></pre></div>
<a id="trunkWebCorebindingsobjcDOMmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/objc/DOM.mm (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/objc/DOM.mm        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/bindings/objc/DOM.mm        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -503,6 +503,21 @@
</span><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> //------------------------------------------------------------------------------------------
</span><ins>+// DOMRGBColor
+
+@implementation DOMRGBColor (WebPrivate)
+
+// FIXME: This should be removed as soon as all internal Apple uses of it have been replaced with
+// calls to the public method - (NSColor *)color.
+- (NSColor *)_color
+{
+    return [self color];
+}
+
+@end
+
+
+//------------------------------------------------------------------------------------------
</ins><span class="cx"> // DOMNodeFilter
</span><span class="cx"> 
</span><span class="cx"> DOMNodeFilter *kit(WebCore::NodeFilter* impl)
</span></span></pre></div>
<a id="trunkWebCorebindingsobjcDOMRGBColormm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/objc/DOMRGBColor.mm (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/objc/DOMRGBColor.mm        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/bindings/objc/DOMRGBColor.mm        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -31,115 +31,74 @@
</span><span class="cx"> #import &quot;CSSPrimitiveValue.h&quot;
</span><span class="cx"> #import &quot;ColorMac.h&quot;
</span><span class="cx"> #import &quot;DOMCSSPrimitiveValueInternal.h&quot;
</span><ins>+#import &quot;ExceptionHandlers.h&quot;
+#import &quot;RGBColor.h&quot;
+#import &quot;ThreadCheck.h&quot;
</ins><span class="cx"> #import &quot;WebCoreObjCExtras.h&quot;
</span><span class="cx"> #import &quot;WebScriptObjectPrivate.h&quot;
</span><del>-#import &lt;runtime/InitializeThreading.h&gt;
</del><ins>+#import &lt;wtf/GetPtr.h&gt;
</ins><span class="cx"> 
</span><del>-static NSMapTable* RGBColorWrapperCache;
</del><ins>+#define IMPL reinterpret_cast&lt;WebCore::RGBColor*&gt;(_internal)
</ins><span class="cx"> 
</span><del>-static id getWrapperForRGB(WebCore::RGBA32 value)
-{
-    if (!RGBColorWrapperCache)
-        return nil;
-    return static_cast&lt;id&gt;(NSMapGet(RGBColorWrapperCache, reinterpret_cast&lt;const void*&gt;(value)));
-}
-
-static void setWrapperForRGB(id wrapper, WebCore::RGBA32 value)
-{
-    if (!RGBColorWrapperCache)
-        // No need to retain/free either impl key, or id value.  Items will be removed
-        // from the cache in dealloc methods.
-        RGBColorWrapperCache = createWrapperCacheWithIntegerKeys();
-    NSMapInsert(RGBColorWrapperCache, reinterpret_cast&lt;const void*&gt;(value), wrapper);
-}
-
-static void removeWrapperForRGB(WebCore::RGBA32 value)
-{
-    if (!RGBColorWrapperCache)
-        return;
-    NSMapRemove(RGBColorWrapperCache, reinterpret_cast&lt;const void*&gt;(value));
-}
-
</del><span class="cx"> @implementation DOMRGBColor
</span><span class="cx"> 
</span><del>-+ (void)initialize
</del><ins>+- (void)dealloc
</ins><span class="cx"> {
</span><del>-    JSC::initializeThreading();
-#ifndef BUILDING_ON_TIGER
-    WebCoreObjCFinalizeOnMainThread(self);
-#endif
</del><ins>+    { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); }
+    if (_internal)
+        IMPL-&gt;deref();
+    [super dealloc];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)dealloc
</del><ins>+- (void)finalize
</ins><span class="cx"> {
</span><del>-    if (WebCoreObjCScheduleDeallocateOnMainThread([DOMRGBColor class], self))
-        return;
-    
-    removeWrapperForRGB(reinterpret_cast&lt;uintptr_t&gt;(_internal));
-    _internal = 0;
-    [super dealloc];
</del><ins>+    if (_internal)
+        IMPL-&gt;deref();
+    [super finalize];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (DOMCSSPrimitiveValue *)red
</span><span class="cx"> {
</span><del>-    WebCore::RGBA32 rgb = reinterpret_cast&lt;uintptr_t&gt;(_internal);
-    int value = (rgb &gt;&gt; 16) &amp; 0xFF;
-    return kit(WebCore::CSSPrimitiveValue::create(value, WebCore::CSSPrimitiveValue::CSS_NUMBER).get());
</del><ins>+    return kit(WTF::getPtr(IMPL-&gt;red()));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (DOMCSSPrimitiveValue *)green
</span><span class="cx"> {
</span><del>-    WebCore::RGBA32 rgb = reinterpret_cast&lt;uintptr_t&gt;(_internal);
-    int value = (rgb &gt;&gt; 8) &amp; 0xFF;
-    return kit(WebCore::CSSPrimitiveValue::create(value, WebCore::CSSPrimitiveValue::CSS_NUMBER).get());
</del><ins>+    return kit(WTF::getPtr(IMPL-&gt;green()));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (DOMCSSPrimitiveValue *)blue
</span><span class="cx"> {
</span><del>-    WebCore::RGBA32 rgb = reinterpret_cast&lt;uintptr_t&gt;(_internal);
-    int value = rgb &amp; 0xFF;
-    return kit(WebCore::CSSPrimitiveValue::create(value, WebCore::CSSPrimitiveValue::CSS_NUMBER).get());
</del><ins>+    return kit(WTF::getPtr(IMPL-&gt;blue()));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (DOMCSSPrimitiveValue *)alpha
</span><span class="cx"> {
</span><del>-    WebCore::RGBA32 rgb = reinterpret_cast&lt;uintptr_t&gt;(_internal);
-    float value = static_cast&lt;float&gt;(WebCore::Color(rgb).alpha()) / 0xFF;
-    return kit(WebCore::CSSPrimitiveValue::create(value, WebCore::CSSPrimitiveValue::CSS_NUMBER).get());
-    
</del><ins>+    return kit(WTF::getPtr(IMPL-&gt;alpha()));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (NSColor *)color
</span><span class="cx"> {
</span><del>-    WebCore::RGBA32 rgb = reinterpret_cast&lt;uintptr_t&gt;(_internal);
-    return WebCore::nsColor(WebCore::Color(rgb));
</del><ins>+    return WebCore::nsColor(IMPL-&gt;color());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span><del>-@implementation DOMRGBColor (WebPrivate)
-
-// FIXME: this should be removed once all internal Apple uses of it have been replaced with
-// calls to the public method, color without the leading underscore.
-- (NSColor *)_color
</del><ins>+WebCore::RGBColor* core(DOMRGBColor *wrapper)
</ins><span class="cx"> {
</span><del>-    return [self color];
</del><ins>+    return wrapper ? reinterpret_cast&lt;WebCore::RGBColor*&gt;(wrapper-&gt;_internal) : 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-@end
-
-WebCore::RGBA32 core(DOMRGBColor *color)
</del><ins>+DOMRGBColor *kit(WebCore::RGBColor* value)
</ins><span class="cx"> {
</span><del>-     return color ? static_cast&lt;WebCore::RGBA32&gt;(reinterpret_cast&lt;uintptr_t&gt;(color-&gt;_internal)) : 0;
-}
-
-DOMRGBColor *kit(WebCore::RGBA32 value)
-{
-    if (DOMRGBColor *wrapper = getWrapperForRGB(value))
</del><ins>+    { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+    if (!value)
+        return nil;
+    if (DOMRGBColor *wrapper = getDOMWrapper(value))
</ins><span class="cx">         return [[wrapper retain] autorelease];
</span><del>-
</del><span class="cx">     DOMRGBColor *wrapper = [[DOMRGBColor alloc] _init];
</span><span class="cx">     wrapper-&gt;_internal = reinterpret_cast&lt;DOMObjectInternal*&gt;(value);
</span><del>-    setWrapperForRGB(wrapper, value);
</del><ins>+    value-&gt;ref();
+    addDOMWrapper(wrapper, value);
</ins><span class="cx">     return [wrapper autorelease];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorebindingsscriptsCodeGeneratorpm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/scripts/CodeGenerator.pm (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/scripts/CodeGenerator.pm        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/bindings/scripts/CodeGenerator.pm        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">                          &quot;float&quot; =&gt; 1, &quot;double&quot; =&gt; 1, 
</span><span class="cx">                          &quot;boolean&quot; =&gt; 1, &quot;void&quot; =&gt; 1);
</span><span class="cx"> 
</span><del>-my %podTypeHash = (&quot;RGBColor&quot; =&gt; 1, &quot;SVGNumber&quot; =&gt; 1, &quot;SVGTransform&quot; =&gt; 1);
</del><ins>+my %podTypeHash = (&quot;SVGNumber&quot; =&gt; 1, &quot;SVGTransform&quot; =&gt; 1);
</ins><span class="cx"> my %podTypesWithWritablePropertiesHash = (&quot;SVGLength&quot; =&gt; 1, &quot;SVGMatrix&quot; =&gt; 1, &quot;SVGPoint&quot; =&gt; 1, &quot;SVGRect&quot; =&gt; 1);
</span><span class="cx"> my %stringTypeHash = (&quot;DOMString&quot; =&gt; 1, &quot;AtomicString&quot; =&gt; 1);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx">     # When we're finished with the one-file-per-class
</span><span class="cx">     # reorganization, we won't need these special cases.
</span><span class="cx">     if ($codeGenerator-&gt;IsPrimitiveType($type) or AvoidInclusionOfType($type)
</span><del>-        or $type eq &quot;DOMString&quot; or $type eq &quot;DOMObject&quot; or $type eq &quot;RGBColor&quot; or $type eq &quot;Array&quot;) {
</del><ins>+        or $type eq &quot;DOMString&quot; or $type eq &quot;DOMObject&quot; or $type eq &quot;Array&quot;) {
</ins><span class="cx">     } elsif ($type =~ /SVGPathSeg/) {
</span><span class="cx">         $joinedName = $type;
</span><span class="cx">         $joinedName =~ s/Abs|Rel//;
</span><span class="lines">@@ -1678,11 +1678,6 @@
</span><span class="cx">         return &quot;jsString(exec, $value)&quot;;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if ($type eq &quot;RGBColor&quot;) {
-        $implIncludes{&quot;JS$type.h&quot;} = 1;
-        return &quot;getJSRGBColor(exec, $value)&quot;;
-    }
-
</del><span class="cx">     if ($codeGenerator-&gt;IsPodType($type)) {
</span><span class="cx">         $implIncludes{&quot;JS$type.h&quot;} = 1;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorebindingsscriptsCodeGeneratorObjCpm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/scripts/CodeGeneratorObjC.pm (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/scripts/CodeGeneratorObjC.pm        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/bindings/scripts/CodeGeneratorObjC.pm        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -522,11 +522,6 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if ($type eq &quot;RGBColor&quot;) {
-        $implIncludes{&quot;DOMRGBColorInternal.h&quot;} = 1;
-        return;
-    }
-
</del><span class="cx">     if ($type eq &quot;DOMWindow&quot;) {
</span><span class="cx">         $implIncludes{&quot;DOMAbstractViewInternal.h&quot;} = 1;
</span><span class="cx">         $implIncludes{&quot;DOMWindow.h&quot;} = 1;
</span><span class="lines">@@ -924,8 +919,6 @@
</span><span class="cx"> 
</span><span class="cx">         if ($codeGenerator-&gt;IsSVGAnimatedType($interfaceName)) {
</span><span class="cx">             push(@internalHeaderContent, &quot;#import &lt;WebCore/SVGAnimatedTemplate.h&gt;\n\n&quot;);
</span><del>-        } elsif ($interfaceName eq &quot;RGBColor&quot;) {
-            push(@internalHeaderContent, &quot;#import &lt;WebCore/Color.h&gt;\n\n&quot;);
</del><span class="cx">         } else {
</span><span class="cx">             push(@internalHeaderContent, &quot;namespace WebCore {\n&quot;);
</span><span class="cx">             $startedNamespace = 1;
</span></span></pre></div>
<a id="trunkWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSParser.cpp (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSParser.cpp        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/css/CSSParser.cpp        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx">             CSSValue* value = parser.m_parsedProperties[0]-&gt;value();
</span><span class="cx">             if (value-&gt;cssValueType() == CSSValue::CSS_PRIMITIVE_VALUE) {
</span><span class="cx">                 CSSPrimitiveValue* primitiveValue = static_cast&lt;CSSPrimitiveValue*&gt;(value);
</span><del>-                color = primitiveValue-&gt;getRGBColorValue();
</del><ins>+                color = primitiveValue-&gt;getRGBA32Value();
</ins><span class="cx">             }
</span><span class="cx">         } else
</span><span class="cx">             return false;
</span></span></pre></div>
<a id="trunkWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSPrimitiveValue.cpp (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSPrimitiveValue.cpp        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/css/CSSPrimitiveValue.cpp        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include &quot;ExceptionCode.h&quot;
</span><span class="cx"> #include &quot;Node.h&quot;
</span><span class="cx"> #include &quot;Pair.h&quot;
</span><ins>+#include &quot;RGBColor.h&quot;
</ins><span class="cx"> #include &quot;Rect.h&quot;
</span><span class="cx"> #include &quot;RenderStyle.h&quot;
</span><span class="cx"> #include &lt;wtf/ASCIICType.h&gt;
</span><span class="lines">@@ -642,7 +643,7 @@
</span><span class="cx">     return m_value.rect;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-unsigned CSSPrimitiveValue::getRGBColorValue(ExceptionCode&amp; ec) const
</del><ins>+RGBColor* CSSPrimitiveValue::getRGBColorValue(ExceptionCode&amp; ec) const
</ins><span class="cx"> {
</span><span class="cx">     ec = 0;
</span><span class="cx">     if (m_type != CSS_RGBCOLOR) {
</span><span class="lines">@@ -650,7 +651,8 @@
</span><span class="cx">         return 0;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    return m_value.rgbcolor;
</del><ins>+    // FIMXE: This should not return a new object for each invocation.
+    return RGBColor::create(m_value.rgbcolor).releaseRef();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Pair* CSSPrimitiveValue::getPairValue(ExceptionCode&amp; ec) const
</span></span></pre></div>
<a id="trunkWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSPrimitiveValue.h (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSPrimitiveValue.h        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/css/CSSPrimitiveValue.h        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #define CSSPrimitiveValue_h
</span><span class="cx"> 
</span><span class="cx"> #include &quot;CSSValue.h&quot;
</span><ins>+#include &quot;Color.h&quot;
</ins><span class="cx"> #include &lt;wtf/PassRefPtr.h&gt;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -30,6 +31,7 @@
</span><span class="cx"> class Counter;
</span><span class="cx"> class DashboardRegion;
</span><span class="cx"> class Pair;
</span><ins>+class RGBColor;
</ins><span class="cx"> class Rect;
</span><span class="cx"> class RenderStyle;
</span><span class="cx"> class StringImpl;
</span><span class="lines">@@ -150,8 +152,8 @@
</span><span class="cx">     Rect* getRectValue(ExceptionCode&amp;) const;
</span><span class="cx">     Rect* getRectValue() const { return m_type != CSS_RECT ? 0 : m_value.rect; }
</span><span class="cx"> 
</span><del>-    unsigned getRGBColorValue(ExceptionCode&amp;) const;
-    unsigned getRGBColorValue() const { return m_type != CSS_RGBCOLOR ? 0 : m_value.rgbcolor; }
</del><ins>+    RGBColor* getRGBColorValue(ExceptionCode&amp;) const;
+    RGBA32 getRGBA32Value() const { return m_type != CSS_RGBCOLOR ? 0 : m_value.rgbcolor; }
</ins><span class="cx"> 
</span><span class="cx">     Pair* getPairValue(ExceptionCode&amp;) const;
</span><span class="cx">     Pair* getPairValue() const { return m_type != CSS_PAIR ? 0 : m_value.pair; }
</span></span></pre></div>
<a id="trunkWebCorecssCSSStyleSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSStyleSelector.cpp (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSStyleSelector.cpp        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/css/CSSStyleSelector.cpp        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -5766,7 +5766,7 @@
</span><span class="cx">         else
</span><span class="cx">             col = colorForCSSValue(ident);
</span><span class="cx">     } else if (primitiveValue-&gt;primitiveType() == CSSPrimitiveValue::CSS_RGBCOLOR)
</span><del>-        col.setRGB(primitiveValue-&gt;getRGBColorValue());
</del><ins>+        col.setRGB(primitiveValue-&gt;getRGBA32Value());
</ins><span class="cx">     return col;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorecssRGBColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/RGBColor.cpp (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/RGBColor.cpp        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/css/RGBColor.cpp        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx">  * Copyright (C) 2008, 2009 Google, Inc.  All rights reserved.
</span><ins>+ * Copyright (C) 2009 Apple Inc.  All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -51,5 +52,11 @@
</span><span class="cx">     return CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+PassRefPtr&lt;CSSPrimitiveValue&gt; RGBColor::alpha()
+{
+    float value = static_cast&lt;float&gt;((m_rgbColor &gt;&gt; 24) &amp; 0xFF) / 0xFF;
+    return WebCore::CSSPrimitiveValue::create(value, WebCore::CSSPrimitiveValue::CSS_NUMBER);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorecssRGBColorh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/RGBColor.h (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/RGBColor.h        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/css/RGBColor.h        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx">  * Copyright (C) 2006, 2007, 2008, 2009 Google, Inc.  All rights reserved.
</span><ins>+ * Copyright (C) 2009 Apple Inc.  All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,24 +28,29 @@
</span><span class="cx"> #define RGBColor_h
</span><span class="cx"> 
</span><span class="cx"> #include &quot;CSSPrimitiveValue.h&quot;
</span><ins>+#include &quot;Color.h&quot;
</ins><span class="cx"> #include &lt;wtf/RefCounted.h&gt;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx">     class RGBColor : public RefCounted&lt;RGBColor&gt; {
</span><span class="cx">     public:
</span><del>-        // FIXME: Make constructor private once codegenerator changes
-        // have landed upstream.
-        RGBColor(unsigned rgbColor) : m_rgbColor(rgbColor) { }
-
</del><span class="cx">         static PassRefPtr&lt;RGBColor&gt; create(unsigned rgbColor);
</span><span class="cx"> 
</span><span class="cx">         PassRefPtr&lt;CSSPrimitiveValue&gt; red();
</span><span class="cx">         PassRefPtr&lt;CSSPrimitiveValue&gt; green();
</span><span class="cx">         PassRefPtr&lt;CSSPrimitiveValue&gt; blue();
</span><ins>+        PassRefPtr&lt;CSSPrimitiveValue&gt; alpha();
</ins><span class="cx"> 
</span><ins>+        Color color() const { return Color(m_rgbColor); }
+
</ins><span class="cx">     private:
</span><del>-        unsigned m_rgbColor;
</del><ins>+        RGBColor(unsigned rgbColor)
+            : m_rgbColor(rgbColor)
+        {
+        }
+
+        RGBA32 m_rgbColor;
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkWebCorecssRGBColoridl"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/RGBColor.idl (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/RGBColor.idl        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/css/RGBColor.idl        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx">     interface [
</span><span class="cx">         ObjCCustomImplementation,
</span><span class="cx">         GenerateConstructor,
</span><del>-        PODType=RGBA32,
</del><span class="cx">         InterfaceUUID=2e3b1501-2cf7-4a4a-bbf7-d8843d1c3be7,
</span><span class="cx">         ImplementationUUID=cf779953-4898-4800-aa31-6c9e3f4711be
</span><span class="cx">     ] RGBColor {
</span></span></pre></div>
<a id="trunkWebCorepageDOMWindowidl"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/DOMWindow.idl (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/DOMWindow.idl        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/page/DOMWindow.idl        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -304,6 +304,7 @@
</span><span class="cx">         attribute CounterConstructor Counter;
</span><span class="cx">         attribute CSSRuleListConstructor CSSRuleList;
</span><span class="cx">         attribute RectConstructor Rect;
</span><ins>+        attribute RGBColorConstructor RGBColor;
</ins><span class="cx">         attribute StyleSheetListConstructor StyleSheetList;
</span><span class="cx"> 
</span><span class="cx">         // FIXME: Implement the commented-out global constructors for interfaces listed in DOM Level 3 Core specification.
</span></span></pre></div>
<a id="trunkWebCoresvgSVGColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/svg/SVGColor.cpp (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/svg/SVGColor.cpp        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/svg/SVGColor.cpp        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #include &quot;SVGColor.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;CSSParser.h&quot;
</span><ins>+#include &quot;RGBColor.h&quot;
</ins><span class="cx"> #include &quot;SVGException.h&quot;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -61,9 +62,9 @@
</span><span class="cx">     return m_colorType;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-unsigned SVGColor::rgbColor() const
</del><ins>+RGBColor* SVGColor::rgbColor() const
</ins><span class="cx"> {
</span><del>-    return m_color.rgb();
</del><ins>+    return RGBColor::create(m_color.rgb()).releaseRef();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void SVGColor::setRGBColor(const String&amp; rgbColor, ExceptionCode&amp; ec)
</span></span></pre></div>
<a id="trunkWebCoresvgSVGColorh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/svg/SVGColor.h (46210 => 46211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/svg/SVGColor.h        2009-07-22 04:03:32 UTC (rev 46210)
+++ trunk/WebCore/svg/SVGColor.h        2009-07-22 04:27:22 UTC (rev 46211)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+    class RGBColor;
+
</ins><span class="cx">     class SVGColor : public CSSValue {
</span><span class="cx">     public:
</span><span class="cx">         static PassRefPtr&lt;SVGColor&gt; create(const String&amp; color)
</span><span class="lines">@@ -55,7 +57,7 @@
</span><span class="cx">         // 'SVGColor' functions
</span><span class="cx">         unsigned short colorType() const;
</span><span class="cx"> 
</span><del>-        unsigned rgbColor() const;
</del><ins>+        RGBColor* rgbColor() const;
</ins><span class="cx">         
</span><span class="cx">         static Color colorFromRGBColorString(const String&amp;);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>