Implement image-rendering:pixelated for accelerated 2D canvases.

Source/core/html/HTMLCanvasElement.cpp

 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 130 matching lines @@
 RenderObject* HTMLCanvasElement::createRenderer(RenderStyle* style)
 {
     LocalFrame* frame = document().frame();
     if (frame && frame->script().canExecuteScripts(NotAboutToExecuteScript))
         return new RenderHTMLCanvas(this);
     return HTMLElement::createRenderer(style);
 }
 
 void HTMLCanvasElement::didRecalcStyle(StyleRecalcChange)
 {
-    SkPaint::FilterLevel filterLevel = computedStyle()->imageRendering() == ImageRenderingPixelated ? SkPaint::kNone_FilterLevel : SkPaint::kLow_FilterLevel;
+    bool pixelated = computedStyle()->imageRendering() == ImageRenderingPixelated;
+    SkPaint::FilterLevel filterLevel = pixelated ? SkPaint::kNone_FilterLevel : SkPaint::kLow_FilterLevel;
     if (m_context && m_context->is3d()) {
         toWebGLRenderingContext(m_context.get())->setFilterLevel(filterLevel);
         setNeedsCompositingUpdate();
     }
+    if (hasImageBuffer()) {
+        m_imageBuffer->setFilterLevel(filterLevel);
+        m_imageBuffer->context()->setImageInterpolationQuality(pixelated ? InterpolationLow : CanvasDefaultInterpolationQuality);

[esprehn, 2014/12/17 23:05:19]

Did you add a test that this dynamically updates?

[jackhou1, 2014/12/18 03:48:07]

I have layout tests that cover changing the CSS property, but they pass without
this change. I guess either it's not necessary to set this for accelerated
canvases, or they're necessary for a case that's not yet tested. I think it's
better to remove this part for now and add it later if we discover a case that
actually requires it.

+    }
 }
 
 Node::InsertionNotificationRequest HTMLCanvasElement::insertedInto(ContainerNode* node)
 {
     setIsInCanvasSubtree(true);
     return HTMLElement::insertedInto(node);
 }
 
 void HTMLCanvasElement::addObserver(CanvasObserver* observer)
 {
@@ skipping 451 matching lines @@
     m_imageBufferIsClear = true;
 
     if (!canCreateImageBuffer(size()))
         return;
 
     int msaaSampleCount;
     OwnPtr<ImageBufferSurface> surface = createImageBufferSurface(size(), &msaaSampleCount);
     if (!surface->isValid())
         return;
 
+    document().updateRenderTreeIfNeeded();
+    RenderStyle* style = computedStyle();
+    bool pixelated = style && (style->imageRendering() == ImageRenderingPixelated || style->imageRendering() == ImageRenderingOptimizeContrast);
+
     m_imageBuffer = ImageBuffer::create(surface.release());
     m_imageBuffer->setClient(this);
+    m_imageBuffer->setFilterLevel(pixelated ? SkPaint::kNone_FilterLevel : SkPaint::kLow_FilterLevel);
 
     m_didFailToCreateImageBuffer = false;
 
     updateExternallyAllocatedMemory();
 
     if (is3D()) {
         // Early out for WebGL canvases
         return;
     }
 
     m_imageBuffer->setClient(this);
     m_imageBuffer->context()->setShouldClampToSourceRect(false);
     m_imageBuffer->context()->disableAntialiasingOptimizationForHairlineImages();
-    m_imageBuffer->context()->setImageInterpolationQuality(CanvasDefaultInterpolationQuality);
+    m_imageBuffer->context()->setImageInterpolationQuality(pixelated ? InterpolationLow : CanvasDefaultInterpolationQuality);
     // Enabling MSAA overrides a request to disable antialiasing. This is true regardless of whether the
     // rendering mode is accelerated or not. For consistency, we don't want to apply AA in accelerated
     // canvases but not in unaccelerated canvases.
     if (!msaaSampleCount && document().settings() && !document().settings()->antialiased2dCanvasEnabled())
         m_imageBuffer->context()->setShouldAntialias(false);
     // GraphicsContext's defaults don't always agree with the 2d canvas spec.
     // See CanvasRenderingContext2D::State::State() for more information.
     m_imageBuffer->context()->setMiterLimit(10);
     m_imageBuffer->context()->setStrokeThickness(1);
 #if ENABLE(ASSERT)
@@ skipping 153 matching lines @@
     if (!isPaintable()) {
         *status = InvalidSourceImageStatus;
         return nullptr;
     }
 
     if (!m_context) {
         *status = NormalSourceImageStatus;
         return createTransparentImage(size());
     }
 
+    m_imageBuffer->willAccessPixels();
+
     if (m_context->is3d()) {
         m_context->paintRenderingResultsToCanvas(BackBuffer);
         *status = ExternalSourceImageStatus;
 
         // can't create SkImage from WebGLImageBufferSurface (contains only SkBitmap)
         return buffer()->copyImage(DontCopyBackingStore, Unscaled);
     }
 
     RefPtr<SkImage> image = buffer()->newImageSnapshot();
     if (image) {
         *status = NormalSourceImageStatus;
         return StaticBitmapImage::create(image.release());
     }
 
     *status = InvalidSourceImageStatus;
     return nullptr;
 }
 
 bool HTMLCanvasElement::wouldTaintOrigin(SecurityOrigin*) const
 {
     return !originClean();
 }
 
 FloatSize HTMLCanvasElement::sourceSize() const
 {
     return FloatSize(width(), height());
 }
 
 }