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

Side by Side Diff: Source/core/rendering/RenderBlock.h

Issue 711493004: Remove unnecessary paintContainer parameter from addFocusRingRects (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase 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/paint/ObjectPainter.cpp ('k') | Source/core/rendering/RenderBlock.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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 void setDesiredColumnCountAndWidth(int, LayoutUnit); 317 void setDesiredColumnCountAndWidth(int, LayoutUnit);
318 318
319 public: 319 public:
320 virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool = false); 320 virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool = false);
321 protected: 321 protected:
322 virtual void addOverflowFromChildren(); 322 virtual void addOverflowFromChildren();
323 void addOverflowFromPositionedObjects(); 323 void addOverflowFromPositionedObjects();
324 void addOverflowFromBlockChildren(); 324 void addOverflowFromBlockChildren();
325 void addVisualOverflowFromTheme(); 325 void addVisualOverflowFromTheme();
326 326
327 virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& addit ionalOffset, const RenderLayerModelObject* paintContainer) const override; 327 virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& addit ionalOffset) const override;
328 328
329 virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const override; 329 virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const override;
330 330
331 void updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, RenderBox* ); 331 void updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, RenderBox* );
332 332
333 virtual bool isInlineBlockOrInlineTable() const override final { return isIn line() && isReplaced(); } 333 virtual bool isInlineBlockOrInlineTable() const override final { return isIn line() && isReplaced(); }
334 334
335 virtual void invalidatePaintOfSubtreesIfNeeded(const PaintInvalidationState& childPaintInvalidationState) override; 335 virtual void invalidatePaintOfSubtreesIfNeeded(const PaintInvalidationState& childPaintInvalidationState) override;
336 336
337 private: 337 private:
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 // FIXME: This is temporary as we move code that accesses block flow 494 // FIXME: This is temporary as we move code that accesses block flow
495 // member variables out of RenderBlock and into RenderBlockFlow. 495 // member variables out of RenderBlock and into RenderBlockFlow.
496 friend class RenderBlockFlow; 496 friend class RenderBlockFlow;
497 }; 497 };
498 498
499 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 499 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
500 500
501 } // namespace blink 501 } // namespace blink
502 502
503 #endif // RenderBlock_h 503 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « Source/core/paint/ObjectPainter.cpp ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698