diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-06-29 11:23:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-29 11:23:40 -0700 |
| commit | 4785e4c54e72d5ce040bcb85356461d9e9277536 (patch) | |
| tree | 52e8944e3f14d87c3ee17ec38face59cb9c4f2ba | |
| parent | c19571f3ec3bec025fa05e8d81ffd1998324e844 (diff) | |
| parent | 0f75d6be298fed21695112a14351eae2ebb6d3bb (diff) | |
| download | external_webkit-4785e4c54e72d5ce040bcb85356461d9e9277536.zip external_webkit-4785e4c54e72d5ce040bcb85356461d9e9277536.tar.gz external_webkit-4785e4c54e72d5ce040bcb85356461d9e9277536.tar.bz2 | |
Merge "Use full scrollable area for content width/height."
| -rw-r--r-- | Source/WebKit/android/nav/CacheBuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/nav/CacheBuilder.cpp b/Source/WebKit/android/nav/CacheBuilder.cpp index a31169b..3ec15f3 100644 --- a/Source/WebKit/android/nav/CacheBuilder.cpp +++ b/Source/WebKit/android/nav/CacheBuilder.cpp @@ -2893,7 +2893,7 @@ bool CacheBuilder::setData(CachedFrame* cachedFrame) if ((x | y) != 0) viewBounds.setLocation(WebCore::IntPoint(x, y)); cachedFrame->setLocalViewBounds(viewBounds); - cachedFrame->setContentsSize(layer->width(), layer->height()); + cachedFrame->setContentsSize(layer->scrollWidth(), layer->scrollHeight()); if (cachedFrame->childCount() == 0) return true; CachedFrame* lastCachedFrame = cachedFrame->lastChild(); |