<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[165052] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/165052">165052</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-04 08:32:19 -0800 (Tue, 04 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove WebInspector.EventHandler in favor of WebInspector.EventListenerSet
https://bugs.webkit.org/show_bug.cgi?id=129185
Patch by Diego Pino Garcia <dpino@igalia.com> on 2014-03-04
Reviewed by Timothy Hatcher.
* UserInterface/Base/EventHandler.js: Removed.
* UserInterface/Main.html: Don't include EventHandler.js.
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor.prototype._dismissPopover):
(WebInspector.SourceCodeTextEditor.prototype._trackPopoverEvents):
Use EventListenerSet instead of EventHandler.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainhtml">trunk/Source/WebInspectorUI/UserInterface/Main.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseEventHandlerjs">trunk/Source/WebInspectorUI/UserInterface/Base/EventHandler.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (165051 => 165052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-03-04 16:22:30 UTC (rev 165051)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-03-04 16:32:19 UTC (rev 165052)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-04 Diego Pino Garcia <dpino@igalia.com>
+
+ Web Inspector: Remove WebInspector.EventHandler in favor of WebInspector.EventListenerSet
+ https://bugs.webkit.org/show_bug.cgi?id=129185
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/EventHandler.js: Removed.
+ * UserInterface/Main.html: Don't include EventHandler.js.
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype._dismissPopover):
+ (WebInspector.SourceCodeTextEditor.prototype._trackPopoverEvents):
+ Use EventListenerSet instead of EventHandler.
+
</ins><span class="cx"> 2014-03-03 Jonathan Wells <jonowells@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Match color of regex in source view with a popover
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseEventHandlerjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Base/EventHandler.js (165051 => 165052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/EventHandler.js 2014-03-04 16:22:30 UTC (rev 165051)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/EventHandler.js 2014-03-04 16:32:19 UTC (rev 165052)
</span><span class="lines">@@ -1,79 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WebInspector.EventHandler = function(delegate, eventHandlers)
-{
- this._delegate = delegate;
- this._eventHandlers = eventHandlers;
-
- this._tracking = false;
- this._target = null;
-};
-
-WebInspector.EventHandler.prototype = {
- constructor: WebInspector.EventHandler,
-
- // Public
-
- trackEvents: function(target)
- {
- if (this._tracking && target === this._target)
- return;
-
- if (this._tracking && this._target)
- this.stopTrackingEvents();
-
- Object.getOwnPropertyNames(this._eventHandlers).forEach(function(eventName) {
- target.addEventListener(eventName, this);
- }, this);
-
- this._target = target;
- this._tracking = true;
- },
-
- stopTrackingEvents: function()
- {
- if (!this._tracking)
- return;
-
- Object.getOwnPropertyNames(this._eventHandlers).forEach(function(eventType) {
- this._target.removeEventListener(eventType, this);
- }, this);
-
- this._tracking = false;
- },
-
- handleEvent: function(event)
- {
- if (event.currentTarget !== this._target)
- return;
-
- var handler = this._eventHandlers[event.type];
- if (handler)
- handler.call(this._delegate, event);
- }
-}
-
-WebInspector.EventHandler.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (165051 => 165052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2014-03-04 16:22:30 UTC (rev 165051)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2014-03-04 16:32:19 UTC (rev 165052)
</span><span class="lines">@@ -163,7 +163,6 @@
</span><span class="cx"> <script src="Base/Object.js"></script>
</span><span class="cx">
</span><span class="cx"> <script src="Base/DOMUtilities.js"></script>
</span><del>- <script src="Base/EventHandler.js"></script>
</del><span class="cx"> <script src="Base/EventListenerSet.js"></script>
</span><span class="cx"> <script src="Base/ImageUtilities.js"></script>
</span><span class="cx"> <script src="Base/LoadLocalizedStrings.js"></script>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (165051 => 165052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2014-03-04 16:22:30 UTC (rev 165051)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2014-03-04 16:32:19 UTC (rev 165052)
</span><span class="lines">@@ -1260,20 +1260,16 @@
</span><span class="cx">
</span><span class="cx"> this._popover.dismiss();
</span><span class="cx">
</span><del>- if (this._popoverEventHandler)
- this._popoverEventHandler.stopTrackingEvents();
</del><ins>+ if (this._popoverEventListeners)
+ this._popoverEventListeners.unregister();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _trackPopoverEvents: function()
</span><span class="cx"> {
</span><del>- if (!this._popoverEventHandler) {
- this._popoverEventHandler = new WebInspector.EventHandler(this, {
- "mouseover": this._popoverMouseover,
- "mouseout": this._popoverMouseout,
- });
- }
-
- this._popoverEventHandler.trackEvents(this._popover.element);
</del><ins>+ if (!this._popoverEventListeners)
+ this._popoverEventListeners = new WebInspector.EventListenerSet(this, "Popover listeners");
+ this._popoverEventListeners.register(this._popover.element, "mouseover", this._popoverMouseover);
+ this._popoverEventListeners.register(this._popover.element, "mouseout", this._popoverMouseout);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _popoverMouseover: function(event)
</span></span></pre>
</div>
</div>
</body>
</html>