| commit | bfe3590b1806e3ff18f46ee3af5d4b83078f305a | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Tue Oct 22 16:41:51 2013 +0100 |
| committer | Torne (Richard Coles) <torne@google.com> | Tue Oct 22 16:41:51 2013 +0100 |
| tree | 685b45e3de5ce60bdf1e8286ccafada058cf077f | |
| parent | 9402e5a409a9456b6d38bc45e6a6983af4bfcd42 [diff] [blame] |
Merge from Chromium at DEPS revision 230120 This commit was generated by merge_to_master.py. Change-Id: Iab152fc67d869deb6e9505babd8d71cab63335dd
diff --git a/Source/core/css/CSSLineBoxContainValue.cpp b/Source/core/css/CSSLineBoxContainValue.cpp index c1ae2e5..7c3532b 100644 --- a/Source/core/css/CSSLineBoxContainValue.cpp +++ b/Source/core/css/CSSLineBoxContainValue.cpp
@@ -37,7 +37,7 @@ { } -String CSSLineBoxContainValue::customCssText() const +String CSSLineBoxContainValue::customCSSText() const { StringBuilder text;