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

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

Issue 254803009: expansionOpportunityCount should be 'unsigned' rather than 'int' (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | Source/core/rendering/RenderBlockFlow.h » ('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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 LayoutUnit marginIntrinsicLogicalWidthForChild(RenderBox* child) const; 283 LayoutUnit marginIntrinsicLogicalWidthForChild(RenderBox* child) const;
284 284
285 int beforeMarginInLineDirection(LineDirectionMode) const; 285 int beforeMarginInLineDirection(LineDirectionMode) const;
286 286
287 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 287 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
288 virtual void paintObject(PaintInfo&, const LayoutPoint&) OVERRIDE; 288 virtual void paintObject(PaintInfo&, const LayoutPoint&) OVERRIDE;
289 virtual void paintChildren(PaintInfo&, const LayoutPoint&); 289 virtual void paintChildren(PaintInfo&, const LayoutPoint&);
290 void paintChild(RenderBox*, PaintInfo&, const LayoutPoint&); 290 void paintChild(RenderBox*, PaintInfo&, const LayoutPoint&);
291 void paintChildAsInlineBlock(RenderBox*, PaintInfo&, const LayoutPoint&); 291 void paintChildAsInlineBlock(RenderBox*, PaintInfo&, const LayoutPoint&);
292 292
293 virtual void adjustInlineDirectionLineBounds(int /* expansionOpportunityCoun t */, float& /* logicalLeft */, float& /* logicalWidth */) const { } 293 virtual void adjustInlineDirectionLineBounds(unsigned /* expansionOpportunit yCount */, float& /* logicalLeft */, float& /* logicalWidth */) const { }
294 294
295 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE; 295 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE;
296 296
297 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE; 297 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;
298 virtual void computePreferredLogicalWidths() OVERRIDE; 298 virtual void computePreferredLogicalWidths() OVERRIDE;
299 void adjustIntrinsicLogicalWidthsForColumns(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const; 299 void adjustIntrinsicLogicalWidthsForColumns(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const;
300 300
301 virtual int firstLineBoxBaseline() const OVERRIDE; 301 virtual int firstLineBoxBaseline() const OVERRIDE;
302 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE; 302 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE;
303 int lastLineBoxBaseline(LineDirectionMode) const; 303 int lastLineBoxBaseline(LineDirectionMode) const;
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 // FIXME: This is temporary as we move code that accesses block flow 546 // FIXME: This is temporary as we move code that accesses block flow
547 // member variables out of RenderBlock and into RenderBlockFlow. 547 // member variables out of RenderBlock and into RenderBlockFlow.
548 friend class RenderBlockFlow; 548 friend class RenderBlockFlow;
549 }; 549 };
550 550
551 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 551 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
552 552
553 } // namespace WebCore 553 } // namespace WebCore
554 554
555 #endif // RenderBlock_h 555 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698