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

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 716023002: Paint code cleanup: remove unnecessary indirections through the Render* code in several cases. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RenderPart.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 if (mustInvalidateFillLayersPaintOnHeightChange(style()->backgroundLayers()) ) 959 if (mustInvalidateFillLayersPaintOnHeightChange(style()->backgroundLayers()) )
960 return true; 960 return true;
961 961
962 // Our fill layers are ok. Let's check border. 962 // Our fill layers are ok. Let's check border.
963 if (style()->hasBorder() && canRenderBorderImage()) 963 if (style()->hasBorder() && canRenderBorderImage())
964 return true; 964 return true;
965 965
966 return false; 966 return false;
967 } 967 }
968 968
969 void RenderObject::paintOutline(PaintInfo& paintInfo, const LayoutRect& paintRec t)
970 {
971 ObjectPainter(*this).paintOutline(paintInfo, paintRect);
972 }
973
974 void RenderObject::addChildFocusRingRects(Vector<LayoutRect>& rects, const Layou tPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const 969 void RenderObject::addChildFocusRingRects(Vector<LayoutRect>& rects, const Layou tPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const
975 { 970 {
976 for (RenderObject* current = slowFirstChild(); current; current = current->n extSibling()) { 971 for (RenderObject* current = slowFirstChild(); current; current = current->n extSibling()) {
977 if (current->isText() || current->isListMarker()) 972 if (current->isText() || current->isListMarker())
978 continue; 973 continue;
979 974
980 if (current->isBox()) { 975 if (current->isBox()) {
981 RenderBox* box = toRenderBox(current); 976 RenderBox* box = toRenderBox(current);
982 if (box->hasLayer()) { 977 if (box->hasLayer()) {
983 Vector<LayoutRect> layerFocusRingRects; 978 Vector<LayoutRect> layerFocusRingRects;
(...skipping 2201 matching lines...) Expand 10 before | Expand all | Expand 10 after
3185 { 3180 {
3186 if (object1) { 3181 if (object1) {
3187 const blink::RenderObject* root = object1; 3182 const blink::RenderObject* root = object1;
3188 while (root->parent()) 3183 while (root->parent())
3189 root = root->parent(); 3184 root = root->parent();
3190 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3185 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3191 } 3186 }
3192 } 3187 }
3193 3188
3194 #endif 3189 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RenderPart.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698