Preserve shape-box order in non-computed values

Source/core/rendering/style/ShapeValue.h

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 30 matching lines @@
 class ShapeValue : public RefCounted<ShapeValue> {
 public:
     enum ShapeValueType {
         // The Auto value is defined by a null ShapeValue*
         Shape,
         Box,
         Outside,
         Image
     };
 
-    static PassRefPtr<ShapeValue> createShapeValue(PassRefPtr<BasicShape> shape)
+    static PassRefPtr<ShapeValue> createShapeValue(PassRefPtr<BasicShape> shape, LayoutBox layoutBox)
     {
-        return adoptRef(new ShapeValue(shape));
+        return adoptRef(new ShapeValue(shape, layoutBox));
     }
 
     static PassRefPtr<ShapeValue> createOutsideValue()
     {
         return adoptRef(new ShapeValue(Outside));
     }
 
     static PassRefPtr<ShapeValue> createLayoutBoxValue(LayoutBox layoutBox)
     {
         return adoptRef(new ShapeValue(layoutBox));
@@ skipping 14 matching lines @@
         ASSERT(type() == Image);
         if (m_image != image)
             m_image = image;
     }
     LayoutBox layoutBox() const { return m_layoutBox; }
     void setLayoutBox(LayoutBox layoutBox) { m_layoutBox = layoutBox; }
 
     bool operator==(const ShapeValue& other) const;
 
 private:
-    ShapeValue(PassRefPtr<BasicShape> shape)
+    ShapeValue(PassRefPtr<BasicShape> shape, LayoutBox layoutBox)
         : m_type(Shape)
         , m_shape(shape)
-        , m_layoutBox(m_shape->layoutBox())
+        , m_layoutBox(layoutBox)
     {
     }
     ShapeValue(ShapeValueType type)
         : m_type(type)
         , m_layoutBox(BoxMissing)
     {
     }
     ShapeValue(PassRefPtr<StyleImage> image)
         : m_type(Image)
         , m_image(image)
@@ skipping 29 matching lines @@
         return image() == other.image();
     }
 
     ASSERT_NOT_REACHED();
     return false;
 }
 
 }
 
 #endif