Compute pageScaleFactor on page so that fixed layout page fits width of window.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 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 "chrome/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
+#include "base/string_number_conversions.h"
 #include "base/string_tokenizer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/external_ipc_fuzzer.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 46 matching lines @@
 #include "grit/renderer_resources.h"
 #include "ipc/ipc_sync_channel.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
 
 using WebKit::WebCache;
@@ skipping 165 matching lines @@
   // notification and can stop the propagation.
   page_click_tracker->AddListener(password_autofill_manager);
   page_click_tracker->AddListener(autofill_agent);
 
   TranslateHelper* translate = new TranslateHelper(render_view);
   new ChromeRenderViewObserver(
       render_view, content_settings, chrome_observer_.get(),
       extension_dispatcher_.get(), translate);
 
   // Used only for testing/automation.
   if (CommandLine::ForCurrentProcess()->HasSwitch(

[darin (slow to review), 2012/02/15 06:13:23]

nit: probably should cache a pointer to the CommandLine here.

           switches::kDomAutomationController)) {
     new AutomationRendererHelper(render_view);
   }
+
+  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  render_view->GetWebView()->enableFixedLayoutMode(
+      cmd_line->HasSwitch(switches::kEnableFixedLayout));
+}
+
+void ChromeContentRendererClient::RenderViewResized(
+    content::RenderView* render_view, int new_width, int new_height) {
+  if (!render_view->GetWebView())
+    return;
+
+  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  int defaultDeviceScaleFactor = 0;

[darin (slow to review), 2012/02/15 06:13:23]

nit: use google_style_for_variable_names

[Fady Samuel, 2012/02/15 17:46:05]

Done. I always forget when switching between chromium and webkit changes :)

+  base::StringToInt(cmd_line->GetSwitchValueASCII(
+                  switches::kDefaultDeviceScaleFactor),

[darin (slow to review), 2012/02/15 06:13:23]

nit: indentation

[Fady Samuel, 2012/02/15 17:46:05]

I think I have matched the style guide now.

+      &defaultDeviceScaleFactor);
+  // This setting has no effect if fixed layout is not enabled.
+  if (defaultDeviceScaleFactor)
+    render_view->GetWebView()->settings()->setLayoutFallbackWidth(

[darin (slow to review), 2012/02/15 06:13:23]

it seems a bit unusual to update WebSettings on resize.  also, are you sure it
makes sense to be doing this from src/chrome and not src/content?  shouldn't
other src/content embedders code similar logic?

[Fady Samuel, 2012/02/15 17:46:05]

In my humble opinion, no. The default device scale factor is a property of
chrome as a whole and not just WebKit (it is only used by WebKit currently but
that will change shortly). Setting the layout fallback width to be equal to the
new width of the render view is also something that feels Chrome specific to me.

+        new_width / defaultDeviceScaleFactor);
 }
 
 void ChromeContentRendererClient::SetNumberOfViews(int number_of_views) {
   child_process_logging::SetNumberOfViews(number_of_views);
 }
 
 SkBitmap* ChromeContentRendererClient::GetSadPluginBitmap() {
   return ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_SAD_PLUGIN);
 }
 
@@ skipping 582 matching lines @@
     webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
   factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
 }
 
 bool ChromeContentRendererClient::AllowSocketAPI(const GURL& url) {
   return allowed_socket_origins_.find(url.host()) !=
       allowed_socket_origins_.end();
 }
 
 }  // namespace chrome