Move core/layout/style to core/style

Source/core/css/resolver/StyleResolverState.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 14 matching lines @@
 #include "core/CSSPropertyNames.h"
 
 #include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSToLengthConversionData.h"
 #include "core/css/resolver/CSSToStyleMap.h"
 #include "core/css/resolver/ElementResolveContext.h"
 #include "core/css/resolver/ElementStyleResources.h"
 #include "core/css/resolver/FontBuilder.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
-#include "core/layout/style/CachedUAStyle.h"
-#include "core/layout/style/ComputedStyle.h"
-#include "core/layout/style/StyleInheritedData.h"
+#include "core/style/CachedUAStyle.h"
+#include "core/style/ComputedStyle.h"
+#include "core/style/StyleInheritedData.h"
 
 namespace blink {
 
 class CSSAnimationUpdate;
 class FontDescription;
 
 class StyleResolverState {
     STACK_ALLOCATED();
     WTF_MAKE_NONCOPYABLE(StyleResolverState);
 public:
@@ skipping 128 matching lines @@
     FontBuilder m_fontBuilder;
 
     OwnPtr<CachedUAStyle> m_cachedUAStyle;
 
     ElementStyleResources m_elementStyleResources;
 };
 
 } // namespace blink
 
 #endif // StyleResolverState_h