Enable Fixed Layout Mode on TOUCH_UI.

content/renderer/render_view.cc

Index: content/renderer/render_view.cc
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index f1eef24a35aaa8aa1a99df3c98035058c8c4e80d..82736b8455a493ab6c9cac9bbdf15ebc872012c4 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -262,6 +262,8 @@ static const int kDelaySecondsForContentStateSync = 1;
 // The maximum number of popups that can be spawned from one page.
 static const int kMaximumNumberOfUnacknowledgedPopups = 25;
 
+static const int kDefaultLayoutWidth = 980;

[jam, 2011/08/26 20:55:59]

nit: comment?

[Fady Samuel, 2011/08/29 18:27:36]

Done.

+static const int kDefaultLayoutHeight = 640;
 static const float kScalingIncrement = 0.1f;
 
 static void GetRedirectChain(WebDataSource* ds, std::vector<GURL>* result) {
@@ -1228,6 +1230,17 @@ void RenderView::UpdateURL(WebFrame* frame) {
     accessibility_.reset();
     pending_accessibility_notifications_.clear();
   }
+#if defined(TOUCH_UI)
+  // Only enable fixed layout for web pages and not extensions
+  // and WebUI, by default.
+  GURL frame_url = GURL(request.url());
+  if (!frame_url.SchemeIs(chrome::kChromeUIScheme) &&

[jam, 2011/08/26 20:55:59]

we really shouldn't be referring to chrome webui schemes and extensions in
content, since those belong in chrome. i realize there are some cases where we
still do, but we want to remove these, so we shouldn't be adding any more. can
you do this in chrome\renderer?

[Fady Samuel, 2011/08/29 18:27:36]

Done.

+      !frame_url.SchemeIs(chrome::kExtensionScheme)) {
+      webview()->enableFixedLayoutMode(true);

[jam, 2011/08/26 20:55:59]

nit: spacing is off

[Fady Samuel, 2011/08/29 18:27:36]

Done.

+      webview()->setFixedLayoutSize(
+          WebSize(kDefaultLayoutWidth, kDefaultLayoutHeight));
+  }
+#endif
 }
 
 // Tell the embedding application that the title of the active page has changed
@@ -1440,6 +1453,12 @@ WebExternalPopupMenu* RenderView::createExternalPopupMenu(
   return external_popup_menu_.get();
 }
 
+#if defined(TOUCH_UI)
+WebRect RenderView::getDeviceRect() const {
+  return WebRect(0, 0, size().width(), size().height());
+}
+#endif
+
 RenderWidgetFullscreenPepper* RenderView::CreatePepperFullscreenContainer(
     webkit::ppapi::PluginInstance* plugin) {
   GURL active_url;