Index: Source/core/layout/LayoutText.h |
diff --git a/Source/core/layout/LayoutText.h b/Source/core/layout/LayoutText.h |
index 8f2c2b256d3c628e823b567aaaffdab8c0356885..9e01976412305f7a96e47212a9b41c9d2f8902fa 100644 |
--- a/Source/core/layout/LayoutText.h |
+++ b/Source/core/layout/LayoutText.h |
@@ -66,13 +66,13 @@ public: |
void dirtyLineBoxes(); |
virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override final; |
- void absoluteRectsForRange(Vector<IntRect>&, unsigned startOffset = 0, unsigned endOffset = INT_MAX, bool useSelectionHeight = false, bool* wasFixed = 0); |
+ void absoluteRectsForRange(Vector<IntRect>&, unsigned startOffset = 0, unsigned endOffset = INT_MAX, bool useSelectionHeight = false, bool* wasFixed = nullptr); |
virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override final; |
- void absoluteQuadsForRange(Vector<FloatQuad>&, unsigned startOffset = 0, unsigned endOffset = INT_MAX, bool useSelectionHeight = false, bool* wasFixed = 0); |
+ void absoluteQuadsForRange(Vector<FloatQuad>&, unsigned startOffset = 0, unsigned endOffset = INT_MAX, bool useSelectionHeight = false, bool* wasFixed = nullptr); |
enum ClippingOption { NoClipping, ClipToEllipsis }; |
- void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed = 0, ClippingOption = NoClipping) const; |
+ void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed = nullptr, ClippingOption = NoClipping) const; |
virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override; |
@@ -86,8 +86,8 @@ public: |
unsigned textLength() const { return m_text.length(); } // non virtual implementation of length() |
void positionLineBox(InlineBox*); |
- virtual float width(unsigned from, unsigned len, const Font&, LayoutUnit xPos, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const; |
- virtual float width(unsigned from, unsigned len, LayoutUnit xPos, TextDirection, bool firstLine = false, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const; |
+ virtual float width(unsigned from, unsigned len, const Font&, LayoutUnit xPos, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = nullptr, GlyphOverflow* = nullptr) const; |
+ virtual float width(unsigned from, unsigned len, LayoutUnit xPos, TextDirection, bool firstLine = false, HashSet<const SimpleFontData*>* fallbackFonts = nullptr, GlyphOverflow* = nullptr) const; |
float minLogicalWidth() const; |
float maxLogicalWidth() const; |
@@ -115,7 +115,7 @@ public: |
virtual bool canBeSelectionLeaf() const override { return true; } |
virtual void setSelectionState(SelectionState) override final; |
virtual LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer) const override; |
- virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) override; |
+ virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = nullptr) override; |
InlineTextBox* firstTextBox() const { return m_firstTextBox; } |
InlineTextBox* lastTextBox() const { return m_lastTextBox; } |
@@ -179,7 +179,7 @@ private: |
bool isText() const = delete; // This will catch anyone doing an unnecessary check. |
- virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override; |
+ virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const override; |
void checkConsistency() const; |