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

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

Issue 11860010: Merge 138481 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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/popover.css » ('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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 WebInspector.View.prototype.show.call(this, document.body); 99 WebInspector.View.prototype.show.call(this, document.body);
100 100
101 if (view) 101 if (view)
102 view.show(this._contentDiv); 102 view.show(this._contentDiv);
103 else 103 else
104 this._contentDiv.appendChild(this.contentElement); 104 this._contentDiv.appendChild(this.contentElement);
105 105
106 this._positionElement(anchor, preferredWidth, preferredHeight); 106 this._positionElement(anchor, preferredWidth, preferredHeight);
107 107
108 if (this._popoverHelper) { 108 if (this._popoverHelper) {
109 this.element.addEventListener("mousemove", this._popoverHelper._kill HidePopoverTimer.bind(this._popoverHelper), true); 109 contentElement.addEventListener("mousemove", this._popoverHelper._ki llHidePopoverTimer.bind(this._popoverHelper), true);
110 this.element.addEventListener("mouseout", this._popoverHelper._popov erMouseOut.bind(this._popoverHelper), true); 110 this.element.addEventListener("mouseout", this._popoverHelper._popov erMouseOut.bind(this._popoverHelper), true);
111 } 111 }
112 }, 112 },
113 113
114 hide: function() 114 hide: function()
115 { 115 {
116 this.detach(); 116 this.detach();
117 delete WebInspector.Popover._popover; 117 delete WebInspector.Popover._popover;
118 }, 118 },
119 119
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 if (this._hidePopoverTimer) { 350 if (this._hidePopoverTimer) {
351 clearTimeout(this._hidePopoverTimer); 351 clearTimeout(this._hidePopoverTimer);
352 delete this._hidePopoverTimer; 352 delete this._hidePopoverTimer;
353 353
354 // We know that we reached the popup, but we might have moved over o ther elements. 354 // We know that we reached the popup, but we might have moved over o ther elements.
355 // Discard pending command. 355 // Discard pending command.
356 this._resetHoverTimer(); 356 this._resetHoverTimer();
357 } 357 }
358 } 358 }
359 } 359 }
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/inspector/front-end/popover.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698