DevTools: place DevTools WebContents underneath inspected WebContents.

chrome/browser/devtools/devtools_window.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/browser/devtools/devtools_window.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
@@ skipping 222 matching lines @@
 
 const char kDockSideBottom[] = "bottom";
 const char kDockSideRight[] = "right";
 const char kDockSideUndocked[] = "undocked";
 const char kDockSideMinimized[] = "minimized";
 
 static const char kFrontendHostId[] = "id";
 static const char kFrontendHostMethod[] = "method";
 static const char kFrontendHostParams[] = "params";
 
-const int kMinContentsSize = 50;
-
 std::string SkColorToRGBAString(SkColor color) {
   // We avoid StringPrintf because it will use locale specific formatters for
   // the double (e.g. ',' instead of '.' in German).
   return "rgba(" + base::IntToString(SkColorGetR(color)) + "," +
       base::IntToString(SkColorGetG(color)) + "," +
       base::IntToString(SkColorGetB(color)) + "," +
       base::DoubleToString(SkColorGetA(color) / 255.0) + ")";
 }
 
 DictionaryValue* CreateFileSystemValue(
@@ skipping 200 matching lines @@
                                     int y) {
   scoped_refptr<DevToolsAgentHost> agent(
       DevToolsAgentHost::GetOrCreateFor(inspected_rvh));
   agent->InspectElement(x, y);
   // TODO(loislo): we should initiate DevTools window opening from within
   // renderer. Otherwise, we still can hit a race condition here.
   OpenDevToolsWindow(inspected_rvh);
 }
 
 // static
-int DevToolsWindow::GetMinimumWidth() {
-  const int kMinDevToolsWidth = 150;
-  return kMinDevToolsWidth;
-}
-
-// static
-int DevToolsWindow::GetMinimumHeight() {
-  // Minimal height of devtools pane or content pane when devtools are docked
-  // to the browser window.
-  const int kMinDevToolsHeight = 50;
-  return kMinDevToolsHeight;
-}
-
-// static
 int DevToolsWindow::GetMinimizedHeight() {
   const int kMinimizedDevToolsHeight = 24;
   return kMinimizedDevToolsHeight;
 }
 
 void DevToolsWindow::InspectedContentsClosing() {
   intercepted_page_beforeunload_ = false;
   web_contents_->GetRenderViewHost()->ClosePage();
 }
 
 content::RenderViewHost* DevToolsWindow::GetRenderViewHost() {
   return web_contents_->GetRenderViewHost();
 }
 
 content::DevToolsClientHost* DevToolsWindow::GetDevToolsClientHostForTest() {
   return frontend_host_.get();
 }
 
-int DevToolsWindow::GetWidth(int container_width) {
-  if (width_ == -1) {
-    width_ = profile_->GetPrefs()->
-        GetInteger(prefs::kDevToolsVSplitLocation);
-  }
-
-  // By default, size devtools as 1/3 of the browser window.
-  if (width_ == -1)
-    width_ = container_width / 3;
-
-  // Respect the minimum devtools width preset.
-  width_ = std::max(GetMinimumWidth(), width_);
-
-  // But it should never compromise the content window size unless the entire
-  // window is tiny.
-  width_ = std::min(container_width - kMinContentsSize, width_);
-  return width_;
+gfx::Size DevToolsWindow::GetTopLeftContentsOffset() const {
+  return top_left_contents_offset_;
 }
 
-int DevToolsWindow::GetHeight(int container_height) {
-  if (height_ == -1) {
-    height_ = profile_->GetPrefs()->
-        GetInteger(prefs::kDevToolsHSplitLocation);
-  }
-
-  // By default, size devtools as 1/3 of the browser window.
-  if (height_ == -1)
-    height_ = container_height / 3;
-
-  // Respect the minimum devtools width preset.
-  height_ = std::max(GetMinimumHeight(), height_);
-
-  // But it should never compromise the content window size.
-  height_ = std::min(container_height - kMinContentsSize, height_);
-  return height_;
+gfx::Size DevToolsWindow::GetBottomRightContentsOffset() const {
+  return bottom_right_contents_offset_;
 }
 
-void DevToolsWindow::SetWidth(int width) {
-  width_ = width;
-  profile_->GetPrefs()->SetInteger(prefs::kDevToolsVSplitLocation, width);
-}
-
-void DevToolsWindow::SetHeight(int height) {
-  height_ = height;
-  profile_->GetPrefs()->SetInteger(prefs::kDevToolsHSplitLocation, height);
+gfx::Size DevToolsWindow::GetMinimumSize() const {
+  const gfx::Size kMinDevToolsSize = gfx::Size(200, 100);
+  return kMinDevToolsSize;
 }
 
 void DevToolsWindow::Show(const DevToolsToggleAction& action) {
   if (IsDocked()) {
     Browser* inspected_browser = NULL;
     int inspected_tab_index = -1;
     // Tell inspected browser to update splitter and switch to inspected panel.
     if (!IsInspectedBrowserPopup() &&
         FindInspectedBrowserAndTabIndex(&inspected_browser,
                                         &inspected_tab_index)) {
@@ skipping 105 matching lines @@
 
 DevToolsWindow::DevToolsWindow(Profile* profile,
                                const GURL& url,
                                content::RenderViewHost* inspected_rvh,
                                DevToolsDockSide dock_side)
     : profile_(profile),
       browser_(NULL),
       dock_side_(dock_side),
       is_loaded_(false),
       action_on_load_(DevToolsToggleAction::Show()),
-      width_(-1),
-      height_(-1),
       dock_side_before_minimized_(dock_side),
       intercepted_page_beforeunload_(false),
       weak_factory_(this) {
   web_contents_ =
       content::WebContents::Create(content::WebContents::CreateParams(profile));
   frontend_contents_observer_.reset(new FrontendWebContentsObserver(this));
 
   web_contents_->GetController().LoadURL(url, content::Referrer(),
       content::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string());
 
@@ skipping 63 matching lines @@
       "&textColor=" +
       SkColorToRGBAString(tp->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT)));
   if (shared_worker_frontend)
     url_string += "&isSharedWorker=true";
   if (external_frontend)
     url_string += "&remoteFrontend=true";
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableDevToolsExperiments))
     url_string += "&experiments=true";
   url_string += "&updateAppcache";
+#if defined(OS_MACOSX) || defined(USE_AURA)

[pfeldman, 2013/12/05 15:54:07]

You probably want this everywhere or nowhere.

+  url_string += "&overlayContents=true";
+#endif
   return GURL(url_string);
 }
 
 // static
 DevToolsWindow* DevToolsWindow::FindDevToolsWindow(
     DevToolsAgentHost* agent_host) {
   DevToolsWindows* instances = &g_instances.Get();
   content::DevToolsManager* manager = content::DevToolsManager::GetInstance();
   for (DevToolsWindows::iterator it(instances->begin()); it != instances->end();
        ++it) {
@@ skipping 13 matching lines @@
   for (DevToolsWindows::iterator it(instances->begin()); it != instances->end();
        ++it) {
     if ((*it)->web_contents_->GetRenderViewHost() == window_rvh)
       return *it;
   }
   return NULL;
 }
 
 // static
 DevToolsDockSide DevToolsWindow::GetDockSideFromPrefs(Profile* profile) {
+#if !defined(OS_MACOSX) && !defined(USE_AURA)

[pfeldman, 2013/12/05 15:54:07]

ditto

+  return DEVTOOLS_DOCK_SIDE_UNDOCKED;
+#endif
+
   std::string dock_side =
       profile->GetPrefs()->GetString(prefs::kDevToolsDockSide);
 
   // Migrate prefs.
   const char kOldPrefBottom[] = "bottom";
   const char kOldPrefRight[] = "right";
   if ((dock_side == kOldPrefBottom) || (dock_side == kOldPrefRight)) {
     if (!profile->GetPrefs()->GetBoolean(prefs::kDevToolsOpenDocked))
       return DEVTOOLS_DOCK_SIDE_UNDOCKED;
     return (dock_side == kOldPrefBottom) ?
@@ skipping 213 matching lines @@
   } else {
     browser_->window()->Activate();
   }
 }
 
 void DevToolsWindow::CloseWindow() {
   DCHECK(IsDocked());
   web_contents_->GetRenderViewHost()->FirePageBeforeUnload(false);
 }
 
-void DevToolsWindow::SetWindowBounds(int x, int y, int width, int height) {
-  if (!IsDocked())
-    browser_->window()->SetBounds(gfx::Rect(x, y, width, height));
+void DevToolsWindow::SetContentsOffsets(
+    int left, int top, int right, int bottom) {
+  if (top_left_contents_offset_.width() == left &&
+      top_left_contents_offset_.height() == top &&
+      bottom_right_contents_offset_.width() == right &&
+      bottom_right_contents_offset_.height() == bottom) {
+    return;
+  }
+
+  top_left_contents_offset_ = gfx::Size(left, top);
+  bottom_right_contents_offset_ = gfx::Size(right, bottom);
+  if (IsDocked()) {
+    // Update inspected window.
+    BrowserWindow* inspected_window = GetInspectedBrowserWindow();
+    if (inspected_window)
+      inspected_window->UpdateDevTools();
+  }
 }
 
 void DevToolsWindow::MoveWindow(int x, int y) {
   if (!IsDocked()) {
     gfx::Rect bounds = browser_->window()->GetBounds();
     bounds.Offset(x, y);
     browser_->window()->SetBounds(bounds);
   }
 }
 
@@ skipping 463 matching lines @@
       base::string16(), javascript);
 }
 
 void DevToolsWindow::UpdateBrowserToolbar() {
   BrowserWindow* inspected_window = GetInspectedBrowserWindow();
   if (inspected_window)
     inspected_window->UpdateToolbar(NULL);
 }
 
 bool DevToolsWindow::IsDocked() {
+#if !defined(OS_MACOSX) && !defined(USE_AURA)

[pfeldman, 2013/12/05 15:54:07]

ditto

+  return false;
+#endif
   return dock_side_ != DEVTOOLS_DOCK_SIDE_UNDOCKED;
 }
 
 void DevToolsWindow::Restore() {
   if (dock_side_ == DEVTOOLS_DOCK_SIDE_MINIMIZED)
     SetDockSide(SideToString(dock_side_before_minimized_));
 }
 
 content::WebContents* DevToolsWindow::GetInspectedWebContents() {
   return inspected_contents_observer_ ?
       inspected_contents_observer_->web_contents() : NULL;
 }
 
 void DevToolsWindow::DocumentOnLoadCompletedInMainFrame() {
   is_loaded_ = true;
   UpdateTheme();
   DoAction();
   AddDevToolsExtensionsToClient();
 }