commit 21939df44de1705786c545cd1bf519d47250322d
author Ben Murdoch <benm@google.com> Tue May 11 18:35:50 2010 +0100
committer Ben Murdoch <benm@google.com> Fri May 14 10:23:05 2010 +0100
tree ef56c310f5c0cdc379c2abb2e212308a3281ce20
parent 4ff1d8891d520763f17675827154340c7c740f90

Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228

WebCore/css/CSSComputedStyleDeclaration.h

diff --git a/WebCore/css/CSSComputedStyleDeclaration.h b/WebCore/css/CSSComputedStyleDeclaration.h
index eb93bad..ba55d77 100644
--- a/WebCore/css/CSSComputedStyleDeclaration.h
+++ b/WebCore/css/CSSComputedStyleDeclaration.h
@@ -39,7 +39,7 @@
 
     virtual String cssText() const;
 
-    virtual unsigned length() const;
+    virtual unsigned virtualLength() const;
     virtual String item(unsigned index) const;
 
     virtual PassRefPtr<CSSValue> getPropertyCSSValue(int propertyID) const;