Implement interfaces in PaintInfo and make it a class.

Source/core/rendering/RenderThemeChromiumMac.mm

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 732 matching lines @@
     float zoomLevel = style->effectiveZoom();
     if (zoomLevel != 1)
         fontSize /= zoomLevel;
     if (fontSize >= [NSFont systemFontSizeForControlSize:NSRegularControlSize])
         return NSRegularControlSize;
     if (fontSize >= [NSFont systemFontSizeForControlSize:NSSmallControlSize])
         return NSSmallControlSize;
     return NSMiniControlSize;
 }
 
-bool RenderThemeChromiumMac::paintTextField(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool RenderThemeChromiumMac::paintTextField(RenderObject* o, PaintInfo& paintInfo, const IntRect& r)
 {
-    LocalCurrentGraphicsContext localContext(paintInfo.context);
+    LocalCurrentGraphicsContext localContext(paintInfo.getContext());
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1070
     bool useNSTextFieldCell = o->style()->hasAppearance()
         && o->style()->visitedDependentColor(CSSPropertyBackgroundColor) == Color::white
         && !o->style()->hasBackgroundImage();
 
     // We do not use NSTextFieldCell to draw styled text fields on Lion and SnowLeopard because
     // there are a number of bugs on those platforms that require NSTextFieldCell to be in charge
     // of painting its own background. We need WebCore to paint styled backgrounds, so we'll use
     // this AppKit SPI function instead.
     if (!useNSTextFieldCell) {
         _NSDrawCarbonThemeBezel(r, isEnabled(o) && !isReadOnlyControl(o), YES);
         return false;
     }
 #endif
 
     NSTextFieldCell *textField = this->textField();
 
-    GraphicsContextStateSaver stateSaver(*paintInfo.context);
+    GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
 
     [textField setEnabled:(isEnabled(o) && !isReadOnlyControl(o))];
     [textField drawWithFrame:NSRect(r) inView:documentViewFor(o)];
 
     [textField setControlView:nil];
 
     return false;
 }
 
 void RenderThemeChromiumMac::adjustTextFieldStyle(RenderStyle*, Element*) const
 {
 }
 
-bool RenderThemeChromiumMac::paintCapsLockIndicator(RenderObject*, const PaintInfo& paintInfo, const IntRect& r)
+bool RenderThemeChromiumMac::paintCapsLockIndicator(RenderObject*, PaintInfo& paintInfo, const IntRect& r)
 {
-    if (paintInfo.context->paintingDisabled())
+    if (paintInfo.getContext()->paintingDisabled())
         return true;
 
     // This draws the caps lock indicator as it was done by WKDrawCapsLockIndicator.
-    LocalCurrentGraphicsContext localContext(paintInfo.context);
+    LocalCurrentGraphicsContext localContext(paintInfo.getContext());
     CGContextRef c = localContext.cgContext();
     CGMutablePathRef shape = CGPathCreateMutable();
 
     // To draw the caps lock indicator, draw the shape into a small
     // square that is then scaled to the size of r.
     const CGFloat kSquareSize = 17;
 
     // Create a rounted square shape.
     CGPathMoveToPoint(shape, NULL, 16.5, 4.5);
     CGPathAddArc(shape, NULL, 12.5, 12.5, 4, 0,        M_PI_2,   false);
@@ skipping 35 matching lines @@
 
     CGContextSetRGBFillColor(c, 0, 0, 0, 0.4);
     CGContextBeginPath(c);
     CGContextAddPath(c, paintPath);
     CGContextFillPath(c);
     CGPathRelease(paintPath);
 
     return false;
 }
 
-bool RenderThemeChromiumMac::paintTextArea(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool RenderThemeChromiumMac::paintTextArea(RenderObject* o, PaintInfo& paintInfo, const IntRect& r)
 {
-    LocalCurrentGraphicsContext localContext(paintInfo.context);
+    LocalCurrentGraphicsContext localContext(paintInfo.getContext());
     _NSDrawCarbonThemeListBox(r, isEnabled(o) && !isReadOnlyControl(o), YES, YES);
     return false;
 }
 
 void RenderThemeChromiumMac::adjustTextAreaStyle(RenderStyle*, Element*) const
 {
 }
 
 const int* RenderThemeChromiumMac::popupButtonMargins() const
 {
@@ skipping 16 matching lines @@
 {
     static const int padding[3][4] =
     {
         { 2, 26, 3, 8 },
         { 2, 23, 3, 8 },
         { 2, 22, 3, 10 }
     };
     return padding[size];
 }
 
-bool RenderThemeChromiumMac::paintMenuList(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool RenderThemeChromiumMac::paintMenuList(RenderObject* o, PaintInfo& paintInfo, const IntRect& r)
 {
-    LocalCurrentGraphicsContext localContext(paintInfo.context);
+    LocalCurrentGraphicsContext localContext(paintInfo.getContext());
     setPopupButtonCellState(o, r);
 
     NSPopUpButtonCell* popupButton = this->popupButton();
 
     float zoomLevel = o->style()->effectiveZoom();
     IntSize size = popupButtonSizes()[[popupButton controlSize]];
     size.setHeight(size.height() * zoomLevel);
     size.setWidth(r.width());
 
     // Now inflate it to account for the shadow.
     IntRect inflatedRect = r;
     if (r.width() >= minimumMenuListSize(o->style()))
         inflatedRect = inflateRect(inflatedRect, size, popupButtonMargins(), zoomLevel);
 
-    GraphicsContextStateSaver stateSaver(*paintInfo.context);
+    GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
 
     // On Leopard, the cell will draw outside of the given rect, so we have to clip to the rect
-    paintInfo.context->clip(inflatedRect);
+    paintInfo.getContext()->clip(inflatedRect);
 
     if (zoomLevel != 1.0f) {
         inflatedRect.setWidth(inflatedRect.width() / zoomLevel);
         inflatedRect.setHeight(inflatedRect.height() / zoomLevel);
-        paintInfo.context->translate(inflatedRect.x(), inflatedRect.y());
-        paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
-        paintInfo.context->translate(-inflatedRect.x(), -inflatedRect.y());
+        paintInfo.getContext()->translate(inflatedRect.x(), inflatedRect.y());
+        paintInfo.getContext()->scale(FloatSize(zoomLevel, zoomLevel));
+        paintInfo.getContext()->translate(-inflatedRect.x(), -inflatedRect.y());
     }
 
     NSView *view = documentViewFor(o);
     [popupButton drawWithFrame:inflatedRect inView:view];
 #if !BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
     if (isFocused(o) && o->style()->outlineStyleIsAuto())
         [popupButton _web_drawFocusRingWithFrame:inflatedRect inView:view];
 #endif
     [popupButton setControlView:nil];
 
     return false;
 }
 
 IntSize RenderThemeChromiumMac::meterSizeForBounds(const RenderMeter* renderMeter, const IntRect& bounds) const
 {
     if (NoControlPart == renderMeter->style()->appearance())
         return bounds.size();
 
     NSLevelIndicatorCell* cell = levelIndicatorFor(renderMeter);
     // Makes enough room for cell's intrinsic size.
     NSSize cellSize = [cell cellSizeForBounds:IntRect(IntPoint(), bounds.size())];
     return IntSize(bounds.width() < cellSize.width ? cellSize.width : bounds.width(),
                    bounds.height() < cellSize.height ? cellSize.height : bounds.height());
 }
 
-bool RenderThemeChromiumMac::paintMeter(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderThemeChromiumMac::paintMeter(RenderObject* renderObject, PaintInfo& paintInfo, const IntRect& rect)
 {
     if (!renderObject->isMeter())
         return true;
 
-    LocalCurrentGraphicsContext localContext(paintInfo.context);
+    LocalCurrentGraphicsContext localContext(paintInfo.getContext());
 
     NSLevelIndicatorCell* cell = levelIndicatorFor(toRenderMeter(renderObject));
-    GraphicsContextStateSaver stateSaver(*paintInfo.context);
+    GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
 
     [cell drawWithFrame:rect inView:documentViewFor(renderObject)];
     [cell setControlView:nil];
     return false;
 }
 
 bool RenderThemeChromiumMac::supportsMeter(ControlPart part) const
 {
     switch (part) {
     case RelevancyLevelIndicatorPart:
@@ skipping 95 matching lines @@
 
 double RenderThemeChromiumMac::animationDurationForProgressBar(RenderProgress*) const
 {
     return progressAnimationNumFrames * progressAnimationFrameRate;
 }
 
 void RenderThemeChromiumMac::adjustProgressBarStyle(RenderStyle*, Element*) const
 {
 }
 
-bool RenderThemeChromiumMac::paintProgressBar(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderThemeChromiumMac::paintProgressBar(RenderObject* renderObject, PaintInfo& paintInfo, const IntRect& rect)
 {
     if (!renderObject->isProgress())
         return true;
 
     float zoomLevel = renderObject->style()->effectiveZoom();
     int controlSize = controlSizeForFont(renderObject->style());
     IntSize size = progressBarSizes()[controlSize];
     size.setHeight(size.height() * zoomLevel);
     size.setWidth(rect.width());
 
@@ skipping 21 matching lines @@
     trackInfo.filler1 = 0;
 
     OwnPtr<ImageBuffer> imageBuffer = ImageBuffer::create(inflatedRect.size(), 1);
     if (!imageBuffer)
         return true;
 
     ContextContainer cgContextContainer(imageBuffer->context());
     CGContextRef cgContext = cgContextContainer.context();
     HIThemeDrawTrack(&trackInfo, 0, cgContext, kHIThemeOrientationNormal);
 
-    GraphicsContextStateSaver stateSaver(*paintInfo.context);
+    GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
 
     if (!renderProgress->style()->isLeftToRightDirection()) {
-        paintInfo.context->translate(2 * inflatedRect.x() + inflatedRect.width(), 0);
-        paintInfo.context->scale(FloatSize(-1, 1));
+        paintInfo.getContext()->translate(2 * inflatedRect.x() + inflatedRect.width(), 0);
+        paintInfo.getContext()->scale(FloatSize(-1, 1));
     }
 
-    paintInfo.context->drawImageBuffer(imageBuffer.get(), inflatedRect.location());
+    paintInfo.getContext()->drawImageBuffer(imageBuffer.get(), inflatedRect.location());
     return false;
 }
 
 const float baseFontSize = 11.0f;
 const float baseArrowHeight = 4.0f;
 const float baseArrowWidth = 5.0f;
 const float baseSpaceBetweenArrows = 2.0f;
 const int arrowPaddingLeft = 6;
 const int arrowPaddingRight = 6;
 const int paddingBeforeSeparator = 4;
@@ skipping 25 matching lines @@
 static void MainGradientInterpolate(void*, const CGFloat* inData, CGFloat* outData)
 {
     static float dark[4] = { 0.0f, 0.0f, 0.0f, 0.15f };
     static float light[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
     float a = inData[0];
     int i = 0;
     for (i = 0; i < 4; i++)
         outData[i] = (1.0f - a) * dark[i] + a * light[i];
 }
 
-void RenderThemeChromiumMac::paintMenuListButtonGradients(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+void RenderThemeChromiumMac::paintMenuListButtonGradients(RenderObject* o, PaintInfo& paintInfo, const IntRect& r)
 {
     if (r.isEmpty())
         return;
 
-    ContextContainer cgContextContainer(paintInfo.context);
+    ContextContainer cgContextContainer(paintInfo.getContext());
     CGContextRef context = cgContextContainer.context();
 
-    GraphicsContextStateSaver stateSaver(*paintInfo.context);
+    GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
 
     RoundedRect border = o->style()->getRoundedBorderFor(r, o->view());
     int radius = border.radii().topLeft().width();
 
     CGColorSpaceRef cspace = deviceRGBColorSpaceRef();
 
     FloatRect topGradient(r.x(), r.y(), r.width(), r.height() / 2.0f);
     struct CGFunctionCallbacks topCallbacks = { 0, TopGradientInterpolate, NULL };
     RetainPtr<CGFunctionRef> topFunction(AdoptCF, CGFunctionCreate(NULL, 1, NULL, 4, NULL, &topCallbacks));
     RetainPtr<CGShadingRef> topShading(AdoptCF, CGShadingCreateAxial(cspace, CGPointMake(topGradient.x(), topGradient.y()), CGPointMake(topGradient.x(), topGradient.maxY()), topFunction.get(), false, false));
 
     FloatRect bottomGradient(r.x() + radius, r.y() + r.height() / 2.0f, r.width() - 2.0f * radius, r.height() / 2.0f);
     struct CGFunctionCallbacks bottomCallbacks = { 0, BottomGradientInterpolate, NULL };
     RetainPtr<CGFunctionRef> bottomFunction(AdoptCF, CGFunctionCreate(NULL, 1, NULL, 4, NULL, &bottomCallbacks));
     RetainPtr<CGShadingRef> bottomShading(AdoptCF, CGShadingCreateAxial(cspace, CGPointMake(bottomGradient.x(),  bottomGradient.y()), CGPointMake(bottomGradient.x(), bottomGradient.maxY()), bottomFunction.get(), false, false));
 
     struct CGFunctionCallbacks mainCallbacks = { 0, MainGradientInterpolate, NULL };
     RetainPtr<CGFunctionRef> mainFunction(AdoptCF, CGFunctionCreate(NULL, 1, NULL, 4, NULL, &mainCallbacks));
     RetainPtr<CGShadingRef> mainShading(AdoptCF, CGShadingCreateAxial(cspace, CGPointMake(r.x(),  r.y()), CGPointMake(r.x(), r.maxY()), mainFunction.get(), false, false));
 
     RetainPtr<CGShadingRef> leftShading(AdoptCF, CGShadingCreateAxial(cspace, CGPointMake(r.x(),  r.y()), CGPointMake(r.x() + radius, r.y()), mainFunction.get(), false, false));
 
     RetainPtr<CGShadingRef> rightShading(AdoptCF, CGShadingCreateAxial(cspace, CGPointMake(r.maxX(),  r.y()), CGPointMake(r.maxX() - radius, r.y()), mainFunction.get(), false, false));
 
     {
-        GraphicsContextStateSaver stateSaver(*paintInfo.context);
+        GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
         CGContextClipToRect(context, r);
-        paintInfo.context->clipRoundedRect(border);
+        paintInfo.getContext()->clipRoundedRect(border);
         context = cgContextContainer.context();
         CGContextDrawShading(context, mainShading.get());
     }
 
     {
-        GraphicsContextStateSaver stateSaver(*paintInfo.context);
+        GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
         CGContextClipToRect(context, topGradient);
-        paintInfo.context->clipRoundedRect(RoundedRect(enclosingIntRect(topGradient), border.radii().topLeft(), border.radii().topRight(), IntSize(), IntSize()));
+        paintInfo.getContext()->clipRoundedRect(RoundedRect(enclosingIntRect(topGradient), border.radii().topLeft(), border.radii().topRight(), IntSize(), IntSize()));
         context = cgContextContainer.context();
         CGContextDrawShading(context, topShading.get());
     }
 
     if (!bottomGradient.isEmpty()) {
-        GraphicsContextStateSaver stateSaver(*paintInfo.context);
+        GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
         CGContextClipToRect(context, bottomGradient);
-        paintInfo.context->clipRoundedRect(RoundedRect(enclosingIntRect(bottomGradient), IntSize(), IntSize(), border.radii().bottomLeft(), border.radii().bottomRight()));
+        paintInfo.getContext()->clipRoundedRect(RoundedRect(enclosingIntRect(bottomGradient), IntSize(), IntSize(), border.radii().bottomLeft(), border.radii().bottomRight()));
         context = cgContextContainer.context();
         CGContextDrawShading(context, bottomShading.get());
     }
 
     {
-        GraphicsContextStateSaver stateSaver(*paintInfo.context);
+        GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
         CGContextClipToRect(context, r);
-        paintInfo.context->clipRoundedRect(border);
+        paintInfo.getContext()->clipRoundedRect(border);
         context = cgContextContainer.context();
         CGContextDrawShading(context, leftShading.get());
         CGContextDrawShading(context, rightShading.get());
     }
 }
 
-bool RenderThemeChromiumMac::paintMenuListButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool RenderThemeChromiumMac::paintMenuListButton(RenderObject* o, PaintInfo& paintInfo, const IntRect& r)
 {
     IntRect bounds = IntRect(r.x() + o->style()->borderLeftWidth(),
                              r.y() + o->style()->borderTopWidth(),
                              r.width() - o->style()->borderLeftWidth() - o->style()->borderRightWidth(),
                              r.height() - o->style()->borderTopWidth() - o->style()->borderBottomWidth());
     // Draw the gradients to give the styled popup menu a button appearance
     paintMenuListButtonGradients(o, paintInfo, bounds);
 
     // Since we actually know the size of the control here, we restrict the font scale to make sure the arrows will fit vertically in the bounds
     float fontScale = min(o->style()->fontSize() / baseFontSize, bounds.height() / (baseArrowHeight * 2 + baseSpaceBetweenArrows));
     float centerY = bounds.y() + bounds.height() / 2.0f;
     float arrowHeight = baseArrowHeight * fontScale;
     float arrowWidth = baseArrowWidth * fontScale;
     float leftEdge = bounds.maxX() - arrowPaddingRight * o->style()->effectiveZoom() - arrowWidth;
     float spaceBetweenArrows = baseSpaceBetweenArrows * fontScale;
 
     if (bounds.width() < arrowWidth + arrowPaddingLeft * o->style()->effectiveZoom())
         return false;
 
-    GraphicsContextStateSaver stateSaver(*paintInfo.context);
+    GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
 
-    paintInfo.context->setFillColor(o->resolveColor(CSSPropertyColor));
-    paintInfo.context->setStrokeStyle(NoStroke);
+    paintInfo.getContext()->setFillColor(o->resolveColor(CSSPropertyColor));
+    paintInfo.getContext()->setStrokeStyle(NoStroke);
 
     FloatPoint arrow1[3];
     arrow1[0] = FloatPoint(leftEdge, centerY - spaceBetweenArrows / 2.0f);
     arrow1[1] = FloatPoint(leftEdge + arrowWidth, centerY - spaceBetweenArrows / 2.0f);
     arrow1[2] = FloatPoint(leftEdge + arrowWidth / 2.0f, centerY - spaceBetweenArrows / 2.0f - arrowHeight);
 
     // Draw the top arrow
-    paintInfo.context->drawConvexPolygon(3, arrow1, true);
+    paintInfo.getContext()->drawConvexPolygon(3, arrow1, true);
 
     FloatPoint arrow2[3];
     arrow2[0] = FloatPoint(leftEdge, centerY + spaceBetweenArrows / 2.0f);
     arrow2[1] = FloatPoint(leftEdge + arrowWidth, centerY + spaceBetweenArrows / 2.0f);
     arrow2[2] = FloatPoint(leftEdge + arrowWidth / 2.0f, centerY + spaceBetweenArrows / 2.0f + arrowHeight);
 
     // Draw the bottom arrow
-    paintInfo.context->drawConvexPolygon(3, arrow2, true);
+    paintInfo.getContext()->drawConvexPolygon(3, arrow2, true);
 
     Color leftSeparatorColor(0, 0, 0, 40);
     Color rightSeparatorColor(255, 255, 255, 40);
 
     // FIXME: Should the separator thickness and space be scaled up by fontScale?
     int separatorSpace = 2; // Deliberately ignores zoom since it looks nicer if it stays thin.
     int leftEdgeOfSeparator = static_cast<int>(leftEdge - arrowPaddingLeft * o->style()->effectiveZoom()); // FIXME: Round?
 
     // Draw the separator to the left of the arrows
-    paintInfo.context->setStrokeThickness(1.0f); // Deliberately ignores zoom since it looks nicer if it stays thin.
-    paintInfo.context->setStrokeStyle(SolidStroke);
-    paintInfo.context->setStrokeColor(leftSeparatorColor);
-    paintInfo.context->drawLine(IntPoint(leftEdgeOfSeparator, bounds.y()),
+    paintInfo.getContext()->setStrokeThickness(1.0f); // Deliberately ignores zoom since it looks nicer if it stays thin.
+    paintInfo.getContext()->setStrokeStyle(SolidStroke);
+    paintInfo.getContext()->setStrokeColor(leftSeparatorColor);
+    paintInfo.getContext()->drawLine(IntPoint(leftEdgeOfSeparator, bounds.y()),
                                 IntPoint(leftEdgeOfSeparator, bounds.maxY()));
 
-    paintInfo.context->setStrokeColor(rightSeparatorColor);
-    paintInfo.context->drawLine(IntPoint(leftEdgeOfSeparator + separatorSpace, bounds.y()),
+    paintInfo.getContext()->setStrokeColor(rightSeparatorColor);
+    paintInfo.getContext()->drawLine(IntPoint(leftEdgeOfSeparator + separatorSpace, bounds.y()),
                                 IntPoint(leftEdgeOfSeparator + separatorSpace, bounds.maxY()));
     return false;
 }
 
 static const IntSize* menuListButtonSizes()
 {
     static const IntSize sizes[3] = { IntSize(0, 21), IntSize(0, 18), IntSize(0, 15) };
     return sizes;
 }
 
@@ skipping 111 matching lines @@
 }
 
 int RenderThemeChromiumMac::minimumMenuListSize(RenderStyle* style) const
 {
     return sizeForSystemFont(style, menuListSizes()).width();
 }
 
 const int sliderTrackWidth = 5;
 const int sliderTrackBorderWidth = 1;
 
-bool RenderThemeChromiumMac::paintSliderTrack(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool RenderThemeChromiumMac::paintSliderTrack(RenderObject* o, PaintInfo& paintInfo, const IntRect& r)
 {
     paintSliderTicks(o, paintInfo, r);
 
     float zoomLevel = o->style()->effectiveZoom();
     FloatRect unzoomedRect = r;
 
     if (o->style()->appearance() ==  SliderHorizontalPart || o->style()->appearance() ==  MediaSliderPart) {
         unzoomedRect.setY(ceilf(unzoomedRect.y() + unzoomedRect.height() / 2 - zoomLevel * sliderTrackWidth / 2));
         unzoomedRect.setHeight(zoomLevel * sliderTrackWidth);
     } else if (o->style()->appearance() == SliderVerticalPart) {
         unzoomedRect.setX(ceilf(unzoomedRect.x() + unzoomedRect.width() / 2 - zoomLevel * sliderTrackWidth / 2));
         unzoomedRect.setWidth(zoomLevel * sliderTrackWidth);
     }
 
     if (zoomLevel != 1) {
         unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
         unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
     }
 
-    GraphicsContextStateSaver stateSaver(*paintInfo.context);
+    GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
     if (zoomLevel != 1) {
-        paintInfo.context->translate(unzoomedRect.x(), unzoomedRect.y());
-        paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
-        paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
+        paintInfo.getContext()->translate(unzoomedRect.x(), unzoomedRect.y());
+        paintInfo.getContext()->scale(FloatSize(zoomLevel, zoomLevel));
+        paintInfo.getContext()->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
     Color fillColor(205, 205, 205);
     Color borderGradientTopColor(109, 109, 109);
     Color borderGradientBottomColor(181, 181, 181);
     Color shadowColor(0, 0, 0, 118);
 
     if (!isEnabled(o)) {
         Color tintColor(255, 255, 255, 128);
         fillColor = fillColor.blend(tintColor);
         borderGradientTopColor = borderGradientTopColor.blend(tintColor);
         borderGradientBottomColor = borderGradientBottomColor.blend(tintColor);
         shadowColor = shadowColor.blend(tintColor);
     }
 
     Color tintColor;
     if (!isEnabled(o))
         tintColor = Color(255, 255, 255, 128);
 
     bool isVerticalSlider = o->style()->appearance() == SliderVerticalPart;
 
     int fillRadiusSize = (sliderTrackWidth - sliderTrackBorderWidth) / 2;
     IntSize fillRadius(fillRadiusSize, fillRadiusSize);
     IntRect fillBounds = enclosedIntRect(unzoomedRect);
     RoundedRect fillRect(fillBounds, fillRadius, fillRadius, fillRadius, fillRadius);
-    paintInfo.context->fillRoundedRect(fillRect, fillColor);
+    paintInfo.getContext()->fillRoundedRect(fillRect, fillColor);
 
     IntSize shadowOffset(isVerticalSlider ? 1 : 0,
                          isVerticalSlider ? 0 : 1);
     int shadowBlur = 3;
     int shadowSpread = 0;
-    paintInfo.context->save();
-    paintInfo.context->drawInnerShadow(fillRect, shadowColor, shadowOffset, shadowBlur, shadowSpread);
-    paintInfo.context->restore();
+    paintInfo.getContext()->save();
+    paintInfo.getContext()->drawInnerShadow(fillRect, shadowColor, shadowOffset, shadowBlur, shadowSpread);
+    paintInfo.getContext()->restore();
 
     RefPtr<Gradient> borderGradient = Gradient::create(fillBounds.minXMinYCorner(),
         isVerticalSlider ? fillBounds.maxXMinYCorner() : fillBounds.minXMaxYCorner());
     borderGradient->addColorStop(0.0, borderGradientTopColor);
     borderGradient->addColorStop(1.0, borderGradientBottomColor);
     Path borderPath;
     FloatRect borderRect(unzoomedRect);
     borderRect.inflate(-sliderTrackBorderWidth / 2.0);
     float borderRadiusSize = (isVerticalSlider ? borderRect.width() : borderRect.height()) / 2;
     FloatSize borderRadius(borderRadiusSize, borderRadiusSize);
     borderPath.addRoundedRect(borderRect, borderRadius, borderRadius, borderRadius, borderRadius);
-    paintInfo.context->setStrokeGradient(borderGradient);
-    paintInfo.context->setStrokeThickness(sliderTrackBorderWidth);
-    paintInfo.context->strokePath(borderPath);
+    paintInfo.getContext()->setStrokeGradient(borderGradient);
+    paintInfo.getContext()->setStrokeThickness(sliderTrackBorderWidth);
+    paintInfo.getContext()->strokePath(borderPath);
     return false;
 }
 
 const int sliderThumbWidth = 15;
 const int sliderThumbHeight = 15;
 const int sliderThumbBorderWidth = 1;
 
-bool RenderThemeChromiumMac::paintSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool RenderThemeChromiumMac::paintSliderThumb(RenderObject* o, PaintInfo& paintInfo, const IntRect& r)
 {
-    GraphicsContextStateSaver stateSaver(*paintInfo.context);
+    GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
     float zoomLevel = o->style()->effectiveZoom();
 
     FloatRect unzoomedRect(r.x(), r.y(), sliderThumbWidth, sliderThumbHeight);
     if (zoomLevel != 1.0f) {
-        paintInfo.context->translate(unzoomedRect.x(), unzoomedRect.y());
-        paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
-        paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
+        paintInfo.getContext()->translate(unzoomedRect.x(), unzoomedRect.y());
+        paintInfo.getContext()->scale(FloatSize(zoomLevel, zoomLevel));
+        paintInfo.getContext()->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
     Color fillGradientTopColor(250, 250, 250);
     Color fillGradientUpperMiddleColor(244, 244, 244);
     Color fillGradientLowerMiddleColor(236, 236, 236);
     Color fillGradientBottomColor(238, 238, 238);
     Color borderGradientTopColor(151, 151, 151);
     Color borderGradientBottomColor(128, 128, 128);
     Color shadowColor(0, 0, 0, 36);
 
@@ skipping 16 matching lines @@
         borderGradientBottomColor = borderGradientBottomColor.blend(tintColor);
         shadowColor = shadowColor.blend(tintColor);
     }
 
     FloatRect borderBounds = unzoomedRect;
     borderBounds.inflate(sliderThumbBorderWidth / 2.0);
 
     FloatRect shadowBounds = unzoomedRect;
     borderBounds.inflate(-sliderThumbBorderWidth);
     FloatSize shadowOffset(0, 1);
-    paintInfo.context->setShadow(shadowOffset, sliderThumbShadowBlur, shadowColor);
-    paintInfo.context->setFillColor(Color::black);
-    paintInfo.context->fillEllipse(borderBounds);
-    paintInfo.context->clearShadow();
+    paintInfo.getContext()->setShadow(shadowOffset, sliderThumbShadowBlur, shadowColor);
+    paintInfo.getContext()->setFillColor(Color::black);
+    paintInfo.getContext()->fillEllipse(borderBounds);
+    paintInfo.getContext()->clearShadow();
 
     IntRect fillBounds = enclosedIntRect(unzoomedRect);
     RefPtr<Gradient> fillGradient = Gradient::create(fillBounds.minXMinYCorner(), fillBounds.minXMaxYCorner());
     fillGradient->addColorStop(0.0, fillGradientTopColor);
     fillGradient->addColorStop(0.52, fillGradientUpperMiddleColor);
     fillGradient->addColorStop(0.52, fillGradientLowerMiddleColor);
     fillGradient->addColorStop(1.0, fillGradientBottomColor);
-    paintInfo.context->setFillGradient(fillGradient);
-    paintInfo.context->fillEllipse(borderBounds);
+    paintInfo.getContext()->setFillGradient(fillGradient);
+    paintInfo.getContext()->fillEllipse(borderBounds);
 
     RefPtr<Gradient> borderGradient = Gradient::create(fillBounds.minXMinYCorner(), fillBounds.minXMaxYCorner());
     borderGradient->addColorStop(0.0, borderGradientTopColor);
     borderGradient->addColorStop(1.0, borderGradientBottomColor);
-    paintInfo.context->setStrokeGradient(borderGradient);
-    paintInfo.context->setStrokeThickness(sliderThumbBorderWidth);
-    paintInfo.context->strokeEllipse(borderBounds);
+    paintInfo.getContext()->setStrokeGradient(borderGradient);
+    paintInfo.getContext()->setStrokeThickness(sliderThumbBorderWidth);
+    paintInfo.getContext()->strokeEllipse(borderBounds);
 
     if (isFocused(o)) {
         Path borderPath;
         borderPath.addEllipse(borderBounds);
-        paintInfo.context->drawFocusRing(borderPath, 5, -2, focusRingColor());
+        paintInfo.getContext()->drawFocusRing(borderPath, 5, -2, focusRingColor());
     }
 
     return false;
 }
 
-bool RenderThemeChromiumMac::paintSearchField(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool RenderThemeChromiumMac::paintSearchField(RenderObject* o, PaintInfo& paintInfo, const IntRect& r)
 {
-    LocalCurrentGraphicsContext localContext(paintInfo.context);
+    LocalCurrentGraphicsContext localContext(paintInfo.getContext());
 
     NSSearchFieldCell* search = this->search();
     setSearchCellState(o, r);
     [search setControlSize:searchFieldControlSizeForFont(o->style())];
 
-    GraphicsContextStateSaver stateSaver(*paintInfo.context);
+    GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
 
     float zoomLevel = o->style()->effectiveZoom();
 
     IntRect unzoomedRect = r;
 
     if (zoomLevel != 1.0f) {
         unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
         unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
-        paintInfo.context->translate(unzoomedRect.x(), unzoomedRect.y());
-        paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
-        paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
+        paintInfo.getContext()->translate(unzoomedRect.x(), unzoomedRect.y());
+        paintInfo.getContext()->scale(FloatSize(zoomLevel, zoomLevel));
+        paintInfo.getContext()->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
     // Set the search button to nil before drawing.  Then reset it so we can draw it later.
     [search setSearchButtonCell:nil];
 
     [search drawWithFrame:NSRect(unzoomedRect) inView:documentViewFor(o)];
 
     [search setControlView:nil];
     [search resetSearchButtonCell];
 
@@ skipping 59 matching lines @@
     style->setPaddingLeft(Length(horizontalPadding, Fixed));
     style->setPaddingRight(Length(horizontalPadding, Fixed));
     style->setPaddingTop(Length(verticalPadding, Fixed));
     style->setPaddingBottom(Length(verticalPadding, Fixed));
 
     setFontFromControlSize(style, controlSize);
 
     style->setBoxShadow(nullptr);
 }
 
-bool RenderThemeChromiumMac::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool RenderThemeChromiumMac::paintSearchFieldCancelButton(RenderObject* o, PaintInfo& paintInfo, const IntRect& r)
 {
     Element* input = o->node()->shadowHost();
     if (!input)
         input = toElement(o->node());
 
     if (!input->renderer()->isBox())
         return false;
 
-    GraphicsContextStateSaver stateSaver(*paintInfo.context);
+    GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
 
     float zoomLevel = o->style()->effectiveZoom();
     FloatRect unzoomedRect(r);
     if (zoomLevel != 1.0f) {
         unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
         unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
-        paintInfo.context->translate(unzoomedRect.x(), unzoomedRect.y());
-        paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
-        paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
+        paintInfo.getContext()->translate(unzoomedRect.x(), unzoomedRect.y());
+        paintInfo.getContext()->scale(FloatSize(zoomLevel, zoomLevel));
+        paintInfo.getContext()->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
     Color fillColor(200, 200, 200);
 
     if (isPressed(o)) {
         Color tintColor(0, 0, 0, 32);
         fillColor = fillColor.blend(tintColor);
     }
 
     float centerX = unzoomedRect.x() + unzoomedRect.width() / 2;
     float centerY = unzoomedRect.y() + unzoomedRect.height() / 2;
     // The line width is 3px on a regular sized, high DPI NSCancelButtonCell
     // (which is 28px wide).
     float lineWidth = unzoomedRect.width() * 3 / 28;
     // The line length is 16px on a regular sized, high DPI NSCancelButtonCell.
     float lineLength = unzoomedRect.width() * 16 / 28;
 
     Path xPath;
     FloatSize lineRectRadius(lineWidth / 2, lineWidth / 2);
     xPath.addRoundedRect(FloatRect(-lineLength / 2, -lineWidth / 2, lineLength, lineWidth),
         lineRectRadius, lineRectRadius, lineRectRadius, lineRectRadius);
     xPath.addRoundedRect(FloatRect(-lineWidth / 2, -lineLength / 2, lineWidth, lineLength),
         lineRectRadius, lineRectRadius, lineRectRadius, lineRectRadius);
 
-    paintInfo.context->translate(centerX, centerY);
-    paintInfo.context->rotate(deg2rad(45.0));
-    paintInfo.context->clipOut(xPath);
-    paintInfo.context->rotate(deg2rad(-45.0));
-    paintInfo.context->translate(-centerX, -centerY);
+    paintInfo.getContext()->translate(centerX, centerY);
+    paintInfo.getContext()->rotate(deg2rad(45.0));
+    paintInfo.getContext()->clipOut(xPath);
+    paintInfo.getContext()->rotate(deg2rad(-45.0));
+    paintInfo.getContext()->translate(-centerX, -centerY);
 
-    paintInfo.context->setFillColor(fillColor);
-    paintInfo.context->fillEllipse(unzoomedRect);
+    paintInfo.getContext()->setFillColor(fillColor);
+    paintInfo.getContext()->fillEllipse(unzoomedRect);
 
     return false;
 }
 
 const IntSize* RenderThemeChromiumMac::cancelButtonSizes() const
 {
     static const IntSize sizes[3] = { IntSize(14, 14), IntSize(11, 11), IntSize(9, 9) };
     return sizes;
 }
 
@@ skipping 14 matching lines @@
 void RenderThemeChromiumMac::adjustSearchFieldDecorationStyle(RenderStyle* style, Element*) const
 {
     NSControlSize controlSize = controlSizeForSystemFont(style);
     IntSize searchFieldSize = searchFieldSizes()[controlSize];
     int width = searchFieldSize.height() / 2 - searchFieldBorderWidth - searchFieldHorizontalPaddings()[controlSize];
     style->setWidth(Length(width, Fixed));
     style->setHeight(Length(0, Fixed));
     style->setBoxShadow(nullptr);
 }
 
-bool RenderThemeChromiumMac::paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&)
+bool RenderThemeChromiumMac::paintSearchFieldDecoration(RenderObject*, PaintInfo&, const IntRect&)
 {
     return false;
 }
 
 void RenderThemeChromiumMac::adjustSearchFieldResultsDecorationStyle(RenderStyle* style, Element*) const
 {
     IntSize size = sizeForSystemFont(style, resultsButtonSizes());
     style->setWidth(Length(size.width(), Fixed));
     style->setHeight(Length(size.height(), Fixed));
     style->setBoxShadow(nullptr);
 }
 
-bool RenderThemeChromiumMac::paintSearchFieldResultsDecoration(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool RenderThemeChromiumMac::paintSearchFieldResultsDecoration(RenderObject* o, PaintInfo& paintInfo, const IntRect& r)
 {
     Node* input = o->node()->shadowHost();
     if (!input)
         input = o->node();
     if (!input->renderer()->isBox())
         return false;
 
-    GraphicsContextStateSaver stateSaver(*paintInfo.context);
+    GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()));
 
     float zoomLevel = o->style()->effectiveZoom();
     FloatRect unzoomedRect(r);
     if (zoomLevel != 1) {
         unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
         unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
-        paintInfo.context->translate(unzoomedRect.x(), unzoomedRect.y());
-        paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
-        paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
+        paintInfo.getContext()->translate(unzoomedRect.x(), unzoomedRect.y());
+        paintInfo.getContext()->scale(FloatSize(zoomLevel, zoomLevel));
+        paintInfo.getContext()->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
-    LocalCurrentGraphicsContext localContext(paintInfo.context);
+    LocalCurrentGraphicsContext localContext(paintInfo.getContext());
 
     NSSearchFieldCell* search = this->search();
     setSearchCellState(input->renderer(), r);
     [search setControlSize:searchFieldControlSizeForFont(o->style())];
     if ([search searchMenuTemplate] != nil)
         [search setSearchMenuTemplate:nil];
 
     updateActiveState([search searchButtonCell], o);
 
     [[search searchButtonCell] drawWithFrame:unzoomedRect inView:documentViewFor(o)];
@@ skipping 140 matching lines @@
 bool RenderThemeChromiumMac::shouldShowPlaceholderWhenFocused() const
 {
     return true;
 }
 
 void RenderThemeChromiumMac::adjustMediaSliderThumbSize(RenderStyle* style) const
 {
     RenderMediaControlsChromium::adjustMediaSliderThumbSize(style);
 }
 
-bool RenderThemeChromiumMac::paintMediaPlayButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderThemeChromiumMac::paintMediaPlayButton(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControlsChromium::paintMediaControlsPart(MediaPlayButton, object, paintInfo, rect);
 }
 
-bool RenderThemeChromiumMac::paintMediaMuteButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderThemeChromiumMac::paintMediaMuteButton(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControlsChromium::paintMediaControlsPart(MediaMuteButton, object, paintInfo, rect);
 }
 
-bool RenderThemeChromiumMac::paintMediaSliderTrack(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderThemeChromiumMac::paintMediaSliderTrack(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControlsChromium::paintMediaControlsPart(MediaSlider, object, paintInfo, rect);
 }
 
 String RenderThemeChromiumMac::extraFullScreenStyleSheet()
 {
     // FIXME: Chromium may wish to style its default media controls differently in fullscreen.
     return String();
 }
 
 String RenderThemeChromiumMac::extraDefaultStyleSheet()
 {
     return RenderTheme::extraDefaultStyleSheet() +
            String(themeChromiumUserAgentStyleSheet, sizeof(themeChromiumUserAgentStyleSheet));
 }
 
-bool RenderThemeChromiumMac::paintMediaVolumeSliderContainer(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderThemeChromiumMac::paintMediaVolumeSliderContainer(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     return true;
 }
 
-bool RenderThemeChromiumMac::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderThemeChromiumMac::paintMediaVolumeSliderTrack(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControlsChromium::paintMediaControlsPart(MediaVolumeSlider, object, paintInfo, rect);
 }
 
-bool RenderThemeChromiumMac::paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderThemeChromiumMac::paintMediaVolumeSliderThumb(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControlsChromium::paintMediaControlsPart(MediaVolumeSliderThumb, object, paintInfo, rect);
 }
 
-bool RenderThemeChromiumMac::paintMediaSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderThemeChromiumMac::paintMediaSliderThumb(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControlsChromium::paintMediaControlsPart(MediaSliderThumb, object, paintInfo, rect);
 }
 
 String RenderThemeChromiumMac::formatMediaControlsTime(float time) const
 {
     return RenderMediaControlsChromium::formatMediaControlsTime(time);
 }
 
 String RenderThemeChromiumMac::formatMediaControlsCurrentTime(float currentTime, float duration) const
 {
     return RenderMediaControlsChromium::formatMediaControlsCurrentTime(currentTime, duration);
 }
 
-bool RenderThemeChromiumMac::paintMediaFullscreenButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderThemeChromiumMac::paintMediaFullscreenButton(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControlsChromium::paintMediaControlsPart(MediaEnterFullscreenButton, object, paintInfo, rect);
 }
 
-bool RenderThemeChromiumMac::paintMediaToggleClosedCaptionsButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderThemeChromiumMac::paintMediaToggleClosedCaptionsButton(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControlsChromium::paintMediaControlsPart(MediaShowClosedCaptionsButton, object, paintInfo, rect);
 }
 
 bool RenderThemeChromiumMac::shouldUseFallbackTheme(RenderStyle* style) const
 {
     ControlPart part = style->appearance();
     if (part == CheckboxPart || part == RadioPart)
         return style->effectiveZoom() != 1;
     return false;
 }
 
 } // namespace WebCore