Enable Fixed Layout Mode on TOUCH_UI.

content/renderer/render_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 244 matching lines @@
 // current content state during tab closing we use a shorter timeout for the
 // foreground renderer. This means there is a small window of time from which
 // content state is modified and not sent to session restore, but this is
 // better than having to wake up all renderers during shutdown.
 static const int kDelaySecondsForContentStateSyncHidden = 5;
 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) {
   WebVector<WebURL> urls;
   ds->redirectChain(urls);
   result->reserve(urls.size());
   for (size_t i = 0; i < urls.size(); ++i)
     result->push_back(urls[i]);
 }
 
@@ skipping 946 matching lines @@
   // If we end up reusing this WebRequest (for example, due to a #ref click),
   // we don't want the transition type to persist.  Just clear it.
   navigation_state->set_transition_type(PageTransition::LINK);
 
   // Check if the navigation was within the same page, in which case we don't
   // want to clear the accessibility cache.
   if (accessibility_.get() && !navigation_state->was_within_same_page()) {
     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
 void RenderView::UpdateTitle(WebFrame* frame,
                              const string16& title,
                              WebTextDirection title_direction) {
   // Ignore all but top level navigations.
   if (frame->parent())
     return;
 
@@ skipping 192 matching lines @@
 
 WebExternalPopupMenu* RenderView::createExternalPopupMenu(
     const WebPopupMenuInfo& popup_menu_info,
     WebExternalPopupMenuClient* popup_menu_client) {
   DCHECK(!external_popup_menu_.get());
   external_popup_menu_.reset(
       new ExternalPopupMenu(this, popup_menu_info, popup_menu_client));
   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;
   if (webview() && webview()->mainFrame())
     active_url = GURL(webview()->mainFrame()->document().url());
   RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create(
       routing_id_, render_thread_, plugin, active_url);
   widget->show(WebKit::WebNavigationPolicyIgnore);
   return widget;
 }
@@ skipping 3130 matching lines @@
 
 void RenderView::OnEnableViewSourceMode() {
   if (!webview())
     return;
   WebFrame* main_frame = webview()->mainFrame();
   if (!main_frame)
     return;
   main_frame->enableViewSourceMode(true);
 }