Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Side by Side Diff: Source/WebCore/inspector/front-end/Drawer.js

Issue 12320033: Merge 143437 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Source/WebCore/inspector/front-end/View.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Joseph Pecoraro 3 * Copyright (C) 2009 Joseph Pecoraro
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 this._view = view; 79 this._view = view;
80 80
81 var statusBarItems = this._view.statusBarItems || []; 81 var statusBarItems = this._view.statusBarItems || [];
82 this._viewStatusBar.removeChildren(); 82 this._viewStatusBar.removeChildren();
83 for (var i = 0; i < statusBarItems.length; ++i) 83 for (var i = 0; i < statusBarItems.length; ++i)
84 this._viewStatusBar.appendChild(statusBarItems[i]); 84 this._viewStatusBar.appendChild(statusBarItems[i]);
85 85
86 document.body.addStyleClass("drawer-visible"); 86 document.body.addStyleClass("drawer-visible");
87 this._floatingStatusBarContainer.insertBefore(document.getElementById("p anel-status-bar"), this._floatingStatusBarContainer.firstElementChild); 87 this._floatingStatusBarContainer.insertBefore(document.getElementById("p anel-status-bar"), this._floatingStatusBarContainer.firstElementChild);
88 this._bottomStatusBar.appendChild(this._viewStatusBar); 88 this._bottomStatusBar.appendChild(this._viewStatusBar);
89 this._view.detach();
89 this._view.markAsRoot(); 90 this._view.markAsRoot();
90 this._view.show(this._drawerContentsElement); 91 this._view.show(this._drawerContentsElement);
91 92
92 if (drawerWasVisible) 93 if (drawerWasVisible)
93 return; 94 return;
94 95
95 var height = this._constrainHeight(this._savedHeight || this.element.off setHeight); 96 var height = this._constrainHeight(this._savedHeight || this.element.off setHeight);
96 var animations = [ 97 var animations = [
97 {element: this.element, end: {height: height}}, 98 {element: this.element, end: {height: height}},
98 {element: this._mainElement, end: {bottom: height}}, 99 {element: this._mainElement, end: {bottom: height}},
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 delete this._statusBarDragOffset; 217 delete this._statusBarDragOffset;
217 218
218 event.consume(); 219 event.consume();
219 } 220 }
220 } 221 }
221 222
222 /** 223 /**
223 * @type {WebInspector.Drawer} 224 * @type {WebInspector.Drawer}
224 */ 225 */
225 WebInspector.drawer = null; 226 WebInspector.drawer = null;
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/inspector/front-end/View.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698