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

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

Issue 135043007: Remove default parameter from virtual layoutBlock function (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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 | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderBlockFlow.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-2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * Copyright (C) 2013 Google Inc. All rights reserved. 7 * Copyright (C) 2013 Google Inc. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions are 10 * modification, are permitted provided that the following conditions are
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 class RenderBlockFlow : public RenderBlock { 50 class RenderBlockFlow : public RenderBlock {
51 public: 51 public:
52 explicit RenderBlockFlow(ContainerNode*); 52 explicit RenderBlockFlow(ContainerNode*);
53 virtual ~RenderBlockFlow(); 53 virtual ~RenderBlockFlow();
54 54
55 static RenderBlockFlow* createAnonymous(Document*); 55 static RenderBlockFlow* createAnonymous(Document*);
56 RenderBlockFlow* createAnonymousBlockFlow() const; 56 RenderBlockFlow* createAnonymousBlockFlow() const;
57 57
58 virtual bool isRenderBlockFlow() const OVERRIDE FINAL { return true; } 58 virtual bool isRenderBlockFlow() const OVERRIDE FINAL { return true; }
59 59
60 virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) OVERRIDE; 60 virtual void layoutBlock(bool relayoutChildren) OVERRIDE;
61 void layoutBlockFlow(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0 );
61 62
62 virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFl oats = false) OVERRIDE; 63 virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFl oats = false) OVERRIDE;
63 virtual void deleteLineBoxTree() OVERRIDE FINAL; 64 virtual void deleteLineBoxTree() OVERRIDE FINAL;
64 65
65 // Versions that can compute line offsets with the region and page offset pa ssed in. Used for speed to avoid having to 66 // Versions that can compute line offsets with the region and page offset pa ssed in. Used for speed to avoid having to
66 // compute the region all over again when you already know it. 67 // compute the region all over again when you already know it.
67 LayoutUnit availableLogicalWidthForLineInRegion(LayoutUnit position, bool sh ouldIndentText, RenderRegion* region, LayoutUnit logicalHeight = 0) const 68 LayoutUnit availableLogicalWidthForLineInRegion(LayoutUnit position, bool sh ouldIndentText, RenderRegion* region, LayoutUnit logicalHeight = 0) const
68 { 69 {
69 return max<LayoutUnit>(0, logicalRightOffsetForLineInRegion(position, sh ouldIndentText, region, logicalHeight) 70 return max<LayoutUnit>(0, logicalRightOffsetForLineInRegion(position, sh ouldIndentText, region, logicalHeight)
70 - logicalLeftOffsetForLineInRegion(position, shouldIndentText, regio n, logicalHeight)); 71 - logicalLeftOffsetForLineInRegion(position, shouldIndentText, regio n, logicalHeight));
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 514
514 // END METHODS DEFINED IN RenderBlockLineLayout 515 // END METHODS DEFINED IN RenderBlockLineLayout
515 516
516 }; 517 };
517 518
518 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); 519 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow());
519 520
520 } // namespace WebCore 521 } // namespace WebCore
521 522
522 #endif // RenderBlockFlow_h 523 #endif // RenderBlockFlow_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698