<!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>[193416] branches/safari-601-branch</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/193416">193416</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 09:10:19 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188194">r188194</a>. rdar://problem/23732393</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcanvascanvasimageSmoothingEnabledexpectedtxt">branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcanvascanvasimageSmoothingEnabledpatternshtml">branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcanvascanvasimageSmoothingEnabledzerosizehtml">branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-zero-size.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcanvasscripttestscanvasimageSmoothingEnabledrepaintjs">branches/safari-601-branch/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcanvasscripttestscanvasimageSmoothingEnabledjs">branches/safari-601-branch/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled.js</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlcanvasCanvasRenderingContext2Dh">branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlcanvasCanvasRenderingContext2Didl">branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193415 => 193416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-04 13:16:05 UTC (rev 193415)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-04 17:10:19 UTC (rev 193416)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-12-03 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r188194. rdar://problem/23732393
+
+ 2015-08-08 Dean Jackson <dino@apple.com>
+
+ Remove the webkit prefix from CanvasRenderingContext2D imageSmoothingEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=147803
+ <rdar://problem/22200553>
+
+ Reviewed by Sam Weinig.
+
+ Use the standard version of imageSmoothingEnabled rather than
+ the prefixed version.
+
+ * fast/canvas/canvas-imageSmoothingEnabled-expected.txt:
+ * fast/canvas/canvas-imageSmoothingEnabled-patterns.html:
+ * fast/canvas/canvas-imageSmoothingEnabled-zero-size.html:
+ * fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js:
+ (draw):
+ * fast/canvas/script-tests/canvas-imageSmoothingEnabled.js: Add some tests
+ to make sure the prefixed version correctly maps to the standard version.
+
</ins><span class="cx"> 2015-12-03 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Skip Inspector tests because the new test harness does not work on the branch currently.
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcanvascanvasimageSmoothingEnabledexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-expected.txt (193415 => 193416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-expected.txt 2015-12-04 13:16:05 UTC (rev 193415)
+++ branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-expected.txt 2015-12-04 17:10:19 UTC (rev 193416)
</span><span class="lines">@@ -4,11 +4,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> Test that the default value is true.
</span><del>-PASS ctx.webkitImageSmoothingEnabled is true
</del><ins>+PASS ctx.imageSmoothingEnabled is true
</ins><span class="cx"> Test that false is returned after a the attribute is set to false.
</span><del>-PASS ctx.webkitImageSmoothingEnabled is false
</del><ins>+PASS ctx.imageSmoothingEnabled is false
</ins><span class="cx"> Test that restore works. We save a false state; create, then save a true state; and then finally restore.
</span><del>-PASS ctx.webkitImageSmoothingEnabled is false
</del><ins>+PASS ctx.imageSmoothingEnabled is false
</ins><span class="cx"> New canvas element created.
</span><span class="cx"> Test that the image is smoothed by default. We check by making sure the pixel just to the left of the middle line is not completely black.
</span><span class="cx"> PASS left_of_center_pixel.data[0] !== 0 is true
</span><span class="lines">@@ -26,6 +26,15 @@
</span><span class="cx"> PASS left_of_center_pixel.data[0] is 0
</span><span class="cx"> PASS left_of_center_pixel.data[1] is 0
</span><span class="cx"> PASS left_of_center_pixel.data[2] is 0
</span><ins>+Test that the prefixed attribute mirrors the unprefixed attribute.
+PASS ctx.imageSmoothingEnabled is false
+PASS ctx.webkitImageSmoothingEnabled is false
+PASS ctx.imageSmoothingEnabled is true
+PASS ctx.webkitImageSmoothingEnabled is true
+PASS ctx.imageSmoothingEnabled is false
+PASS ctx.webkitImageSmoothingEnabled is false
+PASS ctx.imageSmoothingEnabled is true
+PASS ctx.webkitImageSmoothingEnabled is true
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcanvascanvasimageSmoothingEnabledpatternshtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns.html (193415 => 193416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns.html 2015-12-04 13:16:05 UTC (rev 193415)
+++ branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns.html 2015-12-04 17:10:19 UTC (rev 193416)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> var ctx = canvas.getContext('2d');
</span><span class="cx"> var pattern = ctx.createPattern(image, "repeat");
</span><span class="cx"> ctx.fillStyle = pattern;
</span><del>- ctx.webkitImageSmoothingEnabled = smoothing;
</del><ins>+ ctx.imageSmoothingEnabled = smoothing;
</ins><span class="cx"> ctx.scale(10, 10);
</span><span class="cx"> ctx.fillRect(0, 0, canvas.width, canvas.height);
</span><span class="cx"> }
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> var ctx = canvas.getContext('2d');
</span><span class="cx"> var pattern = ctx.createPattern(image, "repeat");
</span><span class="cx"> ctx.fillStyle = pattern;
</span><del>- ctx.webkitImageSmoothingEnabled = smoothing;
</del><ins>+ ctx.imageSmoothingEnabled = smoothing;
</ins><span class="cx"> ctx.scale(10, 10);
</span><span class="cx"> ctx.beginPath();
</span><span class="cx"> ctx.moveTo(0,0);
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> var pattern = ctx.createPattern(image, "repeat");
</span><span class="cx"> ctx.strokeStyle = pattern;
</span><span class="cx"> ctx.lineWidth = 5;
</span><del>- ctx.webkitImageSmoothingEnabled = smoothing;
</del><ins>+ ctx.imageSmoothingEnabled = smoothing;
</ins><span class="cx"> ctx.scale(10, 10);
</span><span class="cx"> ctx.beginPath();
</span><span class="cx"> ctx.moveTo(0,0);
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcanvascanvasimageSmoothingEnabledzerosizehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-zero-size.html (193415 => 193416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-zero-size.html 2015-12-04 13:16:05 UTC (rev 193415)
+++ branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-zero-size.html 2015-12-04 17:10:19 UTC (rev 193416)
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> }
</span><span class="cx"> window.onload = function () {
</span><del>- var canvas = document.createElement('canvas');
- canvas.width = 0;
- canvas.height = 0;
- var context = canvas.getContext('2d');
- if(context.webkitImageSmoothingEnabled) {context.webkitImageSmoothingEnabled = false;}
</del><ins>+ var canvas = document.createElement('canvas');
+ canvas.width = 0;
+ canvas.height = 0;
+ var context = canvas.getContext('2d');
+ if(context.imageSmoothingEnabled) {context.imageSmoothingEnabled = false;}
</ins><span class="cx"> };
</span><span class="cx"> </script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcanvasscripttestscanvasimageSmoothingEnabledrepaintjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js (193415 => 193416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js 2015-12-04 13:16:05 UTC (rev 193415)
+++ branches/safari-601-branch/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js 2015-12-04 17:10:19 UTC (rev 193416)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> srcCtx.fillRect(0, 0, 1, 1);
</span><span class="cx"> srcCtx.fillStyle = "rgb(0, 255, 0)";
</span><span class="cx"> srcCtx.fillRect(1, 0, 1, 1);
</span><del>- dstCtx.webkitImageSmoothingEnabled = false;
</del><ins>+ dstCtx.imageSmoothingEnabled = false;
</ins><span class="cx"> dstCtx.drawImage(srcCanvas, 0, 0, 2, 1, 0, 0, 300, 300);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcanvasscripttestscanvasimageSmoothingEnabledjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled.js (193415 => 193416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled.js 2015-12-04 13:16:05 UTC (rev 193415)
+++ branches/safari-601-branch/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled.js 2015-12-04 17:10:19 UTC (rev 193416)
</span><span class="lines">@@ -2,17 +2,17 @@
</span><span class="cx"> var ctx = document.createElement('canvas').getContext('2d');
</span><span class="cx">
</span><span class="cx"> debug("Test that the default value is true.");
</span><del>-shouldBe("ctx.webkitImageSmoothingEnabled", "true");
</del><ins>+shouldBe("ctx.imageSmoothingEnabled", "true");
</ins><span class="cx">
</span><span class="cx"> debug("Test that false is returned after a the attribute is set to false.");
</span><del>-ctx.webkitImageSmoothingEnabled = false;
-shouldBe("ctx.webkitImageSmoothingEnabled", "false");
</del><ins>+ctx.imageSmoothingEnabled = false;
+shouldBe("ctx.imageSmoothingEnabled", "false");
</ins><span class="cx">
</span><span class="cx"> debug("Test that restore works. We save a false state; create, then save a true state; and then finally restore.");
</span><span class="cx"> ctx.save();
</span><del>-ctx.webkitImageSmoothingEnabled = true;
</del><ins>+ctx.imageSmoothingEnabled = true;
</ins><span class="cx"> ctx.restore();
</span><del>-shouldBe("ctx.webkitImageSmoothingEnabled", "false");
</del><ins>+shouldBe("ctx.imageSmoothingEnabled", "false");
</ins><span class="cx">
</span><span class="cx"> var image = document.createElement('canvas');
</span><span class="cx"> image.width = 2;
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> shouldBe("left_of_center_pixel.data[1] !== 0", "true");
</span><span class="cx"> shouldBe("left_of_center_pixel.data[2] !== 0", "true");
</span><span class="cx">
</span><del>-ctx.webkitImageSmoothingEnabled = false;
</del><ins>+ctx.imageSmoothingEnabled = false;
</ins><span class="cx"> ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
</span><span class="cx"> left_of_center_pixel = ctx.getImageData(1, 0, 1, 1);
</span><span class="cx"> debug("Test that nearest neighbour is used when imageSmoothingEnabled is set to false. We check this by making sure the pixel just to the left of the middle line is completely black.");
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> shouldBe("left_of_center_pixel.data[1]", "0");
</span><span class="cx"> shouldBe("left_of_center_pixel.data[2]", "0");
</span><span class="cx">
</span><del>-ctx.webkitImageSmoothingEnabled = true;
</del><ins>+ctx.imageSmoothingEnabled = true;
</ins><span class="cx"> ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
</span><span class="cx"> left_of_center_pixel = ctx.getImageData(1, 0, 1, 1);
</span><span class="cx"> debug("Test that the image is smoothed when imageSmoothingEnabled is set to true.");
</span><span class="lines">@@ -66,9 +66,9 @@
</span><span class="cx"> shouldBe("left_of_center_pixel.data[2] !== 0", "true");
</span><span class="cx">
</span><span class="cx"> debug("Test that restoring actually changes smoothing and not just the attribute value. We are restoring to a point where imageSmoothingEnabled is set to false.");
</span><del>-ctx.webkitImageSmoothingEnabled = false;
</del><ins>+ctx.imageSmoothingEnabled = false;
</ins><span class="cx"> ctx.save();
</span><del>-ctx.webkitImageSmoothingEnabled = true;
</del><ins>+ctx.imageSmoothingEnabled = true;
</ins><span class="cx"> ctx.restore();
</span><span class="cx"> ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
</span><span class="cx"> left_of_center_pixel = ctx.getImageData(1, 0, 1, 1);
</span><span class="lines">@@ -76,3 +76,16 @@
</span><span class="cx"> shouldBe("left_of_center_pixel.data[1]", "0");
</span><span class="cx"> shouldBe("left_of_center_pixel.data[2]", "0");
</span><span class="cx">
</span><ins>+debug("Test that the prefixed attribute mirrors the unprefixed attribute.");
+ctx.imageSmoothingEnabled = false;
+shouldBe("ctx.imageSmoothingEnabled", "false");
+shouldBe("ctx.webkitImageSmoothingEnabled", "false");
+ctx.imageSmoothingEnabled = true;
+shouldBe("ctx.imageSmoothingEnabled", "true");
+shouldBe("ctx.webkitImageSmoothingEnabled", "true");
+ctx.webkitImageSmoothingEnabled = false;
+shouldBe("ctx.imageSmoothingEnabled", "false");
+shouldBe("ctx.webkitImageSmoothingEnabled", "false");
+ctx.webkitImageSmoothingEnabled = true;
+shouldBe("ctx.imageSmoothingEnabled", "true");
+shouldBe("ctx.webkitImageSmoothingEnabled", "true");
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193415 => 193416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-04 13:16:05 UTC (rev 193415)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-04 17:10:19 UTC (rev 193416)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-12-03 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r188194. rdar://problem/23732393
+
+ 2015-08-08 Dean Jackson <dino@apple.com>
+
+ Remove the webkit prefix from CanvasRenderingContext2D imageSmoothingEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=147803
+ <rdar://problem/22200553>
+
+ Reviewed by Sam Weinig.
+
+ Rename webkitImageSmoothingEnabled to imageSmoothingEnabled.
+
+ Updated existing tests, and made sure that the prefixed version is
+ identical to the standard version.
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::imageSmoothingEnabled): Renamed from webkitImageSmoothingEnabled.
+ (WebCore::CanvasRenderingContext2D::setImageSmoothingEnabled): Renamed from setWebkitImageSmoothingEnabled.
+ (WebCore::CanvasRenderingContext2D::webkitImageSmoothingEnabled): Deleted.
+ (WebCore::CanvasRenderingContext2D::setWebkitImageSmoothingEnabled): Deleted.
+ * html/canvas/CanvasRenderingContext2D.h: Rename the methods.
+ * html/canvas/CanvasRenderingContext2D.idl: Add the non-prefixed form, and mark is as the
+ implementation of the prefixed form.
+
</ins><span class="cx"> 2015-12-03 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r192592. rdar://problem/23221163
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (193415 => 193416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-12-04 13:16:05 UTC (rev 193415)
+++ branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-12-04 17:10:19 UTC (rev 193416)
</span><span class="lines">@@ -2526,12 +2526,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-bool CanvasRenderingContext2D::webkitImageSmoothingEnabled() const
</del><ins>+bool CanvasRenderingContext2D::imageSmoothingEnabled() const
</ins><span class="cx"> {
</span><span class="cx"> return state().m_imageSmoothingEnabled;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::setWebkitImageSmoothingEnabled(bool enabled)
</del><ins>+void CanvasRenderingContext2D::setImageSmoothingEnabled(bool enabled)
</ins><span class="cx"> {
</span><span class="cx"> if (enabled == state().m_imageSmoothingEnabled)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (193415 => 193416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2015-12-04 13:16:05 UTC (rev 193415)
+++ branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2015-12-04 17:10:19 UTC (rev 193416)
</span><span class="lines">@@ -225,8 +225,8 @@
</span><span class="cx"> LineCap getLineCap() const { return state().m_lineCap; }
</span><span class="cx"> LineJoin getLineJoin() const { return state().m_lineJoin; }
</span><span class="cx">
</span><del>- bool webkitImageSmoothingEnabled() const;
- void setWebkitImageSmoothingEnabled(bool);
</del><ins>+ bool imageSmoothingEnabled() const;
+ void setImageSmoothingEnabled(bool);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> enum class Direction {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlcanvasCanvasRenderingContext2Didl"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl (193415 => 193416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2015-12-04 13:16:05 UTC (rev 193415)
+++ branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2015-12-04 17:10:19 UTC (rev 193416)
</span><span class="lines">@@ -186,6 +186,7 @@
</span><span class="cx">
</span><span class="cx"> readonly attribute float webkitBackingStorePixelRatio;
</span><span class="cx">
</span><del>- attribute boolean webkitImageSmoothingEnabled;
</del><ins>+ attribute boolean imageSmoothingEnabled;
+ [ImplementedAs=imageSmoothingEnabled] attribute boolean webkitImageSmoothingEnabled;
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>