Move most of the [Pass]RefPtr's of CSSPrimitiveValue to our transition types.

Move most of the [Pass]RefPtr's of CSSPrimitiveValue to our transition types.

I still need to move the CSSPrimitiveValues referred from the classes

. Pair
. Counter
. CSSBasicShape and subclasses
. CSSCalcExpressionNode and subclasses
. RectBase and subclasses

Instead of using Persistents I plan on moving the objects to the oilpan heap.
I also added a TraceTrait for RefPtr to compile trace method bodies in non-oilpan mode when tracing collections.
Finally I changed RawPtr's release() to zero out the m_ptr to match RefPtr's version.

R=ager@chromium.org, erik.corry@gmail.com, haraken@chromium.org, jochen@chromium.org, tkent@chromium.org, vegorov@chromium.org, zerny@chromium.org
BUG=341815
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=167022

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=167089

[haraken, 2014-02-12 14:05:44]

LGTM.

https://codereview.chromium.org/148523016/diff/1/Source/core/css/CSSGradientV...
File Source/core/css/CSSGradientValue.h (right):

https://codereview.chromium.org/148523016/diff/1/Source/core/css/CSSGradientV...
Source/core/css/CSSGradientValue.h:53: // objects its members are visited via
the traceAfterDispatch method.

traceAfterDispatch => trace

https://codereview.chromium.org/148523016/diff/1/Source/core/css/CSSGradientV...
Source/core/css/CSSGradientValue.h:66: void trace(Visitor*);

Just to confirm: If we forget to declare trace(), we will hit a compile error
when compiling HeapVector<CSSGradientColorStop>, right?

https://codereview.chromium.org/148523016/diff/1/Source/core/css/CSSValuePool...
File Source/core/css/CSSValuePool.cpp (right):

https://codereview.chromium.org/148523016/diff/1/Source/core/css/CSSValuePool...
Source/core/css/CSSValuePool.cpp:59:
m_numberValueCache.resize(maximumCacheableIntegerValue + 1);

Do we need these resize()s? I guess that these collections are already
initialized with the inline capacity.

https://codereview.chromium.org/148523016/diff/1/Source/core/css/parser/Bison...
File Source/core/css/parser/BisonCSSParser-in.cpp (right):

https://codereview.chromium.org/148523016/diff/1/Source/core/css/parser/Bison...
Source/core/css/parser/BisonCSSParser-in.cpp:7283: class
BorderImageSliceParseContext {

You need DISALLOW_ALLOCATION().

It would be nice if Ian's plugin catch this kind of error :)

https://codereview.chromium.org/148523016/diff/1/Source/heap/Handle.h
File Source/heap/Handle.h (right):

https://codereview.chromium.org/148523016/diff/1/Source/heap/Handle.h#newcode397
Source/heap/Handle.h:397: static void trace(Visitor* visitor, void* self)

|visitor| and |self| are not needed.

https://codereview.chromium.org/148523016/diff/1/Source/wtf/RawPtr.h
File Source/wtf/RawPtr.h (right):

https://codereview.chromium.org/148523016/diff/1/Source/wtf/RawPtr.h#newcode61
Source/wtf/RawPtr.h:61: m_ptr = 0;

Nice catch!

[haraken, 2014-02-12 14:06:55]

jochen: would you rubberstamp the wtf/ change?

[zerny-chromium, 2014-02-12 14:10:43]

lgtm

https://codereview.chromium.org/148523016/diff/1/Source/core/css/CSSGradientV...
File Source/core/css/CSSGradientValue.h (right):

https://codereview.chromium.org/148523016/diff/1/Source/core/css/CSSGradientV...
Source/core/css/CSSGradientValue.h:54: struct CSSGradientColorStop {
Add DISALLOW_ALLOCATION

[wibling-chromium, 2014-02-12 14:42:18]

Thanks for the reviews! Replies inline below.

https://codereview.chromium.org/148523016/diff/1/Source/core/css/CSSGradientV...
File Source/core/css/CSSGradientValue.h (right):

https://codereview.chromium.org/148523016/diff/1/Source/core/css/CSSGradientV...
Source/core/css/CSSGradientValue.h:53: // objects its members are visited via
the traceAfterDispatch method.
On 2014/02/12 14:05:45, haraken wrote:
> 
> traceAfterDispatch => trace

I meant the traceAfterDispatch method of the containing CSSGradientValue object.
I will clarify.

https://codereview.chromium.org/148523016/diff/1/Source/core/css/CSSGradientV...
Source/core/css/CSSGradientValue.h:54: struct CSSGradientColorStop {
On 2014/02/12 14:10:44, zerny-chromium wrote:
> Add DISALLOW_ALLOCATION

I have added ALLOW_ONLY_INLINE_ALLOCATION since it is new'ed when appending to
the vector.

https://codereview.chromium.org/148523016/diff/1/Source/core/css/CSSGradientV...
Source/core/css/CSSGradientValue.h:66: void trace(Visitor*);
On 2014/02/12 14:05:45, haraken wrote:
> 
> Just to confirm: If we forget to declare trace(), we will hit a compile error
> when compiling HeapVector<CSSGradientColorStop>, right?

It does get caught, but only when compiling with enable_oilpan=0 (ie. disabled).
The reason it is caught is that we try to instantiate the OffHeapCollectionTrait
in this case which tries to call trace on the vector's element.

https://codereview.chromium.org/148523016/diff/1/Source/core/css/CSSValuePool...
File Source/core/css/CSSValuePool.cpp (right):

https://codereview.chromium.org/148523016/diff/1/Source/core/css/CSSValuePool...
Source/core/css/CSSValuePool.cpp:59:
m_numberValueCache.resize(maximumCacheableIntegerValue + 1);
On 2014/02/12 14:05:45, haraken wrote:
> 
> Do we need these resize()s? I guess that these collections are already
> initialized with the inline capacity.

The resize() method initializes the backing memory so we can use it, whereas the
initial capacity just reserves it.

https://codereview.chromium.org/148523016/diff/1/Source/core/css/parser/Bison...
File Source/core/css/parser/BisonCSSParser-in.cpp (right):

https://codereview.chromium.org/148523016/diff/1/Source/core/css/parser/Bison...
Source/core/css/parser/BisonCSSParser-in.cpp:7283: class
BorderImageSliceParseContext {
On 2014/02/12 14:05:45, haraken wrote:
> 
> You need DISALLOW_ALLOCATION().
> 
> It would be nice if Ian's plugin catch this kind of error :)

Done.

https://codereview.chromium.org/148523016/diff/1/Source/heap/Handle.h
File Source/heap/Handle.h (right):

https://codereview.chromium.org/148523016/diff/1/Source/heap/Handle.h#newcode397
Source/heap/Handle.h:397: static void trace(Visitor* visitor, void* self)
On 2014/02/12 14:05:45, haraken wrote:
> 
> |visitor| and |self| are not needed.

Done.

[wibling-chromium, 2014-02-12 14:47:07]

The CQ bit was checked by wibling@chromium.org

[commit-bot: I haz the power, 2014-02-12 14:47:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/wibling@chromium.org/148523016/130001

[commit-bot: I haz the power, 2014-02-12 14:47:33]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-12 14:47:34]

Failed to apply patch for Source/core/css/parser/BisonCSSParser-in.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/css/parser/BisonCSSParser-in.cpp
  Hunk #1 succeeded at 133 (offset -1 lines).
  Hunk #2 succeeded at 1534 with fuzz 2 (offset -22 lines).
  Hunk #3 FAILED at 1573.
  Hunk #4 succeeded at 1591 (offset -31 lines).
  Hunk #5 succeeded at 2146 (offset -40 lines).
  Hunk #6 succeeded at 2173 (offset -40 lines).
  Hunk #7 succeeded at 2189 (offset -40 lines).
  Hunk #8 succeeded at 3638 (offset -65 lines).
  Hunk #9 succeeded at 3703 (offset -65 lines).
  Hunk #10 succeeded at 3712 (offset -65 lines).
  Hunk #11 succeeded at 3735 (offset -65 lines).
  Hunk #12 succeeded at 3751 (offset -65 lines).
  Hunk #13 succeeded at 3799 (offset -65 lines).
  Hunk #14 succeeded at 3894 (offset -65 lines).
  Hunk #15 succeeded at 4003 (offset -65 lines).
  Hunk #16 succeeded at 4013 (offset -65 lines).
  Hunk #17 succeeded at 4533 (offset -65 lines).
  Hunk #18 succeeded at 4574 (offset -65 lines).
  Hunk #19 succeeded at 4720 (offset -65 lines).
  Hunk #20 succeeded at 4831 (offset -65 lines).
  Hunk #21 succeeded at 4848 (offset -65 lines).
  Hunk #22 succeeded at 4953 (offset -65 lines).
  Hunk #23 succeeded at 4970 (offset -65 lines).
  Hunk #24 succeeded at 5013 (offset -65 lines).
  Hunk #25 succeeded at 5043 (offset -65 lines).
  Hunk #26 succeeded at 5075 (offset -65 lines).
  Hunk #27 succeeded at 5098 (offset -65 lines).
  Hunk #28 succeeded at 5128 (offset -65 lines).
  Hunk #29 succeeded at 5194 (offset -65 lines).
  Hunk #30 succeeded at 5251 (offset -65 lines).
  Hunk #31 succeeded at 5305 (offset -65 lines).
  Hunk #32 succeeded at 5342 (offset -65 lines).
  Hunk #33 succeeded at 5371 (offset -65 lines).
  Hunk #34 succeeded at 5422 (offset -65 lines).
  Hunk #35 succeeded at 5470 (offset -65 lines).
  Hunk #36 succeeded at 5519 (offset -65 lines).
  Hunk #37 succeeded at 5584 (offset -65 lines).
  Hunk #38 succeeded at 5637 (offset -65 lines).
  Hunk #39 succeeded at 5689 (offset -65 lines).
  Hunk #40 succeeded at 5945 (offset -65 lines).
  Hunk #41 succeeded at 6601 (offset -65 lines).
  Hunk #42 succeeded at 6712 (offset -65 lines).
  Hunk #43 succeeded at 6738 (offset -65 lines).
  Hunk #44 succeeded at 6769 (offset -65 lines).
  Hunk #45 succeeded at 6816 (offset -65 lines).
  Hunk #46 FAILED at 6920.
  Hunk #47 succeeded at 6869 (offset -69 lines).
  Hunk #48 succeeded at 6900 (offset -69 lines).
  Hunk #49 succeeded at 7007 (offset -69 lines).
  Hunk #50 succeeded at 7016 (offset -69 lines).
  Hunk #51 succeeded at 7079 (offset -69 lines).
  Hunk #52 succeeded at 7126 (offset -69 lines).
  Hunk #53 succeeded at 7181 (offset -69 lines).
  Hunk #54 succeeded at 7212 (offset -69 lines).
  Hunk #55 succeeded at 7229 (offset -69 lines).
  Hunk #56 succeeded at 7281 (offset -69 lines).
  Hunk #57 succeeded at 7340 (offset -69 lines).
  Hunk #58 succeeded at 7362 (offset -69 lines).
  Hunk #59 succeeded at 7397 (offset -69 lines).
  Hunk #60 succeeded at 7429 (offset -69 lines).
  Hunk #61 succeeded at 7446 (offset -69 lines).
  Hunk #62 succeeded at 7469 (offset -69 lines).
  Hunk #63 succeeded at 7532 (offset -69 lines).
  Hunk #64 succeeded at 7570 (offset -69 lines).
  Hunk #65 succeeded at 7694 (offset -69 lines).
  Hunk #66 succeeded at 7784 (offset -69 lines).
  Hunk #67 succeeded at 7804 (offset -69 lines).
  Hunk #68 succeeded at 7835 (offset -69 lines).
  Hunk #69 succeeded at 7921 (offset -69 lines).
  Hunk #70 succeeded at 7962 (offset -69 lines).
  Hunk #71 succeeded at 8024 (offset -69 lines).
  Hunk #72 succeeded at 8085 (offset -69 lines).
  Hunk #73 succeeded at 8325 (offset -69 lines).
  Hunk #74 succeeded at 9075 (offset -69 lines).
  Hunk #75 succeeded at 9253 (offset -69 lines).
  2 out of 75 hunks FAILED -- saving rejects to file
Source/core/css/parser/BisonCSSParser-in.cpp.rej

Patch:       Source/core/css/parser/BisonCSSParser-in.cpp
Index: Source/core/css/parser/BisonCSSParser-in.cpp
diff --git a/Source/core/css/parser/BisonCSSParser-in.cpp
b/Source/core/css/parser/BisonCSSParser-in.cpp
index
5cabb660114aff7e87e0d9a0992d0e0b878beedf..76b07d3560e9561ad77ee79b6269281c97365cf8
100644
--- a/Source/core/css/parser/BisonCSSParser-in.cpp
+++ b/Source/core/css/parser/BisonCSSParser-in.cpp
@@ -134,7 +134,7 @@ static bool equalIgnoringCase(CSSParserValue* value, const
char (&b)[N])
     return equalIgnoringCase(value->string, b);
 }
 
-static PassRefPtr<CSSPrimitiveValue>
createPrimitiveValuePair(PassRefPtr<CSSPrimitiveValue> first,
PassRefPtr<CSSPrimitiveValue> second, Pair::IdenticalValuesPolicy
identicalValuesPolicy = Pair::DropIdenticalValues)
+static PassRefPtrWillBeRawPtr<CSSPrimitiveValue>
createPrimitiveValuePair(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> first,
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> second, Pair::IdenticalValuesPolicy
identicalValuesPolicy = Pair::DropIdenticalValues)
 {
     return cssValuePool().createValue(Pair::create(first, second,
identicalValuesPolicy));
 }
@@ -1556,7 +1556,7 @@ bool BisonCSSParser::validUnit(CSSParserValue* value,
Units unitflags, CSSParser
     return b;
 }
 
-inline PassRefPtr<CSSPrimitiveValue>
BisonCSSParser::createPrimitiveNumericValue(CSSParserValue* value)
+inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue>
BisonCSSParser::createPrimitiveNumericValue(CSSParserValue* value)
 {
     if (isVariableReference(value))
         return createPrimitiveVariableReferenceValue(value);
@@ -1573,13 +1573,13 @@ inline PassRefPtr<CSSPrimitiveValue>
BisonCSSParser::createPrimitiveNumericValue
     return cssValuePool().createValue(value->fValue,
static_cast<CSSPrimitiveValue::UnitTypes>(value->unit));
 }
 
-inline PassRefPtr<CSSPrimitiveValue>
BisonCSSParser::createPrimitiveStringValue(CSSParserValue* value)
+inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue>
BisonCSSParser::createPrimitiveStringValue(CSSParserValue* value)
 {
     ASSERT(value->unit == CSSPrimitiveValue::CSS_STRING || value->unit ==
CSSPrimitiveValue::CSS_IDENT);
     return cssValuePool().createValue(value->string,
CSSPrimitiveValue::CSS_STRING);
 }
 
-inline PassRefPtr<CSSPrimitiveValue>
BisonCSSParser::createPrimitiveVariableReferenceValue(CSSParserValue* value)
+inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue>
BisonCSSParser::createPrimitiveVariableReferenceValue(CSSParserValue* value)
 {
     ASSERT(value->unit == CSSParserValue::Function &&
value->function->args->size() == 1);
     return CSSPrimitiveValue::create(value->function->args->valueAt(0)->string,
CSSPrimitiveValue::CSS_VARIABLE_REFERENCE);
@@ -1622,7 +1622,7 @@ bool BisonCSSParser::validWidthOrHeight(CSSParserValue*
value)
     return !id && validUnit(value, FLength | FPercent | FNonNeg);
 }
 
-inline PassRefPtr<CSSPrimitiveValue>
BisonCSSParser::parseValidPrimitive(CSSValueID identifier, CSSParserValue*
value)
+inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue>
BisonCSSParser::parseValidPrimitive(CSSValueID identifier, CSSParserValue*
value)
 {
     if (identifier)
         return cssValuePool().createIdentifierValue(identifier);
@@ -2186,7 +2186,7 @@ bool BisonCSSParser::parseValue(CSSPropertyID propId, bool
important)
 
     case CSSPropertyBorderImageOutset:
     case CSSPropertyWebkitMaskBoxImageOutset: {
-        RefPtr<CSSPrimitiveValue> result;
+        RefPtrWillBeRawPtr<CSSPrimitiveValue> result;
         if (parseBorderImageOutset(result)) {
             addProperty(propId, result, important);
             return true;
@@ -2213,7 +2213,7 @@ bool BisonCSSParser::parseValue(CSSPropertyID propId, bool
important)
     }
     case CSSPropertyBorderImageWidth:
     case CSSPropertyWebkitMaskBoxImageWidth: {
-        RefPtr<CSSPrimitiveValue> result;
+        RefPtrWillBeRawPtr<CSSPrimitiveValue> result;
         if (parseBorderImageWidth(result)) {
             addProperty(propId, result, important);
             return true;
@@ -2229,8 +2229,8 @@ bool BisonCSSParser::parseValue(CSSPropertyID propId, bool
important)
         validPrimitive = validUnit(value, FLength | FPercent | FNonNeg);
         if (!validPrimitive)
             return false;
-        RefPtr<CSSPrimitiveValue> parsedValue1 =
createPrimitiveNumericValue(value);
-        RefPtr<CSSPrimitiveValue> parsedValue2;
+        RefPtrWillBeRawPtr<CSSPrimitiveValue> parsedValue1 =
createPrimitiveNumericValue(value);
+        RefPtrWillBeRawPtr<CSSPrimitiveValue> parsedValue2;
         if (num == 2) {
             value = m_valueList->next();
             validPrimitive = validUnit(value, FLength | FPercent | FNonNeg);
@@ -3703,7 +3703,7 @@ PassRefPtr<CSSValue>
BisonCSSParser::parseFillPositionY(CSSParserValueList* valu
     return 0;
 }
 
-PassRefPtr<CSSPrimitiveValue>
BisonCSSParser::parseFillPositionComponent(CSSParserValueList* valueList,
unsigned& cumulativeFlags, FillPositionFlag& individualFlag,
FillPositionParsingMode parsingMode)
+PassRefPtrWillBeRawPtr<CSSPrimitiveValue>
BisonCSSParser::parseFillPositionComponent(CSSParserValueList* valueList,
unsigned& cumulativeFlags, FillPositionFlag& individualFlag,
FillPositionParsingMode parsingMode)
 {
     CSSValueID id = valueList->current()->id;
     if (id == CSSValueLeft || id == CSSValueTop || id == CSSValueRight || id ==
CSSValueBottom || id == CSSValueCenter) {
@@ -3768,7 +3768,7 @@ static bool isFillPositionKeyword(CSSValueID value)
     return value == CSSValueLeft || value == CSSValueTop || value ==
CSSValueBottom || value == CSSValueRight || value == CSSValueCenter;
 }
 
-void BisonCSSParser::parse4ValuesFillPosition(CSSParserValueList* valueList,
RefPtr<CSSValue>& value1, RefPtr<CSSValue>& value2,
PassRefPtr<CSSPrimitiveValue> parsedValue1, PassRefPtr<CSSPrimitiveValue>
parsedValue2)
+void BisonCSSParser::parse4ValuesFillPosition(CSSParserValueList* valueList,
RefPtr<CSSValue>& value1, RefPtr<CSSValue>& value2,
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parsedValue1,
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parsedVal…
(message too large)

[jochen (gone - plz use gerrit), 2014-02-12 15:18:46]

wtf lgtm

[wibling-chromium, 2014-02-12 15:51:41]

The CQ bit was checked by wibling@chromium.org

[commit-bot: I haz the power, 2014-02-12 15:51:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/wibling@chromium.org/148523016/200002

[commit-bot: I haz the power, 2014-02-12 17:07:16]

Change committed as 167022

[abarth-chromium, 2014-02-12 17:35:13]

A revert of this CL has been created in
https://codereview.chromium.org/137863007/ by abarth@chromium.org.

The reason for reverting is: Does not compile on Android:

http://build.chromium.org/p/chromium.webkit/builders/Android%20Builder%20%28d...

/mnt/data/b/build/slave/Android_Builder__dbg_/build/src/third_party/android_tools/ndk//sources/cxx-stl/stlport/stlport/stl/_construct.h:139:3:error:
no matching function for call to 'WebCore::CSSGradientColorStop::operator
new(unsigned int, WebCore::CSSGradientColorStop*&)'
/mnt/data/b/build/slave/Android_Builder__dbg_/build/src/third_party/android_tools/ndk//sources/cxx-stl/stlport/stlport/stl/_construct.h:139:3:
note: candidates are:
../../third_party/WebKit/Source/core/css/CSSGradientValue.h:56:5: note: static
void* WebCore::CSSGradientColorStop::operator new(size_t, NotNullTag, void*)
../../third_party/WebKit/Source/core/css/CSSGradientValue.h:56:5: note:  
candidate expects 3 arguments, 2 provided
../../third_party/WebKit/Source/core/css/CSSGradientValue.h:56:5: note: static
void* WebCore::CSSGradientColorStop::operator new(size_t)
../../third_party/WebKit/Source/core/css/CSSGradientValue.h:56:5: note:  
candidate expects 1 argument, 2 provided
.

[sof, 2014-02-12 20:28:12]

https://codereview.chromium.org/148523016/diff/200002/Source/heap/Handle.h
File Source/heap/Handle.h (right):

https://codereview.chromium.org/148523016/diff/200002/Source/heap/Handle.h#ne...
Source/heap/Handle.h:392: // TraceTrait to allow compilation of trace method
bodies when oilpan is disabled.
This will make the transition type

  WillBeHeapVector<RefPtr<T> > m_field;

compile with oilpan enabled, but fail at run-time. Any reason for not making it
be a compile-time error?

[wibling-chromium, 2014-02-13 10:50:02]

On 2014/02/12 20:28:12, sof wrote:
> https://codereview.chromium.org/148523016/diff/200002/Source/heap/Handle.h
> File Source/heap/Handle.h (right):
> 
>
https://codereview.chromium.org/148523016/diff/200002/Source/heap/Handle.h#ne...
> Source/heap/Handle.h:392: // TraceTrait to allow compilation of trace method
> bodies when oilpan is disabled.
> This will make the transition type
> 
>   WillBeHeapVector<RefPtr<T> > m_field;
> 
> compile with oilpan enabled, but fail at run-time. Any reason for not making
it
> be a compile-time error?

We want to support

WillBeHeapHashMap<RefPtr<T>, RefPtrWillBeMember<U> >

which would not compile if we made the above a compile assert. We could make a
more specialized trait for HeapVector<RefPtr<T> >. However I would prefer to
leave that for Erik Corry or someone with more insights into the on heap
collection code.

[wibling-chromium, 2014-02-13 10:50:05]

On 2014/02/12 20:28:12, sof wrote:
> https://codereview.chromium.org/148523016/diff/200002/Source/heap/Handle.h
> File Source/heap/Handle.h (right):
> 
>
https://codereview.chromium.org/148523016/diff/200002/Source/heap/Handle.h#ne...
> Source/heap/Handle.h:392: // TraceTrait to allow compilation of trace method
> bodies when oilpan is disabled.
> This will make the transition type
> 
>   WillBeHeapVector<RefPtr<T> > m_field;
> 
> compile with oilpan enabled, but fail at run-time. Any reason for not making
it
> be a compile-time error?

We want to support

WillBeHeapHashMap<RefPtr<T>, RefPtrWillBeMember<U> >

which would not compile if we made the above a compile assert. We could make a
more specialized trait for HeapVector<RefPtr<T> >. However I would prefer to
leave that for Erik Corry or someone with more insights into the on heap
collection code.

[wibling-chromium, 2014-02-13 12:15:00]

The CQ bit was checked by wibling@chromium.org

[commit-bot: I haz the power, 2014-02-13 12:15:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/wibling@chromium.org/148523016/570001

[commit-bot: I haz the power, 2014-02-13 14:03:28]

Change committed as 167089