Move core/layout/style to core/style

Source/core/layout/shapes/Shape.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 12 matching lines @@
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY 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 Shape_h
 #define Shape_h
 
-#include "core/layout/style/BasicShapes.h"
-#include "core/layout/style/StyleImage.h"
+#include "core/style/BasicShapes.h"
+#include "core/style/StyleImage.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/Path.h"
 #include "platform/text/WritingMode.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 class FloatRoundedRect;
 
 struct LineSegment {
@@ skipping 52 matching lines @@
         return (lineTop < rect.maxY() && lineTop + lineHeight > rect.y()) || (!lineHeight && lineTop == rect.y());
     }
 
     WritingMode m_writingMode;
     float m_margin;
 };
 
 } // namespace blink
 
 #endif // Shape_h