Source/core/layout/LayoutTextCombine.h - Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/layout/LayoutTextCombine.h

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Add one more file. Created 5 years, 6 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 side-by-side diff with in-line comments

Download patch

Index: Source/core/layout/LayoutTextCombine.h

diff --git a/Source/core/layout/LayoutTextCombine.h b/Source/core/layout/LayoutTextCombine.h

index ebff720f11bfab1a163b0c6d377be4156fd7495d..115042c73b6c696e33f6dade5da870daacee87ba 100644

--- a/Source/core/layout/LayoutTextCombine.h

+++ b/Source/core/layout/LayoutTextCombine.h

@@ -45,7 +45,7 @@ public:

private:

virtual bool isCombineText() const override { return true; }

- virtual float width(unsigned from, unsigned length, const Font&, LayoutUnit xPosition, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const override;

+ virtual float width(unsigned from, unsigned length, const Font&, LayoutUnit xPosition, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = nullptr, GlyphOverflow* = nullptr) const override;

virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;

virtual void setTextInternal(PassRefPtr<StringImpl>) override;

void updateIsCombined();

« no previous file with comments | « Source/core/layout/LayoutText.cpp ('k') | Source/core/layout/LayoutTextControl.h » ('j') | no next file with comments »