Merge 129348 - Web Inspector: [REGRESSION] Cmd-Shift-C doesn't enable element inspection mode when …

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

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 68 matching lines @@
 
         var mainStatusBar = document.getElementById("main-status-bar");
         mainStatusBar.insertBefore(this._dockToggleButton.element, bottomStatusBarContainer);
 
         this._toggleConsoleButton = new WebInspector.StatusBarButton(WebInspector.UIString("Show console."), "console-status-bar-item");
         this._toggleConsoleButton.addEventListener("click", this._toggleConsoleButtonClicked.bind(this), false);
         mainStatusBar.insertBefore(this._toggleConsoleButton.element, bottomStatusBarContainer);
 
         if (!WebInspector.WorkerManager.isWorkerFrontend()) {
             this._nodeSearchButton = new WebInspector.StatusBarButton(WebInspector.UIString("Select an element in the page to inspect it."), "node-search-status-bar-item");
-            this._nodeSearchButton.addEventListener("click", this._toggleSearchingForNode, this);
+            this._nodeSearchButton.addEventListener("click", this.toggleSearchingForNode, this);
             mainStatusBar.insertBefore(this._nodeSearchButton.element, bottomStatusBarContainer);
         }
 
         mainStatusBar.appendChild(this.settingsController.statusBarItem);
     },
 
     _createDockOptions: function()
     {
         var alternateDockToggleButton1 = new WebInspector.StatusBarButton("Dock to main window.", "dock-status-bar-item", 3);
         var alternateDockToggleButton2 = new WebInspector.StatusBarButton("Undock into separate window.", "dock-status-bar-item", 3);
@@ skipping 249 matching lines @@
         this._zoomLevel = 0;
         this._requestZoom();
     },
 
     _requestZoom: function()
     {
         WebInspector.settings.zoomLevel.set(this._zoomLevel);
         InspectorFrontendHost.setZoomFactor(Math.pow(1.2, this._zoomLevel));
     },
 
-    _toggleSearchingForNode: function()
+    toggleSearchingForNode: function()
     {
         var enabled = !this._nodeSearchButton.toggled;
         /**
          * @param {?Protocol.Error} error
          */
         function callback(error)
         {
             if (!error)
                 this._nodeSearchButton.toggled = enabled;
         }
@@ skipping 485 matching lines @@
 
     // Cmd/Control + Shift + C should be a shortcut to clicking the Node Search Button.
     // This shortcut matches Firebug.
     if (event.keyIdentifier === "U+0043") { // C key
         if (WebInspector.isMac())
             var isNodeSearchKey = event.metaKey && !event.ctrlKey && !event.altKey && event.shiftKey;
         else
             var isNodeSearchKey = event.ctrlKey && !event.metaKey && !event.altKey && event.shiftKey;
 
         if (isNodeSearchKey) {
-            this._toggleSearchingForNode();
+            this.toggleSearchingForNode();
             event.consume(true);
             return;
         }
         return;
     }
 }
 
 WebInspector.postDocumentKeyDown = function(event)
 {
     if (event.handled)
@@ skipping 212 matching lines @@
 {
     doc.addEventListener("keydown", this.documentKeyDown.bind(this), true);
     doc.addEventListener("keydown", this.postDocumentKeyDown.bind(this), false);
     doc.addEventListener("beforecopy", this.documentCanCopy.bind(this), true);
     doc.addEventListener("copy", this.documentCopy.bind(this), true);
     doc.addEventListener("contextmenu", this.contextMenuEventFired.bind(this), true);
     doc.addEventListener("click", this.documentClick.bind(this), true);
 }
 
 WebInspector.ProfileURLRegExp = /webkit-profile:\/\/(.+)\/(.+)#([0-9]+)/;