diff options
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/nav/CacheBuilder.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 529fbdf..6daec46 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1303,7 +1303,7 @@ static int findTextBoxIndex(WebCore::Node* node, const WebCore::IntPoint& pt) "offset=%d pt.x=%d globalX=%d renderX=%d x=%d " "textBox->x()=%d textBox->start()=%d prior=%d current=%d next=%d", offset, pt.x(), globalX, absPt.x(), x, - textBox->xPos(), textBox->start(), prior, current, next + textBox->x(), textBox->start(), prior, current, next ); #endif return textBox->start() + offset; diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp index 44beffc..05d1cb5 100644 --- a/WebKit/android/nav/CacheBuilder.cpp +++ b/WebKit/android/nav/CacheBuilder.cpp @@ -529,9 +529,10 @@ void CacheBuilder::Debug::groups() { mIndex += snprintf(&mBuffer[mIndex], mBufferSize - mIndex, ", %d, %d, %d", 0 /*textBox->spaceAdd()*/, textBox->start(), 0 /*textBox->textPos()*/); mIndex += snprintf(&mBuffer[mIndex], mBufferSize - mIndex, ", %d, %d, %d, %d", - textBox->xPos(), textBox->yPos(), textBox->width(), textBox->height()); + textBox->x(), textBox->y(), textBox->width(), textBox->height()); + int baseline = textBox->renderer()->style(textBox->isFirstLineStyle())->font().ascent(); mIndex += snprintf(&mBuffer[mIndex], mBufferSize - mIndex, ", %d }, // %d ", - textBox->baseline(), ++rectIndex); + baseline, ++rectIndex); wideString(node->textContent().characters() + textBox->start(), textBox->len(), true); DUMP_NAV_LOGD("%.*s\n", mIndex, mBuffer); textBox = textBox->nextTextBox(); @@ -694,7 +695,8 @@ void CacheBuilder::Debug::renderTree(RenderObject* renderer, int indent, print(scratch); newLine(indent); const IntRect& oRect = renderer->absoluteClippedOverflowRect(); - const IntRect& cRect = renderer->getOverflowClipRect(0,0); + RenderBox* box = toRenderBox(renderer); + const IntRect& cRect = box->overflowClipRect(0,0); snprintf(scratch, sizeof(scratch), "// render xPos:%d yPos:%d overflowRect:{%d, %d, %d, %d} " " getOverflowClipRect:{%d, %d, %d, %d} ", |