<!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>[165520] trunk/Source/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/165520">165520</a></dd>
<dt>Author</dt> <dd>jaepark@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-12 17:38:38 -0700 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make HTMLCanvasElement::is3D private
https://bugs.webkit.org/show_bug.cgi?id=130117
Reviewed by Anders Carlsson.
HTMLCanvasElement::is3D is not used anywhere except HTMLCanvasElement.
So, make HTMLCanvasElement::is3D a private method. Also, make more use
of is3D method.
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::reset):
(WebCore::HTMLCanvasElement::getImageData):
* html/HTMLCanvasElement.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementh">trunk/Source/WebCore/html/HTMLCanvasElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165519 => 165520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-13 00:26:58 UTC (rev 165519)
+++ trunk/Source/WebCore/ChangeLog 2014-03-13 00:38:38 UTC (rev 165520)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-03-11 Jae Hyun Park <jaepark@webkit.org>
+
+ Make HTMLCanvasElement::is3D private
+ https://bugs.webkit.org/show_bug.cgi?id=130117
+
+ Reviewed by Anders Carlsson.
+
+ HTMLCanvasElement::is3D is not used anywhere except HTMLCanvasElement.
+ So, make HTMLCanvasElement::is3D a private method. Also, make more use
+ of is3D method.
+
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::reset):
+ (WebCore::HTMLCanvasElement::getImageData):
+ * html/HTMLCanvasElement.h:
+
</ins><span class="cx"> 2014-03-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: OS X View Indication
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (165519 => 165520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-03-13 00:26:58 UTC (rev 165519)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-03-13 00:38:38 UTC (rev 165520)
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx"> setSurfaceSize(newSize);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span><del>- if (m_context && m_context->is3d() && oldSize != size())
</del><ins>+ if (is3D() && oldSize != size())
</ins><span class="cx"> static_cast<WebGLRenderingContext*>(m_context.get())->reshape(width(), height());
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -489,15 +489,15 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ImageData> HTMLCanvasElement::getImageData()
</span><span class="cx"> {
</span><del>- if (!m_context || !m_context->is3d())
- return 0;
</del><ins>+#if ENABLE(WEBGL)
+ if (!is3D())
+ return nullptr;
</ins><span class="cx">
</span><del>-#if ENABLE(WEBGL)
</del><span class="cx"> WebGLRenderingContext* ctx = static_cast<WebGLRenderingContext*>(m_context.get());
</span><span class="cx">
</span><span class="cx"> return ctx->paintRenderingResultsToImageData();
</span><span class="cx"> #else
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.h (165519 => 165520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.h 2014-03-13 00:26:58 UTC (rev 165519)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.h 2014-03-13 00:38:38 UTC (rev 165520)
</span><span class="lines">@@ -136,10 +136,6 @@
</span><span class="cx">
</span><span class="cx"> AffineTransform baseTransform() const;
</span><span class="cx">
</span><del>-#if ENABLE(WEBGL)
- bool is3D() const;
-#endif
-
</del><span class="cx"> void makeRenderingResultsAvailable();
</span><span class="cx"> bool hasCreatedImageBuffer() const { return m_hasCreatedImageBuffer; }
</span><span class="cx">
</span><span class="lines">@@ -168,6 +164,10 @@
</span><span class="cx">
</span><span class="cx"> bool paintsIntoCanvasBuffer() const;
</span><span class="cx">
</span><ins>+#if ENABLE(WEBGL)
+ bool is3D() const;
+#endif
+
</ins><span class="cx"> HashSet<CanvasObserver*> m_observers;
</span><span class="cx">
</span><span class="cx"> IntSize m_size;
</span></span></pre>
</div>
</div>
</body>
</html>