DevTools: place DevTools WebContents underneath inspected WebContents.

chrome/browser/devtools/devtools_window.h

 // 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.
 
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/devtools/devtools_embedder_message_dispatcher.h"
 #include "chrome/browser/devtools/devtools_file_helper.h"
 #include "chrome/browser/devtools/devtools_file_system_indexer.h"
 #include "chrome/browser/devtools/devtools_toggle_action.h"
 #include "content/public/browser/devtools_client_host.h"
 #include "content/public/browser/devtools_frontend_host_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
+#include "ui/gfx/size.h"
 
 class Browser;
 class BrowserWindow;
 class DevToolsControllerTest;
 class Profile;
 
 namespace base {
 class Value;
 }
 
@@ skipping 55 matching lines @@
 
   // Exposed for testing, normal clients should not use this method.
   static DevToolsWindow* ToggleDevToolsWindow(
       content::RenderViewHost* inspected_rvh,
       bool force_open,
       const DevToolsToggleAction& action);
 
   static void InspectElement(
       content::RenderViewHost* inspected_rvh, int x, int y);
 
-  static int GetMinimumWidth();
-  static int GetMinimumHeight();
   static int GetMinimizedHeight();
 
   // content::DevToolsFrontendHostDelegate:
   virtual void InspectedContentsClosing() OVERRIDE;
 
   content::WebContents* web_contents() { return web_contents_; }
   Browser* browser() { return browser_; }  // For tests.
   DevToolsDockSide dock_side() const { return dock_side_; }
 
   content::RenderViewHost* GetRenderViewHost();
   content::DevToolsClientHost* GetDevToolsClientHostForTest();
 
-  // Returns preferred devtools window width for given |container_width|. It
-  // tries to use the saved window width, or, if none exists, 1/3 of the
-  // container width, then clamps to try and ensure both devtools and content
-  // are at least somewhat visible.
-  // Called only for the case when devtools window is docked to the side.
-  int GetWidth(int container_width);
+  // Inspected WebContents is placed over DevTools WebContents in docked mode.
+  // The following methods return the top-left and bottom-right offsets of
+  // inspected WebContents relative to DevTools WebContents.
+  gfx::Size GetTopLeftContentsOffset() const;

[pfeldman, 2013/11/18 14:18:27]

gfx::Rect GetContentsRect

[dgozman, 2013/11/18 14:37:14]

The whole idea of offsets is that on resize views layout will change the
webcontents size to the expected one (so that devtools stays of the same
height/width), thus making webcontents resizing faster and only once. Opposite
solution requires devtools resize, round-trip to frontend, and then another
relayout in views.
I'd say it's worth it.

[pfeldman, 2013/11/20 15:02:08]

Ok, sgtm.

Did you measure the overhead though? I like the optimization, but it means that
devtools no longer controls the layout dynamically. For example, we will not be
able to achieve the behavior when resize leads to the sidebar resize. That might
be handly when we are emulating and don't need much real estate to the inspected
contents.

[dgozman, 2013/11/21 15:08:54]

I didn't measure the overhead. But this scenario will still work - devtools
window gets resize event, decides to grow the sidebar, and then requests a new
rect for the inspected contents. This will lead to double-resize for contents,
which should not be a big deal in emulating mode - blink does not know about
resizes while emulate is on.

+  gfx::Size GetBottomRightContentsOffset() const;
 
-  // Returns preferred devtools window height for given |container_height|.
-  // Uses the same logic as GetWidth.
-  // Called only for the case when devtools window is docked to bottom.
-  int GetHeight(int container_height);
-
-  // Stores preferred devtools window width for this instance.
-  void SetWidth(int width);
-
-  // Stores preferred devtools window height for this instance.
-  void SetHeight(int height);
+  // Minimum size of the docked DevTools WebContents. This includes
+  // the overlaying inspected WebContents size.
+  gfx::Size GetMinimumSize() const;
 
   void Show(const DevToolsToggleAction& action);
 
   // BeforeUnload interception ////////////////////////////////////////////////
 
   // In order to preserve any edits the user may have made in devtools, the
   // beforeunload event of the inspected page is hooked - devtools gets the
   // first shot at handling beforeunload and presents a dialog to the user. If
   // the user accepts the dialog then the script is given a chance to handle
   // it. This way 2 dialogs may be displayed: one from the devtools asking the
@@ skipping 127 matching lines @@
       const content::FileChooserParams& params) OVERRIDE;
   virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE;
 
   // content::DevToolsFrontendHostDelegate override:
   virtual void DispatchOnEmbedder(const std::string& message) OVERRIDE;
 
   // DevToolsEmbedderMessageDispatcher::Delegate overrides:
   virtual void ActivateWindow() OVERRIDE;
   virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
   virtual void CloseWindow() OVERRIDE;
-  virtual void SetWindowBounds(int x, int y, int width, int height) OVERRIDE;
+  virtual void SetContentsOffsets(
+      int left, int top, int right, int bottom) OVERRIDE;
   virtual void MoveWindow(int x, int y) OVERRIDE;
   virtual void SetDockSide(const std::string& side) OVERRIDE;
   virtual void OpenInNewTab(const std::string& url) OVERRIDE;
   virtual void SaveToFile(const std::string& url,
                           const std::string& content,
                           bool save_as) OVERRIDE;
   virtual void AppendToFile(const std::string& url,
                             const std::string& content) OVERRIDE;
   virtual void RequestFileSystems() OVERRIDE;
   virtual void AddFileSystem() OVERRIDE;
@@ skipping 59 matching lines @@
   DevToolsToggleAction action_on_load_;
   content::NotificationRegistrar registrar_;
   scoped_ptr<content::DevToolsClientHost> frontend_host_;
   scoped_ptr<DevToolsFileHelper> file_helper_;
   scoped_refptr<DevToolsFileSystemIndexer> file_system_indexer_;
   typedef std::map<
       int,
       scoped_refptr<DevToolsFileSystemIndexer::FileSystemIndexingJob> >
       IndexingJobsMap;
   IndexingJobsMap indexing_jobs_;
-  int width_;
-  int height_;
+  gfx::Size top_left_contents_offset_;
+  gfx::Size bottom_right_contents_offset_;
   DevToolsDockSide dock_side_before_minimized_;
   // True if we're in the process of handling a beforeunload event originating
   // from the inspected webcontents, see InterceptPageBeforeUnload for details.
   bool intercepted_page_beforeunload_;
 
   scoped_ptr<DevToolsEmbedderMessageDispatcher> embedder_message_dispatcher_;
   base::WeakPtrFactory<DevToolsWindow> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_