diff options
| author | Patrick Scott <phanna@android.com> | 2011-02-17 10:58:02 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2011-02-25 13:04:41 -0500 |
| commit | 5c9b9436a58504f9e48283bfd450c688df9f3d45 (patch) | |
| tree | 034f51d8e5f447aae3c640b35f8b17d534942f53 /WebCore/rendering/RenderView.h | |
| parent | 3a89d2677bb5634df98cd01414220b8e095f58a9 (diff) | |
| download | external_webkit-5c9b9436a58504f9e48283bfd450c688df9f3d45.zip external_webkit-5c9b9436a58504f9e48283bfd450c688df9f3d45.tar.gz external_webkit-5c9b9436a58504f9e48283bfd450c688df9f3d45.tar.bz2 | |
Fix frameset expansion.
Do not expand frames that cannot scroll. Use contentsWidth and contentsHeight
instead of exposing docWidth. Trigger a layout of the parent if the FrameView's
layout reveals a larger content dimension. Remove iframe flattening code.
Bug: 3370518
Bug: 3323913
Change-Id: I60e89caf335bfaf271f90ffd538c65f3735572da
Diffstat (limited to 'WebCore/rendering/RenderView.h')
| -rw-r--r-- | WebCore/rendering/RenderView.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h index 66b1d74..8436762 100644 --- a/WebCore/rendering/RenderView.h +++ b/WebCore/rendering/RenderView.h @@ -176,9 +176,6 @@ protected: private: bool shouldRepaint(const IntRect& r) const; -#ifdef ANDROID_FLATTEN_FRAMESET -public: // used by layout function -#endif int docHeight() const; int docLeft() const; int docWidth(int leftOverflow) const; |