Move core/layout/style to core/style

Source/core/layout/shapes/ShapeOutsideInfo.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 13 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef ShapeOutsideInfo_h
 #define ShapeOutsideInfo_h
 
 #include "core/layout/shapes/Shape.h"
-#include "core/layout/style/ComputedStyle.h"
-#include "core/layout/style/ShapeValue.h"
+#include "core/style/ComputedStyle.h"
+#include "core/style/ShapeValue.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/LayoutSize.h"
 #include "wtf/OwnPtr.h"
 
 namespace blink {
 
 class LayoutBlockFlow;
 class LayoutBox;
 class FloatingObject;
 
@@ skipping 93 matching lines @@
 
     const LayoutBox& m_renderer;
     mutable OwnPtr<Shape> m_shape;
     LayoutSize m_referenceBoxLogicalSize;
     ShapeOutsideDeltas m_shapeOutsideDeltas;
     mutable bool m_isComputingShape;
 };
 
 }
 #endif