<!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>[47757] trunk/WebCore</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/47757">47757</a></dd>
<dt>Author</dt> <dd>jianli@chromium.org</dd>
<dt>Date</dt> <dd>2009-08-25 14:04:58 -0700 (Tue, 25 Aug 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>[V8] Fix compiling errors in Chromium build caused by Canvas3D changes from <a href="http://trac.webkit.org/projects/webkit/changeset/47752">r47752</a>.
https://bugs.webkit.org/show_bug.cgi?id=28717

Reviewed by David Levin.

* bindings/v8/DOMObjectsInclude.h:
* bindings/v8/DerivedSourcesAllInOne.cpp:
* bindings/v8/V8Index.cpp:
* bindings/v8/V8Index.h:
* bindings/v8/custom/V8DocumentCustom.cpp:
(WebCore::CALLBACK_FUNC_DECL):
* bindings/v8/custom/V8HTMLCanvasElementCustom.cpp:
(WebCore::CALLBACK_FUNC_DECL):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorebindingsv8DOMObjectsIncludeh">trunk/WebCore/bindings/v8/DOMObjectsInclude.h</a></li>
<li><a href="#trunkWebCorebindingsv8DerivedSourcesAllInOnecpp">trunk/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp</a></li>
<li><a href="#trunkWebCorebindingsv8V8Indexcpp">trunk/WebCore/bindings/v8/V8Index.cpp</a></li>
<li><a href="#trunkWebCorebindingsv8V8Indexh">trunk/WebCore/bindings/v8/V8Index.h</a></li>
<li><a href="#trunkWebCorebindingsv8customV8DocumentCustomcpp">trunk/WebCore/bindings/v8/custom/V8DocumentCustom.cpp</a></li>
<li><a href="#trunkWebCorebindingsv8customV8HTMLCanvasElementCustomcpp">trunk/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (47756 => 47757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-08-25 20:40:16 UTC (rev 47756)
+++ trunk/WebCore/ChangeLog        2009-08-25 21:04:58 UTC (rev 47757)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2009-08-25  Jian Li  &lt;jianli@chromium.org&gt;
+
+        Reviewed by David Levin.
+
+        [V8] Fix compiling errors in Chromium build caused by Canvas3D changes from r47752.
+        https://bugs.webkit.org/show_bug.cgi?id=28717
+
+        * bindings/v8/DOMObjectsInclude.h:
+        * bindings/v8/DerivedSourcesAllInOne.cpp:
+        * bindings/v8/V8Index.cpp:
+        * bindings/v8/V8Index.h:
+        * bindings/v8/custom/V8DocumentCustom.cpp:
+        (WebCore::CALLBACK_FUNC_DECL):
+        * bindings/v8/custom/V8HTMLCanvasElementCustom.cpp:
+        (WebCore::CALLBACK_FUNC_DECL):
+
</ins><span class="cx"> 2009-08-25  Alpha Lam  &lt;hclam@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by David Levin.
</span></span></pre></div>
<a id="trunkWebCorebindingsv8DOMObjectsIncludeh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/DOMObjectsInclude.h (47756 => 47757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/DOMObjectsInclude.h        2009-08-25 20:40:16 UTC (rev 47756)
+++ trunk/WebCore/bindings/v8/DOMObjectsInclude.h        2009-08-25 21:04:58 UTC (rev 47757)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include &quot;CanvasGradient.h&quot;
</span><span class="cx"> #include &quot;CanvasPattern.h&quot;
</span><span class="cx"> #include &quot;CanvasPixelArray.h&quot;
</span><ins>+#include &quot;CanvasRenderingContext.h&quot;
</ins><span class="cx"> #include &quot;CanvasRenderingContext2D.h&quot;
</span><span class="cx"> #include &quot;CanvasStyle.h&quot;
</span><span class="cx"> #include &quot;CharacterData.h&quot;
</span></span></pre></div>
<a id="trunkWebCorebindingsv8DerivedSourcesAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp (47756 => 47757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp        2009-08-25 20:40:16 UTC (rev 47756)
+++ trunk/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp        2009-08-25 21:04:58 UTC (rev 47757)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include &quot;bindings/V8CanvasGradient.cpp&quot;
</span><span class="cx"> #include &quot;bindings/V8CanvasPattern.cpp&quot;
</span><span class="cx"> #include &quot;bindings/V8CanvasPixelArray.cpp&quot;
</span><ins>+#include &quot;bindings/V8CanvasRenderingContext.cpp&quot;
</ins><span class="cx"> #include &quot;bindings/V8CanvasRenderingContext2D.cpp&quot;
</span><span class="cx"> #include &quot;bindings/V8CDATASection.cpp&quot;
</span><span class="cx"> #include &quot;bindings/V8CharacterData.cpp&quot;
</span></span></pre></div>
<a id="trunkWebCorebindingsv8V8Indexcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/V8Index.cpp (47756 => 47757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/V8Index.cpp        2009-08-25 20:40:16 UTC (rev 47756)
+++ trunk/WebCore/bindings/v8/V8Index.cpp        2009-08-25 21:04:58 UTC (rev 47757)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;V8Attr.h&quot;
</span><span class="cx"> #include &quot;V8BarInfo.h&quot;
</span><ins>+#include &quot;V8CanvasRenderingContext.h&quot;
</ins><span class="cx"> #include &quot;V8CanvasRenderingContext2D.h&quot;
</span><span class="cx"> #include &quot;V8CanvasGradient.h&quot;
</span><span class="cx"> #include &quot;V8CanvasPattern.h&quot;
</span></span></pre></div>
<a id="trunkWebCorebindingsv8V8Indexh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/V8Index.h (47756 => 47757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/V8Index.h        2009-08-25 20:40:16 UTC (rev 47756)
+++ trunk/WebCore/bindings/v8/V8Index.h        2009-08-25 21:04:58 UTC (rev 47757)
</span><span class="lines">@@ -313,6 +313,7 @@
</span><span class="cx">     V(BARINFO, BarInfo)                                                 \
</span><span class="cx">     V(CANVASGRADIENT, CanvasGradient)                                   \
</span><span class="cx">     V(CANVASPATTERN, CanvasPattern)                                     \
</span><ins>+    V(CANVASRENDERINGCONTEXT, CanvasRenderingContext)                   \
</ins><span class="cx">     V(CANVASRENDERINGCONTEXT2D, CanvasRenderingContext2D)               \
</span><span class="cx">     V(CLIENTRECT, ClientRect)                                           \
</span><span class="cx">     V(CLIENTRECTLIST, ClientRectList)                                   \
</span></span></pre></div>
<a id="trunkWebCorebindingsv8customV8DocumentCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/custom/V8DocumentCustom.cpp (47756 => 47757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/custom/V8DocumentCustom.cpp        2009-08-25 20:40:16 UTC (rev 47756)
+++ trunk/WebCore/bindings/v8/custom/V8DocumentCustom.cpp        2009-08-25 21:04:58 UTC (rev 47757)
</span><span class="lines">@@ -92,8 +92,8 @@
</span><span class="cx">     String name = toWebCoreString(args[1]);
</span><span class="cx">     int width = toInt32(args[2]);
</span><span class="cx">     int height = toInt32(args[3]);
</span><del>-    CanvasRenderingContext2D* result = imp-&gt;getCSSCanvasContext(contextId, name, width, height);
-    return V8DOMWrapper::convertToV8Object(V8ClassIndex::CANVASRENDERINGCONTEXT2D, result);
</del><ins>+    CanvasRenderingContext* result = imp-&gt;getCSSCanvasContext(contextId, name, width, height);
+    return V8DOMWrapper::convertToV8Object(V8ClassIndex::CANVASRENDERINGCONTEXT, result);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkWebCorebindingsv8customV8HTMLCanvasElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp (47756 => 47757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp        2009-08-25 20:40:16 UTC (rev 47756)
+++ trunk/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp        2009-08-25 21:04:58 UTC (rev 47757)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx">     v8::Handle&lt;v8::Object&gt; holder = args.Holder();
</span><span class="cx">     HTMLCanvasElement* imp = V8DOMWrapper::convertDOMWrapperToNode&lt;HTMLCanvasElement&gt;(holder);
</span><span class="cx">     String contextId = toWebCoreString(args[0]);
</span><del>-    CanvasRenderingContext2D* result = imp-&gt;getContext(contextId);
-    return V8DOMWrapper::convertToV8Object(V8ClassIndex::CANVASRENDERINGCONTEXT2D, result);
</del><ins>+    CanvasRenderingContext* result = imp-&gt;getContext(contextId);
+    return V8DOMWrapper::convertToV8Object(V8ClassIndex::CANVASRENDERINGCONTEXT, result);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>

</body>
</html>