Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
diff --git a/WebCore/css/CSSComputedStyleDeclaration.h b/WebCore/css/CSSComputedStyleDeclaration.h
index 842a995..eb93bad 100644
--- a/WebCore/css/CSSComputedStyleDeclaration.h
+++ b/WebCore/css/CSSComputedStyleDeclaration.h
@@ -23,6 +23,7 @@
#include "CSSStyleDeclaration.h"
#include "Node.h"
+#include "RenderStyleConstants.h"
namespace WebCore {
@@ -33,7 +34,7 @@
class CSSComputedStyleDeclaration : public CSSStyleDeclaration {
public:
- friend PassRefPtr<CSSComputedStyleDeclaration> computedStyle(PassRefPtr<Node>);
+ friend PassRefPtr<CSSComputedStyleDeclaration> computedStyle(PassRefPtr<Node>, bool allowVisitedStyle, const String& pseudoElementName);
virtual ~CSSComputedStyleDeclaration();
virtual String cssText() const;
@@ -60,7 +61,7 @@
virtual bool cssPropertyMatches(const CSSProperty*) const;
private:
- CSSComputedStyleDeclaration(PassRefPtr<Node>);
+ CSSComputedStyleDeclaration(PassRefPtr<Node>, bool allowVisitedStyle, const String&);
virtual void setCssText(const String&, ExceptionCode&);
@@ -70,11 +71,13 @@
PassRefPtr<CSSValue> valueForShadow(const ShadowData*, int) const;
RefPtr<Node> m_node;
+ PseudoId m_pseudoElementSpecifier;
+ bool m_allowVisitedStyle;
};
-inline PassRefPtr<CSSComputedStyleDeclaration> computedStyle(PassRefPtr<Node> node)
+inline PassRefPtr<CSSComputedStyleDeclaration> computedStyle(PassRefPtr<Node> node, bool allowVisitedStyle = false, const String& pseudoElementName = String())
{
- return adoptRef(new CSSComputedStyleDeclaration(node));
+ return adoptRef(new CSSComputedStyleDeclaration(node, allowVisitedStyle, pseudoElementName));
}
} // namespace WebCore