diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-06 13:49:37 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:34 +0100 |
| commit | 559e8b5e40d6fdd5897bbf576376f92a029a5828 (patch) | |
| tree | 5e745e07ae6e18f05ce2404862ed9370107fa103 | |
| parent | a1c42b04d7f6b22071426cd6fa99482bc7b11c1d (diff) | |
| download | external_webkit-559e8b5e40d6fdd5897bbf576376f92a029a5828.zip external_webkit-559e8b5e40d6fdd5897bbf576376f92a029a5828.tar.gz external_webkit-559e8b5e40d6fdd5897bbf576376f92a029a5828.tar.bz2 | |
Merge WebKit at r74534: Rename rendering methods
Following the rename of *visible to *visual upstream,
make them in our platform code.
See http://trac.webkit.org/changeset/73385
Change-Id: Ic4cb1ed8736d67bbc6e963b9f409bfdae07d5c5f
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/nav/CacheBuilder.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index ecb86ea..57a3ca8 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1596,7 +1596,7 @@ static IntRect getAbsoluteBoundingBox(Node* node) { IntRect rect; RenderObject* render = node->renderer(); if (render->isRenderInline()) - rect = toRenderInline(render)->linesVisibleOverflowBoundingBox(); + rect = toRenderInline(render)->linesVisualOverflowBoundingBox(); else if (render->isBox()) rect = toRenderBox(render)->visualOverflowRect(); else if (render->isText()) diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp index 8ac1c2a..dc10f21 100644 --- a/WebKit/android/nav/CacheBuilder.cpp +++ b/WebKit/android/nav/CacheBuilder.cpp @@ -1196,7 +1196,7 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame, clip.mHasClip = hasClip; clip.mDirection = direction; if (columnInfo != NULL) { - const IntRect& oRect = ((RenderBox*)nodeRenderer)->visibleOverflowRect(); + const IntRect& oRect = ((RenderBox*)nodeRenderer)->visualOverflowRect(); clip.mBounds.move(oRect.x(), oRect.y()); } } |