OSDN Git Service

Merge webkit.org at r54127 : Fix conflict in V8DocumentCustom.cpp
authorSteve Block <steveblock@google.com>
Tue, 2 Feb 2010 18:26:23 +0000 (18:26 +0000)
committerSteve Block <steveblock@google.com>
Thu, 4 Feb 2010 15:06:59 +0000 (15:06 +0000)
commit83b697ff0fc7d76d6f22104bdcb29b3f32f8cb6b
tree2038d1df993718d908b7be0a195e69155901579d
parentb4e50f708ae2639b1eaaacc2c25e1825f572fc2c
Merge webkit.org at r54127 : Fix conflict in V8DocumentCustom.cpp

The whole method is now guarded in IDL.
See http://trac.webkit.org/changeset/53271

Change-Id: If319bcc542bd042c63fb060cac473de2dcbed81a
WebCore/bindings/v8/custom/V8DocumentCustom.cpp