From 5c9b9436a58504f9e48283bfd450c688df9f3d45 Mon Sep 17 00:00:00 2001
From: Patrick Scott <phanna@android.com>
Date: Thu, 17 Feb 2011 10:58:02 -0500
Subject: 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
---
 WebCore/rendering/RenderView.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'WebCore/rendering/RenderView.h')

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;
-- 
cgit v1.1