diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:51:23 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:51:23 -0800 |
| commit | e933faefa1e899dbd5bf371f499cc682aff46c83 (patch) | |
| tree | 8fb31ff5c9a41aec9912d0253be7ef0445e2f58a /WebCore/rendering/RenderObject.cpp | |
| parent | 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 (diff) | |
| download | external_webkit-e933faefa1e899dbd5bf371f499cc682aff46c83.zip external_webkit-e933faefa1e899dbd5bf371f499cc682aff46c83.tar.gz external_webkit-e933faefa1e899dbd5bf371f499cc682aff46c83.tar.bz2 | |
auto import from //branches/cupcake/...@125939
Diffstat (limited to 'WebCore/rendering/RenderObject.cpp')
| -rw-r--r-- | WebCore/rendering/RenderObject.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/rendering/RenderObject.cpp b/WebCore/rendering/RenderObject.cpp index 8384a98..56fb7df 100644 --- a/WebCore/rendering/RenderObject.cpp +++ b/WebCore/rendering/RenderObject.cpp @@ -533,7 +533,12 @@ int RenderObject::offsetTop() const RenderObject* offsetPar = offsetParent(); if (!offsetPar) return 0; +#ifdef ANDROID_FIX + // This is to fix https://bugs.webkit.org/show_bug.cgi?id=23178. + int y = yPos() - borderTopExtra() + offsetPar->borderTopExtra() - offsetPar->borderTop(); +#else int y = yPos() - borderTopExtra() - offsetPar->borderTop(); +#endif if (!isPositioned()) { if (isRelPositioned()) y += static_cast<const RenderBox*>(this)->relativePositionOffsetY(); |