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/CacheBuilder.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/CacheBuilder.cpp')
| -rw-r--r-- | Source/WebKit/android/nav/CacheBuilder.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Source/WebKit/android/nav/CacheBuilder.cpp b/Source/WebKit/android/nav/CacheBuilder.cpp index e7691d7..de59626 100644 --- a/Source/WebKit/android/nav/CacheBuilder.cpp +++ b/Source/WebKit/android/nav/CacheBuilder.cpp @@ -2998,7 +2998,7 @@ bool CacheBuilder::AddPartRect(IntRect& bounds, int x, int y, if (bounds.isEmpty()) return true; bounds.move(x, y); - if (bounds.right() <= 0 || bounds.bottom() <= 0) + if (bounds.maxX() <= 0 || bounds.maxY() <= 0) return true; IntRect* work = result->begin() - 1; IntRect* end = result->end(); @@ -3090,14 +3090,11 @@ bool CacheBuilder::ConstructPartRects(Node* node, const IntRect& bounds, if (hasClip == false) { if (nodeIsAnchor && test->hasTagName(HTMLNames::divTag)) { IntRect bounds = renderer->absoluteBoundingBoxRect(); // x, y fixup done by AddPartRect - int left = bounds.x() + ((RenderBox*)renderer)->paddingLeft() - + ((RenderBox*)renderer)->borderLeft(); - int top = bounds.y() + ((RenderBox*)renderer)->paddingTop() - + ((RenderBox*)renderer)->borderTop(); - int right = bounds.right() - ((RenderBox*)renderer)->paddingRight() - - ((RenderBox*)renderer)->borderRight(); - int bottom = bounds.bottom() - ((RenderBox*)renderer)->paddingBottom() - - ((RenderBox*)renderer)->borderBottom(); + RenderBox* renderBox = static_cast<RenderBox*>(renderer); + int left = bounds.x() + renderBox->paddingLeft() + renderBox->borderLeft(); + int top = bounds.y() + renderBox->paddingTop() + renderBox->borderTop(); + int right = bounds.maxX() - renderBox->paddingRight() - renderBox->borderRight(); + int bottom = bounds.maxY() - renderBox->paddingBottom() - renderBox->borderBottom(); if (left >= right || top >= bottom) continue; bounds = IntRect(left, top, right - left, bottom - top); |