Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(736)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp

Issue 1512803004: Use refs for GraphicsContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ScrollbarTheme
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/paint/ThemePainter.cpp ('k') | third_party/WebKit/Source/core/paint/ThemePainterMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp
diff --git a/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp b/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp
index 03adc7005d3abf309013e7ea718fcf9aacdf5741..1d220e01496e94c2a87d54239a34c22b29fced1b 100644
--- a/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp
+++ b/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp
@@ -81,16 +81,16 @@ DirectionFlippingScope::DirectionFlippingScope(const LayoutObject& layoutObject,
{
if (!m_needsFlipping)
return;
- m_paintInfo.context->save();
- m_paintInfo.context->translate(2 * rect.x() + rect.width(), 0);
- m_paintInfo.context->scale(-1, 1);
+ m_paintInfo.context.save();
+ m_paintInfo.context.translate(2 * rect.x() + rect.width(), 0);
+ m_paintInfo.context.scale(-1, 1);
}
DirectionFlippingScope::~DirectionFlippingScope()
{
if (!m_needsFlipping)
return;
- m_paintInfo.context->restore();
+ m_paintInfo.context.restore();
}
IntRect determinateProgressValueRectFor(const LayoutProgress& layoutProgress, const IntRect& rect)
@@ -137,20 +137,20 @@ IntRect convertToPaintingRect(const LayoutObject& inputLayoutObject, const Layou
bool ThemePainterDefault::paintCheckbox(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
{
WebThemeEngine::ExtraParams extraParams;
- WebCanvas* canvas = i.context->canvas();
+ WebCanvas* canvas = i.context.canvas();
extraParams.button.checked = LayoutTheme::isChecked(o);
extraParams.button.indeterminate = LayoutTheme::isIndeterminate(o);
float zoomLevel = o.styleRef().effectiveZoom();
- GraphicsContextStateSaver stateSaver(*i.context, false);
+ GraphicsContextStateSaver stateSaver(i.context, false);
IntRect unzoomedRect = rect;
if (zoomLevel != 1) {
stateSaver.save();
unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
- i.context->translate(unzoomedRect.x(), unzoomedRect.y());
- i.context->scale(zoomLevel, zoomLevel);
- i.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
+ i.context.translate(unzoomedRect.x(), unzoomedRect.y());
+ i.context.scale(zoomLevel, zoomLevel);
+ i.context.translate(-unzoomedRect.x(), -unzoomedRect.y());
}
Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartCheckbox, getWebThemeState(o), WebRect(unzoomedRect), &extraParams);
@@ -160,7 +160,7 @@ bool ThemePainterDefault::paintCheckbox(const LayoutObject& o, const PaintInfo&
bool ThemePainterDefault::paintRadio(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
{
WebThemeEngine::ExtraParams extraParams;
- WebCanvas* canvas = i.context->canvas();
+ WebCanvas* canvas = i.context.canvas();
extraParams.button.checked = LayoutTheme::isChecked(o);
Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartRadio, getWebThemeState(o), WebRect(rect), &extraParams);
@@ -170,7 +170,7 @@ bool ThemePainterDefault::paintRadio(const LayoutObject& o, const PaintInfo& i,
bool ThemePainterDefault::paintButton(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
{
WebThemeEngine::ExtraParams extraParams;
- WebCanvas* canvas = i.context->canvas();
+ WebCanvas* canvas = i.context.canvas();
extraParams.button.hasBorder = true;
extraParams.button.backgroundColor = useMockTheme() ? 0xffc0c0c0 : defaultButtonBackgroundColor;
if (o.hasBackground())
@@ -193,7 +193,7 @@ bool ThemePainterDefault::paintTextField(const LayoutObject& o, const PaintInfo&
extraParams.textField.isTextArea = part == TextAreaPart;
extraParams.textField.isListbox = part == ListboxPart;
- WebCanvas* canvas = i.context->canvas();
+ WebCanvas* canvas = i.context.canvas();
Color backgroundColor = o.resolveColor(CSSPropertyBackgroundColor);
extraParams.textField.backgroundColor = backgroundColor.rgb();
@@ -227,7 +227,7 @@ bool ThemePainterDefault::paintMenuList(const LayoutObject& o, const PaintInfo&
setupMenuListArrow(box, rect, extraParams);
- WebCanvas* canvas = i.context->canvas();
+ WebCanvas* canvas = i.context.canvas();
Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartMenuList, getWebThemeState(o), WebRect(rect), &extraParams);
return false;
}
@@ -244,7 +244,7 @@ bool ThemePainterDefault::paintMenuListButton(const LayoutObject& o, const Paint
extraParams.menuList.fillContentArea = false;
setupMenuListArrow(toLayoutBox(o), rect, extraParams);
- WebCanvas* canvas = i.context->canvas();
+ WebCanvas* canvas = i.context.canvas();
Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartMenuList, getWebThemeState(o), WebRect(rect), &extraParams);
return false;
}
@@ -277,22 +277,22 @@ void ThemePainterDefault::setupMenuListArrow(const LayoutBox& box, const IntRect
bool ThemePainterDefault::paintSliderTrack(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
{
WebThemeEngine::ExtraParams extraParams;
- WebCanvas* canvas = i.context->canvas();
+ WebCanvas* canvas = i.context.canvas();
extraParams.slider.vertical = o.styleRef().appearance() == SliderVerticalPart;
paintSliderTicks(o, i, rect);
// FIXME: Mock theme doesn't handle zoomed sliders.
float zoomLevel = useMockTheme() ? 1 : o.styleRef().effectiveZoom();
- GraphicsContextStateSaver stateSaver(*i.context, false);
+ GraphicsContextStateSaver stateSaver(i.context, false);
IntRect unzoomedRect = rect;
if (zoomLevel != 1) {
stateSaver.save();
unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
- i.context->translate(unzoomedRect.x(), unzoomedRect.y());
- i.context->scale(zoomLevel, zoomLevel);
- i.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
+ i.context.translate(unzoomedRect.x(), unzoomedRect.y());
+ i.context.scale(zoomLevel, zoomLevel);
+ i.context.translate(-unzoomedRect.x(), -unzoomedRect.y());
}
Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartSliderTrack, getWebThemeState(o), WebRect(unzoomedRect), &extraParams);
@@ -303,21 +303,21 @@ bool ThemePainterDefault::paintSliderTrack(const LayoutObject& o, const PaintInf
bool ThemePainterDefault::paintSliderThumb(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
{
WebThemeEngine::ExtraParams extraParams;
- WebCanvas* canvas = i.context->canvas();
+ WebCanvas* canvas = i.context.canvas();
extraParams.slider.vertical = o.styleRef().appearance() == SliderThumbVerticalPart;
extraParams.slider.inDrag = LayoutTheme::isPressed(o);
// FIXME: Mock theme doesn't handle zoomed sliders.
float zoomLevel = useMockTheme() ? 1 : o.styleRef().effectiveZoom();
- GraphicsContextStateSaver stateSaver(*i.context, false);
+ GraphicsContextStateSaver stateSaver(i.context, false);
IntRect unzoomedRect = rect;
if (zoomLevel != 1) {
stateSaver.save();
unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
- i.context->translate(unzoomedRect.x(), unzoomedRect.y());
- i.context->scale(zoomLevel, zoomLevel);
- i.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
+ i.context.translate(unzoomedRect.x(), unzoomedRect.y());
+ i.context.scale(zoomLevel, zoomLevel);
+ i.context.translate(-unzoomedRect.x(), -unzoomedRect.y());
}
Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartSliderThumb, getWebThemeState(o), WebRect(unzoomedRect), &extraParams);
@@ -327,7 +327,7 @@ bool ThemePainterDefault::paintSliderThumb(const LayoutObject& o, const PaintInf
bool ThemePainterDefault::paintInnerSpinButton(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
{
WebThemeEngine::ExtraParams extraParams;
- WebCanvas* canvas = i.context->canvas();
+ WebCanvas* canvas = i.context.canvas();
extraParams.innerSpin.spinUp = (LayoutTheme::controlStatesForLayoutObject(o) & SpinUpControlState);
extraParams.innerSpin.readOnly = LayoutTheme::isReadOnlyControl(o);
@@ -351,7 +351,7 @@ bool ThemePainterDefault::paintProgressBar(const LayoutObject& o, const PaintInf
extraParams.progressBar.valueRectHeight = valueRect.height();
DirectionFlippingScope scope(o, i, rect);
- WebCanvas* canvas = i.context->canvas();
+ WebCanvas* canvas = i.context.canvas();
Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartProgressBar, getWebThemeState(o), WebRect(rect), &extraParams);
return false;
}
@@ -390,7 +390,7 @@ bool ThemePainterDefault::paintSearchFieldCancelButton(const LayoutObject& cance
DEFINE_STATIC_REF(Image, cancelImage, (Image::loadPlatformResource("searchCancel")));
DEFINE_STATIC_REF(Image, cancelPressedImage, (Image::loadPlatformResource("searchCancelPressed")));
- paintInfo.context->drawImage(LayoutTheme::isPressed(cancelButtonObject) ? cancelPressedImage : cancelImage, paintingRect);
+ paintInfo.context.drawImage(LayoutTheme::isPressed(cancelButtonObject) ? cancelPressedImage : cancelImage, paintingRect);
return false;
}
@@ -417,7 +417,7 @@ bool ThemePainterDefault::paintSearchFieldResultsDecoration(const LayoutObject&
IntRect paintingRect = convertToPaintingRect(inputLayoutBox, magnifierObject, magnifierRect, r);
DEFINE_STATIC_REF(Image, magnifierImage, (Image::loadPlatformResource("searchMagnifier")));
- paintInfo.context->drawImage(magnifierImage, paintingRect);
+ paintInfo.context.drawImage(magnifierImage, paintingRect);
return false;
}
« no previous file with comments | « third_party/WebKit/Source/core/paint/ThemePainter.cpp ('k') | third_party/WebKit/Source/core/paint/ThemePainterMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698