diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 18:46:52 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-25 12:25:50 +0100 |
| commit | 1ed8c4d16ac986307f1c0589a3a720a37e60f313 (patch) | |
| tree | fc36f1aa9c4389b3d03a6fc2e2623e2a1a267150 /Source/WebKit/android/nav/CachedNode.cpp | |
| parent | 09b60ab8488b362c96df8f268613aafaeebfcfa1 (diff) | |
| download | external_webkit-1ed8c4d16ac986307f1c0589a3a720a37e60f313.zip external_webkit-1ed8c4d16ac986307f1c0589a3a720a37e60f313.tar.gz external_webkit-1ed8c4d16ac986307f1c0589a3a720a37e60f313.tar.bz2 | |
Merge WebKit at r78450: IntRect::bottom()/right() renamed
See http://trac.webkit.org/changeset/77286 and
http://trac.webkit.org/changeset/77398
Change-Id: I0ae670bff327fb981e037f5394c55bfb4aeb81eb
Diffstat (limited to 'Source/WebKit/android/nav/CachedNode.cpp')
| -rw-r--r-- | Source/WebKit/android/nav/CachedNode.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Source/WebKit/android/nav/CachedNode.cpp b/Source/WebKit/android/nav/CachedNode.cpp index e3ba34d..86c2a38 100644 --- a/Source/WebKit/android/nav/CachedNode.cpp +++ b/Source/WebKit/android/nav/CachedNode.cpp @@ -147,17 +147,17 @@ void CachedNode::fixUpCursorRects(const CachedFrame* frame) while (++unitBoundsPtr < unitBoundsEnd) { // any other unitBounds to the left or right of this one? int unitTop = unitBoundsPtr->y(); - int unitBottom = unitBoundsPtr->bottom(); + int unitBottom = unitBoundsPtr->maxY(); int unitLeft = unitBoundsPtr->x(); - int unitRight = unitBoundsPtr->right(); + int unitRight = unitBoundsPtr->maxX(); WebCore::IntRect* testBoundsPtr = mCursorRing.begin() - 1; while (++testBoundsPtr < unitBoundsEnd) { if (unitBoundsPtr == testBoundsPtr) continue; int testTop = testBoundsPtr->y(); - int testBottom = testBoundsPtr->bottom(); + int testBottom = testBoundsPtr->maxY(); int testLeft = testBoundsPtr->x(); - int testRight = testBoundsPtr->right(); + int testRight = testBoundsPtr->maxX(); int candidateTop = unitTop > testTop ? unitTop : testTop; int candidateBottom = unitBottom < testBottom ? unitBottom : testBottom; int candidateLeft = unitRight < testLeft ? unitRight : testRight; @@ -184,19 +184,19 @@ void CachedNode::fixUpCursorRects(const CachedFrame* frame) continue; if (leftRight) { if (candidateTop >= checkBoundsPtr->y() && - candidateBottom > checkBoundsPtr->bottom()) - candidateTop = checkBoundsPtr->bottom(); + candidateBottom > checkBoundsPtr->maxY()) + candidateTop = checkBoundsPtr->maxY(); else if (candidateTop < checkBoundsPtr->y() && - candidateBottom <= checkBoundsPtr->bottom()) + candidateBottom <= checkBoundsPtr->maxY()) candidateBottom = checkBoundsPtr->y(); else goto nextCheck; } else { if (candidateLeft >= checkBoundsPtr->x() && - candidateRight > checkBoundsPtr->right()) - candidateLeft = checkBoundsPtr->right(); + candidateRight > checkBoundsPtr->maxX()) + candidateLeft = checkBoundsPtr->maxX(); else if (candidateLeft < checkBoundsPtr->x() && - candidateRight <= checkBoundsPtr->right()) + candidateRight <= checkBoundsPtr->maxX()) candidateRight = checkBoundsPtr->x(); else goto nextCheck; |