Title: [139752] branches/chromium/1364/Source
- Revision
- 139752
- Author
- [email protected]
- Date
- 2013-01-15 10:15:57 -0800 (Tue, 15 Jan 2013)
Log Message
Merge 139026
> Add a flag to control canvas antialiasing.
> https://bugs.webkit.org/show_bug.cgi?id=106255
>
> Reviewed by Darin Fisher.
>
> Source/WebCore:
>
> This flag is not exposed through TestRunner or DRT, so no testing is
> possible yet.
>
> * html/HTMLCanvasElement.cpp:
> (WebCore::HTMLCanvasElement::createImageBuffer):
> * page/Settings.in:
>
> Source/WebKit/chromium:
>
> * public/WebSettings.h:
> * src/WebSettingsImpl.cpp:
> (WebKit::WebSettingsImpl::setAntialiased2dCanvasEnabled):
> * src/WebSettingsImpl.h:
>
[email protected]
Modified Paths
Diff
Modified: branches/chromium/1364/Source/WebCore/html/HTMLCanvasElement.cpp (139751 => 139752)
--- branches/chromium/1364/Source/WebCore/html/HTMLCanvasElement.cpp 2013-01-15 18:11:30 UTC (rev 139751)
+++ branches/chromium/1364/Source/WebCore/html/HTMLCanvasElement.cpp 2013-01-15 18:15:57 UTC (rev 139752)
@@ -570,6 +570,8 @@
return;
m_imageBuffer->context()->setShadowsIgnoreTransforms(true);
m_imageBuffer->context()->setImageInterpolationQuality(DefaultInterpolationQuality);
+ if (document()->settings() && !document()->settings()->antialiased2dCanvasEnabled())
+ m_imageBuffer->context()->setShouldAntialias(false);
m_imageBuffer->context()->setStrokeThickness(1);
m_contextStateSaver = adoptPtr(new GraphicsContextStateSaver(*m_imageBuffer->context()));
Modified: branches/chromium/1364/Source/WebCore/page/Settings.in (139751 => 139752)
--- branches/chromium/1364/Source/WebCore/page/Settings.in 2013-01-15 18:11:30 UTC (rev 139751)
+++ branches/chromium/1364/Source/WebCore/page/Settings.in 2013-01-15 18:15:57 UTC (rev 139752)
@@ -101,6 +101,7 @@
privilegedWebGLExtensionsEnabled initial=false
accelerated2dCanvasEnabled initial=false
deferred2dCanvasEnabled initial=false
+antialiased2dCanvasEnabled initial=true
loadDeferringEnabled initial=true
webAudioEnabled initial=false
paginateDuringLayoutEnabled initial=false
Modified: branches/chromium/1364/Source/WebKit/chromium/public/WebSettings.h (139751 => 139752)
--- branches/chromium/1364/Source/WebKit/chromium/public/WebSettings.h 2013-01-15 18:11:30 UTC (rev 139751)
+++ branches/chromium/1364/Source/WebKit/chromium/public/WebSettings.h 2013-01-15 18:15:57 UTC (rev 139752)
@@ -74,6 +74,7 @@
virtual void setAllowRunningOfInsecureContent(bool) = 0;
virtual void setAllowScriptsToCloseWindows(bool) = 0;
virtual void setAllowUniversalAccessFromFileURLs(bool) = 0;
+ virtual void setAntialiased2dCanvasEnabled(bool) = 0;
virtual void setApplyDeviceScaleFactorInCompositor(bool) = 0;
virtual void setApplyPageScaleFactorInCompositor(bool) = 0;
virtual void setAsynchronousSpellCheckingEnabled(bool) = 0;
Modified: branches/chromium/1364/Source/WebKit/chromium/src/WebSettingsImpl.cpp (139751 => 139752)
--- branches/chromium/1364/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2013-01-15 18:11:30 UTC (rev 139751)
+++ branches/chromium/1364/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2013-01-15 18:15:57 UTC (rev 139752)
@@ -503,6 +503,11 @@
m_settings->setAccelerated2dCanvasEnabled(enabled);
}
+void WebSettingsImpl::setAntialiased2dCanvasEnabled(bool enabled)
+{
+ m_settings->setAntialiased2dCanvasEnabled(enabled);
+}
+
void WebSettingsImpl::setDeferred2dCanvasEnabled(bool enabled)
{
m_settings->setDeferred2dCanvasEnabled(enabled);
Modified: branches/chromium/1364/Source/WebKit/chromium/src/WebSettingsImpl.h (139751 => 139752)
--- branches/chromium/1364/Source/WebKit/chromium/src/WebSettingsImpl.h 2013-01-15 18:11:30 UTC (rev 139751)
+++ branches/chromium/1364/Source/WebKit/chromium/src/WebSettingsImpl.h 2013-01-15 18:15:57 UTC (rev 139752)
@@ -66,6 +66,7 @@
virtual void setAllowRunningOfInsecureContent(bool);
virtual void setAllowScriptsToCloseWindows(bool);
virtual void setAllowUniversalAccessFromFileURLs(bool);
+ virtual void setAntialiased2dCanvasEnabled(bool);
virtual void setApplyDeviceScaleFactorInCompositor(bool);
virtual void setApplyPageScaleFactorInCompositor(bool);
virtual void setAsynchronousSpellCheckingEnabled(bool);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
