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

Unified Diff: Source/WebCore/rendering/RenderObject.h

Issue 12616003: Merge 144350 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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
« no previous file with comments | « Source/WebCore/rendering/RenderListBox.cpp ('k') | Source/WebCore/rendering/RenderObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderObject.h
===================================================================
--- Source/WebCore/rendering/RenderObject.h (revision 145084)
+++ Source/WebCore/rendering/RenderObject.h (working copy)
@@ -950,7 +950,7 @@
// return true if this object requires a new stacking context
bool createsGroup() const { return isTransparent() || hasMask() || hasFilter() || hasBlendMode(); }
- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint&) { };
+ virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& /* additionalOffset */, const RenderLayerModelObject* /* paintContainer */ = 0) { };
LayoutRect absoluteOutlineBounds() const
{
@@ -974,8 +974,8 @@
void drawLineForBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2, BoxSide,
Color, EBorderStyle, int adjbw1, int adjbw2, bool antialias = false);
- void paintFocusRing(GraphicsContext*, const LayoutPoint&, RenderStyle*);
- void paintOutline(GraphicsContext*, const LayoutRect&);
+ void paintFocusRing(PaintInfo&, const LayoutPoint&, RenderStyle*);
+ void paintOutline(PaintInfo&, const LayoutRect&);
void addPDFURLRect(GraphicsContext*, const LayoutRect&);
virtual LayoutRect viewRect() const;
« no previous file with comments | « Source/WebCore/rendering/RenderListBox.cpp ('k') | Source/WebCore/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698