OSDN Git Service

Merge WebKit at r72805: Use Node::parent() rather than Node::parentNode()
authorSteve Block <steveblock@google.com>
Wed, 5 Jan 2011 12:37:24 +0000 (12:37 +0000)
committerSteve Block <steveblock@google.com>
Thu, 6 Jan 2011 14:20:54 +0000 (14:20 +0000)
commite509b5dfedf2a9cb61dacd53b55bed4ba34f0974
treedac4aff5adf77cbe237784dcd50fb0d09a400daf
parent8ebdc3cd1d7fdf78826e8369b1bb7c20798a7d9e
Merge WebKit at r72805: Use Node::parent() rather than Node::parentNode()

This is a revert of
"Merge WebKit at r73109: use parentNode method."

See http://trac.webkit.org/changeset/72825

This reverts commit 23aa22bb0c8bf0d91c99d21c5dca4c64a4825a87.

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I5ba4d0976c3b87b32326fdc8e2eb1cffdd7541cf
WebCore/rendering/RenderBlockLineLayout.cpp
WebKit/android/jni/WebViewCore.cpp
WebKit/android/nav/CacheBuilder.cpp