From 21939df44de1705786c545cd1bf519d47250322d Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 11 May 2010 18:35:50 +0100
Subject: Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
---
 WebCore/css/CSSStyleDeclaration.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'WebCore/css/CSSStyleDeclaration.h')

diff --git a/WebCore/css/CSSStyleDeclaration.h b/WebCore/css/CSSStyleDeclaration.h
index 18493df..08b3bf0 100644
--- a/WebCore/css/CSSStyleDeclaration.h
+++ b/WebCore/css/CSSStyleDeclaration.h
@@ -42,7 +42,8 @@ public:
     virtual String cssText() const = 0;
     virtual void setCssText(const String&, ExceptionCode&) = 0;
 
-    virtual unsigned length() const = 0;
+    unsigned length() const { return virtualLength(); }
+    virtual unsigned virtualLength() const = 0;
     bool isEmpty() const { return !length(); }
     virtual String item(unsigned index) const = 0;
 
-- 
cgit v1.1