third_party/WebKit/Source/core/style/ComputedStyle.h - Issue 1915343003: Add CSS hyphens property behind the test flag

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: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 1915343003: Add CSS hyphens property behind the test flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Split histograms.xml to a separate CL Created 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/frame/UseCounter.cpp ('k') | third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/style/ComputedStyle.h

diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h

index a64f0db29bfdf6228850ca88bdfbaf3c3d915e3f..b2da33b7ab9ba63c37db73d4e24e754b365921c5 100644

--- a/third_party/WebKit/Source/core/style/ComputedStyle.h

+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h

@@ -871,6 +871,7 @@ public:

EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareInheritedData->overflowWrap); }

LineBreak getLineBreak() const { return static_cast<LineBreak>(rareInheritedData->lineBreak); }

const AtomicString& highlight() const { return rareInheritedData->highlight; }

+ Hyphens getHyphens() const { return static_cast<Hyphens>(rareInheritedData->hyphens); }

const AtomicString& hyphenationString() const { return rareInheritedData->hyphenationString; }

const AtomicString& locale() const { return getFontDescription().locale(false); }

EResize resize() const { return static_cast<EResize>(rareNonInheritedData->m_resize); }

@@ -1396,6 +1397,7 @@ public:

void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowWrap, b); }

void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); }

void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highlight, h); }

+ void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); }

void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData, hyphenationString, h); }

void setResize(EResize r) { SET_VAR(rareNonInheritedData, m_resize, r); }

void setColumnWidth(float f) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_autoWidth, false); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_width, f); }

@@ -1747,6 +1749,7 @@ public:

static LineBreak initialLineBreak() { return LineBreakAuto; }

static const AtomicString& initialHighlight() { return nullAtom; }

static ESpeak initialSpeak() { return SpeakNormal; }

+ static Hyphens initialHyphens() { return HyphensManual; }

static const AtomicString& initialHyphenationString() { return nullAtom; }

static EResize initialResize() { return RESIZE_NONE; }

static ControlPart initialAppearance() { return NoControlPart; }