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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/rendering/RenderThemeChromiumDefault.cpp

Issue 21430003: Implement interfaces in PaintInfo and make it a class. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@getterPaintInfo01
Patch Set: Fixed Linux compilation (hopefuly Windows too), addressing some reviewer's suggestions. Created 7 years, 5 months 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
« Source/core/rendering/PaintInfo.h ('K') | « Source/core/rendering/RenderThemeChromiumDefault.h ('k') | Source/core/rendering/RenderThemeChromiumMac.h » ('j') | Source/core/rendering/svg/SVGRenderingContext.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderThemeChromiumDefault.cpp
diff --git a/Source/core/rendering/RenderThemeChromiumDefault.cpp b/Source/core/rendering/RenderThemeChromiumDefault.cpp
index 41b12d27bfddd46b6d2765dfbae38f7f2b2cda59..d172b0ecbafd67ecef659f68d9f60755c54ac65f 100644
--- a/Source/core/rendering/RenderThemeChromiumDefault.cpp
+++ b/Source/core/rendering/RenderThemeChromiumDefault.cpp
@@ -207,22 +207,22 @@ void RenderThemeChromiumDefault::setSelectionColors(
m_inactiveSelectionForegroundColor = inactiveForegroundColor;
}
-bool RenderThemeChromiumDefault::paintCheckbox(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintCheckbox(RenderObject* o, PaintInfo& i, const IntRect& rect)
{
WebKit::WebThemeEngine::ExtraParams extraParams;
- WebKit::WebCanvas* canvas = i.context->canvas();
+ WebKit::WebCanvas* canvas = i.getContext()->canvas();
extraParams.button.checked = isChecked(o);
extraParams.button.indeterminate = isIndeterminate(o);
float zoomLevel = o->style()->effectiveZoom();
- GraphicsContextStateSaver stateSaver(*i.context);
+ GraphicsContextStateSaver stateSaver(*(i.getContext()));
IntRect unzoomedRect = rect;
if (zoomLevel != 1) {
unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
- i.context->translate(unzoomedRect.x(), unzoomedRect.y());
- i.context->scale(FloatSize(zoomLevel, zoomLevel));
- i.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
+ i.getContext()->translate(unzoomedRect.x(), unzoomedRect.y());
+ i.getContext()->scale(FloatSize(zoomLevel, zoomLevel));
+ i.getContext()->translate(-unzoomedRect.x(), -unzoomedRect.y());
}
WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartCheckbox, getWebThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams);
@@ -242,10 +242,10 @@ void RenderThemeChromiumDefault::setCheckboxSize(RenderStyle* style) const
setSizeIfAuto(style, size);
}
-bool RenderThemeChromiumDefault::paintRadio(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintRadio(RenderObject* o, PaintInfo& i, const IntRect& rect)
{
WebKit::WebThemeEngine::ExtraParams extraParams;
- WebKit::WebCanvas* canvas = i.context->canvas();
+ WebKit::WebCanvas* canvas = i.getContext()->canvas();
extraParams.button.checked = isChecked(o);
WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartRadio, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
@@ -265,10 +265,10 @@ void RenderThemeChromiumDefault::setRadioSize(RenderStyle* style) const
setSizeIfAuto(style, size);
}
-bool RenderThemeChromiumDefault::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintButton(RenderObject* o, PaintInfo& i, const IntRect& rect)
{
WebKit::WebThemeEngine::ExtraParams extraParams;
- WebKit::WebCanvas* canvas = i.context->canvas();
+ WebKit::WebCanvas* canvas = i.getContext()->canvas();
extraParams.button.hasBorder = true;
extraParams.button.backgroundColor = defaultButtonBackgroundColor;
if (o->hasBackground())
@@ -278,7 +278,7 @@ bool RenderThemeChromiumDefault::paintButton(RenderObject* o, const PaintInfo& i
return false;
}
-bool RenderThemeChromiumDefault::paintTextField(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintTextField(RenderObject* o, PaintInfo& i, const IntRect& rect)
{
// WebThemeEngine does not handle border rounded corner and background image
// so return true to draw CSS border and background.
@@ -291,7 +291,7 @@ bool RenderThemeChromiumDefault::paintTextField(RenderObject* o, const PaintInfo
extraParams.textField.isTextArea = part == TextAreaPart;
extraParams.textField.isListbox = part == ListboxPart;
- WebKit::WebCanvas* canvas = i.context->canvas();
+ WebKit::WebCanvas* canvas = i.getContext()->canvas();
// Fallback to white if the specified color object is invalid.
Color backgroundColor = o->resolveColor(CSSPropertyBackgroundColor, Color::white);
@@ -301,7 +301,7 @@ bool RenderThemeChromiumDefault::paintTextField(RenderObject* o, const PaintInfo
return false;
}
-bool RenderThemeChromiumDefault::paintMenuList(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintMenuList(RenderObject* o, PaintInfo& i, const IntRect& rect)
{
if (!o->isBox())
return false;
@@ -321,29 +321,29 @@ bool RenderThemeChromiumDefault::paintMenuList(RenderObject* o, const PaintInfo&
if (o->hasBackground())
extraParams.menuList.backgroundColor = o->resolveColor(CSSPropertyBackgroundColor).rgb();
- WebKit::WebCanvas* canvas = i.context->canvas();
+ WebKit::WebCanvas* canvas = i.getContext()->canvas();
WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartMenuList, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
return false;
}
-bool RenderThemeChromiumDefault::paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintSliderTrack(RenderObject* o, PaintInfo& i, const IntRect& rect)
{
WebKit::WebThemeEngine::ExtraParams extraParams;
- WebKit::WebCanvas* canvas = i.context->canvas();
+ WebKit::WebCanvas* canvas = i.getContext()->canvas();
extraParams.slider.vertical = o->style()->appearance() == SliderVerticalPart;
paintSliderTicks(o, i, rect);
float zoomLevel = o->style()->effectiveZoom();
- GraphicsContextStateSaver stateSaver(*i.context);
+ GraphicsContextStateSaver stateSaver(*(i.getContext()));
IntRect unzoomedRect = rect;
if (zoomLevel != 1) {
unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
- i.context->translate(unzoomedRect.x(), unzoomedRect.y());
- i.context->scale(FloatSize(zoomLevel, zoomLevel));
- i.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
+ i.getContext()->translate(unzoomedRect.x(), unzoomedRect.y());
+ i.getContext()->scale(FloatSize(zoomLevel, zoomLevel));
+ i.getContext()->translate(-unzoomedRect.x(), -unzoomedRect.y());
}
WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartSliderTrack, getWebThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams);
@@ -351,22 +351,22 @@ bool RenderThemeChromiumDefault::paintSliderTrack(RenderObject* o, const PaintIn
return false;
}
-bool RenderThemeChromiumDefault::paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintSliderThumb(RenderObject* o, PaintInfo& i, const IntRect& rect)
{
WebKit::WebThemeEngine::ExtraParams extraParams;
- WebKit::WebCanvas* canvas = i.context->canvas();
+ WebKit::WebCanvas* canvas = i.getContext()->canvas();
extraParams.slider.vertical = o->style()->appearance() == SliderThumbVerticalPart;
extraParams.slider.inDrag = isPressed(o);
float zoomLevel = o->style()->effectiveZoom();
- GraphicsContextStateSaver stateSaver(*i.context);
+ GraphicsContextStateSaver stateSaver(*(i.getContext()));
IntRect unzoomedRect = rect;
if (zoomLevel != 1) {
unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
- i.context->translate(unzoomedRect.x(), unzoomedRect.y());
- i.context->scale(FloatSize(zoomLevel, zoomLevel));
- i.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
+ i.getContext()->translate(unzoomedRect.x(), unzoomedRect.y());
+ i.getContext()->scale(FloatSize(zoomLevel, zoomLevel));
+ i.getContext()->translate(-unzoomedRect.x(), -unzoomedRect.y());
}
WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartSliderThumb, getWebThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams);
@@ -381,10 +381,10 @@ void RenderThemeChromiumDefault::adjustInnerSpinButtonStyle(RenderStyle* style,
style->setMinWidth(Length(size.width(), Fixed));
}
-bool RenderThemeChromiumDefault::paintInnerSpinButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintInnerSpinButton(RenderObject* o, PaintInfo& i, const IntRect& rect)
{
WebKit::WebThemeEngine::ExtraParams extraParams;
- WebKit::WebCanvas* canvas = i.context->canvas();
+ WebKit::WebCanvas* canvas = i.getContext()->canvas();
extraParams.innerSpin.spinUp = (controlStatesForRenderer(o) & SpinUpState);
extraParams.innerSpin.readOnly = isReadOnlyControl(o);
@@ -392,7 +392,7 @@ bool RenderThemeChromiumDefault::paintInnerSpinButton(RenderObject* o, const Pai
return false;
}
-bool RenderThemeChromiumDefault::paintProgressBar(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool RenderThemeChromiumDefault::paintProgressBar(RenderObject* o, PaintInfo& i, const IntRect& rect)
{
if (!o->isProgress())
return true;
@@ -408,7 +408,7 @@ bool RenderThemeChromiumDefault::paintProgressBar(RenderObject* o, const PaintIn
extraParams.progressBar.valueRectHeight = valueRect.height();
DirectionFlippingScope scope(o, i, rect);
- WebKit::WebCanvas* canvas = i.context->canvas();
+ WebKit::WebCanvas* canvas = i.getContext()->canvas();
WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartProgressBar, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
return false;
}
« Source/core/rendering/PaintInfo.h ('K') | « Source/core/rendering/RenderThemeChromiumDefault.h ('k') | Source/core/rendering/RenderThemeChromiumMac.h » ('j') | Source/core/rendering/svg/SVGRenderingContext.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698