Move core/layout/style to core/style

Source/core/style/ContentData.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef ContentData_h
 #define ContentData_h
 
-#include "core/layout/style/CounterContent.h"
-#include "core/layout/style/StyleImage.h"
+#include "core/style/CounterContent.h"
+#include "core/style/StyleImage.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 class Document;
 class LayoutObject;
 class ComputedStyle;
 
 class ContentData {
@@ skipping 160 matching lines @@
 }
 
 inline bool operator!=(const ContentData& a, const ContentData& b)
 {
     return !(a == b);
 }
 
 } // namespace blink
 
 #endif // ContentData_h