| Index: third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacNonOverlayAPI.mm
|
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacNonOverlayAPI.mm b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacNonOverlayAPI.mm
|
| index 700466772f080639cd830d1a1621d74310c1571a..39589d0dd8759e2239ccf02b7c857d208ef19c67 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacNonOverlayAPI.mm
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacNonOverlayAPI.mm
|
| @@ -103,7 +103,7 @@ bool ScrollbarThemeMacNonOverlayAPI::paint(const ScrollbarThemeClient& scrollbar
|
| trackInfo.trackInfo.scrollbar.pressState = scrollbarPartToHIPressedState(scrollbar.pressedPart());
|
|
|
| SkCanvas* canvas = context.canvas();
|
| - CGAffineTransform currentCTM = gfx::SkMatrixToCGAffineTransform(canvas->getTotalMatrix());
|
| + CGAffineTransform currentCTM = skia::SkMatrixToCGAffineTransform(canvas->getTotalMatrix());
|
|
|
| // The Aqua scrollbar is buggy when rotated and scaled. We will just draw into a bitmap if we detect a scale or rotation.
|
| bool canDrawDirectly = currentCTM.a == 1.0f && currentCTM.b == 0.0f && currentCTM.c == 0.0f && (currentCTM.d == 1.0f || currentCTM.d == -1.0f);
|
| @@ -126,7 +126,7 @@ bool ScrollbarThemeMacNonOverlayAPI::paint(const ScrollbarThemeClient& scrollbar
|
| }
|
|
|
| // Draw the track and its thumb.
|
| - gfx::SkiaBitLocker bitLocker(
|
| + skia::SkiaBitLocker bitLocker(
|
| drawingCanvas,
|
| ThemeMac::inflateRectForAA(scrollbar.frameRect()),
|
| canDrawDirectly ? context.deviceScaleFactor() : 1.0f);
|
|
|