| Index: Source/platform/graphics/Canvas2DLayerBridge.cpp
|
| diff --git a/Source/platform/graphics/Canvas2DLayerBridge.cpp b/Source/platform/graphics/Canvas2DLayerBridge.cpp
|
| index 2a32089f3096ba3dcc1551498296215cbfc09b2c..cd0a1b84e4413ad856272f8dc58bdb45157a9d5d 100644
|
| --- a/Source/platform/graphics/Canvas2DLayerBridge.cpp
|
| +++ b/Source/platform/graphics/Canvas2DLayerBridge.cpp
|
| @@ -91,7 +91,7 @@ Canvas2DLayerBridge::Canvas2DLayerBridge(PassOwnPtr<WebGraphicsContext3DProvider
|
| , m_framesPending(0)
|
| , m_destructionInProgress(false)
|
| , m_rateLimitingEnabled(false)
|
| - , m_filterLevel(SkPaint::kLow_FilterLevel)
|
| + , m_filterQuality(kLow_SkFilterQuality)
|
| , m_isHidden(false)
|
| , m_next(0)
|
| , m_prev(0)
|
| @@ -109,7 +109,7 @@ Canvas2DLayerBridge::Canvas2DLayerBridge(PassOwnPtr<WebGraphicsContext3DProvider
|
| m_layer->setBlendBackgroundColor(opacityMode != Opaque);
|
| GraphicsLayer::registerContentsLayer(m_layer->layer());
|
| m_layer->setRateLimitContext(m_rateLimitingEnabled);
|
| - m_layer->setNearestNeighbor(m_filterLevel == SkPaint::kNone_FilterLevel);
|
| + m_layer->setNearestNeighbor(m_filterQuality == kNone_SkFilterQuality);
|
| m_canvas->setNotificationClient(this);
|
| #ifndef NDEBUG
|
| canvas2DLayerBridgeInstanceCounter.increment();
|
| @@ -152,11 +152,11 @@ void Canvas2DLayerBridge::beginDestruction()
|
| ASSERT(!m_bytesAllocated);
|
| }
|
|
|
| -void Canvas2DLayerBridge::setFilterLevel(SkPaint::FilterLevel filterLevel)
|
| +void Canvas2DLayerBridge::setFilterQuality(SkFilterQuality filterQuality)
|
| {
|
| ASSERT(!m_destructionInProgress);
|
| - m_filterLevel = filterLevel;
|
| - m_layer->setNearestNeighbor(m_filterLevel == SkPaint::kNone_FilterLevel);
|
| + m_filterQuality = filterQuality;
|
| + m_layer->setNearestNeighbor(m_filterQuality == kNone_SkFilterQuality);
|
| }
|
|
|
| void Canvas2DLayerBridge::setIsHidden(bool hidden)
|
| @@ -375,7 +375,7 @@ bool Canvas2DLayerBridge::prepareMailbox(WebExternalTextureMailbox* outMailbox,
|
| RefPtr<SkImage> image = adoptRef(m_canvas->newImageSnapshot());
|
|
|
| // Early exit if canvas was not drawn to since last prepareMailbox
|
| - GLenum filter = m_filterLevel == SkPaint::kNone_FilterLevel ? GL_NEAREST : GL_LINEAR;
|
| + GLenum filter = m_filterQuality == kNone_SkFilterQuality ? GL_NEAREST : GL_LINEAR;
|
| if (image->uniqueID() == m_lastImageId && filter == m_lastFilter)
|
| return false;
|
| m_lastImageId = image->uniqueID();
|
|
|