Merge 142745

Source/WebCore/inspector/front-end/TabbedPane.js

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 22 matching lines @@
  * @constructor
  */
 WebInspector.TabbedPane = function()
 {
     WebInspector.View.call(this);
     this.registerRequiredCSS("tabbedPane.css");
     this.element.addStyleClass("tabbed-pane");
     this._headerElement = this.element.createChild("div", "tabbed-pane-header");
     this._headerContentsElement = this._headerElement.createChild("div", "tabbed-pane-header-contents");
     this._tabsElement = this._headerContentsElement.createChild("div", "tabbed-pane-header-tabs");
-    this._contentElement = this.element.createChild("div", "tabbed-pane-content");
+    this._contentElement = this.element.createChild("div", "tabbed-pane-content scroll-target");
     this._tabs = [];
     this._tabsHistory = [];
     this._tabsById = {};
     this.element.addEventListener("click", this.focus.bind(this), false);
     this.element.addEventListener("mouseup", this.onMouseUp.bind(this), false);
 
     this._dropDownButton = this._createDropDownButton();
 }
 
 WebInspector.TabbedPane.EventTypes = {
@@ skipping 756 matching lines @@
     /**
      * @param {Event} event
      */
     _endTabDragging: function(event)
     {
         this._tabElement.style.removeProperty("position");
         this._tabElement.style.removeProperty("left");
         delete this._dragStartX;
     }
 }