| Index: third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
|
| index fbe421bc71978f52203a339ba876c9c3b362965e..b6cc856ec0ee5d5529d75d25278406c80fc5c6fd 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
|
| @@ -782,7 +782,7 @@ SecurityOrigin* HTMLCanvasElement::getSecurityOrigin() const {
|
|
|
| bool HTMLCanvasElement::originClean() const {
|
| if (document().settings() &&
|
| - document().settings()->disableReadingFromCanvas())
|
| + document().settings()->GetDisableReadingFromCanvas())
|
| return false;
|
| if (placeholderFrame())
|
| return placeholderFrame()->originClean();
|
| @@ -830,7 +830,7 @@ bool HTMLCanvasElement::shouldAccelerate(const IntSize& size) const {
|
| // Do not use acceleration for small canvas.
|
| Settings* settings = document().settings();
|
| if (!settings ||
|
| - canvasPixelCount < settings->minimumAccelerated2dCanvasSize())
|
| + canvasPixelCount < settings->GetMinimumAccelerated2dCanvasSize())
|
| return false;
|
|
|
| // When GPU allocated memory runs low (due to having created too many
|
| @@ -905,9 +905,10 @@ HTMLCanvasElement::createAcceleratedImageBufferSurface(
|
| if (!shouldAccelerate(deviceSize))
|
| return nullptr;
|
|
|
| - if (document().settings())
|
| + if (document().settings()) {
|
| *msaaSampleCount =
|
| - document().settings()->accelerated2dCanvasMSAASampleCount();
|
| + document().settings()->GetAccelerated2dCanvasMSAASampleCount();
|
| + }
|
|
|
| // Avoid creating |contextProvider| until we're sure we want to try use it,
|
| // since it costs us GPU memory.
|
| @@ -1025,7 +1026,7 @@ void HTMLCanvasElement::createImageBufferInternal(
|
| // consistency, we don't want to apply AA in accelerated canvases but not in
|
| // unaccelerated canvases.
|
| if (!msaaSampleCount && document().settings() &&
|
| - !document().settings()->antialiased2dCanvasEnabled())
|
| + !document().settings()->GetAntialiased2dCanvasEnabled())
|
| m_context->setShouldAntialias(false);
|
|
|
| if (m_context)
|
|
|