Move core/layout/style to core/style

Source/core/css/BasicShapeFunctions.cpp

 /*
  * 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 17 matching lines @@
  */
 
 #include "config.h"
 #include "core/css/BasicShapeFunctions.h"
 
 #include "core/css/CSSBasicShapes.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSValuePool.h"
 #include "core/css/Pair.h"
 #include "core/css/resolver/StyleResolverState.h"
-#include "core/layout/style/BasicShapes.h"
-#include "core/layout/style/ComputedStyle.h"
+#include "core/style/BasicShapes.h"
+#include "core/style/ComputedStyle.h"
 
 namespace blink {
 
 static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForCenterCoordinate(CSSValuePool& pool, const ComputedStyle& style, const BasicShapeCenterCoordinate& center, EBoxOrient orientation)
 {
     if (center.direction() == BasicShapeCenterCoordinate::TopLeft)
         return pool.createValue(center.length(), style);
 
     CSSValueID keyword = orientation == HORIZONTAL ? CSSValueRight : CSSValueBottom;
 
@@ skipping 218 matching lines @@
 }
 
 FloatPoint floatPointForCenterCoordinate(const BasicShapeCenterCoordinate& centerX, const BasicShapeCenterCoordinate& centerY, FloatSize boxSize)
 {
     float x = floatValueForLength(centerX.computedLength(), boxSize.width());
     float y = floatValueForLength(centerY.computedLength(), boxSize.height());
     return FloatPoint(x, y);
 }
 
 }