Fix progress bar regression on Mac

The clip rect in r183006 wasn't manually tested, and was wrong.
Specify the un-translated clip rect, which empirically produces
correct results in a variety of test scenarios (zoomed, retina,
various page locations).

Use a LocalCurrentGraphicsContext and delete ContextContainer,
because it is largely redundant.

BUG=419597

Review URL: https://codereview.chromium.org/620673006

git-svn-id: svn://svn.chromium.org/blink/trunk@183162 bbb929c8-8fbe-4397-9dbb-9b2b20218538

Author: ccameron-chromium

Source/core/rendering/RenderThemeChromiumMac.mm

@@ -1052,8 +1052,8 @@ static NSControlSize searchFieldControlSizeForFont(RenderStyle* style)
     if (!imageBuffer)
         return true;
 
-    ContextContainer cgContextContainer(imageBuffer->context(), inflatedRect);
-    CGContextRef cgContext = cgContextContainer.context();
+    LocalCurrentGraphicsContext localContext(imageBuffer->context(), IntRect(IntPoint(), inflatedRect.size()));
+    CGContextRef cgContext = localContext.cgContext();
     HIThemeDrawTrack(&trackInfo, 0, cgContext, kHIThemeOrientationNormal);
 
     GraphicsContextStateSaver stateSaver(*paintInfo.context);

Source/platform/mac/LocalCurrentGraphicsContext.h

@@ -44,17 +44,4 @@ class PLATFORM_EXPORT LocalCurrentGraphicsContext {
     gfx::SkiaBitLocker m_skiaBitLocker;
 };
 
-class PLATFORM_EXPORT ContextContainer {
-    WTF_MAKE_NONCOPYABLE(ContextContainer);
-public:
-    ContextContainer(GraphicsContext*, IntRect clipRect);
-
-    // This synchronizes the CGContext to reflect the current SkCanvas state.
-    // The implementation may not return the same CGContext each time.
-    CGContextRef context() { return m_skiaBitLocker.cgContext(); }
-
-private:
-    gfx::SkiaBitLocker m_skiaBitLocker;
-};
-
 }

Source/platform/mac/LocalCurrentGraphicsContext.mm

@@ -67,12 +67,4 @@
     return cgContext;
 }
 
-ContextContainer::ContextContainer(GraphicsContext* graphicsContext,
-                                   IntRect clipRect)
-    : m_skiaBitLocker(graphicsContext->canvas(),
-                      ThemeMac::inflateRectForAA(clipRect),
-                      graphicsContext->deviceScaleFactor())
-{
-}
-
 }