Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.h b/Source/WebCore/css/CSSComputedStyleDeclaration.h
index 4bf5a03..718eb2d 100644
--- a/Source/WebCore/css/CSSComputedStyleDeclaration.h
+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.h
@@ -22,9 +22,9 @@
#define CSSComputedStyleDeclaration_h
#include "CSSStyleDeclaration.h"
+#include "PlatformString.h"
#include "RenderStyleConstants.h"
#include <wtf/RefPtr.h>
-#include <wtf/text/WTFString.h>
namespace WebCore {
@@ -34,7 +34,6 @@
class Node;
class RenderStyle;
class ShadowData;
-class SVGPaint;
enum EUpdateLayout { DoNotUpdateLayout = false, UpdateLayout = true };
@@ -77,10 +76,7 @@
PassRefPtr<CSSValue> valueForShadow(const ShadowData*, int, RenderStyle*) const;
PassRefPtr<CSSPrimitiveValue> currentColorOrValidColor(RenderStyle*, const Color&) const;
-#if ENABLE(SVG)
- PassRefPtr<SVGPaint> adjustSVGPaintForCurrentColor(PassRefPtr<SVGPaint>, RenderStyle*) const;
-#endif
-
+
RefPtr<Node> m_node;
PseudoId m_pseudoElementSpecifier;
bool m_allowVisitedStyle;