<!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>[181769] trunk</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/181769">181769</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-19 17:18:15 -0700 (Thu, 19 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Adopt ES6 Class Syntax for all Model Objects
https://bugs.webkit.org/show_bug.cgi?id=142858
Reviewed by Timothy Hatcher.
Source/WebInspectorUI:
- Convert WebInspector.Object to a class
- Convert all UserInterface/Models objects to classes
- Convert constructor functions to constructor methods
- Convert "constructor.method" to class static methods where possible
- Convert all methods to method syntax, eliminate commas between methods
- Convert all superclass calls in classes to use "super"
- Workaround <https://webkit.org/b/142862> and add empty constructors
- Added "deprecated" prefix to addConstructorFunctions, since it is not needed with classes
- Added many missing calls to super in constructors
- Added FIXME to WebInspector.Object subclasses not yet moved to classes.
- Cleaned up SourceMap global properties, moved to constructor instead of prototype
- Cleaned up Timeline factory constructor to static "create" factory method
- Fixed any style issues noticed in the mass edit
- Fixed strict mode issues now that classes enforce strict mode
- RunLoopTimelineRecord.js was missing a `var` for a local variable
- "const" is not allowed, converted to "var"
- "arguments.callee" is not allowed in strict mode
* UserInterface/**/*.js:
Many files modified mostly mechanically.
LayoutTests:
* inspector/model/parse-script-syntax-tree.html:
This test was calling a constructor without "new". Class
syntax enforces "new" and threw an exception.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectormodelparsescriptsyntaxtreehtml">trunk/LayoutTests/inspector/model/parse-script-syntax-tree.html</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseObjectjs">trunk/Source/WebInspectorUI/UserInterface/Base/Object.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseTestjs">trunk/Source/WebInspectorUI/UserInterface/Base/Test.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersAnalyzerManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/AnalyzerManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersAnnotatorjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/Annotator.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersApplicationCacheManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/ApplicationCacheManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersBranchManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/BranchManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersCSSStyleManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorCompletionControllerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorEditingControllerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorEditingController.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorTokenTrackingControllerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersDashboardManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/DashboardManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersFormatterSourceMapjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/FormatterSourceMap.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersFrameResourceManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersIssueManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/IssueManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersJavaScriptLogViewControllerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersJavaScriptRuntimeCompletionProviderjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersLayerTreeManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/LayerTreeManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersLogManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersProbeManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/ProbeManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersReplayManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersRuntimeManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/RuntimeManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersSourceMapManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/SourceMapManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersStorageManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/StorageManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsAnalyzerMessagejs">trunk/Source/WebInspectorUI/UserInterface/Models/AnalyzerMessage.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsApplicationCacheFramejs">trunk/Source/WebInspectorUI/UserInterface/Models/ApplicationCacheFrame.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsApplicationCacheManifestjs">trunk/Source/WebInspectorUI/UserInterface/Models/ApplicationCacheManifest.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsBackForwardEntryjs">trunk/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsBranchjs">trunk/Source/WebInspectorUI/UserInterface/Models/Branch.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsBreakpointjs">trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsBreakpointActionjs">trunk/Source/WebInspectorUI/UserInterface/Models/BreakpointAction.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSCompletionsjs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSMediajs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSMedia.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSPropertyjs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSProperty.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSRulejs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSSelectorjs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSSelector.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSStyleDeclarationjs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSStyleDeclaration.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSStyleSheetjs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCallFramejs">trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCollectionEntryjs">trunk/Source/WebInspectorUI/UserInterface/Models/CollectionEntry.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCollectionEntryPreviewjs">trunk/Source/WebInspectorUI/UserInterface/Models/CollectionEntryPreview.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsColorjs">trunk/Source/WebInspectorUI/UserInterface/Models/Color.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsContentFlowjs">trunk/Source/WebInspectorUI/UserInterface/Models/ContentFlow.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCookieStorageObjectjs">trunk/Source/WebInspectorUI/UserInterface/Models/CookieStorageObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDOMNodejs">trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDOMNodeStylesjs">trunk/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDOMSearchMatchObjectjs">trunk/Source/WebInspectorUI/UserInterface/Models/DOMSearchMatchObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDOMStorageObjectjs">trunk/Source/WebInspectorUI/UserInterface/Models/DOMStorageObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDOMTreejs">trunk/Source/WebInspectorUI/UserInterface/Models/DOMTree.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDatabaseObjectjs">trunk/Source/WebInspectorUI/UserInterface/Models/DatabaseObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDatabaseTableObjectjs">trunk/Source/WebInspectorUI/UserInterface/Models/DatabaseTableObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDebuggerDashboardjs">trunk/Source/WebInspectorUI/UserInterface/Models/DebuggerDashboard.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDefaultDashboardjs">trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsExecutionContextjs">trunk/Source/WebInspectorUI/UserInterface/Models/ExecutionContext.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsExecutionContextListjs">trunk/Source/WebInspectorUI/UserInterface/Models/ExecutionContextList.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsFramejs">trunk/Source/WebInspectorUI/UserInterface/Models/Frame.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsGeometryjs">trunk/Source/WebInspectorUI/UserInterface/Models/Geometry.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsGradientjs">trunk/Source/WebInspectorUI/UserInterface/Models/Gradient.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsIndexedDatabasejs">trunk/Source/WebInspectorUI/UserInterface/Models/IndexedDatabase.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsIndexedDatabaseObjectStorejs">trunk/Source/WebInspectorUI/UserInterface/Models/IndexedDatabaseObjectStore.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsIndexedDatabaseObjectStoreIndexjs">trunk/Source/WebInspectorUI/UserInterface/Models/IndexedDatabaseObjectStoreIndex.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsIssueMessagejs">trunk/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsKeyboardShortcutjs">trunk/Source/WebInspectorUI/UserInterface/Models/KeyboardShortcut.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsLayoutTimelineRecordjs">trunk/Source/WebInspectorUI/UserInterface/Models/LayoutTimelineRecord.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsLazySourceCodeLocationjs">trunk/Source/WebInspectorUI/UserInterface/Models/LazySourceCodeLocation.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsLineWidgetjs">trunk/Source/WebInspectorUI/UserInterface/Models/LineWidget.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsLogObjectjs">trunk/Source/WebInspectorUI/UserInterface/Models/LogObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsNetworkTimelinejs">trunk/Source/WebInspectorUI/UserInterface/Models/NetworkTimeline.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsObjectPreviewjs">trunk/Source/WebInspectorUI/UserInterface/Models/ObjectPreview.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsProbejs">trunk/Source/WebInspectorUI/UserInterface/Models/Probe.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsProbeSetjs">trunk/Source/WebInspectorUI/UserInterface/Models/ProbeSet.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsProbeSetDataFramejs">trunk/Source/WebInspectorUI/UserInterface/Models/ProbeSetDataFrame.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsProbeSetDataTablejs">trunk/Source/WebInspectorUI/UserInterface/Models/ProbeSetDataTable.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsProfilejs">trunk/Source/WebInspectorUI/UserInterface/Models/Profile.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsProfileNodejs">trunk/Source/WebInspectorUI/UserInterface/Models/ProfileNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsProfileNodeCalljs">trunk/Source/WebInspectorUI/UserInterface/Models/ProfileNodeCall.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsPropertyDescriptorjs">trunk/Source/WebInspectorUI/UserInterface/Models/PropertyDescriptor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsPropertyPathjs">trunk/Source/WebInspectorUI/UserInterface/Models/PropertyPath.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsPropertyPreviewjs">trunk/Source/WebInspectorUI/UserInterface/Models/PropertyPreview.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsReplayDashboardjs">trunk/Source/WebInspectorUI/UserInterface/Models/ReplayDashboard.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsReplaySessionjs">trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySession.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsReplaySessionSegmentjs">trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySessionSegment.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsResourcejs">trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsResourceCollectionjs">trunk/Source/WebInspectorUI/UserInterface/Models/ResourceCollection.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsResourceTimelineRecordjs">trunk/Source/WebInspectorUI/UserInterface/Models/ResourceTimelineRecord.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsRevisionjs">trunk/Source/WebInspectorUI/UserInterface/Models/Revision.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsRunLoopTimelineRecordjs">trunk/Source/WebInspectorUI/UserInterface/Models/RunLoopTimelineRecord.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsScopeChainNodejs">trunk/Source/WebInspectorUI/UserInterface/Models/ScopeChainNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsScriptjs">trunk/Source/WebInspectorUI/UserInterface/Models/Script.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs">trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsScriptTimelineRecordjs">trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSettingjs">trunk/Source/WebInspectorUI/UserInterface/Models/Setting.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceCodejs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceCode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeLocationjs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceCodePositionjs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodePosition.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeRevisionjs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeRevision.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeSearchMatchObjectjs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeSearchMatchObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeTextRangejs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeTextRange.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeTimelinejs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeTimeline.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceMapjs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceMap.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceMapResourcejs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsTextMarkerjs">trunk/Source/WebInspectorUI/UserInterface/Models/TextMarker.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsTextRangejs">trunk/Source/WebInspectorUI/UserInterface/Models/TextRange.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsTimelinejs">trunk/Source/WebInspectorUI/UserInterface/Models/Timeline.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsTimelineMarkerjs">trunk/Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsTimelineRecordjs">trunk/Source/WebInspectorUI/UserInterface/Models/TimelineRecord.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsTimelineRecordingjs">trunk/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsTypeSetjs">trunk/Source/WebInspectorUI/UserInterface/Models/TypeSet.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsUnitBezierjs">trunk/Source/WebInspectorUI/UserInterface/Models/UnitBezier.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolApplicationCacheObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/ApplicationCacheObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolCSSObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/CSSObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolConsoleObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/ConsoleObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolDOMObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/DOMObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolDOMStorageObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/DOMStorageObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolDatabaseObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/DatabaseObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolDebuggerObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/DebuggerObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolLayerTreeObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/LayerTreeObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolNetworkObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/NetworkObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolPageObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/PageObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolReplayObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/ReplayObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolRuntimeObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/RuntimeObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolTimelineObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/TimelineObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceTesthtml">trunk/Source/WebInspectorUI/UserInterface/Test.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsBreakpointActionViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsColorPickerjs">trunk/Source/WebInspectorUI/UserInterface/Views/ColorPicker.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsColorWheeljs">trunk/Source/WebInspectorUI/UserInterface/Views/ColorWheel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCompletionSuggestionsViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/CompletionSuggestionsView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleCommandjs">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleCommand.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleGroupjs">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleGroup.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsolePromptjs">trunk/Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleSessionjs">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleSession.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentViewContainerjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeOutlinejs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDashboardContainerViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDashboardViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DashboardView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectionjs">trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectionGroupjs">trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionGroup.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectionRowjs">trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionRow.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFilterBarjs">trunk/Source/WebInspectorUI/UserInterface/Views/FilterBar.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFindBannerjs">trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsGoToLineDialogjs">trunk/Source/WebInspectorUI/UserInterface/Views/GoToLineDialog.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsHierarchicalPathComponentjs">trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsHoverMenujs">trunk/Source/WebInspectorUI/UserInterface/Views/HoverMenu.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsIndeterminateProgressSpinnerjs">trunk/Source/WebInspectorUI/UserInterface/Views/IndeterminateProgressSpinner.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNavigationBarjs">trunk/Source/WebInspectorUI/UserInterface/Views/NavigationBar.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNavigationItemjs">trunk/Source/WebInspectorUI/UserInterface/Views/NavigationItem.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectPreviewViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPreviewView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsPopoverjs">trunk/Source/WebInspectorUI/UserInterface/Views/Popover.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsProfileNodeDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsQuickConsolejs">trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceTimelineDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScopeBarItemjs">trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBarItem.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScriptTimelineDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSectionjs">trunk/Source/WebInspectorUI/UserInterface/Views/Section.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSidebarjs">trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/SidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTimelineTimelineDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTimelineTimelineDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewGraphjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordBarjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordFramejs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsToolbarjs">trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTreeElementStatusButtonjs">trunk/Source/WebInspectorUI/UserInterface/Views/TreeElementStatusButton.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinejs">trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlineDataGridSynchronizerjs">trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutlineDataGridSynchronizer.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTypeTokenViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/LayoutTests/ChangeLog 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Adopt ES6 Class Syntax for all Model Objects
+ https://bugs.webkit.org/show_bug.cgi?id=142858
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/model/parse-script-syntax-tree.html:
+ This test was calling a constructor without "new". Class
+ syntax enforces "new" and threw an exception.
+
</ins><span class="cx"> 2015-03-19 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> <attachment> should put URLs on the pasteboard so that Finder can accept drops.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelparsescriptsyntaxtreehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/parse-script-syntax-tree.html (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/parse-script-syntax-tree.html 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/LayoutTests/inspector/model/parse-script-syntax-tree.html 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> {
</span><span class="cx"> function makeNode(text, isExpression)
</span><span class="cx"> {
</span><del>- var script = new WebInspector.Script(1, WebInspector.TextRange(0, text.length));
</del><ins>+ var script = new WebInspector.Script(1, new WebInspector.TextRange(0, text.length));
</ins><span class="cx"> var scriptSyntaxTree = new WebInspector.ScriptSyntaxTree(text, script);
</span><span class="cx"> var syntaxTree = scriptSyntaxTree._syntaxTree;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-03-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Adopt ES6 Class Syntax for all Model Objects
+ https://bugs.webkit.org/show_bug.cgi?id=142858
+
+ Reviewed by Timothy Hatcher.
+
+ - Convert WebInspector.Object to a class
+ - Convert all UserInterface/Models objects to classes
+ - Convert constructor functions to constructor methods
+ - Convert "constructor.method" to class static methods where possible
+ - Convert all methods to method syntax, eliminate commas between methods
+ - Convert all superclass calls in classes to use "super"
+ - Workaround <https://webkit.org/b/142862> and add empty constructors
+ - Added "deprecated" prefix to addConstructorFunctions, since it is not needed with classes
+ - Added many missing calls to super in constructors
+ - Added FIXME to WebInspector.Object subclasses not yet moved to classes.
+ - Cleaned up SourceMap global properties, moved to constructor instead of prototype
+ - Cleaned up Timeline factory constructor to static "create" factory method
+ - Fixed any style issues noticed in the mass edit
+ - Fixed strict mode issues now that classes enforce strict mode
+ - RunLoopTimelineRecord.js was missing a `var` for a local variable
+ - "const" is not allowed, converted to "var"
+ - "arguments.callee" is not allowed in strict mode
+
+ * UserInterface/**/*.js:
+ Many files modified mostly mechanically.
+
</ins><span class="cx"> 2015-03-19 Jono Wells <jonowells@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Debugger sidebar header should say "Scripts" instead of "Breakpoints", appear only on pause
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Object.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Object.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Object.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,108 +23,96 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.Object = function()
</del><ins>+WebInspector.Object = class Object
</ins><span class="cx"> {
</span><del>-};
-
-WebInspector.Object.addConstructorFunctions = function(subclassConstructor)
-{
- // Copies the relevant functions the subclass constructor.
- for (var property in WebInspector.Object) {
- var value = WebInspector.Object[property];
- if (typeof value !== "function")
- continue;
- if (value === arguments.callee)
- continue;
- subclassConstructor[property] = value;
</del><ins>+ constructor()
+ {
+ // FIXME: Remove once <https://webkit.org/b/142862> is fixed.
</ins><span class="cx"> }
</span><del>-};
</del><span class="cx">
</span><del>-WebInspector.Object.addEventListener = function(eventType, listener, thisObject)
-{
- thisObject = thisObject || null;
</del><ins>+ // Static
</ins><span class="cx">
</span><del>- console.assert(eventType, "Object.addEventListener: invalid event type ", eventType, "(listener: ", listener, "thisObject: ", thisObject, ")");
- if (!eventType)
- return;
</del><ins>+ static addEventListener(eventType, listener, thisObject)
+ {
+ thisObject = thisObject || null;
</ins><span class="cx">
</span><del>- console.assert(listener, "Object.addEventListener: invalid listener ", listener, "(event type: ", eventType, "thisObject: ", thisObject, ")");
- if (!listener)
- return;
</del><ins>+ console.assert(eventType, "Object.addEventListener: invalid event type ", eventType, "(listener: ", listener, "thisObject: ", thisObject, ")");
+ if (!eventType)
+ return;
</ins><span class="cx">
</span><del>- if (!this._listeners)
- this._listeners = {};
-
- var listeners = this._listeners[eventType];
- if (!listeners)
- listeners = this._listeners[eventType] = [];
-
- // Prevent registering multiple times.
- for (var i = 0; i < listeners.length; ++i) {
- if (listeners[i].listener === listener && listeners[i].thisObject === thisObject)
</del><ins>+ console.assert(listener, "Object.addEventListener: invalid listener ", listener, "(event type: ", eventType, "thisObject: ", thisObject, ")");
+ if (!listener)
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><del>- listeners.push({thisObject, listener});
-};
</del><ins>+ if (!this._listeners)
+ this._listeners = {};
</ins><span class="cx">
</span><del>-WebInspector.Object.removeEventListener = function(eventType, listener, thisObject)
-{
- eventType = eventType || null;
- listener = listener || null;
- thisObject = thisObject || null;
</del><ins>+ var listeners = this._listeners[eventType];
+ if (!listeners)
+ listeners = this._listeners[eventType] = [];
</ins><span class="cx">
</span><del>- if (!this._listeners)
- return;
</del><ins>+ // Prevent registering multiple times.
+ for (var i = 0; i < listeners.length; ++i) {
+ if (listeners[i].listener === listener && listeners[i].thisObject === thisObject)
+ return;
+ }
</ins><span class="cx">
</span><del>- if (!eventType) {
- for (eventType in this._listeners)
- this.removeEventListener(eventType, listener, thisObject);
- return;
</del><ins>+ listeners.push({thisObject, listener});
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- var listeners = this._listeners[eventType];
- if (!listeners)
- return;
</del><ins>+ static removeEventListener(eventType, listener, thisObject)
+ {
+ eventType = eventType || null;
+ listener = listener || null;
+ thisObject = thisObject || null;
</ins><span class="cx">
</span><del>- for (var i = listeners.length - 1; i >= 0; --i) {
- if (listener && listeners[i].listener === listener && listeners[i].thisObject === thisObject)
- listeners.splice(i, 1);
- else if (!listener && thisObject && listeners[i].thisObject === thisObject)
- listeners.splice(i, 1);
- }
</del><ins>+ if (!this._listeners)
+ return;
</ins><span class="cx">
</span><del>- if (!listeners.length)
- delete this._listeners[eventType];
</del><ins>+ if (!eventType) {
+ for (eventType in this._listeners)
+ this.removeEventListener(eventType, listener, thisObject);
+ return;
+ }
</ins><span class="cx">
</span><del>- if (!Object.keys(this._listeners).length)
- delete this._listeners;
-};
</del><ins>+ var listeners = this._listeners[eventType];
+ if (!listeners)
+ return;
</ins><span class="cx">
</span><del>-WebInspector.Object.removeAllListeners = function()
-{
- delete this._listeners;
-};
</del><ins>+ for (var i = listeners.length - 1; i >= 0; --i) {
+ if (listener && listeners[i].listener === listener && listeners[i].thisObject === thisObject)
+ listeners.splice(i, 1);
+ else if (!listener && thisObject && listeners[i].thisObject === thisObject)
+ listeners.splice(i, 1);
+ }
</ins><span class="cx">
</span><del>-WebInspector.Object.hasEventListeners = function(eventType)
-{
- if (!this._listeners || !this._listeners[eventType])
- return false;
- return true;
-};
</del><ins>+ if (!listeners.length)
+ delete this._listeners[eventType];
</ins><span class="cx">
</span><del>-WebInspector.Object.prototype = {
- constructor: WebInspector.Object,
</del><ins>+ if (!Object.keys(this._listeners).length)
+ delete this._listeners;
+ }
</ins><span class="cx">
</span><del>- addEventListener: WebInspector.Object.addEventListener,
</del><ins>+ static removeAllListeners()
+ {
+ delete this._listeners;
+ }
</ins><span class="cx">
</span><del>- removeEventListener: WebInspector.Object.removeEventListener,
</del><ins>+ static hasEventListeners(eventType)
+ {
+ if (!this._listeners || !this._listeners[eventType])
+ return false;
+ return true;
+ }
</ins><span class="cx">
</span><del>- removeAllListeners: WebInspector.Object.removeAllListeners,
</del><ins>+ // Public
</ins><span class="cx">
</span><del>- hasEventListeners: WebInspector.Object.hasEventListeners,
</del><ins>+ addEventListener() { return WebInspector.Object.addEventListener.apply(this, arguments); }
+ removeEventListener() { return WebInspector.Object.removeEventListener.apply(this, arguments); }
+ removeAllListeners() { return WebInspector.Object.removeAllListeners.apply(this, arguments); }
+ hasEventListeners() { return WebInspector.Object.hasEventListeners.apply(this, arguments); }
</ins><span class="cx">
</span><del>- dispatchEventToListeners: function(eventType, eventData)
</del><ins>+ dispatchEventToListeners(eventType, eventData)
</ins><span class="cx"> {
</span><span class="cx"> var event = new WebInspector.Event(this, eventType, eventData);
</span><span class="cx">
</span><span class="lines">@@ -165,24 +153,38 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Event = function(target, type, data)
</del><ins>+// FIXME: Uses arguments.callee, so it cannot be in the class.
+WebInspector.Object.deprecatedAddConstructorFunctions = function(subclassConstructor)
</ins><span class="cx"> {
</span><del>- this.target = target;
- this.type = type;
- this.data = data;
- this.defaultPrevented = false;
- this._stoppedPropagation = false;
</del><ins>+ // Copies the relevant functions to the subclass constructor.
+ var list = ["addEventListener", "removeEventListener", "removeAllListeners", "hasEventListeners"];
+ for (var property of list) {
+ var value = WebInspector.Object[property];
+ if (typeof value !== "function")
+ continue;
+ if (value === arguments.callee)
+ continue;
+ subclassConstructor[property] = value;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Event.prototype = {
- constructor: WebInspector.Event,
</del><ins>+WebInspector.Event = class Event
+{
+ constructor(target, type, data)
+ {
+ this.target = target;
+ this.type = type;
+ this.data = data;
+ this.defaultPrevented = false;
+ this._stoppedPropagation = false;
+ }
</ins><span class="cx">
</span><del>- stopPropagation: function()
</del><ins>+ stopPropagation()
</ins><span class="cx"> {
</span><span class="cx"> this._stoppedPropagation = true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- preventDefault: function()
</del><ins>+ preventDefault()
</ins><span class="cx"> {
</span><span class="cx"> this.defaultPrevented = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseTestjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Test.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Test.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Test.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -103,7 +103,8 @@
</span><span class="cx"> // prototype, and prototype chain for the singleton InspectorTest.
</span><span class="cx"> InspectorTest.EventDispatcher = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> InspectorTest.EventDispatcher.Event = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersAnalyzerManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/AnalyzerManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/AnalyzerManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/AnalyzerManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.AnalyzerManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._eslintConfig = {
</span><span class="cx"> env: {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersAnnotatorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/Annotator.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/Annotator.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/Annotator.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -26,7 +26,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.Annotator = function(sourceCodeTextEditor)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> console.assert(sourceCodeTextEditor instanceof WebInspector.SourceCodeTextEditor, sourceCodeTextEditor);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersApplicationCacheManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/ApplicationCacheManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/ApplicationCacheManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/ApplicationCacheManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ApplicationCacheManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> if (window.ApplicationCacheAgent)
</span><span class="cx"> ApplicationCacheAgent.enable();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersBranchManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/BranchManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/BranchManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/BranchManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.BranchManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersCSSStyleManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.CSSStyleManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> if (window.CSSAgent)
</span><span class="cx"> CSSAgent.enable();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorCompletionControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorCompletionController.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.CodeMirrorCompletionController = function(codeMirror, delegate, stopCharactersRegex)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> console.assert(codeMirror);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorEditingControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorEditingController.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorEditingController.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorEditingController.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.CodeMirrorEditingController = function(codeMirror, marker)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._codeMirror = codeMirror;
</span><span class="cx"> this._marker = marker;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorTokenTrackingControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.CodeMirrorTokenTrackingController = function(codeMirror, delegate)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> console.assert(codeMirror);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -41,7 +41,8 @@
</span><span class="cx"> WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.DOMTreeManager);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.DOMTreeManager);
</ins><span class="cx">
</span><span class="cx"> WebInspector.DOMTreeManager.Event = {
</span><span class="cx"> AttributeModified: "dom-tree-manager-attribute-modified",
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDashboardManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DashboardManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DashboardManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DashboardManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.DashboardManager = function() {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._dashboards = {};
</span><span class="cx"> this._dashboards.default = new WebInspector.DefaultDashboard;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.DebuggerManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> if (window.DebuggerAgent)
</span><span class="cx"> DebuggerAgent.enable();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersFormatterSourceMapjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/FormatterSourceMap.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/FormatterSourceMap.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/FormatterSourceMap.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.FormatterSourceMap = function(originalLineEndings, formattedLineEndings, mapping)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._originalLineEndings = originalLineEndings;
</span><span class="cx"> this._formattedLineEndings = formattedLineEndings;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersFrameResourceManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.FrameResourceManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> if (window.PageAgent)
</span><span class="cx"> PageAgent.enable();
</span><span class="lines">@@ -37,7 +38,8 @@
</span><span class="cx"> this.initialize();
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.FrameResourceManager);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.FrameResourceManager);
</ins><span class="cx">
</span><span class="cx"> WebInspector.FrameResourceManager.Event = {
</span><span class="cx"> FrameWasAdded: "frame-resource-manager-frame-was-added",
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersIssueManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/IssueManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/IssueManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/IssueManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.IssueManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
</span><span class="cx"> WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.ActiveLogCleared, this._activeLogCleared, this);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersJavaScriptLogViewControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.JavaScriptLogViewController = function(element, scrollElement, textPrompt, delegate, historySettingIdentifier)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> console.assert(textPrompt instanceof WebInspector.ConsolePrompt);
</span><span class="cx"> console.assert(historySettingIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersJavaScriptRuntimeCompletionProviderjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.JavaScriptRuntimeCompletionProvider = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> console.assert(!WebInspector.JavaScriptRuntimeCompletionProvider._instance);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersLayerTreeManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/LayerTreeManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/LayerTreeManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/LayerTreeManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.LayerTreeManager = function() {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._supported = !!window.LayerTreeAgent;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersLogManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.LogManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersProbeManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/ProbeManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/ProbeManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/ProbeManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -26,7 +26,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ProbeManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> // Used to detect deleted probe actions.
</span><span class="cx"> this._knownProbeIdentifiersForBreakpoint = new Map;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersReplayManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -26,7 +26,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ReplayManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._sessionState = WebInspector.ReplayManager.SessionState.Inactive;
</span><span class="cx"> this._segmentState = WebInspector.ReplayManager.SegmentState.Unloaded;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersRuntimeManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/RuntimeManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/RuntimeManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/RuntimeManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.RuntimeManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> // Enable the RuntimeAgent to receive notification of execution contexts.
</span><span class="cx"> if (RuntimeAgent.enable)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersSourceMapManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/SourceMapManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/SourceMapManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/SourceMapManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.SourceMapManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._sourceMapURLMap = {};
</span><span class="cx"> this._downloadingSourceMaps = {};
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersStorageManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/StorageManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/StorageManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/StorageManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -26,7 +26,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.StorageManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> if (window.DOMStorageAgent)
</span><span class="cx"> DOMStorageAgent.enable();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineManager = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> WebInspector.Frame.addEventListener(WebInspector.Frame.Event.ProvisionalLoadStarted, this._startAutoCapturing, this);
</span><span class="cx"> WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
</span><span class="lines">@@ -431,10 +432,10 @@
</span><span class="cx">
</span><span class="cx"> var identifier = this._nextRecordingIdentifier++;
</span><span class="cx"> var newRecording = new WebInspector.TimelineRecording(identifier, WebInspector.UIString("Timeline Recording %d").format(identifier));
</span><del>- newRecording.addTimeline(new WebInspector.Timeline(WebInspector.TimelineRecord.Type.Network, newRecording));
- newRecording.addTimeline(new WebInspector.Timeline(WebInspector.TimelineRecord.Type.RunLoop, newRecording));
- newRecording.addTimeline(new WebInspector.Timeline(WebInspector.TimelineRecord.Type.Layout, newRecording));
- newRecording.addTimeline(new WebInspector.Timeline(WebInspector.TimelineRecord.Type.Script, newRecording));
</del><ins>+ newRecording.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.Network, newRecording));
+ newRecording.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.RunLoop, newRecording));
+ newRecording.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.Layout, newRecording));
+ newRecording.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.Script, newRecording));
</ins><span class="cx">
</span><span class="cx"> this._recordings.push(newRecording);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineManager.Event.RecordingCreated, {recording: newRecording});
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsAnalyzerMessagejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/AnalyzerMessage.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/AnalyzerMessage.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/AnalyzerMessage.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,36 +23,36 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.AnalyzerMessage = function(sourceCodeLocation, text, ruleIdentifier)
</del><ins>+WebInspector.AnalyzerMessage = class AnalyzerMessage extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(sourceCodeLocation, text, ruleIdentifier)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(sourceCodeLocation instanceof WebInspector.SourceCodeLocation);
- console.assert(typeof text === "string");
</del><ins>+ console.assert(sourceCodeLocation instanceof WebInspector.SourceCodeLocation);
+ console.assert(typeof text === "string");
</ins><span class="cx">
</span><del>- this._sourceCodeLocation = sourceCodeLocation;
- this._text = text;
- this._ruleIdentifier = ruleIdentifier;
-};
</del><ins>+ this._sourceCodeLocation = sourceCodeLocation;
+ this._text = text;
+ this._ruleIdentifier = ruleIdentifier;
+ }
</ins><span class="cx">
</span><del>-WebInspector.AnalyzerMessage.prototype = {
- constructor: WebInspector.AnalyzerMessage,
- __proto__: WebInspector.Object.prototype,
</del><ins>+ // Public
</ins><span class="cx">
</span><span class="cx"> get sourceCodeLocation()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCodeLocation;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceCode()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCodeLocation.sourceCode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get text()
</span><span class="cx"> {
</span><span class="cx"> return this._text;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get ruleIdentifier()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsApplicationCacheFramejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ApplicationCacheFrame.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ApplicationCacheFrame.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ApplicationCacheFrame.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,52 +23,49 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ApplicationCacheFrame = function(frame, manifest, status)
</del><ins>+WebInspector.ApplicationCacheFrame = class ApplicationCacheFrame extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- console.assert(frame instanceof WebInspector.Frame);
- console.assert(manifest instanceof WebInspector.ApplicationCacheManifest);
</del><ins>+ constructor(frame, manifest, status)
+ {
+ super();
</ins><span class="cx">
</span><del>- WebInspector.Object.call(this);
</del><ins>+ console.assert(frame instanceof WebInspector.Frame);
+ console.assert(manifest instanceof WebInspector.ApplicationCacheManifest);
</ins><span class="cx">
</span><del>- this._frame = frame;
- this._manifest = manifest;
- this._status = status;
-};
</del><ins>+ this._frame = frame;
+ this._manifest = manifest;
+ this._status = status;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ApplicationCacheFrame.TypeIdentifier = "application-cache-frame";
-WebInspector.ApplicationCacheFrame.FrameURLCookieKey = "application-cache-frame-url";
-WebInspector.ApplicationCacheFrame.ManifestURLCookieKey = "application-cache-frame-manifest-url";
-
-WebInspector.ApplicationCacheFrame.prototype = {
- constructor: WebInspector.ApplicationCacheFrame,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get frame()
</span><span class="cx"> {
</span><span class="cx"> return this._frame;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get manifest()
</span><span class="cx"> {
</span><span class="cx"> return this._manifest;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get status()
</span><span class="cx"> {
</span><span class="cx"> return this._status;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set status(status)
</span><span class="cx"> {
</span><span class="cx"> this._status = status;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.ApplicationCacheFrame.FrameURLCookieKey] = this.frame.url;
</span><span class="cx"> cookie[WebInspector.ApplicationCacheFrame.ManifestURLCookieKey] = this.manifest.manifestURL;
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.ApplicationCacheFrame.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.ApplicationCacheFrame.TypeIdentifier = "application-cache-frame";
+WebInspector.ApplicationCacheFrame.FrameURLCookieKey = "application-cache-frame-url";
+WebInspector.ApplicationCacheFrame.ManifestURLCookieKey = "application-cache-frame-manifest-url";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsApplicationCacheManifestjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ApplicationCacheManifest.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ApplicationCacheManifest.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ApplicationCacheManifest.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,20 +23,17 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ApplicationCacheManifest = function(manifestURL)
</del><ins>+WebInspector.ApplicationCacheManifest = class ApplicationCacheManifest extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(manifestURL)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._manifestURL = manifestURL;
-};
</del><ins>+ this._manifestURL = manifestURL;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ApplicationCacheManifest.prototype = {
- constructor: WebInspector.ApplicationCacheManifest,
-
</del><span class="cx"> get manifestURL()
</span><span class="cx"> {
</span><span class="cx"> return this._manifestURL;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.ApplicationCacheManifest.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsBackForwardEntryjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,35 +24,35 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.BackForwardEntry = function(contentView, cookie)
</del><ins>+WebInspector.BackForwardEntry = class BackForwardEntry extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
- this._contentView = contentView;
- // Cookies are compared with Object.shallowEqual, so should not store objects or arrays.
- this._cookie = cookie || {};
- this._scrollPositions = [];
</del><ins>+ constructor(contentView, cookie)
+ {
+ super();
</ins><span class="cx">
</span><del>- contentView.saveToCookie(this._cookie);
-};
</del><ins>+ this._contentView = contentView;
</ins><span class="cx">
</span><del>-WebInspector.BackForwardEntry.prototype = {
- constructor: WebInspector.BackForwardEntry,
- __proto__: WebInspector.Object.prototype,
</del><ins>+ // Cookies are compared with Object.shallowEqual, so should not store objects or arrays.
+ this._cookie = cookie || {};
+ this._scrollPositions = [];
</ins><span class="cx">
</span><ins>+ contentView.saveToCookie(this._cookie);
+ }
+
</ins><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get contentView()
</span><span class="cx"> {
</span><span class="cx"> return this._contentView;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get cookie()
</span><span class="cx"> {
</span><span class="cx"> // Cookies are immutable; they represent a specific navigation action.
</span><span class="cx"> return Object.shallowCopy(this._cookie);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- prepareToShow: function(shouldCallShown)
</del><ins>+ prepareToShow(shouldCallShown)
</ins><span class="cx"> {
</span><span class="cx"> this._restoreFromCookie();
</span><span class="cx">
</span><span class="lines">@@ -60,25 +60,25 @@
</span><span class="cx"> if (shouldCallShown)
</span><span class="cx"> this.contentView.shown();
</span><span class="cx"> this.contentView.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- prepareToHide: function()
</del><ins>+ prepareToHide()
</ins><span class="cx"> {
</span><span class="cx"> this.contentView.visible = false;
</span><span class="cx"> this.contentView.hidden();
</span><span class="cx">
</span><span class="cx"> this._saveScrollPositions();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _restoreFromCookie: function()
</del><ins>+ _restoreFromCookie()
</ins><span class="cx"> {
</span><span class="cx"> this._restoreScrollPositions();
</span><span class="cx"> this.contentView.restoreFromCookie(this.cookie);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _restoreScrollPositions: function()
</del><ins>+ _restoreScrollPositions()
</ins><span class="cx"> {
</span><span class="cx"> // If no scroll positions are saved, do nothing.
</span><span class="cx"> if (!this._scrollPositions.length)
</span><span class="lines">@@ -100,9 +100,9 @@
</span><span class="cx"> // the user won't be left in a weird horizontal position.
</span><span class="cx"> element.scrollLeft = position.isScrolledToBottom ? 0 : position.scrollLeft;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _saveScrollPositions: function()
</del><ins>+ _saveScrollPositions()
</ins><span class="cx"> {
</span><span class="cx"> var scrollableElements = this.contentView.scrollableElements || [];
</span><span class="cx"> var scrollPositions = [];
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsBranchjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Branch.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Branch.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Branch.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,26 +23,25 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.Branch = function(displayName, revisions, locked)
</del><ins>+WebInspector.Branch = class Branch extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(displayName, revisions, locked)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(displayName);
</del><ins>+ console.assert(displayName);
</ins><span class="cx">
</span><del>- this._displayName = displayName;
- this._revisions = revisions instanceof Array ? revisions.slice() : [];
- this._locked = locked || false;
-};
</del><ins>+ this._displayName = displayName;
+ this._revisions = revisions instanceof Array ? revisions.slice() : [];
+ this._locked = locked || false;
+ }
</ins><span class="cx">
</span><del>-WebInspector.Branch.prototype = {
- constructor: WebInspector.Branch,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get displayName()
</span><span class="cx"> {
</span><span class="cx"> return this._displayName;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set displayName(displayName)
</span><span class="cx"> {
</span><span class="lines">@@ -51,19 +50,19 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._displayName = displayName;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get revisions()
</span><span class="cx"> {
</span><span class="cx"> return this._revisions;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get locked()
</span><span class="cx"> {
</span><span class="cx"> return this._locked;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revisionForRepresentedObject: function(representedObject, doNotCreateIfNeeded)
</del><ins>+ revisionForRepresentedObject(representedObject, doNotCreateIfNeeded)
</ins><span class="cx"> {
</span><span class="cx"> for (var i = 0; i < this._revisions.length; ++i) {
</span><span class="cx"> var revision = this._revisions[i];
</span><span class="lines">@@ -82,9 +81,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addRevision: function(revision)
</del><ins>+ addRevision(revision)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(revision instanceof WebInspector.Revision);
</span><span class="cx">
</span><span class="lines">@@ -95,9 +94,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._revisions.push(revision);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeRevision: function(revision)
</del><ins>+ removeRevision(revision)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(revision instanceof WebInspector.Revision);
</span><span class="cx">
</span><span class="lines">@@ -105,45 +104,43 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._revisions.remove(revision);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- reset: function()
</del><ins>+ reset()
</ins><span class="cx"> {
</span><span class="cx"> if (this._locked)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._revisions = [];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- fork: function(displayName)
</del><ins>+ fork(displayName)
</ins><span class="cx"> {
</span><span class="cx"> var copiedRevisions = this._revisions.map(function(revision) { return revision.copy(); });
</span><span class="cx"> return new WebInspector.Branch(displayName, copiedRevisions);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- apply: function()
</del><ins>+ apply()
</ins><span class="cx"> {
</span><span class="cx"> for (var i = 0; i < this._revisions.length; ++i)
</span><span class="cx"> this._revisions[i].apply();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revert: function()
</del><ins>+ revert()
</ins><span class="cx"> {
</span><span class="cx"> for (var i = this._revisions.length - 1; i >= 0; --i)
</span><span class="cx"> this._revisions[i].revert();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- lock: function()
</del><ins>+ lock()
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!this._locked);
</span><span class="cx"> this._locked = true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- unlock: function()
</del><ins>+ unlock()
</ins><span class="cx"> {
</span><span class="cx"> console.assert(this._locked);
</span><span class="cx"> this._locked = false;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.Branch.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsBreakpointjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,102 +23,76 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.Breakpoint = function(sourceCodeLocationOrInfo, disabled, condition)
</del><ins>+WebInspector.Breakpoint = class Breakpoint extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(sourceCodeLocationOrInfo, disabled, condition)
+ {
+ super();
</ins><span class="cx">
</span><del>- if (sourceCodeLocationOrInfo instanceof WebInspector.SourceCodeLocation) {
- var sourceCode = sourceCodeLocationOrInfo.sourceCode;
- var url = sourceCode ? sourceCode.url : null;
- var scriptIdentifier = sourceCode instanceof WebInspector.Script ? sourceCode.id : null;
- var location = sourceCodeLocationOrInfo;
- } else if (sourceCodeLocationOrInfo && typeof sourceCodeLocationOrInfo === "object") {
- var url = sourceCodeLocationOrInfo.url;
- var lineNumber = sourceCodeLocationOrInfo.lineNumber || 0;
- var columnNumber = sourceCodeLocationOrInfo.columnNumber || 0;
- var location = new WebInspector.SourceCodeLocation(null, lineNumber, columnNumber);
- var autoContinue = sourceCodeLocationOrInfo.autoContinue || false;
- var actions = sourceCodeLocationOrInfo.actions || [];
- for (var i = 0; i < actions.length; ++i)
- actions[i] = new WebInspector.BreakpointAction(this, actions[i]);
- disabled = sourceCodeLocationOrInfo.disabled;
- condition = sourceCodeLocationOrInfo.condition;
- } else
- console.error("Unexpected type passed to WebInspector.Breakpoint", sourceCodeLocationOrInfo);
</del><ins>+ if (sourceCodeLocationOrInfo instanceof WebInspector.SourceCodeLocation) {
+ var sourceCode = sourceCodeLocationOrInfo.sourceCode;
+ var url = sourceCode ? sourceCode.url : null;
+ var scriptIdentifier = sourceCode instanceof WebInspector.Script ? sourceCode.id : null;
+ var location = sourceCodeLocationOrInfo;
+ } else if (sourceCodeLocationOrInfo && typeof sourceCodeLocationOrInfo === "object") {
+ var url = sourceCodeLocationOrInfo.url;
+ var lineNumber = sourceCodeLocationOrInfo.lineNumber || 0;
+ var columnNumber = sourceCodeLocationOrInfo.columnNumber || 0;
+ var location = new WebInspector.SourceCodeLocation(null, lineNumber, columnNumber);
+ var autoContinue = sourceCodeLocationOrInfo.autoContinue || false;
+ var actions = sourceCodeLocationOrInfo.actions || [];
+ for (var i = 0; i < actions.length; ++i)
+ actions[i] = new WebInspector.BreakpointAction(this, actions[i]);
+ disabled = sourceCodeLocationOrInfo.disabled;
+ condition = sourceCodeLocationOrInfo.condition;
+ } else
+ console.error("Unexpected type passed to WebInspector.Breakpoint", sourceCodeLocationOrInfo);
</ins><span class="cx">
</span><del>- this._id = null;
- this._url = url || null;
- this._scriptIdentifier = scriptIdentifier || null;
- this._disabled = disabled || false;
- this._condition = condition || "";
- this._autoContinue = autoContinue || false;
- this._actions = actions || [];
- this._resolved = false;
</del><ins>+ this._id = null;
+ this._url = url || null;
+ this._scriptIdentifier = scriptIdentifier || null;
+ this._disabled = disabled || false;
+ this._condition = condition || "";
+ this._autoContinue = autoContinue || false;
+ this._actions = actions || [];
+ this._resolved = false;
</ins><span class="cx">
</span><del>- this._sourceCodeLocation = location;
- this._sourceCodeLocation.addEventListener(WebInspector.SourceCodeLocation.Event.LocationChanged, this._sourceCodeLocationLocationChanged, this);
- this._sourceCodeLocation.addEventListener(WebInspector.SourceCodeLocation.Event.DisplayLocationChanged, this._sourceCodeLocationDisplayLocationChanged, this);
-};
</del><ins>+ this._sourceCodeLocation = location;
+ this._sourceCodeLocation.addEventListener(WebInspector.SourceCodeLocation.Event.LocationChanged, this._sourceCodeLocationLocationChanged, this);
+ this._sourceCodeLocation.addEventListener(WebInspector.SourceCodeLocation.Event.DisplayLocationChanged, this._sourceCodeLocationDisplayLocationChanged, this);
+ }
</ins><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.Breakpoint);
-
-WebInspector.Breakpoint.PopoverClassName = "edit-breakpoint-popover-content";
-WebInspector.Breakpoint.WidePopoverClassName = "wide";
-WebInspector.Breakpoint.PopoverConditionInputId = "edit-breakpoint-popover-condition";
-WebInspector.Breakpoint.PopoverOptionsAutoContinueInputId = "edit-breakpoint-popoover-auto-continue";
-WebInspector.Breakpoint.HiddenStyleClassName = "hidden";
-
-WebInspector.Breakpoint.DefaultBreakpointActionType = WebInspector.BreakpointAction.Type.Log;
-
-WebInspector.Breakpoint.TypeIdentifier = "breakpoint";
-WebInspector.Breakpoint.URLCookieKey = "breakpoint-url";
-WebInspector.Breakpoint.LineNumberCookieKey = "breakpoint-line-number";
-WebInspector.Breakpoint.ColumnNumberCookieKey = "breakpoint-column-number";
-
-WebInspector.Breakpoint.Event = {
- DisabledStateDidChange: "breakpoint-disabled-state-did-change",
- ResolvedStateDidChange: "breakpoint-resolved-state-did-change",
- ConditionDidChange: "breakpoint-condition-did-change",
- ActionsDidChange: "breakpoint-actions-did-change",
- AutoContinueDidChange: "breakpoint-auto-continue-did-change",
- LocationDidChange: "breakpoint-location-did-change",
- DisplayLocationDidChange: "breakpoint-display-location-did-change",
-};
-
-WebInspector.Breakpoint.prototype = {
- constructor: WebInspector.Breakpoint,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> return this._id;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set id(id)
</span><span class="cx"> {
</span><span class="cx"> this._id = id || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get url()
</span><span class="cx"> {
</span><span class="cx"> return this._url;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get scriptIdentifier()
</span><span class="cx"> {
</span><span class="cx"> return this._scriptIdentifier;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceCodeLocation()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCodeLocation;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get resolved()
</span><span class="cx"> {
</span><span class="cx"> return this._resolved;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set resolved(resolved)
</span><span class="cx"> {
</span><span class="lines">@@ -135,12 +109,12 @@
</span><span class="cx"> this._resolved = resolved || false;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Breakpoint.Event.ResolvedStateDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get disabled()
</span><span class="cx"> {
</span><span class="cx"> return this._disabled;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set disabled(disabled)
</span><span class="cx"> {
</span><span class="lines">@@ -150,12 +124,12 @@
</span><span class="cx"> this._disabled = disabled || false;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Breakpoint.Event.DisabledStateDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get condition()
</span><span class="cx"> {
</span><span class="cx"> return this._condition;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set condition(condition)
</span><span class="cx"> {
</span><span class="lines">@@ -165,12 +139,12 @@
</span><span class="cx"> this._condition = condition;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Breakpoint.Event.ConditionDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get autoContinue()
</span><span class="cx"> {
</span><span class="cx"> return this._autoContinue;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set autoContinue(cont)
</span><span class="cx"> {
</span><span class="lines">@@ -180,12 +154,12 @@
</span><span class="cx"> this._autoContinue = cont;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Breakpoint.Event.AutoContinueDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get actions()
</span><span class="cx"> {
</span><span class="cx"> return this._actions;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get options()
</span><span class="cx"> {
</span><span class="lines">@@ -194,7 +168,7 @@
</span><span class="cx"> actions: this._serializableActions(),
</span><span class="cx"> autoContinue: this._autoContinue
</span><span class="cx"> };
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get info()
</span><span class="cx"> {
</span><span class="lines">@@ -208,16 +182,16 @@
</span><span class="cx"> actions: this._serializableActions(),
</span><span class="cx"> autoContinue: this._autoContinue
</span><span class="cx"> };
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get probeActions()
</span><span class="cx"> {
</span><span class="cx"> return this._actions.filter(function(action) {
</span><span class="cx"> return action.type === WebInspector.BreakpointAction.Type.Probe;
</span><span class="cx"> });
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- cycleToNextMode: function()
</del><ins>+ cycleToNextMode()
</ins><span class="cx"> {
</span><span class="cx"> if (this.disabled) {
</span><span class="cx"> // When cycling, clear auto-continue when going from disabled to enabled.
</span><span class="lines">@@ -237,9 +211,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.disabled = true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- appendContextMenuItems: function(contextMenu, breakpointDisplayElement)
</del><ins>+ appendContextMenuItems(contextMenu, breakpointDisplayElement)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(document.body.contains(breakpointDisplayElement), "breakpoint popover display element must be in the DOM");
</span><span class="cx">
</span><span class="lines">@@ -293,9 +267,9 @@
</span><span class="cx"> contextMenu.appendSeparator();
</span><span class="cx"> contextMenu.appendItem(WebInspector.UIString("Reveal in Original Resource"), revealOriginalSourceCodeLocation.bind(this));
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- createAction: function(type, precedingAction, data)
</del><ins>+ createAction(type, precedingAction, data)
</ins><span class="cx"> {
</span><span class="cx"> var newAction = new WebInspector.BreakpointAction(this, type, data || null);
</span><span class="cx">
</span><span class="lines">@@ -313,9 +287,9 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Breakpoint.Event.ActionsDidChange);
</span><span class="cx">
</span><span class="cx"> return newAction;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- recreateAction: function(type, actionToReplace)
</del><ins>+ recreateAction(type, actionToReplace)
</ins><span class="cx"> {
</span><span class="cx"> var newAction = new WebInspector.BreakpointAction(this, type, null);
</span><span class="cx">
</span><span class="lines">@@ -329,9 +303,9 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Breakpoint.Event.ActionsDidChange);
</span><span class="cx">
</span><span class="cx"> return newAction;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeAction: function(action)
</del><ins>+ removeAction(action)
</ins><span class="cx"> {
</span><span class="cx"> var index = this._actions.indexOf(action);
</span><span class="cx"> console.assert(index !== -1);
</span><span class="lines">@@ -344,9 +318,9 @@
</span><span class="cx"> this.autoContinue = false;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Breakpoint.Event.ActionsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- clearActions: function(type)
</del><ins>+ clearActions(type)
</ins><span class="cx"> {
</span><span class="cx"> if (!type)
</span><span class="cx"> this._actions = [];
</span><span class="lines">@@ -354,18 +328,18 @@
</span><span class="cx"> this._actions = this._actions.filter(function(action) { action.type !== type; });
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Breakpoint.Event.ActionsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.Breakpoint.URLCookieKey] = this.url;
</span><span class="cx"> cookie[WebInspector.Breakpoint.LineNumberCookieKey] = this.sourceCodeLocation.lineNumber;
</span><span class="cx"> cookie[WebInspector.Breakpoint.ColumnNumberCookieKey] = this.sourceCodeLocation.columnNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protected (Called by BreakpointAction)
</span><span class="cx">
</span><del>- breakpointActionDidChange: function(action)
</del><ins>+ breakpointActionDidChange(action)
</ins><span class="cx"> {
</span><span class="cx"> var index = this._actions.indexOf(action);
</span><span class="cx"> console.assert(index !== -1);
</span><span class="lines">@@ -373,43 +347,43 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Breakpoint.Event.ActionsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _serializableActions: function()
</del><ins>+ _serializableActions()
</ins><span class="cx"> {
</span><span class="cx"> var actions = [];
</span><span class="cx"> for (var i = 0; i < this._actions.length; ++i)
</span><span class="cx"> actions.push(this._actions[i].info);
</span><span class="cx"> return actions;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _popoverToggleEnabledCheckboxChanged: function(event)
</del><ins>+ _popoverToggleEnabledCheckboxChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> this.disabled = !event.target.checked;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _popoverConditionInputChanged: function(event)
</del><ins>+ _popoverConditionInputChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> this.condition = event.target.value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _popoverToggleAutoContinueCheckboxChanged: function(event)
</del><ins>+ _popoverToggleAutoContinueCheckboxChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> this.autoContinue = event.target.checked;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _popoverConditionInputKeyDown: function(event)
</del><ins>+ _popoverConditionInputKeyDown(event)
</ins><span class="cx"> {
</span><span class="cx"> if (this._keyboardShortcutEsc.matchesEvent(event) || this._keyboardShortcutEnter.matchesEvent(event)) {
</span><span class="cx"> this._popover.dismiss();
</span><span class="cx"> event.stopPropagation();
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _editBreakpointPopoverContentElement: function()
</del><ins>+ _editBreakpointPopoverContentElement()
</ins><span class="cx"> {
</span><span class="cx"> var content = this._popoverContentElement = document.createElement("div");
</span><span class="cx"> content.className = WebInspector.Breakpoint.PopoverClassName;
</span><span class="lines">@@ -478,9 +452,9 @@
</span><span class="cx"> content.appendChild(table);
</span><span class="cx">
</span><span class="cx"> return content;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _popoverActionsCreateAddActionButton: function()
</del><ins>+ _popoverActionsCreateAddActionButton()
</ins><span class="cx"> {
</span><span class="cx"> this._popoverContentElement.classList.remove(WebInspector.Breakpoint.WidePopoverClassName);
</span><span class="cx"> this._actionsContainer.removeChildren();
</span><span class="lines">@@ -488,9 +462,9 @@
</span><span class="cx"> var addActionButton = this._actionsContainer.appendChild(document.createElement("button"));
</span><span class="cx"> addActionButton.textContent = WebInspector.UIString("Add Action");
</span><span class="cx"> addActionButton.addEventListener("click", this._popoverActionsAddActionButtonClicked.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _popoverActionsAddActionButtonClicked: function(event)
</del><ins>+ _popoverActionsAddActionButtonClicked(event)
</ins><span class="cx"> {
</span><span class="cx"> this._popoverContentElement.classList.add(WebInspector.Breakpoint.WidePopoverClassName);
</span><span class="cx"> this._actionsContainer.removeChildren();
</span><span class="lines">@@ -500,9 +474,9 @@
</span><span class="cx"> this._popoverActionsInsertBreakpointActionView(newBreakpointActionView, -1);
</span><span class="cx"> this._popoverOptionsRowElement.classList.remove(WebInspector.Breakpoint.HiddenStyleClassName);
</span><span class="cx"> this._popover.update();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _popoverActionsInsertBreakpointActionView: function(breakpointActionView, index)
</del><ins>+ _popoverActionsInsertBreakpointActionView(breakpointActionView, index)
</ins><span class="cx"> {
</span><span class="cx"> if (index === -1)
</span><span class="cx"> this._actionsContainer.appendChild(breakpointActionView.element);
</span><span class="lines">@@ -510,9 +484,9 @@
</span><span class="cx"> var nextElement = this._actionsContainer.children[index + 1] || null;
</span><span class="cx"> this._actionsContainer.insertBefore(breakpointActionView.element, nextElement);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- breakpointActionViewAppendActionView: function(breakpointActionView, newAction)
</del><ins>+ breakpointActionViewAppendActionView(breakpointActionView, newAction)
</ins><span class="cx"> {
</span><span class="cx"> var newBreakpointActionView = new WebInspector.BreakpointActionView(newAction, this);
</span><span class="cx">
</span><span class="lines">@@ -529,9 +503,9 @@
</span><span class="cx"> this._popoverOptionsRowElement.classList.remove(WebInspector.Breakpoint.HiddenStyleClassName);
</span><span class="cx">
</span><span class="cx"> this._popover.update();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- breakpointActionViewRemoveActionView: function(breakpointActionView)
</del><ins>+ breakpointActionViewRemoveActionView(breakpointActionView)
</ins><span class="cx"> {
</span><span class="cx"> breakpointActionView.element.remove();
</span><span class="cx">
</span><span class="lines">@@ -542,14 +516,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._popover.update();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- breakpointActionViewResized: function(breakpointActionView)
</del><ins>+ breakpointActionViewResized(breakpointActionView)
</ins><span class="cx"> {
</span><span class="cx"> this._popover.update();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- willDismissPopover: function(popover)
</del><ins>+ willDismissPopover(popover)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(this._popover === popover);
</span><span class="cx"> delete this._popoverContentElement;
</span><span class="lines">@@ -557,9 +531,9 @@
</span><span class="cx"> delete this._popoverOptionsCheckboxElement;
</span><span class="cx"> delete this._actionsContainer;
</span><span class="cx"> delete this._popover;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _showEditBreakpointPopover: function(boundingClientRect)
</del><ins>+ _showEditBreakpointPopover(boundingClientRect)
</ins><span class="cx"> {
</span><span class="cx"> var bounds = WebInspector.Rect.rectFromClientRect(boundingClientRect);
</span><span class="cx"> bounds.origin.x -= 1; // Move the anchor left one pixel so it looks more centered.
</span><span class="lines">@@ -574,17 +548,38 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> document.getElementById(WebInspector.Breakpoint.PopoverConditionInputId).select();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _sourceCodeLocationLocationChanged: function(event)
</del><ins>+ _sourceCodeLocationLocationChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Breakpoint.Event.LocationDidChange, event.data);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _sourceCodeLocationDisplayLocationChanged: function(event)
</del><ins>+ _sourceCodeLocationDisplayLocationChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Breakpoint.Event.DisplayLocationDidChange, event.data);
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Breakpoint.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.Breakpoint.PopoverClassName = "edit-breakpoint-popover-content";
+WebInspector.Breakpoint.WidePopoverClassName = "wide";
+WebInspector.Breakpoint.PopoverConditionInputId = "edit-breakpoint-popover-condition";
+WebInspector.Breakpoint.PopoverOptionsAutoContinueInputId = "edit-breakpoint-popoover-auto-continue";
+WebInspector.Breakpoint.HiddenStyleClassName = "hidden";
+
+WebInspector.Breakpoint.DefaultBreakpointActionType = WebInspector.BreakpointAction.Type.Log;
+
+WebInspector.Breakpoint.TypeIdentifier = "breakpoint";
+WebInspector.Breakpoint.URLCookieKey = "breakpoint-url";
+WebInspector.Breakpoint.LineNumberCookieKey = "breakpoint-line-number";
+WebInspector.Breakpoint.ColumnNumberCookieKey = "breakpoint-column-number";
+
+WebInspector.Breakpoint.Event = {
+ DisabledStateDidChange: "breakpoint-disabled-state-did-change",
+ ResolvedStateDidChange: "breakpoint-resolved-state-did-change",
+ ConditionDidChange: "breakpoint-condition-did-change",
+ ActionsDidChange: "breakpoint-actions-did-change",
+ AutoContinueDidChange: "breakpoint-auto-continue-did-change",
+ LocationDidChange: "breakpoint-location-did-change",
+ DisplayLocationDidChange: "breakpoint-display-location-did-change",
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsBreakpointActionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/BreakpointAction.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/BreakpointAction.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/BreakpointAction.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,60 +23,51 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.BreakpointAction = function(breakpoint, typeOrInfo, data)
</del><ins>+WebInspector.BreakpointAction = class BreakpointAction extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(breakpoint, typeOrInfo, data)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(breakpoint);
- console.assert(typeOrInfo);
</del><ins>+ console.assert(breakpoint);
+ console.assert(typeOrInfo);
</ins><span class="cx">
</span><del>- this._breakpoint = breakpoint;
</del><ins>+ this._breakpoint = breakpoint;
</ins><span class="cx">
</span><del>- if (typeof typeOrInfo === "string") {
- this._type = typeOrInfo;
- this._data = data || null;
- } else if (typeof typeOrInfo === "object") {
- this._type = typeOrInfo.type;
- this._data = typeOrInfo.data || null;
- } else
- console.error("Unexpected type passed to WebInspector.BreakpointAction");
</del><ins>+ if (typeof typeOrInfo === "string") {
+ this._type = typeOrInfo;
+ this._data = data || null;
+ } else if (typeof typeOrInfo === "object") {
+ this._type = typeOrInfo.type;
+ this._data = typeOrInfo.data || null;
+ } else
+ console.error("Unexpected type passed to WebInspector.BreakpointAction");
</ins><span class="cx">
</span><del>- console.assert(typeof this._type === "string");
- this._id = WebInspector.debuggerManager.nextBreakpointActionIdentifier;
-};
</del><ins>+ console.assert(typeof this._type === "string");
+ this._id = WebInspector.debuggerManager.nextBreakpointActionIdentifier;
+ }
</ins><span class="cx">
</span><del>-WebInspector.BreakpointAction.Type = {
- Log: "log",
- Evaluate: "evaluate",
- Sound: "sound",
- Probe: "probe"
-};
-
-WebInspector.BreakpointAction.prototype = {
- constructor: WebInspector.BreakpointAction,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get breakpoint()
</span><span class="cx"> {
</span><span class="cx"> return this._breakpoint;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> return this._id;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get data()
</span><span class="cx"> {
</span><span class="cx"> return this._data;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set data(data)
</span><span class="cx"> {
</span><span class="lines">@@ -86,7 +77,7 @@
</span><span class="cx"> this._data = data;
</span><span class="cx">
</span><span class="cx"> this._breakpoint.breakpointActionDidChange(this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get info()
</span><span class="cx"> {
</span><span class="lines">@@ -96,3 +87,10 @@
</span><span class="cx"> return obj;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.BreakpointAction.Type = {
+ Log: "log",
+ Evaluate: "evaluate",
+ Sound: "sound",
+ Probe: "probe"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSCompletionsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSCompletions.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -31,142 +31,145 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.CSSCompletions = function(properties, acceptEmptyPrefix)
</del><ins>+WebInspector.CSSCompletions = class CSSCompletions
</ins><span class="cx"> {
</span><del>- this._values = [];
- this._longhands = {};
- this._shorthands = {};
</del><ins>+ constructor(properties, acceptEmptyPrefix)
+ {
+ this._values = [];
+ this._longhands = {};
+ this._shorthands = {};
</ins><span class="cx">
</span><del>- for (var i = 0; i < properties.length; ++i) {
- // COMPATIBILITY (iOS 6): This used to be an array of strings,
- // now it contains objects with a 'name' property. Support both here.
- var property = properties[i];
- if (typeof property === "string") {
- this._values.push(property);
- continue;
- }
</del><ins>+ for (var i = 0; i < properties.length; ++i) {
+ // COMPATIBILITY (iOS 6): This used to be an array of strings,
+ // now it contains objects with a 'name' property. Support both here.
+ var property = properties[i];
+ if (typeof property === "string") {
+ this._values.push(property);
+ continue;
+ }
</ins><span class="cx">
</span><del>- var propertyName = property.name;
- this._values.push(propertyName);
</del><ins>+ var propertyName = property.name;
+ this._values.push(propertyName);
</ins><span class="cx">
</span><del>- var longhands = property.longhands;
- if (longhands) {
- this._longhands[propertyName] = longhands;
</del><ins>+ var longhands = property.longhands;
+ if (longhands) {
+ this._longhands[propertyName] = longhands;
</ins><span class="cx">
</span><del>- for (var j = 0; j < longhands.length; ++j) {
- var longhandName = longhands[j];
</del><ins>+ for (var j = 0; j < longhands.length; ++j) {
+ var longhandName = longhands[j];
</ins><span class="cx">
</span><del>- var shorthands = this._shorthands[longhandName];
- if (!shorthands) {
- shorthands = [];
- this._shorthands[longhandName] = shorthands;
</del><ins>+ var shorthands = this._shorthands[longhandName];
+ if (!shorthands) {
+ shorthands = [];
+ this._shorthands[longhandName] = shorthands;
+ }
+
+ shorthands.push(propertyName);
</ins><span class="cx"> }
</span><del>-
- shorthands.push(propertyName);
</del><span class="cx"> }
</span><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- this._values.sort();
</del><ins>+ this._values.sort();
</ins><span class="cx">
</span><del>- this._acceptEmptyPrefix = acceptEmptyPrefix;
-};
</del><ins>+ this._acceptEmptyPrefix = acceptEmptyPrefix;
+ }
</ins><span class="cx">
</span><del>-WebInspector.CSSCompletions.cssNameCompletions = null;
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.CSSCompletions.requestCSSNameCompletions = function()
-{
- if (WebInspector.CSSCompletions.cssNameCompletions)
- return;
-
- function propertyNamesCallback(error, names)
</del><ins>+ static requestCSSNameCompletions()
</ins><span class="cx"> {
</span><del>- if (error)
</del><ins>+ if (WebInspector.CSSCompletions.cssNameCompletions)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- WebInspector.CSSCompletions.cssNameCompletions = new WebInspector.CSSCompletions(names, false);
</del><ins>+ function propertyNamesCallback(error, names)
+ {
+ if (error)
+ return;
</ins><span class="cx">
</span><del>- WebInspector.CSSKeywordCompletions.addCustomCompletions(names);
</del><ins>+ WebInspector.CSSCompletions.cssNameCompletions = new WebInspector.CSSCompletions(names, false);
</ins><span class="cx">
</span><del>- // CodeMirror is not included by tests so we shouldn't assume it always exists.
- // If it isn't available we skip MIME type associations.
- if (!window.CodeMirror)
- return;
</del><ins>+ WebInspector.CSSKeywordCompletions.addCustomCompletions(names);
</ins><span class="cx">
</span><del>- var propertyNamesForCodeMirror = {};
- var valueKeywordsForCodeMirror = {"inherit": true, "initial": true};
- var colorKeywordsForCodeMirror = {};
</del><ins>+ // CodeMirror is not included by tests so we shouldn't assume it always exists.
+ // If it isn't available we skip MIME type associations.
+ if (!window.CodeMirror)
+ return;
</ins><span class="cx">
</span><del>- function nameForCodeMirror(name)
- {
- // CodeMirror parses the vendor prefix separate from the property or keyword name,
- // so we need to strip vendor prefixes from our names. Also strip function parenthesis.
- return name.replace(/^-[^-]+-/, "").replace(/\(\)$/, "");
- }
</del><ins>+ var propertyNamesForCodeMirror = {};
+ var valueKeywordsForCodeMirror = {"inherit": true, "initial": true};
+ var colorKeywordsForCodeMirror = {};
</ins><span class="cx">
</span><del>- function collectPropertyNameForCodeMirror(propertyName)
- {
- // Properties can also be value keywords, like when used in a transition.
- // So we add them to both lists.
- var codeMirrorPropertyName = nameForCodeMirror(propertyName);
- propertyNamesForCodeMirror[codeMirrorPropertyName] = true;
- valueKeywordsForCodeMirror[codeMirrorPropertyName] = true;
- }
</del><ins>+ function nameForCodeMirror(name)
+ {
+ // CodeMirror parses the vendor prefix separate from the property or keyword name,
+ // so we need to strip vendor prefixes from our names. Also strip function parenthesis.
+ return name.replace(/^-[^-]+-/, "").replace(/\(\)$/, "");
+ }
</ins><span class="cx">
</span><del>- for (var i = 0; i < names.length; ++i) {
- // COMPATIBILITY (iOS 6): This used to be an array of strings,
- // now it contains objects with a 'name' property. Support both here.
- var property = names[i];
- if (typeof property === "string")
- collectPropertyNameForCodeMirror(property);
- else
- collectPropertyNameForCodeMirror(property.name);
- }
</del><ins>+ function collectPropertyNameForCodeMirror(propertyName)
+ {
+ // Properties can also be value keywords, like when used in a transition.
+ // So we add them to both lists.
+ var codeMirrorPropertyName = nameForCodeMirror(propertyName);
+ propertyNamesForCodeMirror[codeMirrorPropertyName] = true;
+ valueKeywordsForCodeMirror[codeMirrorPropertyName] = true;
+ }
</ins><span class="cx">
</span><del>- for (var propertyName in WebInspector.CSSKeywordCompletions._propertyKeywordMap) {
- var keywords = WebInspector.CSSKeywordCompletions._propertyKeywordMap[propertyName];
- for (var i = 0; i < keywords.length; ++i) {
- // Skip numbers, like the ones defined for font-weight.
- if (!isNaN(Number(keywords[i])))
- continue;
- valueKeywordsForCodeMirror[nameForCodeMirror(keywords[i])] = true;
</del><ins>+ for (var i = 0; i < names.length; ++i) {
+ // COMPATIBILITY (iOS 6): This used to be an array of strings,
+ // now it contains objects with a 'name' property. Support both here.
+ var property = names[i];
+ if (typeof property === "string")
+ collectPropertyNameForCodeMirror(property);
+ else
+ collectPropertyNameForCodeMirror(property.name);
</ins><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- WebInspector.CSSKeywordCompletions._colors.forEach(function(colorName) {
- colorKeywordsForCodeMirror[nameForCodeMirror(colorName)] = true;
- });
</del><ins>+ for (var propertyName in WebInspector.CSSKeywordCompletions._propertyKeywordMap) {
+ var keywords = WebInspector.CSSKeywordCompletions._propertyKeywordMap[propertyName];
+ for (var i = 0; i < keywords.length; ++i) {
+ // Skip numbers, like the ones defined for font-weight.
+ if (!isNaN(Number(keywords[i])))
+ continue;
+ valueKeywordsForCodeMirror[nameForCodeMirror(keywords[i])] = true;
+ }
+ }
</ins><span class="cx">
</span><del>- function updateCodeMirrorCSSMode(mimeType)
- {
- var modeSpec = CodeMirror.resolveMode(mimeType);
</del><ins>+ WebInspector.CSSKeywordCompletions._colors.forEach(function(colorName) {
+ colorKeywordsForCodeMirror[nameForCodeMirror(colorName)] = true;
+ });
</ins><span class="cx">
</span><del>- console.assert(modeSpec.propertyKeywords);
- console.assert(modeSpec.valueKeywords);
- console.assert(modeSpec.colorKeywords);
</del><ins>+ function updateCodeMirrorCSSMode(mimeType)
+ {
+ var modeSpec = CodeMirror.resolveMode(mimeType);
</ins><span class="cx">
</span><del>- modeSpec.propertyKeywords = propertyNamesForCodeMirror;
- modeSpec.valueKeywords = valueKeywordsForCodeMirror;
- modeSpec.colorKeywords = colorKeywordsForCodeMirror;
</del><ins>+ console.assert(modeSpec.propertyKeywords);
+ console.assert(modeSpec.valueKeywords);
+ console.assert(modeSpec.colorKeywords);
</ins><span class="cx">
</span><del>- CodeMirror.defineMIME(mimeType, modeSpec);
</del><ins>+ modeSpec.propertyKeywords = propertyNamesForCodeMirror;
+ modeSpec.valueKeywords = valueKeywordsForCodeMirror;
+ modeSpec.colorKeywords = colorKeywordsForCodeMirror;
+
+ CodeMirror.defineMIME(mimeType, modeSpec);
+ }
+
+ updateCodeMirrorCSSMode("text/css");
+ updateCodeMirrorCSSMode("text/x-scss");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- updateCodeMirrorCSSMode("text/css");
- updateCodeMirrorCSSMode("text/x-scss");
</del><ins>+ if (window.CSSAgent)
+ CSSAgent.getSupportedCSSProperties(propertyNamesCallback);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (window.CSSAgent)
- CSSAgent.getSupportedCSSProperties(propertyNamesCallback);
-};
</del><ins>+ // Public
</ins><span class="cx">
</span><del>-WebInspector.CSSCompletions.prototype = {
</del><span class="cx"> get values()
</span><span class="cx"> {
</span><span class="cx"> return this._values;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- startsWith: function(prefix)
</del><ins>+ startsWith(prefix)
</ins><span class="cx"> {
</span><span class="cx"> var firstIndex = this._firstIndexOfPrefix(prefix);
</span><span class="cx"> if (firstIndex === -1)
</span><span class="lines">@@ -176,15 +179,15 @@
</span><span class="cx"> while (firstIndex < this._values.length && this._values[firstIndex].startsWith(prefix))
</span><span class="cx"> results.push(this._values[firstIndex++]);
</span><span class="cx"> return results;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- firstStartsWith: function(prefix)
</del><ins>+ firstStartsWith(prefix)
</ins><span class="cx"> {
</span><span class="cx"> var foundIndex = this._firstIndexOfPrefix(prefix);
</span><span class="cx"> return (foundIndex === -1 ? "" : this._values[foundIndex]);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _firstIndexOfPrefix: function(prefix)
</del><ins>+ _firstIndexOfPrefix(prefix)
</ins><span class="cx"> {
</span><span class="cx"> if (!this._values.length)
</span><span class="cx"> return -1;
</span><span class="lines">@@ -214,26 +217,26 @@
</span><span class="cx"> foundIndex--;
</span><span class="cx">
</span><span class="cx"> return foundIndex;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- keySet: function()
</del><ins>+ keySet()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._keySet)
</span><span class="cx"> this._keySet = this._values.keySet();
</span><span class="cx"> return this._keySet;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- next: function(str, prefix)
</del><ins>+ next(str, prefix)
</ins><span class="cx"> {
</span><span class="cx"> return this._closest(str, prefix, 1);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- previous: function(str, prefix)
</del><ins>+ previous(str, prefix)
</ins><span class="cx"> {
</span><span class="cx"> return this._closest(str, prefix, -1);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _closest: function(str, prefix, shift)
</del><ins>+ _closest(str, prefix, shift)
</ins><span class="cx"> {
</span><span class="cx"> if (!str)
</span><span class="cx"> return "";
</span><span class="lines">@@ -251,25 +254,27 @@
</span><span class="cx"> var j = propertiesWithPrefix.indexOf(str);
</span><span class="cx"> j = (j + propertiesWithPrefix.length + shift) % propertiesWithPrefix.length;
</span><span class="cx"> return propertiesWithPrefix[j];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isShorthandPropertyName: function(shorthand)
</del><ins>+ isShorthandPropertyName(shorthand)
</ins><span class="cx"> {
</span><span class="cx"> return shorthand in this._longhands;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isLonghandPropertyName: function(longhand)
</del><ins>+ isLonghandPropertyName(longhand)
</ins><span class="cx"> {
</span><span class="cx"> return longhand in this._shorthands;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- longhandsForShorthand: function(shorthand)
</del><ins>+ longhandsForShorthand(shorthand)
</ins><span class="cx"> {
</span><span class="cx"> return this._longhands[shorthand] || [];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shorthandsForLonghand: function(longhand)
</del><ins>+ shorthandsForLonghand(longhand)
</ins><span class="cx"> {
</span><span class="cx"> return this._shorthands[longhand] || [];
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.CSSCompletions.cssNameCompletions = null;
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSMediajs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSMedia.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSMedia.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSMedia.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,36 +23,30 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.CSSMedia = function(type, text, sourceCodeLocation)
</del><ins>+WebInspector.CSSMedia = class CSSMedia extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(type, text, sourceCodeLocation)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._type = type || null;
- this._text = text || "";
- this._sourceCodeLocation = sourceCodeLocation || null;
-};
</del><ins>+ console.assert(!sourceCodeLocation || sourceCodeLocation instanceof WebInspector.SourceCodeLocation);
</ins><span class="cx">
</span><del>-WebInspector.CSSMedia.Type = {
- MediaRule: "css-media-type-media-rule",
- ImportRule: "css-media-type-import-rule",
- LinkedStyleSheet: "css-media-type-linked-stylesheet",
- InlineStyleSheet: "css-media-type-inline-stylesheet"
-};
</del><ins>+ this._type = type || null;
+ this._text = text || "";
+ this._sourceCodeLocation = sourceCodeLocation || null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.CSSMedia.prototype = {
- constructor: WebInspector.CSSMedia,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get text()
</span><span class="cx"> {
</span><span class="cx"> return this._text;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceCodeLocation()
</span><span class="cx"> {
</span><span class="lines">@@ -60,4 +54,9 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.CSSMedia.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.CSSMedia.Type = {
+ MediaRule: "css-media-type-media-rule",
+ ImportRule: "css-media-type-import-rule",
+ LinkedStyleSheet: "css-media-type-linked-stylesheet",
+ InlineStyleSheet: "css-media-type-inline-stylesheet"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSPropertyjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSProperty.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSProperty.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSProperty.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,50 +23,41 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.CSSProperty = function(index, text, name, value, priority, enabled, overridden, implicit, anonymous, valid, styleSheetTextRange, styleDeclarationTextRange)
</del><ins>+WebInspector.CSSProperty = class CSSProperty extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(index, text, name, value, priority, enabled, overridden, implicit, anonymous, valid, styleSheetTextRange, styleDeclarationTextRange)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._ownerStyle = null;
- this._index = index;
</del><ins>+ this._ownerStyle = null;
+ this._index = index;
</ins><span class="cx">
</span><del>- this.update(text, name, value, priority, enabled, overridden, implicit, anonymous, valid, styleSheetTextRange, styleDeclarationTextRange, true);
-};
</del><ins>+ this.update(text, name, value, priority, enabled, overridden, implicit, anonymous, valid, styleSheetTextRange, styleDeclarationTextRange, true);
+ }
</ins><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.CSSProperty);
-
-WebInspector.CSSProperty.Event = {
- Changed: "css-property-changed",
- OverriddenStatusChanged: "css-property-overridden-status-changed"
-};
-
-WebInspector.CSSProperty.prototype = {
- constructor: WebInspector.CSSProperty,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get ownerStyle()
</span><span class="cx"> {
</span><span class="cx"> return this._ownerStyle;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set ownerStyle(ownerStyle)
</span><span class="cx"> {
</span><span class="cx"> this._ownerStyle = ownerStyle || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get index()
</span><span class="cx"> {
</span><span class="cx"> return this._index;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set index(index)
</span><span class="cx"> {
</span><span class="cx"> this._index = index;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- update: function(text, name, value, priority, enabled, overridden, implicit, anonymous, valid, styleSheetTextRange, styleDeclarationTextRange, dontFireEvents)
</del><ins>+ update(text, name, value, priority, enabled, overridden, implicit, anonymous, valid, styleSheetTextRange, styleDeclarationTextRange, dontFireEvents)
</ins><span class="cx"> {
</span><span class="cx"> text = text || "";
</span><span class="cx"> name = name || "";
</span><span class="lines">@@ -116,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> if (changed)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.CSSProperty.Event.Changed);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get synthesizedText()
</span><span class="cx"> {
</span><span class="lines">@@ -126,17 +117,17 @@
</span><span class="cx">
</span><span class="cx"> var priority = this.priority;
</span><span class="cx"> return name + ": " + this.value.trim() + (priority ? " !" + priority : "") + ";";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get text()
</span><span class="cx"> {
</span><span class="cx"> return this._text || this.synthesizedText;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get name()
</span><span class="cx"> {
</span><span class="cx"> return this._name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get canonicalName()
</span><span class="cx"> {
</span><span class="lines">@@ -146,32 +137,32 @@
</span><span class="cx"> this._canonicalName = WebInspector.cssStyleManager.canonicalNameForPropertyName(this.name);
</span><span class="cx">
</span><span class="cx"> return this._canonicalName;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get value()
</span><span class="cx"> {
</span><span class="cx"> return this._value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get important()
</span><span class="cx"> {
</span><span class="cx"> return this.priority === "important";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get priority()
</span><span class="cx"> {
</span><span class="cx"> return this._priority;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get enabled()
</span><span class="cx"> {
</span><span class="cx"> return this._enabled && this._ownerStyle && (!isNaN(this._index) || this._ownerStyle.type === WebInspector.CSSStyleDeclaration.Type.Computed);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get overridden()
</span><span class="cx"> {
</span><span class="cx"> return this._overridden;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set overridden(overridden)
</span><span class="cx"> {
</span><span class="lines">@@ -198,32 +189,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._overriddenStatusChangedTimeout = setTimeout(delayed.bind(this), 0);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get implicit()
</span><span class="cx"> {
</span><span class="cx"> return this._implicit;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get anonymous()
</span><span class="cx"> {
</span><span class="cx"> return this._anonymous;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get inherited()
</span><span class="cx"> {
</span><span class="cx"> return this._inherited;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get valid()
</span><span class="cx"> {
</span><span class="cx"> return this._valid;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get styleSheetTextRange()
</span><span class="cx"> {
</span><span class="cx"> return this._styleSheetTextRange;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get styleDeclarationTextRange()
</span><span class="cx"> {
</span><span class="lines">@@ -251,34 +242,34 @@
</span><span class="cx"> this._styleDeclarationTextRange = new WebInspector.TextRange(startLine, startColumn, endLine, endColumn);
</span><span class="cx">
</span><span class="cx"> return this._styleDeclarationTextRange;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get relatedShorthandProperty()
</span><span class="cx"> {
</span><span class="cx"> return this._relatedShorthandProperty;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set relatedShorthandProperty(property)
</span><span class="cx"> {
</span><span class="cx"> this._relatedShorthandProperty = property || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get relatedLonghandProperties()
</span><span class="cx"> {
</span><span class="cx"> return this._relatedLonghandProperties;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addRelatedLonghandProperty: function(property)
</del><ins>+ addRelatedLonghandProperty(property)
</ins><span class="cx"> {
</span><span class="cx"> this._relatedLonghandProperties.push(property);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- clearRelatedLonghandProperties: function(property)
</del><ins>+ clearRelatedLonghandProperties(property)
</ins><span class="cx"> {
</span><span class="cx"> this._relatedLonghandProperties = [];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hasOtherVendorNameOrKeyword: function()
</del><ins>+ hasOtherVendorNameOrKeyword()
</ins><span class="cx"> {
</span><span class="cx"> if ("_hasOtherVendorNameOrKeyword" in this)
</span><span class="cx"> return this._hasOtherVendorNameOrKeyword;
</span><span class="lines">@@ -288,3 +279,8 @@
</span><span class="cx"> return this._hasOtherVendorNameOrKeyword;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.CSSProperty.Event = {
+ Changed: "css-property-changed",
+ OverriddenStatusChanged: "css-property-overridden-status-changed"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSRulejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,54 +23,40 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.CSSRule = function(nodeStyles, ownerStyleSheet, id, type, sourceCodeLocation, selectorText, selectors, matchedSelectorIndices, style, mediaList)
</del><ins>+WebInspector.CSSRule = class CSSRule extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(nodeStyles, ownerStyleSheet, id, type, sourceCodeLocation, selectorText, selectors, matchedSelectorIndices, style, mediaList)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(nodeStyles);
- this._nodeStyles = nodeStyles;
</del><ins>+ console.assert(nodeStyles);
+ this._nodeStyles = nodeStyles;
</ins><span class="cx">
</span><del>- this._ownerStyleSheet = ownerStyleSheet || null;
- this._id = id || null;
- this._type = type || null;
</del><ins>+ this._ownerStyleSheet = ownerStyleSheet || null;
+ this._id = id || null;
+ this._type = type || null;
</ins><span class="cx">
</span><del>- this.update(sourceCodeLocation, selectorText, selectors, matchedSelectorIndices, style, mediaList, true);
-};
</del><ins>+ this.update(sourceCodeLocation, selectorText, selectors, matchedSelectorIndices, style, mediaList, true);
+ }
</ins><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.CSSRule);
-
-WebInspector.CSSRule.Event = {
- Changed: "css-rule-changed"
-};
-
-WebInspector.CSSRule.Type = {
- Author: "css-rule-type-author",
- User: "css-rule-type-user",
- UserAgent: "css-rule-type-user-agent",
- Inspector: "css-rule-type-inspector"
-};
-
-WebInspector.CSSRule.prototype = {
- constructor: WebInspector.CSSRule,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> return this._id;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get ownerStyleSheet()
</span><span class="cx"> {
</span><span class="cx"> return this._ownerStyleSheet;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get editable()
</span><span class="cx"> {
</span><span class="cx"> return !!this._id && (this._type === WebInspector.CSSRule.Type.Author || this._type === WebInspector.CSSRule.Type.Inspector);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- update: function(sourceCodeLocation, selectorText, selectors, matchedSelectorIndices, style, mediaList, dontFireEvents)
</del><ins>+ update(sourceCodeLocation, selectorText, selectors, matchedSelectorIndices, style, mediaList, dontFireEvents)
</ins><span class="cx"> {
</span><span class="cx"> sourceCodeLocation = sourceCodeLocation || null;
</span><span class="cx"> selectorText = selectorText || "";
</span><span class="lines">@@ -105,22 +91,22 @@
</span><span class="cx">
</span><span class="cx"> if (changed)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.CSSRule.Event.Changed);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceCodeLocation()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCodeLocation;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get selectorText()
</span><span class="cx"> {
</span><span class="cx"> return this._selectorText;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set selectorText(selectorText)
</span><span class="cx"> {
</span><span class="lines">@@ -132,17 +118,17 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._nodeStyles.changeRuleSelector(this, selectorText);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get selectors()
</span><span class="cx"> {
</span><span class="cx"> return this._selectors;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get matchedSelectorIndices()
</span><span class="cx"> {
</span><span class="cx"> return this._matchedSelectorIndices;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get matchedSelectors()
</span><span class="cx"> {
</span><span class="lines">@@ -160,7 +146,7 @@
</span><span class="cx"> }, this);
</span><span class="cx">
</span><span class="cx"> return this._matchedSelectors;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get matchedSelectorText()
</span><span class="cx"> {
</span><span class="lines">@@ -176,25 +162,25 @@
</span><span class="cx"> this._matchedSelectorText = this.matchedSelectors.map(function(x) { return x.text; }).join(", ");
</span><span class="cx">
</span><span class="cx"> return this._matchedSelectorText;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get style()
</span><span class="cx"> {
</span><span class="cx"> return this._style;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get mediaList()
</span><span class="cx"> {
</span><span class="cx"> return this._mediaList;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isEqualTo: function(rule)
</del><ins>+ isEqualTo(rule)
</ins><span class="cx"> {
</span><span class="cx"> if (!rule)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return Object.shallowEqual(this._id, rule.id);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><span class="lines">@@ -204,4 +190,13 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.CSSRule.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.CSSRule.Event = {
+ Changed: "css-rule-changed"
+};
+
+WebInspector.CSSRule.Type = {
+ Author: "css-rule-type-author",
+ User: "css-rule-type-user",
+ UserAgent: "css-rule-type-user-agent",
+ Inspector: "css-rule-type-inspector"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSSelectorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSSelector.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSSelector.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSSelector.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,32 +23,30 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.CSSSelector = function(text, specificity, dynamic)
</del><ins>+WebInspector.CSSSelector = class CSSSelector extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(text, specificity, dynamic)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(text);
</del><ins>+ console.assert(text);
</ins><span class="cx">
</span><del>- this._text = text;
- this._specificity = specificity || null;
- this._dynamic = dynamic || false;
-};
</del><ins>+ this._text = text;
+ this._specificity = specificity || null;
+ this._dynamic = dynamic || false;
+ }
</ins><span class="cx">
</span><del>-WebInspector.CSSSelector.prototype = {
- constructor: WebInspector.CSSSelector,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get text()
</span><span class="cx"> {
</span><span class="cx"> return this._text;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get specificity()
</span><span class="cx"> {
</span><span class="cx"> return this._specificity;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get dynamic()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSStyleDeclarationjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSStyleDeclaration.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSStyleDeclaration.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSStyleDeclaration.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,70 +23,55 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.CSSStyleDeclaration = function(nodeStyles, ownerStyleSheet, id, type, node, inherited, text, properties, styleSheetTextRange)
</del><ins>+WebInspector.CSSStyleDeclaration = class CSSStyleDeclaration extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(nodeStyles, ownerStyleSheet, id, type, node, inherited, text, properties, styleSheetTextRange)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(nodeStyles);
- this._nodeStyles = nodeStyles;
</del><ins>+ console.assert(nodeStyles);
+ this._nodeStyles = nodeStyles;
</ins><span class="cx">
</span><del>- this._ownerRule = null;
</del><ins>+ this._ownerRule = null;
</ins><span class="cx">
</span><del>- this._ownerStyleSheet = ownerStyleSheet || null;
- this._id = id || null;
- this._type = type || null;
- this._node = node || null;
- this._inherited = inherited || false;
</del><ins>+ this._ownerStyleSheet = ownerStyleSheet || null;
+ this._id = id || null;
+ this._type = type || null;
+ this._node = node || null;
+ this._inherited = inherited || false;
</ins><span class="cx">
</span><del>- this._pendingProperties = [];
- this._propertyNameMap = {};
</del><ins>+ this._pendingProperties = [];
+ this._propertyNameMap = {};
</ins><span class="cx">
</span><del>- this.update(text, properties, styleSheetTextRange, true);
-};
</del><ins>+ this.update(text, properties, styleSheetTextRange, true);
+ }
</ins><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.CSSStyleDeclaration);
-
-WebInspector.CSSStyleDeclaration.Event = {
- PropertiesChanged: "css-style-declaration-properties-changed"
-};
-
-WebInspector.CSSStyleDeclaration.Type = {
- Rule: "css-style-declaration-type-rule",
- Inline: "css-style-declaration-type-inline",
- Attribute: "css-style-declaration-type-attribute",
- Computed: "css-style-declaration-type-computed"
-};
-
-WebInspector.CSSStyleDeclaration.prototype = {
- constructor: WebInspector.CSSStyleDeclaration,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> return this._id;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get ownerStyleSheet()
</span><span class="cx"> {
</span><span class="cx"> return this._ownerStyleSheet;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get inherited()
</span><span class="cx"> {
</span><span class="cx"> return this._inherited;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get node()
</span><span class="cx"> {
</span><span class="cx"> return this._node;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get editable()
</span><span class="cx"> {
</span><span class="lines">@@ -100,9 +85,9 @@
</span><span class="cx"> return !this._node.isInShadowTree();
</span><span class="cx">
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- update: function(text, properties, styleSheetTextRange, dontFireEvents)
</del><ins>+ update(text, properties, styleSheetTextRange, dontFireEvents)
</ins><span class="cx"> {
</span><span class="cx"> text = text || "";
</span><span class="cx"> properties = properties || [];
</span><span class="lines">@@ -176,22 +161,22 @@
</span><span class="cx">
</span><span class="cx"> // Delay firing the PropertiesChanged event so DOMNodeStyles has a chance to mark overridden and associated properties.
</span><span class="cx"> setTimeout(delayed.bind(this), 0);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get ownerRule()
</span><span class="cx"> {
</span><span class="cx"> return this._ownerRule;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set ownerRule(rule)
</span><span class="cx"> {
</span><span class="cx"> this._ownerRule = rule || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get text()
</span><span class="cx"> {
</span><span class="cx"> return this._text;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set text(text)
</span><span class="cx"> {
</span><span class="lines">@@ -199,12 +184,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._nodeStyles.changeStyleText(this, text);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get properties()
</span><span class="cx"> {
</span><span class="cx"> return this._properties;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get visibleProperties()
</span><span class="cx"> {
</span><span class="lines">@@ -216,19 +201,19 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return this._visibleProperties;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get pendingProperties()
</span><span class="cx"> {
</span><span class="cx"> return this._pendingProperties;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get styleSheetTextRange()
</span><span class="cx"> {
</span><span class="cx"> return this._styleSheetTextRange;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- propertyForName: function(name, dontCreateIfMissing)
</del><ins>+ propertyForName(name, dontCreateIfMissing)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(name);
</span><span class="cx"> if (!name)
</span><span class="lines">@@ -273,7 +258,7 @@
</span><span class="cx"> this._pendingProperties.push(newProperty);
</span><span class="cx">
</span><span class="cx"> return newProperty;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><span class="lines">@@ -282,3 +267,14 @@
</span><span class="cx"> return this._nodeStyles;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.CSSStyleDeclaration.Event = {
+ PropertiesChanged: "css-style-declaration-properties-changed"
+};
+
+WebInspector.CSSStyleDeclaration.Type = {
+ Rule: "css-style-declaration-type-rule",
+ Inline: "css-style-declaration-type-inline",
+ Attribute: "css-style-declaration-type-attribute",
+ Computed: "css-style-declaration-type-computed"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSStyleSheetjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,62 +23,54 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.CSSStyleSheet = function(id, url, parentFrame)
</del><ins>+WebInspector.CSSStyleSheet = class CSSStyleSheet extends WebInspector.SourceCode
</ins><span class="cx"> {
</span><del>- WebInspector.SourceCode.call(this);
</del><ins>+ constructor(id, url, parentFrame)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(id);
</del><ins>+ console.assert(id);
</ins><span class="cx">
</span><del>- this._id = id || null;
</del><ins>+ this._id = id || null;
</ins><span class="cx">
</span><del>- this.updateInfo(url, parentFrame);
-};
</del><ins>+ this.updateInfo(url, parentFrame);
+ }
</ins><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.CSSStyleSheet);
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.CSSStyleSheet.resetUniqueDisplayNameNumbers = function()
-{
- WebInspector.CSSStyleSheet._nextUniqueDisplayNameNumber = 1;
-};
</del><ins>+ static resetUniqueDisplayNameNumbers()
+ {
+ WebInspector.CSSStyleSheet._nextUniqueDisplayNameNumber = 1;
+ }
</ins><span class="cx">
</span><del>-WebInspector.CSSStyleSheet._nextUniqueDisplayNameNumber = 1;
-
-WebInspector.CSSStyleSheet.Event = {
- ContentDidChange: "stylesheet-content-did-change"
-};
-
-WebInspector.CSSStyleSheet.prototype = {
- constructor: WebInspector.CSSStyleSheet,
- __proto__: WebInspector.SourceCode.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> return this._id;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get parentFrame()
</span><span class="cx"> {
</span><span class="cx"> return this._parentFrame;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get url()
</span><span class="cx"> {
</span><span class="cx"> return this._url;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get urlComponents()
</span><span class="cx"> {
</span><span class="cx"> if (!this._urlComponents)
</span><span class="cx"> this._urlComponents = parseURL(this._url);
</span><span class="cx"> return this._urlComponents;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get mimeType()
</span><span class="cx"> {
</span><span class="cx"> return "text/css";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get displayName()
</span><span class="cx"> {
</span><span class="lines">@@ -90,24 +82,24 @@
</span><span class="cx"> this._uniqueDisplayNameNumber = this.constructor._nextUniqueDisplayNameNumber++;
</span><span class="cx">
</span><span class="cx"> return WebInspector.UIString("Anonymous StyleSheet %d").format(this._uniqueDisplayNameNumber);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><del>- updateInfo: function(url, parentFrame)
</del><ins>+ updateInfo(url, parentFrame)
</ins><span class="cx"> {
</span><span class="cx"> this._url = url || null;
</span><span class="cx"> delete this._urlComponents;
</span><span class="cx">
</span><span class="cx"> this._parentFrame = parentFrame || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get revisionForRequestedContent()
</span><span class="cx"> {
</span><span class="cx"> return this.currentRevision;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- handleCurrentRevisionContentChange: function()
</del><ins>+ handleCurrentRevisionContentChange()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._id)
</span><span class="cx"> return;
</span><span class="lines">@@ -125,9 +117,9 @@
</span><span class="cx"> this._ignoreNextContentDidChangeNotification = true;
</span><span class="cx">
</span><span class="cx"> CSSAgent.setStyleSheetText(this._id, this.currentRevision.content, contentDidChange.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- requestContentFromBackend: function()
</del><ins>+ requestContentFromBackend()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._id) {
</span><span class="cx"> // There is no identifier to request content with. Reject the promise to cause the
</span><span class="lines">@@ -136,9 +128,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return CSSAgent.getStyleSheetText(this._id);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- noteContentDidChange: function()
</del><ins>+ noteContentDidChange()
</ins><span class="cx"> {
</span><span class="cx"> if (this._ignoreNextContentDidChangeNotification) {
</span><span class="cx"> delete this._ignoreNextContentDidChangeNotification;
</span><span class="lines">@@ -150,3 +142,9 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.CSSStyleSheet._nextUniqueDisplayNameNumber = 1;
+
+WebInspector.CSSStyleSheet.Event = {
+ ContentDidChange: "stylesheet-content-did-change"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCallFramejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,64 +23,63 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.CallFrame = function(id, sourceCodeLocation, functionName, thisObject, scopeChain, nativeCode)
</del><ins>+WebInspector.CallFrame = class CallFrame extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(id, sourceCodeLocation, functionName, thisObject, scopeChain, nativeCode)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(!sourceCodeLocation || sourceCodeLocation instanceof WebInspector.SourceCodeLocation);
- console.assert(!thisObject || thisObject instanceof WebInspector.RemoteObject);
- console.assert(!scopeChain || scopeChain instanceof Array);
</del><ins>+ console.assert(!sourceCodeLocation || sourceCodeLocation instanceof WebInspector.SourceCodeLocation);
+ console.assert(!thisObject || thisObject instanceof WebInspector.RemoteObject);
+ console.assert(!scopeChain || scopeChain instanceof Array);
</ins><span class="cx">
</span><del>- this._id = id || null;
- this._sourceCodeLocation = sourceCodeLocation || null;
- this._functionName = functionName || null;
- this._thisObject = thisObject || null;
- this._scopeChain = scopeChain || [];
- this._nativeCode = nativeCode || false;
-};
</del><ins>+ this._id = id || null;
+ this._sourceCodeLocation = sourceCodeLocation || null;
+ this._functionName = functionName || null;
+ this._thisObject = thisObject || null;
+ this._scopeChain = scopeChain || [];
+ this._nativeCode = nativeCode || false;
+ }
</ins><span class="cx">
</span><del>-WebInspector.CallFrame.prototype = {
- constructor: WebInspector.CallFrame,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> return this._id;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceCodeLocation()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCodeLocation;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get functionName()
</span><span class="cx"> {
</span><span class="cx"> return this._functionName;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get nativeCode()
</span><span class="cx"> {
</span><span class="cx"> return this._nativeCode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get thisObject()
</span><span class="cx"> {
</span><span class="cx"> return this._thisObject;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get scopeChain()
</span><span class="cx"> {
</span><span class="cx"> return this._scopeChain;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function()
</del><ins>+ saveIdentityToCookie()
</ins><span class="cx"> {
</span><span class="cx"> // Do nothing. The call frame is torn down when the inspector closes, and
</span><span class="cx"> // we shouldn't restore call frame content views across debugger pauses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- collectScopeChainVariableNames: function(callback)
</del><ins>+ collectScopeChainVariableNames(callback)
</ins><span class="cx"> {
</span><span class="cx"> var result = {this: true};
</span><span class="cx">
</span><span class="lines">@@ -101,5 +100,3 @@
</span><span class="cx"> this._scopeChain[i].object.deprecatedGetAllProperties(propertiesCollected);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.CallFrame.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCollectionEntryjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CollectionEntry.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CollectionEntry.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CollectionEntry.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,38 +23,38 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.CollectionEntry = function(key, value)
</del><ins>+WebInspector.CollectionEntry = class CollectionEntry extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(key, value)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(value instanceof WebInspector.RemoteObject);
- console.assert(!key || key instanceof WebInspector.RemoteObject);
</del><ins>+ console.assert(value instanceof WebInspector.RemoteObject);
+ console.assert(!key || key instanceof WebInspector.RemoteObject);
</ins><span class="cx">
</span><del>- this._key = key;
- this._value = value;
-};
</del><ins>+ this._key = key;
+ this._value = value;
+ }
</ins><span class="cx">
</span><del>-// Runtime.CollectionEntry.
-WebInspector.CollectionEntry.fromPayload = function(payload)
-{
- if (payload.key)
- payload.key = WebInspector.RemoteObject.fromPayload(payload.key);
- if (payload.value)
- payload.value = WebInspector.RemoteObject.fromPayload(payload.value);
</del><ins>+ // Static
</ins><span class="cx">
</span><del>- return new WebInspector.CollectionEntry(payload.key, payload.value);
-};
</del><ins>+ // Runtime.CollectionEntry.
+ static fromPayload(payload)
+ {
+ if (payload.key)
+ payload.key = WebInspector.RemoteObject.fromPayload(payload.key);
+ if (payload.value)
+ payload.value = WebInspector.RemoteObject.fromPayload(payload.value);
</ins><span class="cx">
</span><del>-WebInspector.CollectionEntry.prototype = {
- constructor: WebInspector.CollectionEntry,
- __proto__: WebInspector.Object.prototype,
</del><ins>+ return new WebInspector.CollectionEntry(payload.key, payload.value);
+ }
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get key()
</span><span class="cx"> {
</span><span class="cx"> return this._key;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get value()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCollectionEntryPreviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CollectionEntryPreview.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CollectionEntryPreview.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CollectionEntryPreview.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,38 +23,38 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.CollectionEntryPreview = function(keyPreview, valuePreview)
</del><ins>+WebInspector.CollectionEntryPreview = class CollectionEntryPreview extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(keyPreview, valuePreview)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(valuePreview instanceof WebInspector.ObjectPreview);
- console.assert(!keyPreview || keyPreview instanceof WebInspector.ObjectPreview);
</del><ins>+ console.assert(valuePreview instanceof WebInspector.ObjectPreview);
+ console.assert(!keyPreview || keyPreview instanceof WebInspector.ObjectPreview);
</ins><span class="cx">
</span><del>- this._key = keyPreview;
- this._value = valuePreview;
-};
</del><ins>+ this._key = keyPreview;
+ this._value = valuePreview;
+ }
</ins><span class="cx">
</span><del>-// Runtime.EntryPreview.
-WebInspector.CollectionEntryPreview.fromPayload = function(payload)
-{
- if (payload.key)
- payload.key = WebInspector.ObjectPreview.fromPayload(payload.key);
- if (payload.value)
- payload.value = WebInspector.ObjectPreview.fromPayload(payload.value);
</del><ins>+ // Static
</ins><span class="cx">
</span><del>- return new WebInspector.CollectionEntryPreview(payload.key, payload.value);
-};
</del><ins>+ // Runtime.EntryPreview.
+ static fromPayload(payload)
+ {
+ if (payload.key)
+ payload.key = WebInspector.ObjectPreview.fromPayload(payload.key);
+ if (payload.value)
+ payload.value = WebInspector.ObjectPreview.fromPayload(payload.value);
</ins><span class="cx">
</span><del>-WebInspector.CollectionEntryPreview.prototype = {
- constructor: WebInspector.CollectionEntryPreview,
- __proto__: WebInspector.Object.prototype,
</del><ins>+ return new WebInspector.CollectionEntryPreview(payload.key, payload.value);
+ }
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get keyPreview()
</span><span class="cx"> {
</span><span class="cx"> return this._key;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get valuePreview()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsColorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Color.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Color.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Color.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -27,118 +27,186 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.Color = function(format, components)
</del><ins>+WebInspector.Color = class Color
</ins><span class="cx"> {
</span><del>- this.format = format;
- if (format === WebInspector.Color.Format.HSL || format === WebInspector.Color.Format.HSLA)
- this._hsla = components;
- else
- this._rgba = components;
</del><ins>+ constructor(format, components)
+ {
+ this.format = format;
</ins><span class="cx">
</span><del>- this.valid = !components.some(function(component) {
- return isNaN(component);
- });
-};
</del><ins>+ if (format === WebInspector.Color.Format.HSL || format === WebInspector.Color.Format.HSLA)
+ this._hsla = components;
+ else
+ this._rgba = components;
</ins><span class="cx">
</span><del>-WebInspector.Color.Format = {
- Original: "color-format-original",
- Nickname: "color-format-nickname",
- HEX: "color-format-hex",
- ShortHEX: "color-format-short-hex",
- RGB: "color-format-rgb",
- RGBA: "color-format-rgba",
- HSL: "color-format-hsl",
- HSLA: "color-format-hsla"
-};
-
-WebInspector.Color.fromString = function(colorString)
-{
- var value = colorString.toLowerCase().replace(/%|\s+/g, "");
- const transparentNicknames = ["transparent", "rgba(0,0,0,0)", "hsla(0,0,0,0)"];
- if (transparentNicknames.contains(value)) {
- var color = new WebInspector.Color(WebInspector.Color.Format.Nickname, [0, 0, 0, 0]);
- color.nickname = "transparent";
- color.original = colorString;
- return color;
</del><ins>+ this.valid = !components.some(function(component) {
+ return isNaN(component);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Simple - #hex, rgb(), nickname, hsl()
- var simple = /^(?:#([0-9a-f]{3,6})|rgb\(([^)]+)\)|(\w+)|hsl\(([^)]+)\))$/i;
- var match = colorString.match(simple);
- if (match) {
- if (match[1]) { // hex
- var hex = match[1].toUpperCase();
- if (hex.length === 3) {
- return new WebInspector.Color(WebInspector.Color.Format.ShortHEX, [
- parseInt(hex.charAt(0) + hex.charAt(0), 16),
- parseInt(hex.charAt(1) + hex.charAt(1), 16),
- parseInt(hex.charAt(2) + hex.charAt(2), 16),
</del><ins>+ // Static
+
+ static fromString(colorString)
+ {
+ var value = colorString.toLowerCase().replace(/%|\s+/g, "");
+ var transparentNicknames = ["transparent", "rgba(0,0,0,0)", "hsla(0,0,0,0)"];
+ if (transparentNicknames.contains(value)) {
+ var color = new WebInspector.Color(WebInspector.Color.Format.Nickname, [0, 0, 0, 0]);
+ color.nickname = "transparent";
+ color.original = colorString;
+ return color;
+ }
+
+ // Simple - #hex, rgb(), nickname, hsl()
+ var simple = /^(?:#([0-9a-f]{3,6})|rgb\(([^)]+)\)|(\w+)|hsl\(([^)]+)\))$/i;
+ var match = colorString.match(simple);
+ if (match) {
+ if (match[1]) { // hex
+ var hex = match[1].toUpperCase();
+ if (hex.length === 3) {
+ return new WebInspector.Color(WebInspector.Color.Format.ShortHEX, [
+ parseInt(hex.charAt(0) + hex.charAt(0), 16),
+ parseInt(hex.charAt(1) + hex.charAt(1), 16),
+ parseInt(hex.charAt(2) + hex.charAt(2), 16),
+ 1
+ ]);
+ } else {
+ return new WebInspector.Color(WebInspector.Color.Format.HEX, [
+ parseInt(hex.substring(0, 2), 16),
+ parseInt(hex.substring(2, 4), 16),
+ parseInt(hex.substring(4, 6), 16),
+ 1
+ ]);
+ }
+ } else if (match[2]) { // rgb
+ var rgb = match[2].split(/\s*,\s*/);
+ return new WebInspector.Color(WebInspector.Color.Format.RGB, [
+ parseInt(rgb[0]),
+ parseInt(rgb[1]),
+ parseInt(rgb[2]),
</ins><span class="cx"> 1
</span><span class="cx"> ]);
</span><del>- } else {
- return new WebInspector.Color(WebInspector.Color.Format.HEX, [
- parseInt(hex.substring(0, 2), 16),
- parseInt(hex.substring(2, 4), 16),
- parseInt(hex.substring(4, 6), 16),
</del><ins>+ } else if (match[3]) { // nickname
+ var nickname = match[3].toLowerCase();
+ if (WebInspector.Color.Nicknames.hasOwnProperty(nickname)) {
+ var color = new WebInspector.Color(WebInspector.Color.Format.Nickname, WebInspector.Color.Nicknames[nickname].concat(1));
+ color.nickname = nickname;
+ color.original = colorString;
+ return color;
+ } else
+ return null;
+ } else if (match[4]) { // hsl
+ var hsl = match[4].replace(/%/g, "").split(/\s*,\s*/);
+ return new WebInspector.Color(WebInspector.Color.Format.HSL, [
+ parseInt(hsl[0]),
+ parseInt(hsl[1]),
+ parseInt(hsl[2]),
</ins><span class="cx"> 1
</span><span class="cx"> ]);
</span><span class="cx"> }
</span><del>- } else if (match[2]) { // rgb
- var rgb = match[2].split(/\s*,\s*/);
- return new WebInspector.Color(WebInspector.Color.Format.RGB, [
- parseInt(rgb[0]),
- parseInt(rgb[1]),
- parseInt(rgb[2]),
- 1
- ]);
- } else if (match[3]) { // nickname
- var nickname = match[3].toLowerCase();
- if (WebInspector.Color.Nicknames.hasOwnProperty(nickname)) {
- var color = new WebInspector.Color(WebInspector.Color.Format.Nickname, WebInspector.Color.Nicknames[nickname].concat(1));
- color.nickname = nickname;
- color.original = colorString;
- return color;
- } else
- return null;
- } else if (match[4]) { // hsl
- var hsl = match[4].replace(/%/g, "").split(/\s*,\s*/);
- return new WebInspector.Color(WebInspector.Color.Format.HSL, [
- parseInt(hsl[0]),
- parseInt(hsl[1]),
- parseInt(hsl[2]),
- 1
- ]);
</del><span class="cx"> }
</span><ins>+
+ // Advanced - rgba(), hsla()
+ var advanced = /^(?:rgba\(([^)]+)\)|hsla\(([^)]+)\))$/;
+ match = colorString.match(advanced);
+ if (match) {
+ if (match[1]) { // rgba
+ var rgba = match[1].split(/\s*,\s*/);
+ return new WebInspector.Color(WebInspector.Color.Format.RGBA, [
+ parseInt(rgba[0]),
+ parseInt(rgba[1]),
+ parseInt(rgba[2]),
+ Number.constrain(parseFloat(rgba[3]), 0, 1)
+ ]);
+ } else if (match[2]) { // hsla
+ var hsla = match[2].replace(/%/g, "").split(/\s*,\s*/);
+ return new WebInspector.Color(WebInspector.Color.Format.HSLA, [
+ parseInt(hsla[0]),
+ parseInt(hsla[1]),
+ parseInt(hsla[2]),
+ Number.constrain(parseFloat(hsla[3]), 0, 1)
+ ]);
+ }
+ }
+
+ return null;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Advanced - rgba(), hsla()
- var advanced = /^(?:rgba\(([^)]+)\)|hsla\(([^)]+)\))$/;
- match = colorString.match(advanced);
- if (match) {
- if (match[1]) { // rgba
- var rgba = match[1].split(/\s*,\s*/);
- return new WebInspector.Color(WebInspector.Color.Format.RGBA, [
- parseInt(rgba[0]),
- parseInt(rgba[1]),
- parseInt(rgba[2]),
- Number.constrain(parseFloat(rgba[3]), 0, 1)
- ]);
- } else if (match[2]) { // hsla
- var hsla = match[2].replace(/%/g, "").split(/\s*,\s*/);
- return new WebInspector.Color(WebInspector.Color.Format.HSLA, [
- parseInt(hsla[0]),
- parseInt(hsla[1]),
- parseInt(hsla[2]),
- Number.constrain(parseFloat(hsla[3]), 0, 1)
- ]);
</del><ins>+ static rgb2hsv(r, g, b)
+ {
+ r /= 255;
+ g /= 255;
+ b /= 255;
+
+ var min = Math.min(Math.min(r, g), b);
+ var max = Math.max(Math.max(r, g), b);
+ var delta = max - min;
+
+ var v = max;
+ var s, h;
+
+ if (max === min)
+ h = 0;
+ else if (max === r)
+ h = (60 * ((g - b) / delta)) % 360;
+ else if (max === g)
+ h = 60 * ((b - r) / delta) + 120;
+ else if (max === b)
+ h = 60 * ((r - g) / delta) + 240;
+
+ if (h < 0)
+ h += 360;
+
+ // Saturation
+ if (max === 0)
+ s = 0;
+ else
+ s = 1 - (min / max);
+
+ return [h, s, v];
+ }
+
+ static hsv2rgb(h, s, v)
+ {
+ if (s === 0)
+ return [v, v, v];
+
+ h /= 60;
+ var i = Math.floor(h);
+ var data = [
+ v * (1 - s),
+ v * (1 - s * (h - i)),
+ v * (1 - s * (1 - (h - i)))
+ ];
+ var rgb;
+
+ switch (i) {
+ case 0:
+ rgb = [v, data[2], data[0]];
+ break;
+ case 1:
+ rgb = [data[1], v, data[0]];
+ break;
+ case 2:
+ rgb = [data[0], v, data[2]];
+ break;
+ case 3:
+ rgb = [data[0], data[1], v];
+ break;
+ case 4:
+ rgb = [data[2], data[0], v];
+ break;
+ default:
+ rgb = [v, data[0], data[1]];
+ break;
</ins><span class="cx"> }
</span><ins>+
+ return rgb;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return null;
-};
</del><span class="cx">
</span><del>-WebInspector.Color.prototype = {
- nextFormat: function(format)
</del><ins>+ // Public
+
+ nextFormat(format)
</ins><span class="cx"> {
</span><span class="cx"> format = format || this.format;
</span><span class="cx">
</span><span class="lines">@@ -175,47 +243,47 @@
</span><span class="cx"> console.error("Unknown color format.");
</span><span class="cx"> return null;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get alpha()
</span><span class="cx"> {
</span><span class="cx"> return this._rgba ? this._rgba[3] : this._hsla[3];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get simple()
</span><span class="cx"> {
</span><span class="cx"> return this.alpha === 1;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get rgb()
</span><span class="cx"> {
</span><span class="cx"> var rgb = this.rgba.slice();
</span><span class="cx"> rgb.pop();
</span><span class="cx"> return rgb;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get hsl()
</span><span class="cx"> {
</span><span class="cx"> var hsl = this.hsla.slice();
</span><span class="cx"> hsl.pop();
</span><span class="cx"> return hsl;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get rgba()
</span><span class="cx"> {
</span><span class="cx"> if (!this._rgba)
</span><span class="cx"> this._rgba = this._hslaToRGBA(this._hsla);
</span><span class="cx"> return this._rgba;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get hsla()
</span><span class="cx"> {
</span><span class="cx"> if (!this._hsla)
</span><span class="cx"> this._hsla = this._rgbaToHSLA(this.rgba);
</span><span class="cx"> return this._hsla;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- copy: function()
</del><ins>+ copy()
</ins><span class="cx"> {
</span><span class="cx"> switch (this.format) {
</span><span class="cx"> case WebInspector.Color.Format.RGB:
</span><span class="lines">@@ -228,9 +296,9 @@
</span><span class="cx"> case WebInspector.Color.Format.HSLA:
</span><span class="cx"> return new WebInspector.Color(this.format, this.hsla);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- toString: function(format)
</del><ins>+ toString(format)
</ins><span class="cx"> {
</span><span class="cx"> if (!format)
</span><span class="cx"> format = this.format;
</span><span class="lines">@@ -255,14 +323,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> throw "invalid color format";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toOriginalString: function()
</del><ins>+ // Private
+
+ _toOriginalString()
</ins><span class="cx"> {
</span><span class="cx"> return this.original || this._toNicknameString();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toNicknameString: function()
</del><ins>+ _toNicknameString()
</ins><span class="cx"> {
</span><span class="cx"> if (this.nickname)
</span><span class="cx"> return this.nickname;
</span><span class="lines">@@ -285,9 +355,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return this._toRGBString();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toShortHEXString: function()
</del><ins>+ _toShortHEXString()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.simple)
</span><span class="cx"> return this._toRGBAString();
</span><span class="lines">@@ -301,9 +371,9 @@
</span><span class="cx"> return "#" + r[0] + g[0] + b[0];
</span><span class="cx"> else
</span><span class="cx"> return "#" + r + g + b;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toHEXString: function()
</del><ins>+ _toHEXString()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.simple)
</span><span class="cx"> return this._toRGBAString();
</span><span class="lines">@@ -314,38 +384,38 @@
</span><span class="cx"> var b = this._componentToHexValue(rgba[2]);
</span><span class="cx">
</span><span class="cx"> return "#" + r + g + b;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toRGBString: function()
</del><ins>+ _toRGBString()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.simple)
</span><span class="cx"> return this._toRGBAString();
</span><span class="cx">
</span><span class="cx"> var rgba = this.rgba;
</span><span class="cx"> return "rgb(" + [rgba[0], rgba[1], rgba[2]].join(", ") + ")";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toRGBAString: function()
</del><ins>+ _toRGBAString()
</ins><span class="cx"> {
</span><span class="cx"> return "rgba(" + this.rgba.join(", ") + ")";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toHSLString: function()
</del><ins>+ _toHSLString()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.simple)
</span><span class="cx"> return this._toHSLAString();
</span><span class="cx">
</span><span class="cx"> var hsla = this.hsla;
</span><span class="cx"> return "hsl(" + hsla[0] + ", " + hsla[1] + "%, " + hsla[2] + "%)";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toHSLAString: function()
</del><ins>+ _toHSLAString()
</ins><span class="cx"> {
</span><span class="cx"> var hsla = this.hsla;
</span><span class="cx"> return "hsla(" + hsla[0] + ", " + hsla[1] + "%, " + hsla[2] + "%, " + hsla[3] + ")";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _canBeSerializedAsShortHEX: function()
</del><ins>+ _canBeSerializedAsShortHEX()
</ins><span class="cx"> {
</span><span class="cx"> var rgba = this.rgba;
</span><span class="cx">
</span><span class="lines">@@ -362,22 +432,22 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _componentToNumber: function(value)
</del><ins>+ _componentToNumber(value)
</ins><span class="cx"> {
</span><span class="cx"> return Number.constrain(value, 0, 255);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _componentToHexValue: function(value)
</del><ins>+ _componentToHexValue(value)
</ins><span class="cx"> {
</span><span class="cx"> var hex = this._componentToNumber(value).toString(16);
</span><span class="cx"> if (hex.length === 1)
</span><span class="cx"> hex = "0" + hex;
</span><span class="cx"> return hex;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _rgbToHSL: function(rgb)
</del><ins>+ _rgbToHSL(rgb)
</ins><span class="cx"> {
</span><span class="cx"> var r = this._componentToNumber(rgb[0]) / 255;
</span><span class="cx"> var g = this._componentToNumber(rgb[1]) / 255;
</span><span class="lines">@@ -412,9 +482,9 @@
</span><span class="cx"> l = Math.round(l * 100);
</span><span class="cx">
</span><span class="cx"> return [h, s, l];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _hslToRGB: function(hsl)
</del><ins>+ _hslToRGB(hsl)
</ins><span class="cx"> {
</span><span class="cx"> var h = parseFloat(hsl[0]) / 360;
</span><span class="cx"> var s = parseFloat(hsl[1]) / 100;
</span><span class="lines">@@ -434,16 +504,16 @@
</span><span class="cx"> Math.round(sArray[ (h | 16) % 6 ] * 255),
</span><span class="cx"> Math.round(sArray[ (h | 8) % 6 ] * 255)
</span><span class="cx"> ];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _rgbaToHSLA: function(rgba)
</del><ins>+ _rgbaToHSLA(rgba)
</ins><span class="cx"> {
</span><span class="cx"> var hsl = this._rgbToHSL(rgba);
</span><span class="cx"> hsl.push(rgba[3]);
</span><span class="cx"> return hsl;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _hslaToRGBA: function(hsla)
</del><ins>+ _hslaToRGBA(hsla)
</ins><span class="cx"> {
</span><span class="cx"> var rgba = this._hslToRGB(hsla);
</span><span class="cx"> rgba.push(hsla[3]);
</span><span class="lines">@@ -451,6 +521,17 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector.Color.Format = {
+ Original: "color-format-original",
+ Nickname: "color-format-nickname",
+ HEX: "color-format-hex",
+ ShortHEX: "color-format-short-hex",
+ RGB: "color-format-rgb",
+ RGBA: "color-format-rgba",
+ HSL: "color-format-hsl",
+ HSLA: "color-format-hsla"
+};
+
</ins><span class="cx"> WebInspector.Color.Nicknames = {
</span><span class="cx"> "aliceblue": [240, 248, 255],
</span><span class="cx"> "antiquewhite": [250, 235, 215],
</span><span class="lines">@@ -592,75 +673,3 @@
</span><span class="cx"> "yellow": [255, 255, 0],
</span><span class="cx"> "yellowgreen": [154, 205, 50]
</span><span class="cx"> };
</span><del>-
-WebInspector.Color.rgb2hsv = function(r, g, b)
-{
- r /= 255;
- g /= 255;
- b /= 255;
-
- var min = Math.min(Math.min(r, g), b);
- var max = Math.max(Math.max(r, g), b);
- var delta = max - min;
-
- var v = max;
- var s, h;
-
- if (max === min)
- h = 0;
- else if (max === r)
- h = (60 * ((g - b) / delta)) % 360;
- else if (max === g)
- h = 60 * ((b - r) / delta) + 120;
- else if (max === b)
- h = 60 * ((r - g) / delta) + 240;
-
- if (h < 0)
- h += 360;
-
- // Saturation
- if (max === 0)
- s = 0;
- else
- s = 1 - (min / max);
-
- return [h, s, v];
-};
-
-WebInspector.Color.hsv2rgb = function(h, s, v)
-{
- if (s === 0)
- return [v, v, v];
-
- h /= 60;
- var i = Math.floor(h);
- var data = [
- v * (1 - s),
- v * (1 - s * (h - i)),
- v * (1 - s * (1 - (h - i)))
- ];
- var rgb;
-
- switch (i) {
- case 0:
- rgb = [v, data[2], data[0]];
- break;
- case 1:
- rgb = [data[1], v, data[0]];
- break;
- case 2:
- rgb = [data[0], v, data[2]];
- break;
- case 3:
- rgb = [data[0], data[1], v];
- break;
- case 4:
- rgb = [data[2], data[0], v];
- break;
- default:
- rgb = [v, data[0], data[1]];
- break;
- }
-
- return rgb;
-};
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsContentFlowjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ContentFlow.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ContentFlow.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ContentFlow.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -27,49 +27,40 @@
</span><span class="cx"> * SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ContentFlow = function(documentNodeIdentifier, name, overset, contentNodes)
</del><ins>+WebInspector.ContentFlow = class ContentFlow extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(documentNodeIdentifier, name, overset, contentNodes)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._documentNodeIdentifier = documentNodeIdentifier;
- this._name = name;
- this._overset = overset;
- this._contentNodes = contentNodes;
-};
</del><ins>+ this._documentNodeIdentifier = documentNodeIdentifier;
+ this._name = name;
+ this._overset = overset;
+ this._contentNodes = contentNodes;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ContentFlow.Event = {
- OversetWasChanged: "content-flow-overset-was-changed",
- ContentNodeWasAdded: "content-flow-content-node-was-added",
- ContentNodeWasRemoved: "content-flow-content-node-was-removed"
-};
-
-WebInspector.ContentFlow.prototype = {
-
- constructor: WebInspector.ContentFlow,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> // Use the flow node id, to avoid collisions when we change main document id.
</span><span class="cx"> return this._documentNodeIdentifier + ":" + this._name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get documentNodeIdentifier()
</span><span class="cx"> {
</span><span class="cx"> return this._documentNodeIdentifier;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get name()
</span><span class="cx"> {
</span><span class="cx"> return this._name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get overset()
</span><span class="cx"> {
</span><span class="cx"> return this._overset;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set overset(overset)
</span><span class="cx"> {
</span><span class="lines">@@ -77,28 +68,28 @@
</span><span class="cx"> return;
</span><span class="cx"> this._overset = overset;
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentFlow.Event.FlowOversetWasChanged);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get contentNodes()
</span><span class="cx"> {
</span><span class="cx"> return this._contentNodes;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- insertContentNodeBefore: function(contentNode, referenceNode)
</del><ins>+ insertContentNodeBefore(contentNode, referenceNode)
</ins><span class="cx"> {
</span><span class="cx"> var index = this._contentNodes.indexOf(referenceNode);
</span><span class="cx"> console.assert(index !== -1);
</span><span class="cx"> this._contentNodes.splice(index, 0, contentNode);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentFlow.Event.ContentNodeWasAdded, {node: contentNode, before: referenceNode});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- appendContentNode: function(contentNode)
</del><ins>+ appendContentNode(contentNode)
</ins><span class="cx"> {
</span><span class="cx"> this._contentNodes.push(contentNode);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentFlow.Event.ContentNodeWasAdded, {node: contentNode});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeContentNode: function(contentNode)
</del><ins>+ removeContentNode(contentNode)
</ins><span class="cx"> {
</span><span class="cx"> var index = this._contentNodes.indexOf(contentNode);
</span><span class="cx"> console.assert(index !== -1);
</span><span class="lines">@@ -106,3 +97,9 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentFlow.Event.ContentNodeWasRemoved, {node: contentNode});
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.ContentFlow.Event = {
+ OversetWasChanged: "content-flow-overset-was-changed",
+ ContentNodeWasAdded: "content-flow-content-node-was-added",
+ ContentNodeWasRemoved: "content-flow-content-node-was-removed"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCookieStorageObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CookieStorageObject.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CookieStorageObject.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CookieStorageObject.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,25 +23,26 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.CookieStorageObject = function(host)
</del><ins>+WebInspector.CookieStorageObject = class CookieStorageObject
</ins><span class="cx"> {
</span><del>- this._host = host;
-};
</del><ins>+ constructor(host)
+ {
+ this._host = host;
+ }
</ins><span class="cx">
</span><del>-WebInspector.CookieStorageObject.TypeIdentifier = "cookie-storage";
-WebInspector.CookieStorageObject.CookieHostCookieKey = "cookie-storage-host";
</del><ins>+ // Public
</ins><span class="cx">
</span><del>-WebInspector.CookieStorageObject.prototype = {
- constructor: WebInspector.CookieStorageObject,
-
</del><span class="cx"> get host()
</span><span class="cx"> {
</span><span class="cx"> return this._host;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><ins>+ // FIXME: This class will need to look up cookies that are set for this host.
</ins><span class="cx"> cookie[WebInspector.CookieStorageObject.CookieHostCookieKey] = this.host;
</span><del>- }
- // FIXME: This class will need to look up cookies that are set for this host.
</del><ins>+ }
</ins><span class="cx"> };
</span><ins>+
+WebInspector.CookieStorageObject.TypeIdentifier = "cookie-storage";
+WebInspector.CookieStorageObject.CookieHostCookieKey = "cookie-storage-host";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDOMNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -30,92 +30,86 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DOMNode = function(domAgent, doc, isInShadowTree, payload) {
- WebInspector.Object.call(this);
</del><ins>+WebInspector.DOMNode = class DOMNode extends WebInspector.Object
+{
+ constructor(domAgent, doc, isInShadowTree, payload)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._domAgent = domAgent;
- this._isInShadowTree = isInShadowTree;
</del><ins>+ this._domAgent = domAgent;
+ this._isInShadowTree = isInShadowTree;
</ins><span class="cx">
</span><del>- this.id = payload.nodeId;
- domAgent._idToDOMNode[this.id] = this;
</del><ins>+ this.id = payload.nodeId;
+ domAgent._idToDOMNode[this.id] = this;
</ins><span class="cx">
</span><del>- this._nodeType = payload.nodeType;
- this._nodeName = payload.nodeName;
- this._localName = payload.localName;
- this._nodeValue = payload.nodeValue;
- this._computedRole = payload.role;
</del><ins>+ this._nodeType = payload.nodeType;
+ this._nodeName = payload.nodeName;
+ this._localName = payload.localName;
+ this._nodeValue = payload.nodeValue;
+ this._computedRole = payload.role;
</ins><span class="cx">
</span><del>- if (this._nodeType === Node.DOCUMENT_NODE)
- this.ownerDocument = this;
- else
- this.ownerDocument = doc;
</del><ins>+ if (this._nodeType === Node.DOCUMENT_NODE)
+ this.ownerDocument = this;
+ else
+ this.ownerDocument = doc;
</ins><span class="cx">
</span><del>- this._attributes = [];
- this._attributesMap = {};
- if (payload.attributes)
- this._setAttributesPayload(payload.attributes);
</del><ins>+ this._attributes = [];
+ this._attributesMap = {};
+ if (payload.attributes)
+ this._setAttributesPayload(payload.attributes);
</ins><span class="cx">
</span><del>- this._childNodeCount = payload.childNodeCount;
- this._children = null;
- this._filteredChildren = null;
- this._filteredChildrenNeedsUpdating = true;
</del><ins>+ this._childNodeCount = payload.childNodeCount;
+ this._children = null;
+ this._filteredChildren = null;
+ this._filteredChildrenNeedsUpdating = true;
</ins><span class="cx">
</span><del>- this._nextSibling = null;
- this._previousSibling = null;
- this.parentNode = null;
</del><ins>+ this._nextSibling = null;
+ this._previousSibling = null;
+ this.parentNode = null;
</ins><span class="cx">
</span><del>- this._enabledPseudoClasses = [];
</del><ins>+ this._enabledPseudoClasses = [];
</ins><span class="cx">
</span><del>- this._shadowRoots = [];
- if (payload.shadowRoots) {
- for (var i = 0; i < payload.shadowRoots.length; ++i) {
- var root = payload.shadowRoots[i];
- var node = new WebInspector.DOMNode(this._domAgent, this.ownerDocument, true, root);
- this._shadowRoots.push(node);
</del><ins>+ this._shadowRoots = [];
+ if (payload.shadowRoots) {
+ for (var i = 0; i < payload.shadowRoots.length; ++i) {
+ var root = payload.shadowRoots[i];
+ var node = new WebInspector.DOMNode(this._domAgent, this.ownerDocument, true, root);
+ this._shadowRoots.push(node);
+ }
</ins><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- if (payload.children)
- this._setChildrenPayload(payload.children);
</del><ins>+ if (payload.children)
+ this._setChildrenPayload(payload.children);
</ins><span class="cx">
</span><del>- if (payload.contentDocument) {
- this._contentDocument = new WebInspector.DOMNode(domAgent, null, false, payload.contentDocument);
- this._children = [this._contentDocument];
- this._renumber();
- }
</del><ins>+ if (payload.contentDocument) {
+ this._contentDocument = new WebInspector.DOMNode(domAgent, null, false, payload.contentDocument);
+ this._children = [this._contentDocument];
+ this._renumber();
+ }
</ins><span class="cx">
</span><del>- if (this._nodeType === Node.ELEMENT_NODE) {
- // HTML and BODY from internal iframes should not overwrite top-level ones.
- if (this.ownerDocument && !this.ownerDocument.documentElement && this._nodeName === "HTML")
- this.ownerDocument.documentElement = this;
- if (this.ownerDocument && !this.ownerDocument.body && this._nodeName === "BODY")
- this.ownerDocument.body = this;
- if (payload.documentURL)
</del><ins>+ if (this._nodeType === Node.ELEMENT_NODE) {
+ // HTML and BODY from internal iframes should not overwrite top-level ones.
+ if (this.ownerDocument && !this.ownerDocument.documentElement && this._nodeName === "HTML")
+ this.ownerDocument.documentElement = this;
+ if (this.ownerDocument && !this.ownerDocument.body && this._nodeName === "BODY")
+ this.ownerDocument.body = this;
+ if (payload.documentURL)
+ this.documentURL = payload.documentURL;
+ } else if (this._nodeType === Node.DOCUMENT_TYPE_NODE) {
+ this.publicId = payload.publicId;
+ this.systemId = payload.systemId;
+ this.internalSubset = payload.internalSubset;
+ } else if (this._nodeType === Node.DOCUMENT_NODE) {
</ins><span class="cx"> this.documentURL = payload.documentURL;
</span><del>- } else if (this._nodeType === Node.DOCUMENT_TYPE_NODE) {
- this.publicId = payload.publicId;
- this.systemId = payload.systemId;
- this.internalSubset = payload.internalSubset;
- } else if (this._nodeType === Node.DOCUMENT_NODE) {
- this.documentURL = payload.documentURL;
- this.xmlVersion = payload.xmlVersion;
- } else if (this._nodeType === Node.ATTRIBUTE_NODE) {
- this.name = payload.name;
- this.value = payload.value;
</del><ins>+ this.xmlVersion = payload.xmlVersion;
+ } else if (this._nodeType === Node.ATTRIBUTE_NODE) {
+ this.name = payload.name;
+ this.value = payload.value;
+ }
</ins><span class="cx"> }
</span><del>-};
</del><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.DOMNode);
</del><ins>+ // Public
</ins><span class="cx">
</span><del>-WebInspector.DOMNode.Event = {
- EnabledPseudoClassesChanged: "dom-node-enabled-pseudo-classes-did-change",
- AttributeModified: "dom-node-attribute-modified",
- AttributeRemoved: "dom-node-attribute-removed"
-};
-
-WebInspector.DOMNode.prototype = {
- constructor: WebInspector.DOMNode,
-
</del><span class="cx"> get children()
</span><span class="cx"> {
</span><span class="cx"> if (!this._children)
</span><span class="lines">@@ -132,7 +126,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return this._filteredChildren;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get firstChild()
</span><span class="cx"> {
</span><span class="lines">@@ -142,7 +136,7 @@
</span><span class="cx"> return children[0];
</span><span class="cx">
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get lastChild()
</span><span class="cx"> {
</span><span class="lines">@@ -152,7 +146,7 @@
</span><span class="cx"> return children.lastValue;
</span><span class="cx">
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get nextSibling()
</span><span class="cx"> {
</span><span class="lines">@@ -166,7 +160,7 @@
</span><span class="cx"> node = node._nextSibling;
</span><span class="cx"> }
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get previousSibling()
</span><span class="cx"> {
</span><span class="lines">@@ -180,7 +174,7 @@
</span><span class="cx"> node = node._previousSibling;
</span><span class="cx"> }
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get childNodeCount()
</span><span class="cx"> {
</span><span class="lines">@@ -192,95 +186,95 @@
</span><span class="cx"> return this._childNodeCount + this._shadowRoots.length;
</span><span class="cx">
</span><span class="cx"> return this._childNodeCount;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set childNodeCount(count)
</span><span class="cx"> {
</span><span class="cx"> this._childNodeCount = count;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- computedRole: function()
</del><ins>+ computedRole()
</ins><span class="cx"> {
</span><span class="cx"> return this._computedRole;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hasAttributes: function()
</del><ins>+ hasAttributes()
</ins><span class="cx"> {
</span><span class="cx"> return this._attributes.length > 0;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hasChildNodes: function()
</del><ins>+ hasChildNodes()
</ins><span class="cx"> {
</span><span class="cx"> return this.childNodeCount > 0;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hasShadowRoots: function()
</del><ins>+ hasShadowRoots()
</ins><span class="cx"> {
</span><span class="cx"> return !!this._shadowRoots.length;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isInShadowTree: function()
</del><ins>+ isInShadowTree()
</ins><span class="cx"> {
</span><span class="cx"> return this._isInShadowTree;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- nodeType: function()
</del><ins>+ nodeType()
</ins><span class="cx"> {
</span><span class="cx"> return this._nodeType;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- nodeName: function()
</del><ins>+ nodeName()
</ins><span class="cx"> {
</span><span class="cx"> return this._nodeName;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- nodeNameInCorrectCase: function()
</del><ins>+ nodeNameInCorrectCase()
</ins><span class="cx"> {
</span><span class="cx"> return this.isXMLNode() ? this.nodeName() : this.nodeName().toLowerCase();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- setNodeName: function(name, callback)
</del><ins>+ setNodeName(name, callback)
</ins><span class="cx"> {
</span><span class="cx"> DOMAgent.setNodeName(this.id, name, this._makeUndoableCallback(callback));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- localName: function()
</del><ins>+ localName()
</ins><span class="cx"> {
</span><span class="cx"> return this._localName;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- nodeValue: function()
</del><ins>+ nodeValue()
</ins><span class="cx"> {
</span><span class="cx"> return this._nodeValue;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- setNodeValue: function(value, callback)
</del><ins>+ setNodeValue(value, callback)
</ins><span class="cx"> {
</span><span class="cx"> DOMAgent.setNodeValue(this.id, value, this._makeUndoableCallback(callback));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- getAttribute: function(name)
</del><ins>+ getAttribute(name)
</ins><span class="cx"> {
</span><span class="cx"> var attr = this._attributesMap[name];
</span><span class="cx"> return attr ? attr.value : undefined;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- setAttribute: function(name, text, callback)
</del><ins>+ setAttribute(name, text, callback)
</ins><span class="cx"> {
</span><span class="cx"> DOMAgent.setAttributesAsText(this.id, text, name, this._makeUndoableCallback(callback));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- setAttributeValue: function(name, value, callback)
</del><ins>+ setAttributeValue(name, value, callback)
</ins><span class="cx"> {
</span><span class="cx"> DOMAgent.setAttributeValue(this.id, name, value, this._makeUndoableCallback(callback));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- attributes: function()
</del><ins>+ attributes()
</ins><span class="cx"> {
</span><span class="cx"> return this._attributes;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeAttribute: function(name, callback)
</del><ins>+ removeAttribute(name, callback)
</ins><span class="cx"> {
</span><span class="cx"> function mycallback(error, success)
</span><span class="cx"> {
</span><span class="lines">@@ -297,9 +291,9 @@
</span><span class="cx"> this._makeUndoableCallback(callback)(error);
</span><span class="cx"> }
</span><span class="cx"> DOMAgent.removeAttribute(this.id, name, mycallback.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- getChildNodes: function(callback)
</del><ins>+ getChildNodes(callback)
</ins><span class="cx"> {
</span><span class="cx"> if (this.children) {
</span><span class="cx"> if (callback)
</span><span class="lines">@@ -313,9 +307,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DOMAgent.requestChildNodes(this.id, mycallback.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- getSubtree: function(depth, callback)
</del><ins>+ getSubtree(depth, callback)
</ins><span class="cx"> {
</span><span class="cx"> function mycallback(error)
</span><span class="cx"> {
</span><span class="lines">@@ -324,24 +318,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DOMAgent.requestChildNodes(this.id, depth, mycallback.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- getOuterHTML: function(callback)
</del><ins>+ getOuterHTML(callback)
</ins><span class="cx"> {
</span><span class="cx"> DOMAgent.getOuterHTML(this.id, callback);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- setOuterHTML: function(html, callback)
</del><ins>+ setOuterHTML(html, callback)
</ins><span class="cx"> {
</span><span class="cx"> DOMAgent.setOuterHTML(this.id, html, this._makeUndoableCallback(callback));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeNode: function(callback)
</del><ins>+ removeNode(callback)
</ins><span class="cx"> {
</span><span class="cx"> DOMAgent.removeNode(this.id, this._makeUndoableCallback(callback));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- copyNode: function()
</del><ins>+ copyNode()
</ins><span class="cx"> {
</span><span class="cx"> function copy(error, text)
</span><span class="cx"> {
</span><span class="lines">@@ -349,14 +343,14 @@
</span><span class="cx"> InspectorFrontendHost.copyText(text);
</span><span class="cx"> }
</span><span class="cx"> DOMAgent.getOuterHTML(this.id, copy);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- eventListeners: function(callback)
</del><ins>+ eventListeners(callback)
</ins><span class="cx"> {
</span><span class="cx"> DOMAgent.getEventListenersForNode(this.id, callback);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- accessibilityProperties: function(callback)
</del><ins>+ accessibilityProperties(callback)
</ins><span class="cx"> {
</span><span class="cx"> function accessibilityPropertiesCallback(error, accessibilityProperties)
</span><span class="cx"> {
</span><span class="lines">@@ -394,9 +388,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> DOMAgent.getAccessibilityPropertiesForNode(this.id, accessibilityPropertiesCallback.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- path: function()
</del><ins>+ path()
</ins><span class="cx"> {
</span><span class="cx"> var path = [];
</span><span class="cx"> var node = this;
</span><span class="lines">@@ -406,9 +400,9 @@
</span><span class="cx"> }
</span><span class="cx"> path.reverse();
</span><span class="cx"> return path.join(",");
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- appropriateSelectorFor: function(justSelector)
</del><ins>+ appropriateSelectorFor(justSelector)
</ins><span class="cx"> {
</span><span class="cx"> var lowerCaseName = this.localName() || this.nodeName().toLowerCase();
</span><span class="cx">
</span><span class="lines">@@ -432,9 +426,9 @@
</span><span class="cx"> return lowerCaseName + "[type=\"" + this.getAttribute("type") + "\"]";
</span><span class="cx">
</span><span class="cx"> return lowerCaseName;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isAncestor: function(node)
</del><ins>+ isAncestor(node)
</ins><span class="cx"> {
</span><span class="cx"> if (!node)
</span><span class="cx"> return false;
</span><span class="lines">@@ -446,22 +440,22 @@
</span><span class="cx"> currentNode = currentNode.parentNode;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isDescendant: function(descendant)
</del><ins>+ isDescendant(descendant)
</ins><span class="cx"> {
</span><span class="cx"> return descendant !== null && descendant.isAncestor(this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _setAttributesPayload: function(attrs)
</del><ins>+ _setAttributesPayload(attrs)
</ins><span class="cx"> {
</span><span class="cx"> this._attributes = [];
</span><span class="cx"> this._attributesMap = {};
</span><span class="cx"> for (var i = 0; i < attrs.length; i += 2)
</span><span class="cx"> this._addAttribute(attrs[i], attrs[i + 1]);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _insertChild: function(prev, payload)
</del><ins>+ _insertChild(prev, payload)
</ins><span class="cx"> {
</span><span class="cx"> var node = new WebInspector.DOMNode(this._domAgent, this.ownerDocument, this._isInShadowTree, payload);
</span><span class="cx"> if (!prev) {
</span><span class="lines">@@ -474,16 +468,16 @@
</span><span class="cx"> this._children.splice(this._children.indexOf(prev) + 1, 0, node);
</span><span class="cx"> this._renumber();
</span><span class="cx"> return node;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _removeChild: function(node)
</del><ins>+ _removeChild(node)
</ins><span class="cx"> {
</span><span class="cx"> this._children.splice(this._children.indexOf(node), 1);
</span><span class="cx"> node.parentNode = null;
</span><span class="cx"> this._renumber();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _setChildrenPayload: function(payloads)
</del><ins>+ _setChildrenPayload(payloads)
</ins><span class="cx"> {
</span><span class="cx"> // We set children in the constructor.
</span><span class="cx"> if (this._contentDocument)
</span><span class="lines">@@ -496,9 +490,9 @@
</span><span class="cx"> this._children.push(node);
</span><span class="cx"> }
</span><span class="cx"> this._renumber();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _renumber: function()
</del><ins>+ _renumber()
</ins><span class="cx"> {
</span><span class="cx"> this._filteredChildrenNeedsUpdating = true;
</span><span class="cx">
</span><span class="lines">@@ -513,49 +507,49 @@
</span><span class="cx"> child._previousSibling = i - 1 >= 0 ? this._children[i - 1] : null;
</span><span class="cx"> child.parentNode = this;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _addAttribute: function(name, value)
</del><ins>+ _addAttribute(name, value)
</ins><span class="cx"> {
</span><span class="cx"> var attr = {name, value, _node: this};
</span><span class="cx"> this._attributesMap[name] = attr;
</span><span class="cx"> this._attributes.push(attr);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _setAttribute: function(name, value)
</del><ins>+ _setAttribute(name, value)
</ins><span class="cx"> {
</span><span class="cx"> var attr = this._attributesMap[name];
</span><span class="cx"> if (attr)
</span><span class="cx"> attr.value = value;
</span><span class="cx"> else
</span><span class="cx"> this._addAttribute(name, value);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _removeAttribute: function(name)
</del><ins>+ _removeAttribute(name)
</ins><span class="cx"> {
</span><span class="cx"> var attr = this._attributesMap[name];
</span><span class="cx"> if (attr) {
</span><span class="cx"> this._attributes.remove(attr);
</span><span class="cx"> delete this._attributesMap[name];
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- moveTo: function(targetNode, anchorNode, callback)
</del><ins>+ moveTo(targetNode, anchorNode, callback)
</ins><span class="cx"> {
</span><span class="cx"> DOMAgent.moveTo(this.id, targetNode.id, anchorNode ? anchorNode.id : undefined, this._makeUndoableCallback(callback));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isXMLNode: function()
</del><ins>+ isXMLNode()
</ins><span class="cx"> {
</span><span class="cx"> return !!this.ownerDocument && !!this.ownerDocument.xmlVersion;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get enabledPseudoClasses()
</span><span class="cx"> {
</span><span class="cx"> return this._enabledPseudoClasses;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- setPseudoClassEnabled: function(pseudoClass, enabled)
</del><ins>+ setPseudoClassEnabled(pseudoClass, enabled)
</ins><span class="cx"> {
</span><span class="cx"> var pseudoClasses = this._enabledPseudoClasses;
</span><span class="cx"> if (enabled) {
</span><span class="lines">@@ -575,9 +569,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSAgent.forcePseudoState(this.id, pseudoClasses, changed.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _makeUndoableCallback: function(callback)
</del><ins>+ _makeUndoableCallback(callback)
</ins><span class="cx"> {
</span><span class="cx"> return function(error)
</span><span class="cx"> {
</span><span class="lines">@@ -590,4 +584,8 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.DOMNode.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.DOMNode.Event = {
+ EnabledPseudoClassesChanged: "dom-node-enabled-pseudo-classes-did-change",
+ AttributeModified: "dom-node-attribute-modified",
+ AttributeRemoved: "dom-node-attribute-removed"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDOMNodeStylesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,60 +23,52 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DOMNodeStyles = function(node)
</del><ins>+WebInspector.DOMNodeStyles = class DOMNodeStyles extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(node)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(node);
- this._node = node || null;
</del><ins>+ console.assert(node);
+ this._node = node || null;
</ins><span class="cx">
</span><del>- this._rulesMap = {};
- this._styleDeclarationsMap = {};
</del><ins>+ this._rulesMap = {};
+ this._styleDeclarationsMap = {};
</ins><span class="cx">
</span><del>- this._matchedRules = [];
- this._inheritedRules = [];
- this._pseudoElements = {};
- this._inlineStyle = null;
- this._attributesStyle = null;
- this._computedStyle = null;
- this._orderedStyles = [];
- this._stylesNeedingTextCommited = [];
</del><ins>+ this._matchedRules = [];
+ this._inheritedRules = [];
+ this._pseudoElements = {};
+ this._inlineStyle = null;
+ this._attributesStyle = null;
+ this._computedStyle = null;
+ this._orderedStyles = [];
+ this._stylesNeedingTextCommited = [];
</ins><span class="cx">
</span><del>- this._propertyNameToEffectivePropertyMap = {};
</del><ins>+ this._propertyNameToEffectivePropertyMap = {};
</ins><span class="cx">
</span><del>- this.refresh();
-};
</del><ins>+ this.refresh();
+ }
</ins><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.DOMNodeStyles);
-
-WebInspector.DOMNodeStyles.Event = {
- NeedsRefresh: "dom-node-styles-needs-refresh",
- Refreshed: "dom-node-styles-refreshed"
-};
-
-WebInspector.DOMNodeStyles.prototype = {
- constructor: WebInspector.DOMNodeStyles,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get node()
</span><span class="cx"> {
</span><span class="cx"> return this._node;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get needsRefresh()
</span><span class="cx"> {
</span><span class="cx"> return this._refreshPending || this._needsRefresh;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- refreshIfNeeded: function()
</del><ins>+ refreshIfNeeded()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._needsRefresh)
</span><span class="cx"> return;
</span><span class="cx"> this.refresh();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- refresh: function()
</del><ins>+ refresh()
</ins><span class="cx"> {
</span><span class="cx"> if (this._refreshPending)
</span><span class="cx"> return;
</span><span class="lines">@@ -246,9 +238,9 @@
</span><span class="cx"> CSSAgent.getMatchedStylesForNode.invoke({nodeId: this._node.id, includePseudo: true, includeInherited: true}, fetchedMatchedStyles.bind(this));
</span><span class="cx"> CSSAgent.getInlineStylesForNode.invoke({nodeId: this._node.id}, fetchedInlineStyles.bind(this));
</span><span class="cx"> CSSAgent.getComputedStyleForNode.invoke({nodeId: this._node.id}, fetchedComputedStyle.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addEmptyRule: function()
</del><ins>+ addEmptyRule()
</ins><span class="cx"> {
</span><span class="cx"> function addedRule(error, rulePayload)
</span><span class="cx"> {
</span><span class="lines">@@ -263,63 +255,63 @@
</span><span class="cx"> selector = this._node.appropriateSelectorFor(true);
</span><span class="cx">
</span><span class="cx"> CSSAgent.addRule.invoke({contextNodeId: this._node.id, selector}, addedRule.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get matchedRules()
</span><span class="cx"> {
</span><span class="cx"> return this._matchedRules;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get inheritedRules()
</span><span class="cx"> {
</span><span class="cx"> return this._inheritedRules;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get inlineStyle()
</span><span class="cx"> {
</span><span class="cx"> return this._inlineStyle;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get attributesStyle()
</span><span class="cx"> {
</span><span class="cx"> return this._attributesStyle;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get pseudoElements()
</span><span class="cx"> {
</span><span class="cx"> return this._pseudoElements;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get computedStyle()
</span><span class="cx"> {
</span><span class="cx"> return this._computedStyle;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get orderedStyles()
</span><span class="cx"> {
</span><span class="cx"> return this._orderedStyles;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- effectivePropertyForName: function(name)
</del><ins>+ effectivePropertyForName(name)
</ins><span class="cx"> {
</span><span class="cx"> var canonicalName = WebInspector.cssStyleManager.canonicalNameForPropertyName(name);
</span><span class="cx"> return this._propertyNameToEffectivePropertyMap[canonicalName] || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><del>- mediaQueryResultDidChange: function()
</del><ins>+ mediaQueryResultDidChange()
</ins><span class="cx"> {
</span><span class="cx"> this._markAsNeedsRefresh();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- pseudoClassesDidChange: function(node)
</del><ins>+ pseudoClassesDidChange(node)
</ins><span class="cx"> {
</span><span class="cx"> this._includeUserAgentRulesOnNextRefresh = true;
</span><span class="cx"> this._markAsNeedsRefresh();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- attributeDidChange: function(node, attributeName)
</del><ins>+ attributeDidChange(node, attributeName)
</ins><span class="cx"> {
</span><span class="cx"> // Ignore the attribute we know we just changed and handled above.
</span><span class="cx"> if (this._ignoreNextStyleAttributeDidChangeEvent && node === this._node && attributeName === "style") {
</span><span class="lines">@@ -328,9 +320,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._markAsNeedsRefresh();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- changeRuleSelector: function(rule, selector)
</del><ins>+ changeRuleSelector(rule, selector)
</ins><span class="cx"> {
</span><span class="cx"> selector = selector || "";
</span><span class="cx">
</span><span class="lines">@@ -347,41 +339,41 @@
</span><span class="cx"> this._ignoreNextContentDidChangeForStyleSheet = rule.ownerStyleSheet;
</span><span class="cx">
</span><span class="cx"> CSSAgent.setRuleSelector(rule.id, selector, ruleSelectorChanged.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- changeStyleText: function(style, text)
</del><ins>+ changeStyleText(style, text)
</ins><span class="cx"> {
</span><span class="cx"> if (!style.ownerStyleSheet || !style.styleSheetTextRange)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> text = text || "";
</span><span class="cx">
</span><del>- if (CSSAgent.setStyleText) {
- function styleChanged(error, stylePayload)
- {
- if (error)
- return;
- this.refresh();
- }
</del><ins>+ function styleChanged(error, stylePayload)
+ {
+ if (error)
+ return;
+ this.refresh();
+ }
</ins><span class="cx">
</span><ins>+ if (CSSAgent.setStyleText) {
</ins><span class="cx"> CSSAgent.setStyleText(style.id, text, styleChanged.bind(this));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // COMPATIBILITY (iOS 6): CSSAgent.setStyleText was not available in iOS 6.
</span><span class="cx">
</span><ins>+ function attributeChanged(error)
+ {
+ if (error)
+ return;
+ this.refresh();
+ }
+
</ins><span class="cx"> // Setting the text on CSSStyleSheet for inline styles causes a crash. https://webkit.org/b/110359
</span><span class="cx"> // So we just set the style attribute to get the same affect. This also avoids SourceCodeRevisions.
</span><span class="cx"> if (style.type === WebInspector.CSSStyleDeclaration.Type.Inline) {
</span><span class="cx"> text = text.trim();
</span><span class="cx">
</span><del>- function attributeChanged(error)
- {
- if (error)
- return;
- this.refresh();
- }
-
</del><span class="cx"> this._ignoreNextStyleAttributeDidChangeEvent = true;
</span><span class="cx">
</span><span class="cx"> if (text)
</span><span class="lines">@@ -449,11 +441,11 @@
</span><span class="cx"> this._ignoreNextContentDidChangeForStyleSheet = style.ownerStyleSheet;
</span><span class="cx">
</span><span class="cx"> style.ownerStyleSheet.requestContent().then(fetchedStyleSheetContent.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _createSourceCodeLocation: function(sourceURL, sourceLine, sourceColumn)
</del><ins>+ _createSourceCodeLocation(sourceURL, sourceLine, sourceColumn)
</ins><span class="cx"> {
</span><span class="cx"> if (!sourceURL)
</span><span class="cx"> return null;
</span><span class="lines">@@ -477,9 +469,9 @@
</span><span class="cx"> return null;
</span><span class="cx">
</span><span class="cx"> return sourceCode.createSourceCodeLocation(sourceLine || 0, sourceColumn || 0);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _parseSourceRangePayload: function(payload, text)
</del><ins>+ _parseSourceRangePayload(payload, text)
</ins><span class="cx"> {
</span><span class="cx"> if (!payload)
</span><span class="cx"> return null;
</span><span class="lines">@@ -494,9 +486,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return new WebInspector.TextRange(payload.startLine, payload.startColumn, payload.endLine, payload.endColumn);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _parseStylePropertyPayload: function(payload, index, styleDeclaration, styleText)
</del><ins>+ _parseStylePropertyPayload(payload, index, styleDeclaration, styleText)
</ins><span class="cx"> {
</span><span class="cx"> var text = payload.text || "";
</span><span class="cx"> var name = payload.name;
</span><span class="lines">@@ -564,9 +556,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return new WebInspector.CSSProperty(index, text, name, value, priority, enabled, overridden, implicit, anonymous, valid, styleSheetTextRange, styleDeclarationTextRange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _parseStyleDeclarationPayload: function(payload, node, inherited, type, rule, updateAllStyles)
</del><ins>+ _parseStyleDeclarationPayload(payload, node, inherited, type, rule, updateAllStyles)
</ins><span class="cx"> {
</span><span class="cx"> if (!payload)
</span><span class="cx"> return null;
</span><span class="lines">@@ -674,9 +666,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return styleDeclaration;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _parseSelectorListPayload: function(selectorList)
</del><ins>+ _parseSelectorListPayload(selectorList)
</ins><span class="cx"> {
</span><span class="cx"> // COMPATIBILITY (iOS 6): The payload did not have 'selectorList'.
</span><span class="cx"> if (!selectorList)
</span><span class="lines">@@ -697,9 +689,9 @@
</span><span class="cx"> return selectors.map(function(selectorPayload) {
</span><span class="cx"> return new WebInspector.CSSSelector(selectorPayload.text, selectorPayload.specificity, selectorPayload.dynamic);
</span><span class="cx"> });
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _parseRulePayload: function(payload, matchedSelectorIndices, node, inherited, ruleOccurrences)
</del><ins>+ _parseRulePayload(payload, matchedSelectorIndices, node, inherited, ruleOccurrences)
</ins><span class="cx"> {
</span><span class="cx"> if (!payload)
</span><span class="cx"> return null;
</span><span class="lines">@@ -812,15 +804,15 @@
</span><span class="cx"> this._rulesMap[mapKey] = rule;
</span><span class="cx">
</span><span class="cx"> return rule;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _markAsNeedsRefresh: function()
</del><ins>+ _markAsNeedsRefresh()
</ins><span class="cx"> {
</span><span class="cx"> this._needsRefresh = true;
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DOMNodeStyles.Event.NeedsRefresh);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _styleSheetContentDidChange: function(event)
</del><ins>+ _styleSheetContentDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> var styleSheet = event.target;
</span><span class="cx"> console.assert(styleSheet);
</span><span class="lines">@@ -834,9 +826,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._markAsNeedsRefresh();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateStyleCascade: function()
</del><ins>+ _updateStyleCascade()
</ins><span class="cx"> {
</span><span class="cx"> var cascadeOrderedStyleDeclarations = this._collectStylesInCascadeOrder(this._matchedRules, this._inlineStyle, this._attributesStyle);
</span><span class="cx">
</span><span class="lines">@@ -859,9 +851,9 @@
</span><span class="cx"> this._markOverriddenProperties(pseudoElementInfo.orderedStyles);
</span><span class="cx"> this._associateRelatedProperties(pseudoElementInfo.orderedStyles);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _collectStylesInCascadeOrder: function(matchedRules, inlineStyle, attributesStyle)
</del><ins>+ _collectStylesInCascadeOrder(matchedRules, inlineStyle, attributesStyle)
</ins><span class="cx"> {
</span><span class="cx"> var result = [];
</span><span class="cx">
</span><span class="lines">@@ -897,9 +889,9 @@
</span><span class="cx"> result = result.concat(userAndUserAgentStyles);
</span><span class="cx">
</span><span class="cx"> return result;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _markOverriddenProperties: function(styles, propertyNameToEffectiveProperty)
</del><ins>+ _markOverriddenProperties(styles, propertyNameToEffectiveProperty)
</ins><span class="cx"> {
</span><span class="cx"> propertyNameToEffectiveProperty = propertyNameToEffectiveProperty || {};
</span><span class="cx">
</span><span class="lines">@@ -941,9 +933,9 @@
</span><span class="cx"> propertyNameToEffectiveProperty[canonicalName] = property;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _associateRelatedProperties: function(styles, propertyNameToEffectiveProperty)
</del><ins>+ _associateRelatedProperties(styles, propertyNameToEffectiveProperty)
</ins><span class="cx"> {
</span><span class="cx"> for (var i = 0; i < styles.length; ++i) {
</span><span class="cx"> var properties = styles[i].properties;
</span><span class="lines">@@ -1001,4 +993,7 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.DOMNodeStyles.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.DOMNodeStyles.Event = {
+ NeedsRefresh: "dom-node-styles-needs-refresh",
+ Refreshed: "dom-node-styles-refreshed"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDOMSearchMatchObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMSearchMatchObject.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMSearchMatchObject.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMSearchMatchObject.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,52 +23,87 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DOMSearchMatchObject = function(resource, domNode, title, searchTerm, textRange)
</del><ins>+WebInspector.DOMSearchMatchObject = class DOMSearchMatchObject extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- console.assert(resource instanceof WebInspector.Resource);
- console.assert(domNode instanceof WebInspector.DOMNode);
</del><ins>+ constructor(resource, domNode, title, searchTerm, textRange)
+ {
+ super();
</ins><span class="cx">
</span><del>- WebInspector.Object.call(this);
</del><ins>+ console.assert(resource instanceof WebInspector.Resource);
+ console.assert(domNode instanceof WebInspector.DOMNode);
</ins><span class="cx">
</span><del>- this._resource = resource;
- this._domNode = domNode;
- this._title = title;
- this._searchTerm = searchTerm;
- this._sourceCodeTextRange = resource.createSourceCodeTextRange(textRange);
-};
</del><ins>+ this._resource = resource;
+ this._domNode = domNode;
+ this._title = title;
+ this._searchTerm = searchTerm;
+ this._sourceCodeTextRange = resource.createSourceCodeTextRange(textRange);
+ }
</ins><span class="cx">
</span><del>-WebInspector.DOMSearchMatchObject.DOMMatchElementIconStyleClassName = "dom-match-element-icon";
-WebInspector.DOMSearchMatchObject.DOMMatchTextNodeIconStyleClassName = "dom-match-text-node-icon";
-WebInspector.DOMSearchMatchObject.DOMMatchCommentIconStyleClassName = "dom-match-comment-icon";
-WebInspector.DOMSearchMatchObject.DOMMatchDocumentTypeIconStyleClassName = "dom-match-document-type-icon";
-WebInspector.DOMSearchMatchObject.DOMMatchCharacterDataIconStyleClassName = "dom-match-character-data-icon";
-WebInspector.DOMSearchMatchObject.DOMMatchNodeIconStyleClassName = "dom-match-node-icon";
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.DOMSearchMatchObject.TypeIdentifier = "dom-search-match-object";
-WebInspector.DOMSearchMatchObject.URLCookieKey = "resource-url";
-WebInspector.DOMSearchMatchObject.TitleKey = "title";
-WebInspector.DOMSearchMatchObject.TextRangeKey = "text-range";
</del><ins>+ static titleForDOMNode(domNode)
+ {
+ switch (domNode.nodeType()) {
+ case Node.ELEMENT_NODE:
+ var title = "<" + domNode.nodeNameInCorrectCase();
+ for (var attribute of domNode.attributes()) {
+ title += " " + attribute.name;
+ if (attribute.value.length)
+ title += "=\"" + attribute.value + "\"";
+ }
+ return title + ">";
</ins><span class="cx">
</span><del>-WebInspector.DOMSearchMatchObject.prototype = {
- constructor: WebInspector.DOMSearchMatchObject,
- __proto__: WebInspector.Object.prototype,
</del><ins>+ case Node.TEXT_NODE:
+ return "\"" + domNode.nodeValue() + "\"";
</ins><span class="cx">
</span><ins>+ case Node.COMMENT_NODE:
+ return "<!--" + domNode.nodeValue() + "-->";
+
+ case Node.DOCUMENT_TYPE_NODE:
+ var title = "<!DOCTYPE " + domNode.nodeName();
+ if (domNode.publicId) {
+ title += " PUBLIC \"" + domNode.publicId + "\"";
+ if (domNode.systemId)
+ title += " \"" + domNode.systemId + "\"";
+ } else if (domNode.systemId)
+ title += " SYSTEM \"" + domNode.systemId + "\"";
+
+ if (domNode.internalSubset)
+ title += " [" + domNode.internalSubset + "]";
+
+ return title + ">";
+
+ case Node.CDATA_SECTION_NODE:
+ return "<![CDATA[" + domNode + "]]>";
+
+ case Node.PROCESSING_INSTRUCTION_NODE:
+ var data = domNode.nodeValue();
+ var dataString = data.length ? " " + data : "";
+ var title = "<?" + domNode.nodeNameInCorrectCase() + dataString + "?>";
+ return title;
+
+ default:
+ console.error("Unknown DOM node type: ", domNode.nodeType());
+ return domNode.nodeNameInCorrectCase();
+ }
+ }
+
</ins><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get resource()
</span><span class="cx"> {
</span><span class="cx"> return this._resource;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get domNode()
</span><span class="cx"> {
</span><span class="cx"> return this._domNode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get title()
</span><span class="cx"> {
</span><span class="cx"> return this._title;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get className()
</span><span class="cx"> {
</span><span class="lines">@@ -76,17 +111,17 @@
</span><span class="cx"> this._className = this._generateClassName();
</span><span class="cx">
</span><span class="cx"> return this._className;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get searchTerm()
</span><span class="cx"> {
</span><span class="cx"> return this._searchTerm;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceCodeTextRange()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCodeTextRange;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> saveIdentityToCookie(cookie)
</span><span class="cx"> {
</span><span class="lines">@@ -94,7 +129,7 @@
</span><span class="cx"> cookie[WebInspector.DOMSearchMatchObject.TitleKey] = this._title;
</span><span class="cx"> var textRange = this._sourceCodeTextRange.textRange;
</span><span class="cx"> cookie[WebInspector.DOMSearchMatchObject.TextRangeKey] = [textRange.startLine, textRange.startColumn, textRange.endLine, textRange.endColumn].join();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><span class="lines">@@ -127,49 +162,14 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.DOMSearchMatchObject.titleForDOMNode = function(domNode)
-{
- switch (domNode.nodeType()) {
- case Node.ELEMENT_NODE:
- var title = "<" + domNode.nodeNameInCorrectCase();
- for (var attribute of domNode.attributes()) {
- title += " " + attribute.name;
- if (attribute.value.length)
- title += "=\"" + attribute.value + "\"";
- }
- return title + ">";
</del><ins>+WebInspector.DOMSearchMatchObject.DOMMatchElementIconStyleClassName = "dom-match-element-icon";
+WebInspector.DOMSearchMatchObject.DOMMatchTextNodeIconStyleClassName = "dom-match-text-node-icon";
+WebInspector.DOMSearchMatchObject.DOMMatchCommentIconStyleClassName = "dom-match-comment-icon";
+WebInspector.DOMSearchMatchObject.DOMMatchDocumentTypeIconStyleClassName = "dom-match-document-type-icon";
+WebInspector.DOMSearchMatchObject.DOMMatchCharacterDataIconStyleClassName = "dom-match-character-data-icon";
+WebInspector.DOMSearchMatchObject.DOMMatchNodeIconStyleClassName = "dom-match-node-icon";
</ins><span class="cx">
</span><del>- case Node.TEXT_NODE:
- return "\"" + domNode.nodeValue() + "\"";
-
- case Node.COMMENT_NODE:
- return "<!--" + domNode.nodeValue() + "-->";
-
- case Node.DOCUMENT_TYPE_NODE:
- var title = "<!DOCTYPE " + domNode.nodeName();
- if (domNode.publicId) {
- title += " PUBLIC \"" + domNode.publicId + "\"";
- if (domNode.systemId)
- title += " \"" + domNode.systemId + "\"";
- } else if (domNode.systemId)
- title += " SYSTEM \"" + domNode.systemId + "\"";
-
- if (domNode.internalSubset)
- title += " [" + domNode.internalSubset + "]";
-
- return title + ">";
-
- case Node.CDATA_SECTION_NODE:
- return "<![CDATA[" + domNode + "]]>";
-
- case Node.PROCESSING_INSTRUCTION_NODE:
- var data = domNode.nodeValue();
- var dataString = data.length ? " " + data : "";
- var title = "<?" + domNode.nodeNameInCorrectCase() + dataString + "?>";
- return title;
-
- default:
- console.error("Unknown DOM node type: ", domNode.nodeType());
- return domNode.nodeNameInCorrectCase();
- }
-};
</del><ins>+WebInspector.DOMSearchMatchObject.TypeIdentifier = "dom-search-match-object";
+WebInspector.DOMSearchMatchObject.URLCookieKey = "resource-url";
+WebInspector.DOMSearchMatchObject.TitleKey = "title";
+WebInspector.DOMSearchMatchObject.TextRangeKey = "text-range";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDOMStorageObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMStorageObject.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMStorageObject.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMStorageObject.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,56 +23,47 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DOMStorageObject = function(id, host, isLocalStorage)
</del><ins>+WebInspector.DOMStorageObject = class DOMStorageObject extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- this._id = id;
- this._host = host;
- this._isLocalStorage = isLocalStorage;
- this._entries = new Map;
-};
</del><ins>+ constructor(id, host, isLocalStorage)
+ {
+ super();
</ins><span class="cx">
</span><del>-WebInspector.DOMStorageObject.TypeIdentifier = "dom-storage";
-WebInspector.DOMStorageObject.HostCookieKey = "dom-storage-object-host";
-WebInspector.DOMStorageObject.LocalStorageCookieKey = "dom-storage-object-local-storage";
</del><ins>+ this._id = id;
+ this._host = host;
+ this._isLocalStorage = isLocalStorage;
+ this._entries = new Map;
+ }
</ins><span class="cx">
</span><del>-WebInspector.DOMStorageObject.Event = {
- ItemsCleared: "dom-storage-object-items-cleared",
- ItemAdded: "dom-storage-object-item-added",
- ItemRemoved: "dom-storage-object-item-removed",
- ItemUpdated: "dom-storage-object-updated",
-};
</del><ins>+ // Public
</ins><span class="cx">
</span><del>-WebInspector.DOMStorageObject.prototype = {
- constructor: WebInspector.DOMStorageObject,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> return this._id;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get host()
</span><span class="cx"> {
</span><span class="cx"> return this._host;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get entries()
</span><span class="cx"> {
</span><span class="cx"> return this._entries;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.DOMStorageObject.HostCookieKey] = this.host;
</span><span class="cx"> cookie[WebInspector.DOMStorageObject.LocalStorageCookieKey] = this.isLocalStorage();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isLocalStorage: function()
</del><ins>+ isLocalStorage()
</ins><span class="cx"> {
</span><span class="cx"> return this._isLocalStorage;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- getEntries: function(callback)
</del><ins>+ getEntries(callback)
</ins><span class="cx"> {
</span><span class="cx"> function innerCallback(error, entries)
</span><span class="cx"> {
</span><span class="lines">@@ -93,40 +84,51 @@
</span><span class="cx"> DOMStorageAgent.getDOMStorageEntries(this._id, innerCallback.bind(this));
</span><span class="cx"> else
</span><span class="cx"> DOMStorageAgent.getDOMStorageItems(this._id, innerCallback.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeItem: function(key)
</del><ins>+ removeItem(key)
</ins><span class="cx"> {
</span><span class="cx"> DOMStorageAgent.removeDOMStorageItem(this._id, key);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- setItem: function(key, value)
</del><ins>+ setItem(key, value)
</ins><span class="cx"> {
</span><span class="cx"> DOMStorageAgent.setDOMStorageItem(this._id, key, value);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- itemsCleared: function()
</del><ins>+ itemsCleared()
</ins><span class="cx"> {
</span><span class="cx"> this._entries.clear();
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DOMStorageObject.Event.ItemsCleared);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- itemRemoved: function(key)
</del><ins>+ itemRemoved(key)
</ins><span class="cx"> {
</span><span class="cx"> this._entries.delete(key);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DOMStorageObject.Event.ItemRemoved, {key});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- itemAdded: function(key, value)
</del><ins>+ itemAdded(key, value)
</ins><span class="cx"> {
</span><span class="cx"> this._entries.set(key, value);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DOMStorageObject.Event.ItemAdded, {key, value});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- itemUpdated: function(key, oldValue, value)
</del><ins>+ itemUpdated(key, oldValue, value)
</ins><span class="cx"> {
</span><span class="cx"> this._entries.set(key, value);
</span><span class="cx"> var data = {key, oldValue, value};
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DOMStorageObject.Event.ItemUpdated, data);
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.DOMStorageObject.TypeIdentifier = "dom-storage";
+WebInspector.DOMStorageObject.HostCookieKey = "dom-storage-object-host";
+WebInspector.DOMStorageObject.LocalStorageCookieKey = "dom-storage-object-local-storage";
+
+WebInspector.DOMStorageObject.Event = {
+ ItemsCleared: "dom-storage-object-items-cleared",
+ ItemAdded: "dom-storage-object-item-added",
+ ItemRemoved: "dom-storage-object-item-removed",
+ ItemUpdated: "dom-storage-object-updated",
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDOMTreejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMTree.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMTree.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMTree.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,60 +23,51 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DOMTree = function(frame)
</del><ins>+WebInspector.DOMTree = class DOMTree extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(frame)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._frame = frame;
</del><ins>+ this._frame = frame;
</ins><span class="cx">
</span><del>- this._rootDOMNode = null;
- this._requestIdentifier = 0;
- this._flowMap = {};
</del><ins>+ this._rootDOMNode = null;
+ this._requestIdentifier = 0;
+ this._flowMap = {};
</ins><span class="cx">
</span><del>- this._frame.addEventListener(WebInspector.Frame.Event.PageExecutionContextChanged, this._framePageExecutionContextChanged, this);
</del><ins>+ this._frame.addEventListener(WebInspector.Frame.Event.PageExecutionContextChanged, this._framePageExecutionContextChanged, this);
</ins><span class="cx">
</span><del>- WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.DocumentUpdated, this._documentUpdated, this);
</del><ins>+ WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.DocumentUpdated, this._documentUpdated, this);
</ins><span class="cx">
</span><del>- // Only add extra event listeners when not the main frame. Since DocumentUpdated is enough for the main frame.
- if (!this._frame.isMainFrame()) {
- WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.NodeRemoved, this._nodeRemoved, this);
- this._frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._frameMainResourceDidChange, this);
</del><ins>+ // Only add extra event listeners when not the main frame. Since DocumentUpdated is enough for the main frame.
+ if (!this._frame.isMainFrame()) {
+ WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.NodeRemoved, this._nodeRemoved, this);
+ this._frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._frameMainResourceDidChange, this);
+ }
+
+ WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.ContentFlowListWasUpdated, this._contentFlowListWasUpdated, this);
+ WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.ContentFlowWasAdded, this._contentFlowWasAdded, this);
+ WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.ContentFlowWasRemoved, this._contentFlowWasRemoved, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.ContentFlowListWasUpdated, this._contentFlowListWasUpdated, this);
- WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.ContentFlowWasAdded, this._contentFlowWasAdded, this);
- WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.ContentFlowWasRemoved, this._contentFlowWasRemoved, this);
-};
-
-WebInspector.Object.addConstructorFunctions(WebInspector.DOMTree);
-
-WebInspector.DOMTree.Event = {
- RootDOMNodeInvalidated: "dom-tree-root-dom-node-invalidated",
- ContentFlowWasAdded: "dom-tree-content-flow-was-added",
- ContentFlowWasRemoved: "dom-tree-content-flow-was-removed"
-};
-
-WebInspector.DOMTree.prototype = {
- constructor: WebInspector.DOMTree,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get frame()
</span><span class="cx"> {
</span><span class="cx"> return this._frame;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get flowMap()
</span><span class="cx"> {
</span><span class="cx"> return this._flowMap;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get flowsCount()
</span><span class="cx"> {
</span><span class="cx"> return Object.keys(this._flowMap).length;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- invalidate: function()
</del><ins>+ invalidate()
</ins><span class="cx"> {
</span><span class="cx"> // Set to null so it is fetched again next time requestRootDOMNode is called.
</span><span class="cx"> this._rootDOMNode = null;
</span><span class="lines">@@ -97,9 +88,9 @@
</span><span class="cx">
</span><span class="cx"> // Delay the invalidation on a timeout to coalesce multiple calls to invalidate.
</span><span class="cx"> this._invalidateTimeoutIdentifier = setTimeout(performInvalidate.bind(this), 0);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- requestRootDOMNode: function(callback)
</del><ins>+ requestRootDOMNode(callback)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(typeof callback === "function");
</span><span class="cx"> if (typeof callback !== "function")
</span><span class="lines">@@ -125,11 +116,19 @@
</span><span class="cx">
</span><span class="cx"> this._pendingRootDOMNodeRequests = [callback];
</span><span class="cx"> this._requestRootDOMNode();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><ins>+ requestContentFlowList()
+ {
+ this.requestRootDOMNode(function(rootNode) {
+ // Let the backend know we are interested about the named flow events for this document.
+ WebInspector.domTreeManager.getNamedFlowCollection(rootNode.id);
+ });
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><del>- _requestRootDOMNode: function()
</del><ins>+ _requestRootDOMNode()
</ins><span class="cx"> {
</span><span class="cx"> console.assert(this._frame.isMainFrame() || !WebInspector.ExecutionContext.supported() || this._frame.pageExecutionContext);
</span><span class="cx"> console.assert(this._pendingRootDOMNodeRequests.length);
</span><span class="lines">@@ -213,9 +212,9 @@
</span><span class="cx"> var contextId = this._frame.pageExecutionContext ? this._frame.pageExecutionContext.id : undefined;
</span><span class="cx"> RuntimeAgent.evaluate.invoke({expression: "document", objectGroup: "", includeCommandLineAPI: false, doNotPauseOnExceptionsAndMuteConsole: true, contextId, frameId: this._frame.id, returnByValue: false, generatePreview: false}, rootObjectAvailable.bind(this));
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _nodeRemoved: function(event)
</del><ins>+ _nodeRemoved(event)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!this._frame.isMainFrame());
</span><span class="cx">
</span><span class="lines">@@ -223,21 +222,21 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.invalidate();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _documentUpdated: function(event)
</del><ins>+ _documentUpdated(event)
</ins><span class="cx"> {
</span><span class="cx"> this.invalidate();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _frameMainResourceDidChange: function(event)
</del><ins>+ _frameMainResourceDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!this._frame.isMainFrame());
</span><span class="cx">
</span><span class="cx"> this.invalidate();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _framePageExecutionContextChanged: function(event)
</del><ins>+ _framePageExecutionContextChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> if (this._rootDOMNodeRequestWaitingForExecutionContext) {
</span><span class="cx"> console.assert(this._frame.pageExecutionContext);
</span><span class="lines">@@ -247,22 +246,14 @@
</span><span class="cx">
</span><span class="cx"> this._requestRootDOMNode();
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- requestContentFlowList: function()
</del><ins>+ _isContentFlowInCurrentDocument(flow)
</ins><span class="cx"> {
</span><del>- this.requestRootDOMNode(function(rootNode) {
- // Let the backend know we are interested about the named flow events for this document.
- WebInspector.domTreeManager.getNamedFlowCollection(rootNode.id);
- });
- },
-
- _isContentFlowInCurrentDocument: function(flow)
- {
</del><span class="cx"> return this._rootDOMNode && this._rootDOMNode.id === flow.documentNodeIdentifier;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentFlowListWasUpdated: function(event)
</del><ins>+ _contentFlowListWasUpdated(event)
</ins><span class="cx"> {
</span><span class="cx"> if (!this._rootDOMNode || this._rootDOMNode.id !== event.data.documentNodeIdentifier)
</span><span class="cx"> return;
</span><span class="lines">@@ -302,9 +293,9 @@
</span><span class="cx">
</span><span class="cx"> for (var i = 0; i < newFlows.length; ++i)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DOMTree.Event.ContentFlowWasAdded, {flow: newFlows[i]});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentFlowWasAdded: function(event)
</del><ins>+ _contentFlowWasAdded(event)
</ins><span class="cx"> {
</span><span class="cx"> var flow = event.data.flow;
</span><span class="cx"> if (!this._isContentFlowInCurrentDocument(flow))
</span><span class="lines">@@ -315,9 +306,9 @@
</span><span class="cx"> this._flowMap[flowId] = flow;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DOMTree.Event.ContentFlowWasAdded, {flow});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentFlowWasRemoved: function(event)
</del><ins>+ _contentFlowWasRemoved(event)
</ins><span class="cx"> {
</span><span class="cx"> var flow = event.data.flow;
</span><span class="cx"> if (!this._isContentFlowInCurrentDocument(flow))
</span><span class="lines">@@ -331,4 +322,8 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.DOMTree.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.DOMTree.Event = {
+ RootDOMNodeInvalidated: "dom-tree-root-dom-node-invalidated",
+ ContentFlowWasAdded: "dom-tree-content-flow-was-added",
+ ContentFlowWasRemoved: "dom-tree-content-flow-was-removed"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDatabaseObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DatabaseObject.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DatabaseObject.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DatabaseObject.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,50 +23,47 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DatabaseObject = function(id, host, name, version)
</del><ins>+WebInspector.DatabaseObject = class DatabaseObject extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- this._id = id;
- this._host = host ? host : WebInspector.UIString("Local File");
- this._name = name;
- this._version = version;
-};
</del><ins>+ constructor(id, host, name, version)
+ {
+ super();
</ins><span class="cx">
</span><del>-WebInspector.DatabaseObject.TypeIdentifier = "database";
-WebInspector.DatabaseObject.HostCookieKey = "database-object-host";
-WebInspector.DatabaseObject.NameCookieKey = "database-object-name";
</del><ins>+ this._id = id;
+ this._host = host ? host : WebInspector.UIString("Local File");
+ this._name = name;
+ this._version = version;
+ }
</ins><span class="cx">
</span><del>-WebInspector.DatabaseObject.prototype = {
- constructor: WebInspector.DatabaseObject,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> return this._id;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get host()
</span><span class="cx"> {
</span><span class="cx"> return this._host;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get name()
</span><span class="cx"> {
</span><span class="cx"> return this._name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get version()
</span><span class="cx"> {
</span><span class="cx"> return this._version;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.DatabaseObject.HostCookieKey] = this.host;
</span><span class="cx"> cookie[WebInspector.DatabaseObject.NameCookieKey] = this.name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- getTableNames: function(callback)
</del><ins>+ getTableNames(callback)
</ins><span class="cx"> {
</span><span class="cx"> function sortingCallback(error, names)
</span><span class="cx"> {
</span><span class="lines">@@ -75,9 +72,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DatabaseAgent.getDatabaseTableNames(this._id, sortingCallback);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- executeSQL: function(query, successCallback, errorCallback)
</del><ins>+ executeSQL(query, successCallback, errorCallback)
</ins><span class="cx"> {
</span><span class="cx"> function queryCallback(columnNames, values, sqlError)
</span><span class="cx"> {
</span><span class="lines">@@ -133,3 +130,7 @@
</span><span class="cx"> DatabaseAgent.executeSQL(this._id, query, callback);
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.DatabaseObject.TypeIdentifier = "database";
+WebInspector.DatabaseObject.HostCookieKey = "database-object-host";
+WebInspector.DatabaseObject.NameCookieKey = "database-object-name";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDatabaseTableObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DatabaseTableObject.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DatabaseTableObject.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DatabaseTableObject.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,34 +23,35 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DatabaseTableObject = function(name, database)
</del><ins>+WebInspector.DatabaseTableObject = class DatabaseTableObject extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- console.assert(database instanceof WebInspector.DatabaseObject);
</del><ins>+ constructor(name, database)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._name = name;
- this._database = database;
-};
</del><ins>+ console.assert(database instanceof WebInspector.DatabaseObject);
</ins><span class="cx">
</span><del>-WebInspector.DatabaseTableObject.TypeIdentifier = "database-table";
-WebInspector.DatabaseTableObject.NameCookieKey = "database-table-object-name";
</del><ins>+ this._name = name;
+ this._database = database;
+ }
</ins><span class="cx">
</span><del>-WebInspector.DatabaseTableObject.prototype = {
- constructor: WebInspector.DatabaseTableObject,
</del><ins>+ // Public
</ins><span class="cx">
</span><span class="cx"> get name()
</span><span class="cx"> {
</span><span class="cx"> return this._name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get database()
</span><span class="cx"> {
</span><span class="cx"> return this._database;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.DatabaseTableObject.NameCookieKey] = this.name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.DatabaseTableObject.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.DatabaseTableObject.TypeIdentifier = "database-table";
+WebInspector.DatabaseTableObject.NameCookieKey = "database-table-object-name";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDebuggerDashboardjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DebuggerDashboard.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DebuggerDashboard.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DebuggerDashboard.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DebuggerDashboard = function() {
- WebInspector.Object.call(this);
</del><ins>+WebInspector.DebuggerDashboard = class DebuggerDashboard extends WebInspector.Object
+{
+ constructor()
+ {
+ // FIXME: Remove once <https://webkit.org/b/142862> is fixed.
+ super();
+ }
</ins><span class="cx"> };
</span><del>-
-WebInspector.DebuggerDashboard.prototype = {
- constructor: WebInspector.DebuggerDashboard,
- __proto__: WebInspector.Object.prototype,
-};
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDefaultDashboardjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,118 +23,113 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DefaultDashboard = function() {
- WebInspector.Object.call(this);
</del><ins>+WebInspector.DefaultDashboard = class DefaultDashboard extends WebInspector.Object
+{
+ constructor()
+ {
+ super();
</ins><span class="cx">
</span><del>- this._waitingForFirstMainResourceToStartTrackingSize = true;
</del><ins>+ this._waitingForFirstMainResourceToStartTrackingSize = true;
</ins><span class="cx">
</span><del>- // Necessary event required to track page load time and resource sizes.
- WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
- WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.CapturingStopped, this._capturingStopped, this);
</del><ins>+ // Necessary event required to track page load time and resource sizes.
+ WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
+ WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.CapturingStopped, this._capturingStopped, this);
</ins><span class="cx">
</span><del>- // Necessary events required to track load of resources.
- WebInspector.Frame.addEventListener(WebInspector.Frame.Event.ResourceWasAdded, this._resourceWasAdded, this);
- WebInspector.frameResourceManager.addEventListener(WebInspector.FrameResourceManager.Event.FrameWasAdded, this._frameWasAdded, this);
</del><ins>+ // Necessary events required to track load of resources.
+ WebInspector.Frame.addEventListener(WebInspector.Frame.Event.ResourceWasAdded, this._resourceWasAdded, this);
+ WebInspector.frameResourceManager.addEventListener(WebInspector.FrameResourceManager.Event.FrameWasAdded, this._frameWasAdded, this);
</ins><span class="cx">
</span><del>- // Necessary events required to track console messages.
- var logManager = WebInspector.logManager;
- logManager.addEventListener(WebInspector.LogManager.Event.Cleared, this._consoleWasCleared, this);
- logManager.addEventListener(WebInspector.LogManager.Event.ActiveLogCleared, this._consoleWasCleared, this);
- logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, this._consoleMessageAdded, this);
- logManager.addEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, this._consoleMessageWasRepeated, this);
</del><ins>+ // Necessary events required to track console messages.
+ var logManager = WebInspector.logManager;
+ logManager.addEventListener(WebInspector.LogManager.Event.Cleared, this._consoleWasCleared, this);
+ logManager.addEventListener(WebInspector.LogManager.Event.ActiveLogCleared, this._consoleWasCleared, this);
+ logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, this._consoleMessageAdded, this);
+ logManager.addEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, this._consoleMessageWasRepeated, this);
</ins><span class="cx">
</span><del>- this._resourcesCount = 0;
- this._resourcesSize = 0;
- this._time = 0;
- this._logs = 0;
- this._errors = 0;
- this._issues = 0;
-};
</del><ins>+ this._resourcesCount = 0;
+ this._resourcesSize = 0;
+ this._time = 0;
+ this._logs = 0;
+ this._errors = 0;
+ this._issues = 0;
+ }
</ins><span class="cx">
</span><del>-WebInspector.DefaultDashboard.Event = {
- DataDidChange: "default-dashboard-data-did-change"
-};
-
-WebInspector.DefaultDashboard.prototype = {
- constructor: WebInspector.DefaultDashboard,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get resourcesCount()
</span><span class="cx"> {
</span><span class="cx"> return this._resourcesCount;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set resourcesCount(value)
</span><span class="cx"> {
</span><span class="cx"> this._resourcesCount = value;
</span><span class="cx"> this._dataDidChange();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get resourcesSize()
</span><span class="cx"> {
</span><span class="cx"> return this._resourcesSize;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set resourcesSize(value)
</span><span class="cx"> {
</span><span class="cx"> this._resourcesSize = value;
</span><span class="cx"> this._dataDidChange();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get time()
</span><span class="cx"> {
</span><span class="cx"> return this._time;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set time(value)
</span><span class="cx"> {
</span><span class="cx"> this._time = value;
</span><span class="cx"> this._dataDidChange();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get logs()
</span><span class="cx"> {
</span><span class="cx"> return this._logs;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set logs(value)
</span><span class="cx"> {
</span><span class="cx"> this._logs = value;
</span><span class="cx"> this._dataDidChange();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get errors()
</span><span class="cx"> {
</span><span class="cx"> return this._errors;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set errors(value)
</span><span class="cx"> {
</span><span class="cx"> this._errors = value;
</span><span class="cx"> this._dataDidChange();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get issues()
</span><span class="cx"> {
</span><span class="cx"> return this._issues;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set issues(value)
</span><span class="cx"> {
</span><span class="cx"> this._issues = value;
</span><span class="cx"> this._dataDidChange();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _dataDidChange: function()
</del><ins>+ _dataDidChange()
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DefaultDashboard.Event.DataDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _mainResourceDidChange: function(event)
</del><ins>+ _mainResourceDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(event.target instanceof WebInspector.Frame);
</span><span class="cx">
</span><span class="lines">@@ -158,30 +153,30 @@
</span><span class="cx">
</span><span class="cx"> this._dataDidChange();
</span><span class="cx"> this._startUpdatingTime();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _capturingStopped: function(event)
</del><ins>+ _capturingStopped(event)
</ins><span class="cx"> {
</span><span class="cx"> // If recording stops, we should stop the timer if it hasn't stopped already.
</span><span class="cx"> this._stopUpdatingTime();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _resourceWasAdded: function(event)
</del><ins>+ _resourceWasAdded(event)
</ins><span class="cx"> {
</span><span class="cx"> ++this.resourcesCount;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _frameWasAdded: function(event)
</del><ins>+ _frameWasAdded(event)
</ins><span class="cx"> {
</span><span class="cx"> ++this.resourcesCount;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _resourceSizeDidChange: function(event)
</del><ins>+ _resourceSizeDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this.resourcesSize += event.target.size - event.data.previousSize;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _startUpdatingTime: function()
</del><ins>+ _startUpdatingTime()
</ins><span class="cx"> {
</span><span class="cx"> this._stopUpdatingTime();
</span><span class="cx">
</span><span class="lines">@@ -190,18 +185,18 @@
</span><span class="cx"> this._timelineBaseTime = Date.now();
</span><span class="cx"> this._timeIntervalDelay = 50;
</span><span class="cx"> this._timeIntervalIdentifier = setInterval(this._updateTime.bind(this), this._timeIntervalDelay);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _stopUpdatingTime: function()
</del><ins>+ _stopUpdatingTime()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._timeIntervalIdentifier)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> clearInterval(this._timeIntervalIdentifier);
</span><span class="cx"> delete this._timeIntervalIdentifier;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateTime: function()
</del><ins>+ _updateTime()
</ins><span class="cx"> {
</span><span class="cx"> var duration = Date.now() - this._timelineBaseTime;
</span><span class="cx">
</span><span class="lines">@@ -232,21 +227,21 @@
</span><span class="cx"> this.time = mainFrameLoadEventTime - mainFrameStartTime;
</span><span class="cx">
</span><span class="cx"> this._stopUpdatingTime();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _consoleMessageAdded: function(event)
</del><ins>+ _consoleMessageAdded(event)
</ins><span class="cx"> {
</span><span class="cx"> var message = event.data.message;
</span><span class="cx"> this._lastConsoleMessageType = message.level;
</span><span class="cx"> this._incrementConsoleMessageType(message.level, message.totalRepeatCount);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _consoleMessageWasRepeated: function(event)
</del><ins>+ _consoleMessageWasRepeated(event)
</ins><span class="cx"> {
</span><span class="cx"> this._incrementConsoleMessageType(this._lastConsoleMessageType, 1);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _incrementConsoleMessageType: function(type, increment)
</del><ins>+ _incrementConsoleMessageType(type, increment)
</ins><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="cx"> case WebInspector.LegacyConsoleMessage.MessageLevel.Log:
</span><span class="lines">@@ -259,9 +254,9 @@
</span><span class="cx"> this.errors += increment;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _consoleWasCleared: function(event)
</del><ins>+ _consoleWasCleared(event)
</ins><span class="cx"> {
</span><span class="cx"> this._logs = 0;
</span><span class="cx"> this._issues = 0;
</span><span class="lines">@@ -269,3 +264,7 @@
</span><span class="cx"> this._dataDidChange();
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.DefaultDashboard.Event = {
+ DataDidChange: "default-dashboard-data-did-change"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsExecutionContextjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ExecutionContext.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ExecutionContext.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ExecutionContext.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,51 +23,50 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ExecutionContext = function(id, name, isPageContext, frame)
</del><ins>+WebInspector.ExecutionContext = class ExecutionContext extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(id, name, isPageContext, frame)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(typeof id === "number" || id === WebInspector.QuickConsole.MainFrameContextExecutionIdentifier);
- console.assert(typeof name === "string");
</del><ins>+ console.assert(typeof id === "number" || id === WebInspector.QuickConsole.MainFrameContextExecutionIdentifier);
+ console.assert(typeof name === "string");
</ins><span class="cx">
</span><del>- this._id = id;
- this._name = name;
- this._isPageContext = isPageContext || false;
- this._frame = frame || null;
-};
</del><ins>+ this._id = id;
+ this._name = name;
+ this._isPageContext = isPageContext || false;
+ this._frame = frame || null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ExecutionContext.supported = function()
-{
- // Execution contexts were added to the Inspector protocol alongside RuntimeAgent.enable and
- // disable methods, which turn on and off sending Runtime agent execution context created events.
- // So we can feature detect support for execution contexts with these RuntimeAgent functions.
- return typeof RuntimeAgent.enable === "function";
-};
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.ExecutionContext.prototype = {
- constructor: WebInspector.ExecutionContext,
</del><ins>+ static supported()
+ {
+ // Execution contexts were added to the Inspector protocol alongside RuntimeAgent.enable and
+ // disable methods, which turn on and off sending Runtime agent execution context created events.
+ // So we can feature detect support for execution contexts with these RuntimeAgent functions.
+ return typeof RuntimeAgent.enable === "function";
+ }
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> return this._id;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get name()
</span><span class="cx"> {
</span><span class="cx"> return this._name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get isPageContext()
</span><span class="cx"> {
</span><span class="cx"> return this._isPageContext;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get frame()
</span><span class="cx"> {
</span><span class="cx"> return this._frame;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.ExecutionContext.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsExecutionContextListjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ExecutionContextList.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ExecutionContextList.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ExecutionContextList.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,30 +23,29 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ExecutionContextList = function()
</del><ins>+WebInspector.ExecutionContextList = class ExecutionContextList extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor()
+ {
+ super();
</ins><span class="cx">
</span><del>- this._contexts = [];
- this._pageExecutionContext = null;
-};
</del><ins>+ this._contexts = [];
+ this._pageExecutionContext = null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ExecutionContextList.prototype = {
- constructor: WebInspector.ExecutionContextList,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get pageExecutionContext()
</span><span class="cx"> {
</span><span class="cx"> return this._pageExecutionContext;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get contexts()
</span><span class="cx"> {
</span><span class="cx"> return this._contexts;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- add: function(context)
</del><ins>+ add(context)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: The backend sends duplicate page context execution contexts with the same id. Why?
</span><span class="cx"> if (context.isPageContext && this._pageExecutionContext) {
</span><span class="lines">@@ -63,13 +62,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- clear: function()
</del><ins>+ clear()
</ins><span class="cx"> {
</span><span class="cx"> this._contexts = [];
</span><span class="cx"> this._pageExecutionContext = null;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.ExecutionContextList.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsFramejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Frame.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Frame.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Frame.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,64 +23,39 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.Frame = function(id, name, securityOrigin, loaderIdentifier, mainResource)
</del><ins>+WebInspector.Frame = class Frame extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(id, name, securityOrigin, loaderIdentifier, mainResource)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(id);
</del><ins>+ console.assert(id);
</ins><span class="cx">
</span><del>- this._id = id;
</del><ins>+ this._id = id;
</ins><span class="cx">
</span><del>- this._name = null;
- this._securityOrigin = null;
</del><ins>+ this._name = null;
+ this._securityOrigin = null;
</ins><span class="cx">
</span><del>- this._resourceCollection = new WebInspector.ResourceCollection;
- this._provisionalResourceCollection = new WebInspector.ResourceCollection;
</del><ins>+ this._resourceCollection = new WebInspector.ResourceCollection;
+ this._provisionalResourceCollection = new WebInspector.ResourceCollection;
</ins><span class="cx">
</span><del>- this._childFrames = [];
- this._childFrameIdentifierMap = {};
</del><ins>+ this._childFrames = [];
+ this._childFrameIdentifierMap = {};
</ins><span class="cx">
</span><del>- this._parentFrame = null;
- this._isMainFrame = false;
</del><ins>+ this._parentFrame = null;
+ this._isMainFrame = false;
</ins><span class="cx">
</span><del>- this._domContentReadyEventTimestamp = NaN;
- this._loadEventTimestamp = NaN;
</del><ins>+ this._domContentReadyEventTimestamp = NaN;
+ this._loadEventTimestamp = NaN;
</ins><span class="cx">
</span><del>- this._executionContextList = new WebInspector.ExecutionContextList;
</del><ins>+ this._executionContextList = new WebInspector.ExecutionContextList;
</ins><span class="cx">
</span><del>- this.initialize(name, securityOrigin, loaderIdentifier, mainResource);
-};
</del><ins>+ this.initialize(name, securityOrigin, loaderIdentifier, mainResource);
+ }
</ins><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.Frame);
-
-WebInspector.Frame.Event = {
- NameDidChange: "frame-name-did-change",
- SecurityOriginDidChange: "frame-security-origin-did-change",
- MainResourceDidChange: "frame-main-resource-did-change",
- ProvisionalLoadStarted: "frame-provisional-load-started",
- ProvisionalLoadCommitted: "frame-provisional-load-committed",
- ProvisionalLoadCleared: "frame-provisional-load-cleared",
- ProvisionalResourceWasAdded: "frame-provisional-resource-was-added",
- ResourceWasAdded: "frame-resource-was-added",
- ResourceWasRemoved: "frame-resource-was-removed",
- AllResourcesRemoved: "frame-all-resources-removed",
- ChildFrameWasAdded: "frame-child-frame-was-added",
- ChildFrameWasRemoved: "frame-child-frame-was-removed",
- AllChildFramesRemoved: "frame-all-child-frames-removed",
- PageExecutionContextChanged: "frame-page-execution-context-changed",
- ExecutionContextsCleared: "frame-execution-contexts-cleared"
-};
-
-WebInspector.Frame.TypeIdentifier = "Frame";
-WebInspector.Frame.MainResourceURLCookieKey = "frame-main-resource-url";
-WebInspector.Frame.IsMainFrameCookieKey = "frame-is-main-frame";
-
-WebInspector.Frame.prototype = {
- constructor: WebInspector.Frame,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><del>- initialize: function(name, securityOrigin, loaderIdentifier, mainResource)
</del><ins>+ initialize(name, securityOrigin, loaderIdentifier, mainResource)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(loaderIdentifier);
</span><span class="cx"> console.assert(mainResource);
</span><span class="lines">@@ -112,9 +87,9 @@
</span><span class="cx">
</span><span class="cx"> if (this._name !== oldName)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Frame.Event.NameDidChange, {oldName});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- startProvisionalLoad: function(provisionalMainResource)
</del><ins>+ startProvisionalLoad(provisionalMainResource)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(provisionalMainResource);
</span><span class="cx">
</span><span class="lines">@@ -126,9 +101,9 @@
</span><span class="cx"> this._provisionalResourceCollection.removeAllResources();
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Frame.Event.ProvisionalLoadStarted);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- commitProvisionalLoad: function(securityOrigin)
</del><ins>+ commitProvisionalLoad(securityOrigin)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(this._provisionalMainResource);
</span><span class="cx"> console.assert(this._provisionalLoaderIdentifier);
</span><span class="lines">@@ -164,9 +139,9 @@
</span><span class="cx">
</span><span class="cx"> if (this._securityOrigin !== oldSecurityOrigin)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Frame.Event.SecurityOriginDidChange, {oldSecurityOrigin});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- clearProvisionalLoad: function(skipProvisionalLoadClearedEvent)
</del><ins>+ clearProvisionalLoad(skipProvisionalLoadClearedEvent)
</ins><span class="cx"> {
</span><span class="cx"> if (!this._provisionalLoaderIdentifier)
</span><span class="cx"> return;
</span><span class="lines">@@ -177,127 +152,127 @@
</span><span class="cx">
</span><span class="cx"> if (!skipProvisionalLoadClearedEvent)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Frame.Event.ProvisionalLoadCleared);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> return this._id;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get loaderIdentifier()
</span><span class="cx"> {
</span><span class="cx"> return this._loaderIdentifier;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get provisionalLoaderIdentifier()
</span><span class="cx"> {
</span><span class="cx"> return this._provisionalLoaderIdentifier;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get name()
</span><span class="cx"> {
</span><span class="cx"> return this._name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get securityOrigin()
</span><span class="cx"> {
</span><span class="cx"> return this._securityOrigin;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get url()
</span><span class="cx"> {
</span><span class="cx"> return this._mainResource._url;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get domTree()
</span><span class="cx"> {
</span><span class="cx"> if (!this._domTree)
</span><span class="cx"> this._domTree = new WebInspector.DOMTree(this);
</span><span class="cx"> return this._domTree;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get pageExecutionContext()
</span><span class="cx"> {
</span><span class="cx"> return this._executionContextList.pageExecutionContext;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get executionContextList()
</span><span class="cx"> {
</span><span class="cx"> return this._executionContextList;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- clearExecutionContexts: function(committingProvisionalLoad)
</del><ins>+ clearExecutionContexts(committingProvisionalLoad)
</ins><span class="cx"> {
</span><span class="cx"> if (this._executionContextList.contexts.length) {
</span><span class="cx"> this._executionContextList.clear();
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Frame.Event.ExecutionContextsCleared, {committingProvisionalLoad:!!committingProvisionalLoad});
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addExecutionContext: function(context)
</del><ins>+ addExecutionContext(context)
</ins><span class="cx"> {
</span><span class="cx"> var changedPageContext = this._executionContextList.add(context);
</span><span class="cx">
</span><span class="cx"> if (changedPageContext)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Frame.Event.PageExecutionContextChanged);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get mainResource()
</span><span class="cx"> {
</span><span class="cx"> return this._mainResource;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get provisionalMainResource()
</span><span class="cx"> {
</span><span class="cx"> return this._provisionalMainResource;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get parentFrame()
</span><span class="cx"> {
</span><span class="cx"> return this._parentFrame;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get childFrames()
</span><span class="cx"> {
</span><span class="cx"> return this._childFrames;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get domContentReadyEventTimestamp()
</span><span class="cx"> {
</span><span class="cx"> return this._domContentReadyEventTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get loadEventTimestamp()
</span><span class="cx"> {
</span><span class="cx"> return this._loadEventTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isMainFrame: function()
</del><ins>+ isMainFrame()
</ins><span class="cx"> {
</span><span class="cx"> return this._isMainFrame;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- markAsMainFrame: function()
</del><ins>+ markAsMainFrame()
</ins><span class="cx"> {
</span><span class="cx"> this._isMainFrame = true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- unmarkAsMainFrame: function()
</del><ins>+ unmarkAsMainFrame()
</ins><span class="cx"> {
</span><span class="cx"> this._isMainFrame = false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- markDOMContentReadyEvent: function(timestamp)
</del><ins>+ markDOMContentReadyEvent(timestamp)
</ins><span class="cx"> {
</span><span class="cx"> this._domContentReadyEventTimestamp = timestamp || NaN;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- markLoadEvent: function(timestamp)
</del><ins>+ markLoadEvent(timestamp)
</ins><span class="cx"> {
</span><span class="cx"> this._loadEventTimestamp = timestamp || NaN;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isDetached: function()
</del><ins>+ isDetached()
</ins><span class="cx"> {
</span><span class="cx"> var frame = this;
</span><span class="cx"> while (frame) {
</span><span class="lines">@@ -307,14 +282,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- childFrameForIdentifier: function(frameId)
</del><ins>+ childFrameForIdentifier(frameId)
</ins><span class="cx"> {
</span><span class="cx"> return this._childFrameIdentifierMap[frameId] || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addChildFrame: function(frame)
</del><ins>+ addChildFrame(frame)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(frame instanceof WebInspector.Frame);
</span><span class="cx"> if (!(frame instanceof WebInspector.Frame))
</span><span class="lines">@@ -332,9 +307,9 @@
</span><span class="cx"> frame._parentFrame = this;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Frame.Event.ChildFrameWasAdded, {childFrame: frame});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeChildFrame: function(frameOrFrameId)
</del><ins>+ removeChildFrame(frameOrFrameId)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(frameOrFrameId);
</span><span class="cx">
</span><span class="lines">@@ -359,9 +334,9 @@
</span><span class="cx"> childFrame._parentFrame = null;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Frame.Event.ChildFrameWasRemoved, {childFrame});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeAllChildFrames: function()
</del><ins>+ removeAllChildFrames()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._childFrames.length)
</span><span class="cx"> return;
</span><span class="lines">@@ -373,14 +348,14 @@
</span><span class="cx"> this._childFrameIdentifierMap = {};
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Frame.Event.AllChildFramesRemoved);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get resources()
</span><span class="cx"> {
</span><span class="cx"> return this._resourceCollection.resources;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- resourceForURL: function(url, recursivelySearchChildFrames)
</del><ins>+ resourceForURL(url, recursivelySearchChildFrames)
</ins><span class="cx"> {
</span><span class="cx"> var resource = this._resourceCollection.resourceForURL(url);
</span><span class="cx"> if (resource)
</span><span class="lines">@@ -404,14 +379,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- resourcesWithType: function(type)
</del><ins>+ resourcesWithType(type)
</ins><span class="cx"> {
</span><span class="cx"> return this._resourceCollection.resourcesWithType(type);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addResource: function(resource)
</del><ins>+ addResource(resource)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(resource instanceof WebInspector.Resource);
</span><span class="cx"> if (!(resource instanceof WebInspector.Resource))
</span><span class="lines">@@ -432,9 +407,9 @@
</span><span class="cx"> this._resourceCollection.addResource(resource);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Frame.Event.ResourceWasAdded, {resource});
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeResource: function(resourceOrURL)
</del><ins>+ removeResource(resourceOrURL)
</ins><span class="cx"> {
</span><span class="cx"> // This does not remove provisional resources.
</span><span class="cx">
</span><span class="lines">@@ -445,9 +420,9 @@
</span><span class="cx"> this._disassociateWithResource(resource);
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Frame.Event.ResourceWasRemoved, {resource});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeAllResources: function()
</del><ins>+ removeAllResources()
</ins><span class="cx"> {
</span><span class="cx"> // This does not remove provisional resources, use clearProvisionalLoad for that.
</span><span class="cx">
</span><span class="lines">@@ -461,43 +436,63 @@
</span><span class="cx"> this._resourceCollection.removeAllResources();
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Frame.Event.AllResourcesRemoved);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.Frame.MainResourceURLCookieKey] = this.mainResource.url.hash;
</span><span class="cx"> cookie[WebInspector.Frame.IsMainFrameCookieKey] = this._isMainFrame;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _isProvisionalResource: function(resource)
</del><ins>+ _isProvisionalResource(resource)
</ins><span class="cx"> {
</span><span class="cx"> return (resource.loaderIdentifier && this._provisionalLoaderIdentifier && resource.loaderIdentifier === this._provisionalLoaderIdentifier);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _associateWithResource: function(resource)
</del><ins>+ _associateWithResource(resource)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!resource._parentFrame);
</span><span class="cx"> if (resource._parentFrame)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> resource._parentFrame = this;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _disassociateWithResource: function(resource)
</del><ins>+ _disassociateWithResource(resource)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(resource.parentFrame === this);
</span><span class="cx"> if (resource.parentFrame !== this)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> resource._parentFrame = null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _dispatchMainResourceDidChangeEvent: function(oldMainResource)
</del><ins>+ _dispatchMainResourceDidChangeEvent(oldMainResource)
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Frame.Event.MainResourceDidChange, {oldMainResource});
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Frame.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.Frame.Event = {
+ NameDidChange: "frame-name-did-change",
+ SecurityOriginDidChange: "frame-security-origin-did-change",
+ MainResourceDidChange: "frame-main-resource-did-change",
+ ProvisionalLoadStarted: "frame-provisional-load-started",
+ ProvisionalLoadCommitted: "frame-provisional-load-committed",
+ ProvisionalLoadCleared: "frame-provisional-load-cleared",
+ ProvisionalResourceWasAdded: "frame-provisional-resource-was-added",
+ ResourceWasAdded: "frame-resource-was-added",
+ ResourceWasRemoved: "frame-resource-was-removed",
+ AllResourcesRemoved: "frame-all-resources-removed",
+ ChildFrameWasAdded: "frame-child-frame-was-added",
+ ChildFrameWasRemoved: "frame-child-frame-was-removed",
+ AllChildFramesRemoved: "frame-all-child-frames-removed",
+ PageExecutionContextChanged: "frame-page-execution-context-changed",
+ ExecutionContextsCleared: "frame-execution-contexts-cleared"
+};
+
+WebInspector.Frame.TypeIdentifier = "Frame";
+WebInspector.Frame.MainResourceURLCookieKey = "frame-main-resource-url";
+WebInspector.Frame.IsMainFrameCookieKey = "frame-is-main-frame";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsGeometryjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Geometry.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Geometry.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Geometry.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,62 +23,66 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.Point = function(x, y)
</del><ins>+WebInspector.Point = class Point
</ins><span class="cx"> {
</span><del>- this.x = x || 0;
- this.y = y || 0;
-};
</del><ins>+ constructor(x, y)
+ {
+ this.x = x || 0;
+ this.y = y || 0;
+ }
</ins><span class="cx">
</span><del>-WebInspector.Point.fromEvent = function(event)
-{
- return new WebInspector.Point(event.pageX, event.pageY);
-};
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.Point.fromEventInElement = function(event, element)
-{
- var wkPoint = window.webkitConvertPointFromPageToNode(element, new WebKitPoint(event.pageX, event.pageY));
- return new WebInspector.Point(wkPoint.x, wkPoint.y);
-};
</del><ins>+ static fromEvent(event)
+ {
+ return new WebInspector.Point(event.pageX, event.pageY);
+ }
</ins><span class="cx">
</span><del>-WebInspector.Point.prototype = {
- constructor: WebInspector.Point,
</del><ins>+ static fromEventInElement(event, element)
+ {
+ var wkPoint = window.webkitConvertPointFromPageToNode(element, new WebKitPoint(event.pageX, event.pageY));
+ return new WebInspector.Point(wkPoint.x, wkPoint.y);
+ }
</ins><span class="cx">
</span><del>- toString : function()
</del><ins>+ // Public
+
+ toString()
</ins><span class="cx"> {
</span><span class="cx"> return "WebInspector.Point[" + this.x + "," + this.y + "]";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- copy: function()
</del><ins>+ copy()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.Point(this.x, this.y);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- equals: function(anotherPoint)
</del><ins>+ equals(anotherPoint)
</ins><span class="cx"> {
</span><span class="cx"> return (this.x === anotherPoint.x && this.y === anotherPoint.y);
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Size = function(width, height)
</del><ins>+WebInspector.Size = class Size
</ins><span class="cx"> {
</span><del>- this.width = width || 0;
- this.height = height || 0;
-};
</del><ins>+ constructor(width, height)
+ {
+ this.width = width || 0;
+ this.height = height || 0;
+ }
</ins><span class="cx">
</span><del>-WebInspector.Size.prototype = {
- constructor: WebInspector.Size,
</del><ins>+ // Public
</ins><span class="cx">
</span><del>- toString: function()
</del><ins>+ toString()
</ins><span class="cx"> {
</span><span class="cx"> return "WebInspector.Size[" + this.width + "," + this.height + "]";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- copy: function()
</del><ins>+ copy()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.Size(this.width, this.height);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- equals: function(anotherSize)
</del><ins>+ equals(anotherSize)
</ins><span class="cx"> {
</span><span class="cx"> return (this.width === anotherSize.width && this.height === anotherSize.height);
</span><span class="cx"> }
</span><span class="lines">@@ -87,44 +91,47 @@
</span><span class="cx"> WebInspector.Size.ZERO_SIZE = new WebInspector.Size(0, 0);
</span><span class="cx">
</span><span class="cx">
</span><del>-WebInspector.Rect = function(x, y, width, height)
</del><ins>+WebInspector.Rect = class Rect
</ins><span class="cx"> {
</span><del>- this.origin = new WebInspector.Point(x || 0, y || 0);
- this.size = new WebInspector.Size(width || 0, height || 0);
-};
</del><ins>+ constructor(x, y, width, height)
+ {
+ this.origin = new WebInspector.Point(x || 0, y || 0);
+ this.size = new WebInspector.Size(width || 0, height || 0);
+ }
</ins><span class="cx">
</span><del>-WebInspector.Rect.rectFromClientRect = function(clientRect)
-{
- return new WebInspector.Rect(clientRect.left, clientRect.top, clientRect.width, clientRect.height);
-};
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.Rect.unionOfRects = function(rects)
-{
- var union = rects[0];
- for (var i = 1; i < rects.length; ++i)
- union = union.unionWithRect(rects[i]);
- return union;
-};
</del><ins>+ static rectFromClientRect(clientRect)
+ {
+ return new WebInspector.Rect(clientRect.left, clientRect.top, clientRect.width, clientRect.height);
+ }
</ins><span class="cx">
</span><del>-WebInspector.Rect.prototype = {
- constructor: WebInspector.Rect,
</del><ins>+ static unionOfRects(rects)
+ {
+ var union = rects[0];
+ for (var i = 1; i < rects.length; ++i)
+ union = union.unionWithRect(rects[i]);
+ return union;
+ }
</ins><span class="cx">
</span><del>- toString: function()
</del><ins>+ // Public
+
+ toString()
</ins><span class="cx"> {
</span><span class="cx"> return "WebInspector.Rect[" + [this.origin.x, this.origin.y, this.size.width, this.size.height].join(", ") + "]";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- copy: function()
</del><ins>+ copy()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.Rect(this.origin.x, this.origin.y, this.size.width, this.size.height);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- equals: function(anotherRect)
</del><ins>+ equals(anotherRect)
</ins><span class="cx"> {
</span><span class="cx"> return (this.origin.equals(anotherRect.origin) && this.size.equals(anotherRect.size));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- inset: function(insets)
</del><ins>+ inset(insets)
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.Rect(
</span><span class="cx"> this.origin.x + insets.left,
</span><span class="lines">@@ -132,9 +139,9 @@
</span><span class="cx"> this.size.width - insets.left - insets.right,
</span><span class="cx"> this.size.height - insets.top - insets.bottom
</span><span class="cx"> );
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- pad: function(padding)
</del><ins>+ pad(padding)
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.Rect(
</span><span class="cx"> this.origin.x - padding,
</span><span class="lines">@@ -142,39 +149,39 @@
</span><span class="cx"> this.size.width + padding * 2,
</span><span class="cx"> this.size.height + padding * 2
</span><span class="cx"> );
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- minX: function()
</del><ins>+ minX()
</ins><span class="cx"> {
</span><span class="cx"> return this.origin.x;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- minY: function()
</del><ins>+ minY()
</ins><span class="cx"> {
</span><span class="cx"> return this.origin.y;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- midX: function()
</del><ins>+ midX()
</ins><span class="cx"> {
</span><span class="cx"> return this.origin.x + (this.size.width / 2);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- midY: function()
</del><ins>+ midY()
</ins><span class="cx"> {
</span><span class="cx"> return this.origin.y + (this.size.height / 2);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- maxX: function()
</del><ins>+ maxX()
</ins><span class="cx"> {
</span><span class="cx"> return this.origin.x + this.size.width;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- maxY: function()
</del><ins>+ maxY()
</ins><span class="cx"> {
</span><span class="cx"> return this.origin.y + this.size.height;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- intersectionWithRect: function(rect)
</del><ins>+ intersectionWithRect(rect)
</ins><span class="cx"> {
</span><span class="cx"> var x1 = Math.max(this.minX(), rect.minX());
</span><span class="cx"> var x2 = Math.min(this.maxX(), rect.maxX());
</span><span class="lines">@@ -190,18 +197,18 @@
</span><span class="cx"> intersection.origin.y = y1;
</span><span class="cx"> intersection.size.height = y2 - y1;
</span><span class="cx"> return intersection;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- unionWithRect: function(rect)
</del><ins>+ unionWithRect(rect)
</ins><span class="cx"> {
</span><span class="cx"> var x = Math.min(this.minX(), rect.minX());
</span><span class="cx"> var y = Math.min(this.minY(), rect.minY());
</span><span class="cx"> var width = Math.max(this.maxX(), rect.maxX()) - x;
</span><span class="cx"> var height = Math.max(this.maxY(), rect.maxY()) - y;
</span><span class="cx"> return new WebInspector.Rect(x, y, width, height);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- round: function()
</del><ins>+ round()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.Rect(
</span><span class="cx"> Math.floor(this.origin.x),
</span><span class="lines">@@ -215,33 +222,34 @@
</span><span class="cx"> WebInspector.Rect.ZERO_RECT = new WebInspector.Rect(0, 0, 0, 0);
</span><span class="cx">
</span><span class="cx">
</span><del>-WebInspector.EdgeInsets = function(top, right, bottom, left)
</del><ins>+WebInspector.EdgeInsets = class EdgeInsets
</ins><span class="cx"> {
</span><del>- console.assert(arguments.length === 1 || arguments.length === 4);
</del><ins>+ constructor(top, right, bottom, left)
+ {
+ console.assert(arguments.length === 1 || arguments.length === 4);
</ins><span class="cx">
</span><del>- if (arguments.length === 1) {
- this.top = top;
- this.right = top;
- this.bottom = top;
- this.left = top;
- } else if (arguments.length === 4) {
- this.top = top;
- this.right = right;
- this.bottom = bottom;
- this.left = left;
</del><ins>+ if (arguments.length === 1) {
+ this.top = top;
+ this.right = top;
+ this.bottom = top;
+ this.left = top;
+ } else if (arguments.length === 4) {
+ this.top = top;
+ this.right = right;
+ this.bottom = bottom;
+ this.left = left;
+ }
</ins><span class="cx"> }
</span><del>-};
</del><span class="cx">
</span><del>-WebInspector.EdgeInsets.prototype = {
- constructor: WebInspector.EdgeInsets,
</del><ins>+ // Public
</ins><span class="cx">
</span><del>- equals: function(anotherInset)
</del><ins>+ equals(anotherInset)
</ins><span class="cx"> {
</span><span class="cx"> return (this.top === anotherInset.top && this.right === anotherInset.right &&
</span><span class="cx"> this.bottom === anotherInset.bottom && this.left === anotherInset.left);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- copy: function()
</del><ins>+ copy()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.EdgeInsets(this.top, this.right, this.bottom, this.left);
</span><span class="cx"> }
</span><span class="lines">@@ -254,23 +262,24 @@
</span><span class="cx"> MAX_Y : 3
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Quad = function(quad)
</del><ins>+WebInspector.Quad = class Quad
</ins><span class="cx"> {
</span><del>- this.points = [
- new WebInspector.Point(quad[0], quad[1]), // top left
- new WebInspector.Point(quad[2], quad[3]), // top right
- new WebInspector.Point(quad[4], quad[5]), // bottom right
- new WebInspector.Point(quad[6], quad[7]) // bottom left
- ];
</del><ins>+ constructor(quad)
+ {
+ this.points = [
+ new WebInspector.Point(quad[0], quad[1]), // top left
+ new WebInspector.Point(quad[2], quad[3]), // top right
+ new WebInspector.Point(quad[4], quad[5]), // bottom right
+ new WebInspector.Point(quad[6], quad[7]) // bottom left
+ ];
</ins><span class="cx">
</span><del>- this.width = Math.round(Math.sqrt(Math.pow(quad[0] - quad[2], 2) + Math.pow(quad[1] - quad[3], 2)));
- this.height = Math.round(Math.sqrt(Math.pow(quad[0] - quad[6], 2) + Math.pow(quad[1] - quad[7], 2)));
-};
</del><ins>+ this.width = Math.round(Math.sqrt(Math.pow(quad[0] - quad[2], 2) + Math.pow(quad[1] - quad[3], 2)));
+ this.height = Math.round(Math.sqrt(Math.pow(quad[0] - quad[6], 2) + Math.pow(quad[1] - quad[7], 2)));
+ }
</ins><span class="cx">
</span><del>-WebInspector.Quad.prototype = {
- constructor: WebInspector.Quad,
</del><ins>+ // Public
</ins><span class="cx">
</span><del>- toProtocol: function()
</del><ins>+ toProtocol()
</ins><span class="cx"> {
</span><span class="cx"> return [
</span><span class="cx"> this.points[0].x, this.points[0].y,
</span><span class="lines">@@ -281,15 +290,16 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Polygon = function(points)
</del><ins>+WebInspector.Polygon = class Polygon
</ins><span class="cx"> {
</span><del>- this.points = points;
-}
</del><ins>+ constructor(points)
+ {
+ this.points = points;
+ }
</ins><span class="cx">
</span><del>-WebInspector.Polygon.prototype = {
- constructor: WebInspector.Polygon,
</del><ins>+ // Public
</ins><span class="cx">
</span><del>- bounds: function()
</del><ins>+ bounds()
</ins><span class="cx"> {
</span><span class="cx"> var minX = Number.MAX_VALUE;
</span><span class="cx"> var minY = Number.MAX_VALUE;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsGradientjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Gradient.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Gradient.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Gradient.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,13 +23,14 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+// FIXME: Convert to class?
</ins><span class="cx"> WebInspector.Gradient = {
</span><del>- Types : {
</del><ins>+ Types: {
</ins><span class="cx"> Linear: "linear-gradient",
</span><span class="cx"> Radial: "radial-gradient"
</span><span class="cx"> },
</span><span class="cx">
</span><del>- fromString: function(cssString)
</del><ins>+ fromString(cssString)
</ins><span class="cx"> {
</span><span class="cx"> var type;
</span><span class="cx"> var openingParenthesisIndex = cssString.indexOf("(");
</span><span class="lines">@@ -95,7 +96,7 @@
</span><span class="cx"> return gradient;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- stopsWithComponents: function(components)
</del><ins>+ stopsWithComponents(components)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: handle lengths.
</span><span class="cx"> var stops = components.map(function(component) {
</span><span class="lines">@@ -131,7 +132,7 @@
</span><span class="cx"> return stops;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- stringFromStops: function(stops)
</del><ins>+ stringFromStops(stops)
</ins><span class="cx"> {
</span><span class="cx"> var count = stops.length - 1;
</span><span class="cx"> return stops.map(function(stop, index) {
</span><span class="lines">@@ -143,74 +144,77 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.LinearGradient = function(angle, stops)
</del><ins>+WebInspector.LinearGradient = class LinearGradient
</ins><span class="cx"> {
</span><del>- this.type = WebInspector.Gradient.Types.Linear;
- this.angle = angle;
- this.stops = stops;
-};
</del><ins>+ constructor(angle, stops)
+ {
+ this.type = WebInspector.Gradient.Types.Linear;
+ this.angle = angle;
+ this.stops = stops;
+ }
</ins><span class="cx">
</span><del>-WebInspector.LinearGradient.linearGradientWithComponents = function(components)
-{
- var angle = 180;
</del><ins>+ // Static
</ins><span class="cx">
</span><del>- if (components[0].length === 1 && components[0][0].substr(-3) === "deg") {
- angle = (parseFloat(components[0][0]) % 360 + 360) % 360;
- components.shift();
- } else if (components[0][0] === "to") {
- components[0].shift();
- switch (components[0].sort().join(" ")) {
- case "top":
- angle = 0;
- break;
- case "right top":
- angle = 45;
- break;
- case "right":
- angle = 90;
- break;
- case "bottom right":
- angle = 135;
- break;
- case "bottom":
- angle = 180;
- break;
- case "bottom left":
- angle = 225;
- break;
- case "left":
- angle = 270;
- break;
- case "left top":
- angle = 315;
- break;
- default:
- console.error("Couldn't parse angle \"to " + components[0].join(" ") + "\"");
</del><ins>+ static linearGradientWithComponents(components)
+ {
+ var angle = 180;
+
+ if (components[0].length === 1 && components[0][0].substr(-3) === "deg") {
+ angle = (parseFloat(components[0][0]) % 360 + 360) % 360;
+ components.shift();
+ } else if (components[0][0] === "to") {
+ components[0].shift();
+ switch (components[0].sort().join(" ")) {
+ case "top":
+ angle = 0;
+ break;
+ case "right top":
+ angle = 45;
+ break;
+ case "right":
+ angle = 90;
+ break;
+ case "bottom right":
+ angle = 135;
+ break;
+ case "bottom":
+ angle = 180;
+ break;
+ case "bottom left":
+ angle = 225;
+ break;
+ case "left":
+ angle = 270;
+ break;
+ case "left top":
+ angle = 315;
+ break;
+ default:
+ console.error("Couldn't parse angle \"to " + components[0].join(" ") + "\"");
+ return null;
+ }
+ components.shift();
+ } else if (components[0].length !== 1 && !WebInspector.Color.fromString(components[0][0])) {
+ // If the first component is not a color, then we're dealing with a
+ // legacy linear gradient format that we don't support.
</ins><span class="cx"> return null;
</span><span class="cx"> }
</span><del>- components.shift();
- } else if (components[0].length !== 1 && !WebInspector.Color.fromString(components[0][0])) {
- // If the first component is not a color, then we're dealing with a
- // legacy linear gradient format that we don't support.
- return null;
- }
</del><span class="cx">
</span><del>- var stops = WebInspector.Gradient.stopsWithComponents(components);
- if (!stops)
- return null;
</del><ins>+ var stops = WebInspector.Gradient.stopsWithComponents(components);
+ if (!stops)
+ return null;
</ins><span class="cx">
</span><del>- return new WebInspector.LinearGradient(angle, stops);
-};
</del><ins>+ return new WebInspector.LinearGradient(angle, stops);
+ }
</ins><span class="cx">
</span><del>-WebInspector.LinearGradient.prototype = {
- constructor: WebInspector.LinearGradient,
</del><ins>+ // Public
</ins><span class="cx">
</span><del>- copy: function()
</del><ins>+ copy()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.LinearGradient(this.angle, this.stops.concat());
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- toString: function()
</del><ins>+ toString()
</ins><span class="cx"> {
</span><span class="cx"> var str = "";
</span><span class="cx">
</span><span class="lines">@@ -240,33 +244,36 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.RadialGradient = function(sizing, stops)
</del><ins>+WebInspector.RadialGradient = class RadialGradient
</ins><span class="cx"> {
</span><del>- this.type = WebInspector.Gradient.Types.Radial;
- this.sizing = sizing;
- this.stops = stops;
-};
</del><ins>+ constructor(sizing, stops)
+ {
+ this.type = WebInspector.Gradient.Types.Radial;
+ this.sizing = sizing;
+ this.stops = stops;
+ }
</ins><span class="cx">
</span><del>-WebInspector.RadialGradient.radialGradientWithComponents = function(components)
-{
- var sizing = !WebInspector.Color.fromString(components[0].join(" ")) ? components.shift().join(" ") : "";
</del><ins>+ // Static
</ins><span class="cx">
</span><del>- var stops = WebInspector.Gradient.stopsWithComponents(components);
- if (!stops)
- return null;
</del><ins>+ static radialGradientWithComponents(components)
+ {
+ var sizing = !WebInspector.Color.fromString(components[0].join(" ")) ? components.shift().join(" ") : "";
</ins><span class="cx">
</span><del>- return new WebInspector.RadialGradient(sizing, stops);
-};
</del><ins>+ var stops = WebInspector.Gradient.stopsWithComponents(components);
+ if (!stops)
+ return null;
</ins><span class="cx">
</span><del>-WebInspector.RadialGradient.prototype = {
- constructor: WebInspector.RadialGradient,
</del><ins>+ return new WebInspector.RadialGradient(sizing, stops);
+ }
</ins><span class="cx">
</span><del>- copy: function()
</del><ins>+ // Public
+
+ copy()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.RadialGradient(this.sizing, this.stops.concat());
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- toString: function()
</del><ins>+ toString()
</ins><span class="cx"> {
</span><span class="cx"> var str = this.sizing;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsIndexedDatabasejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/IndexedDatabase.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/IndexedDatabase.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/IndexedDatabase.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,58 +23,56 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.IndexedDatabase = function(name, securityOrigin, version, objectStores)
</del><ins>+WebInspector.IndexedDatabase = class IndexedDatabase extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(name, securityOrigin, version, objectStores)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._name = name;
- this._securityOrigin = securityOrigin;
- this._host = parseSecurityOrigin(securityOrigin).host;
- this._version = version;
- this._objectStores = objectStores || [];
</del><ins>+ this._name = name;
+ this._securityOrigin = securityOrigin;
+ this._host = parseSecurityOrigin(securityOrigin).host;
+ this._version = version;
+ this._objectStores = objectStores || [];
</ins><span class="cx">
</span><del>- for (var objectStore of this._objectStores)
- objectStore.establishRelationship(this);
-};
</del><ins>+ for (var objectStore of this._objectStores)
+ objectStore.establishRelationship(this);
+ }
</ins><span class="cx">
</span><del>-WebInspector.IndexedDatabase.TypeIdentifier = "indexed-database";
-WebInspector.IndexedDatabase.NameCookieKey = "indexed-database-name";
-WebInspector.IndexedDatabase.HostCookieKey = "indexed-database-host";
-
-WebInspector.IndexedDatabase.prototype = {
- constructor: WebInspector.IndexedDatabase,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get name()
</span><span class="cx"> {
</span><span class="cx"> return this._name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get securityOrigin()
</span><span class="cx"> {
</span><span class="cx"> return this._securityOrigin;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get host()
</span><span class="cx"> {
</span><span class="cx"> return this._host;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get version()
</span><span class="cx"> {
</span><span class="cx"> return this._version;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get objectStores()
</span><span class="cx"> {
</span><span class="cx"> return this._objectStores;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.IndexedDatabase.NameCookieKey] = this._name;
</span><span class="cx"> cookie[WebInspector.IndexedDatabase.HostCookieKey] = this._host;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.IndexedDatabase.TypeIdentifier = "indexed-database";
+WebInspector.IndexedDatabase.NameCookieKey = "indexed-database-name";
+WebInspector.IndexedDatabase.HostCookieKey = "indexed-database-host";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsIndexedDatabaseObjectStorejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/IndexedDatabaseObjectStore.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/IndexedDatabaseObjectStore.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/IndexedDatabaseObjectStore.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,65 +23,63 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.IndexedDatabaseObjectStore = function(name, keyPath, autoIncrement, indexes)
</del><ins>+WebInspector.IndexedDatabaseObjectStore = class IndexedDatabaseObjectStore extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(name, keyPath, autoIncrement, indexes)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._name = name;
- this._keyPath = keyPath;
- this._autoIncrement = autoIncrement || false;
- this._indexes = indexes || [];
- this._parentDatabase = null;
</del><ins>+ this._name = name;
+ this._keyPath = keyPath;
+ this._autoIncrement = autoIncrement || false;
+ this._indexes = indexes || [];
+ this._parentDatabase = null;
</ins><span class="cx">
</span><del>- for (var index of this._indexes)
- index.establishRelationship(this);
-};
</del><ins>+ for (var index of this._indexes)
+ index.establishRelationship(this);
+ }
</ins><span class="cx">
</span><del>-WebInspector.IndexedDatabaseObjectStore.TypeIdentifier = "indexed-database-object-store";
-WebInspector.IndexedDatabaseObjectStore.NameCookieKey = "indexed-database-object-store-name";
-WebInspector.IndexedDatabaseObjectStore.KeyPathCookieKey = "indexed-database-object-store-key-path";
-
-WebInspector.IndexedDatabaseObjectStore.prototype = {
- constructor: WebInspector.IndexedDatabaseObjectStore,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get name()
</span><span class="cx"> {
</span><span class="cx"> return this._name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get keyPath()
</span><span class="cx"> {
</span><span class="cx"> return this._keyPath;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get autoIncrement()
</span><span class="cx"> {
</span><span class="cx"> return this._autoIncrement;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get parentDatabase()
</span><span class="cx"> {
</span><span class="cx"> return this._parentDatabase;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get indexes()
</span><span class="cx"> {
</span><span class="cx"> return this._indexes;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.IndexedDatabaseObjectStore.NameCookieKey] = this._name;
</span><span class="cx"> cookie[WebInspector.IndexedDatabaseObjectStore.KeyPathCookieKey] = this._keyPath;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><del>- establishRelationship: function(parentDatabase)
</del><ins>+ establishRelationship(parentDatabase)
</ins><span class="cx"> {
</span><span class="cx"> this._parentDatabase = parentDatabase || null;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.IndexedDatabaseObjectStore.TypeIdentifier = "indexed-database-object-store";
+WebInspector.IndexedDatabaseObjectStore.NameCookieKey = "indexed-database-object-store-name";
+WebInspector.IndexedDatabaseObjectStore.KeyPathCookieKey = "indexed-database-object-store-key-path";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsIndexedDatabaseObjectStoreIndexjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/IndexedDatabaseObjectStoreIndex.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/IndexedDatabaseObjectStoreIndex.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/IndexedDatabaseObjectStoreIndex.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,62 +23,60 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.IndexedDatabaseObjectStoreIndex = function(name, keyPath, unique, multiEntry)
</del><ins>+WebInspector.IndexedDatabaseObjectStoreIndex = class IndexedDatabaseObjectStoreIndex extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(name, keyPath, unique, multiEntry)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._name = name;
- this._keyPath = keyPath;
- this._unique = unique || false;
- this._multiEntry = multiEntry || false;
- this._parentObjectStore = null;
-};
</del><ins>+ this._name = name;
+ this._keyPath = keyPath;
+ this._unique = unique || false;
+ this._multiEntry = multiEntry || false;
+ this._parentObjectStore = null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.IndexedDatabaseObjectStoreIndex.TypeIdentifier = "indexed-database-object-store-index";
-WebInspector.IndexedDatabaseObjectStoreIndex.NameCookieKey = "indexed-database-object-store-index-name";
-WebInspector.IndexedDatabaseObjectStoreIndex.KeyPathCookieKey = "indexed-database-object-store-index-key-path";
-
-WebInspector.IndexedDatabaseObjectStoreIndex.prototype = {
- constructor: WebInspector.IndexedDatabaseObjectStoreIndex,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get name()
</span><span class="cx"> {
</span><span class="cx"> return this._name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get keyPath()
</span><span class="cx"> {
</span><span class="cx"> return this._keyPath;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get unique()
</span><span class="cx"> {
</span><span class="cx"> return this._unique;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get multiEntry()
</span><span class="cx"> {
</span><span class="cx"> return this._multiEntry;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get parentObjectStore()
</span><span class="cx"> {
</span><span class="cx"> return this._parentObjectStore;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.IndexedDatabaseObjectStoreIndex.NameCookieKey] = this._name;
</span><span class="cx"> cookie[WebInspector.IndexedDatabaseObjectStoreIndex.KeyPathCookieKey] = this._keyPath;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><del>- establishRelationship: function(parentObjectStore)
</del><ins>+ establishRelationship(parentObjectStore)
</ins><span class="cx"> {
</span><span class="cx"> this._parentObjectStore = parentObjectStore || null;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.IndexedDatabaseObjectStoreIndex.TypeIdentifier = "indexed-database-object-store-index";
+WebInspector.IndexedDatabaseObjectStoreIndex.NameCookieKey = "indexed-database-object-store-index-name";
+WebInspector.IndexedDatabaseObjectStoreIndex.KeyPathCookieKey = "indexed-database-object-store-index-key-path";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsIssueMessagejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,196 +23,142 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.IssueMessage = function(source, level, text, url, lineNumber, columnNumber, parameters)
</del><ins>+WebInspector.IssueMessage = class IssueMessage extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(source, level, text, url, lineNumber, columnNumber, parameters)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._level = level;
- this._text = text;
</del><ins>+ this._level = level;
+ this._text = text;
</ins><span class="cx">
</span><del>- // FIXME: Move to a SourceCodeLocation.
</del><ins>+ // FIXME: Move to a SourceCodeLocation.
</ins><span class="cx">
</span><del>- // FIXME <http://webkit.org/b/76404>: Remove the string equality checks for undefined
- // once we don't get that value anymore from WebCore.
</del><ins>+ // FIXME <http://webkit.org/b/76404>: Remove the string equality checks for undefined
+ // once we don't get that value anymore from WebCore.
</ins><span class="cx">
</span><del>- // FIXME: If the URL is undefined, get the URL from the stacktrace.
- if (url && url !== "undefined")
- this._url = url;
</del><ins>+ // FIXME: If the URL is undefined, get the URL from the stacktrace.
+ if (url && url !== "undefined")
+ this._url = url;
</ins><span class="cx">
</span><del>- if (typeof lineNumber === "number" && lineNumber >= 0)
- this._lineNumber = lineNumber;
</del><ins>+ if (typeof lineNumber === "number" && lineNumber >= 0)
+ this._lineNumber = lineNumber;
</ins><span class="cx">
</span><del>- if (typeof columnNumber === "number" && columnNumber >= 0)
- this._columnNumber = columnNumber;
</del><ins>+ if (typeof columnNumber === "number" && columnNumber >= 0)
+ this._columnNumber = columnNumber;
</ins><span class="cx">
</span><del>- // FIXME: <https://webkit.org/b/142553> Web Inspector: Merge IssueMessage/ConsoleMessage - both attempt to modify the Console Messages parameter independently
</del><ins>+ // FIXME: <https://webkit.org/b/142553> Web Inspector: Merge IssueMessage/ConsoleMessage - both attempt to modify the Console Messages parameter independently
</ins><span class="cx">
</span><del>- if (parameters && parameters !== "undefined") {
- this._parameters = [];
- for (var i = 0; i < parameters.length; ++i) {
- if (parameters[i] instanceof WebInspector.RemoteObject) {
- this._parameters.push(parameters[i]);
- continue;
</del><ins>+ if (parameters && parameters !== "undefined") {
+ this._parameters = [];
+ for (var i = 0; i < parameters.length; ++i) {
+ if (parameters[i] instanceof WebInspector.RemoteObject) {
+ this._parameters.push(parameters[i]);
+ continue;
+ }
+
+ if (typeof parameters[i] === "object")
+ this._parameters.push(WebInspector.RemoteObject.fromPayload(parameters[i]));
+ else
+ this._parameters.push(WebInspector.RemoteObject.fromPrimitiveValue(parameters[i]));
</ins><span class="cx"> }
</span><del>-
- if (typeof parameters[i] === "object")
- this._parameters.push(WebInspector.RemoteObject.fromPayload(parameters[i]));
- else
- this._parameters.push(WebInspector.RemoteObject.fromPrimitiveValue(parameters[i]));
</del><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- this._formatTextIfNecessary();
</del><ins>+ this._formatTextIfNecessary();
</ins><span class="cx">
</span><del>- switch (source) {
- case "javascript":
- // FIXME: It would be nice if we had this information (the specific type of JavaScript error)
- // as part of the data passed from WebCore, instead of having to determine it ourselves.
- var prefixRegex = /^([^:]+): (?:DOM Exception \d+: )?/;
- var match = prefixRegex.exec(this._text);
- if (match && match[1] in WebInspector.IssueMessage.Type._prefixTypeMap) {
- this._type = WebInspector.IssueMessage.Type._prefixTypeMap[match[1]];
- this._text = this._text.substring(match[0].length);
- } else
- this._type = WebInspector.IssueMessage.Type.OtherIssue;
- break;
</del><ins>+ switch (source) {
+ case "javascript":
+ // FIXME: It would be nice if we had this information (the specific type of JavaScript error)
+ // as part of the data passed from WebCore, instead of having to determine it ourselves.
+ var prefixRegex = /^([^:]+): (?:DOM Exception \d+: )?/;
+ var match = prefixRegex.exec(this._text);
+ if (match && match[1] in WebInspector.IssueMessage.Type._prefixTypeMap) {
+ this._type = WebInspector.IssueMessage.Type._prefixTypeMap[match[1]];
+ this._text = this._text.substring(match[0].length);
+ } else
+ this._type = WebInspector.IssueMessage.Type.OtherIssue;
+ break;
</ins><span class="cx">
</span><del>- case "html":
- case "css":
- case "wml":
- case "xml":
- this._type = WebInspector.IssueMessage.Type.PageIssue;
- break;
</del><ins>+ case "html":
+ case "css":
+ case "wml":
+ case "xml":
+ this._type = WebInspector.IssueMessage.Type.PageIssue;
+ break;
</ins><span class="cx">
</span><del>- case "network":
- this._type = WebInspector.IssueMessage.Type.NetworkIssue;
- break;
</del><ins>+ case "network":
+ this._type = WebInspector.IssueMessage.Type.NetworkIssue;
+ break;
</ins><span class="cx">
</span><del>- case "console-api":
- case "other":
- this._type = WebInspector.IssueMessage.Type.OtherIssue;
- break;
</del><ins>+ case "console-api":
+ case "other":
+ this._type = WebInspector.IssueMessage.Type.OtherIssue;
+ break;
</ins><span class="cx">
</span><del>- default:
- console.error("Unknown issue source:", source);
- this._type = WebInspector.IssueMessage.Type.OtherIssue;
</del><ins>+ default:
+ console.error("Unknown issue source:", source);
+ this._type = WebInspector.IssueMessage.Type.OtherIssue;
+ }
</ins><span class="cx"> }
</span><del>-};
</del><span class="cx">
</span><del>-WebInspector.IssueMessage.Level = {
- Error: "error",
- Warning: "warning"
-};
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.IssueMessage.Type = {
- SemanticIssue: "issue-message-type-semantic-issue",
- RangeIssue: "issue-message-type-range-issue",
- ReferenceIssue: "issue-message-type-reference-issue",
- TypeIssue: "issue-message-type-type-issue",
- PageIssue: "issue-message-type-page-issue",
- NetworkIssue: "issue-message-type-network-issue",
- SecurityIssue: "issue-message-type-security-issue",
- OtherIssue: "issue-message-type-other-issue"
-};
-
-WebInspector.IssueMessage.Type._prefixTypeMap = {
- "SyntaxError": WebInspector.IssueMessage.Type.SemanticIssue,
- "URIError": WebInspector.IssueMessage.Type.SemanticIssue,
- "EvalError": WebInspector.IssueMessage.Type.SemanticIssue,
- "INVALID_CHARACTER_ERR": WebInspector.IssueMessage.Type.SemanticIssue,
- "SYNTAX_ERR": WebInspector.IssueMessage.Type.SemanticIssue,
-
- "RangeError": WebInspector.IssueMessage.Type.RangeIssue,
- "INDEX_SIZE_ERR": WebInspector.IssueMessage.Type.RangeIssue,
- "DOMSTRING_SIZE_ERR": WebInspector.IssueMessage.Type.RangeIssue,
-
- "ReferenceError": WebInspector.IssueMessage.Type.ReferenceIssue,
- "HIERARCHY_REQUEST_ERR": WebInspector.IssueMessage.Type.ReferenceIssue,
- "INVALID_STATE_ERR": WebInspector.IssueMessage.Type.ReferenceIssue,
- "NOT_FOUND_ERR": WebInspector.IssueMessage.Type.ReferenceIssue,
- "WRONG_DOCUMENT_ERR": WebInspector.IssueMessage.Type.ReferenceIssue,
-
- "TypeError": WebInspector.IssueMessage.Type.TypeIssue,
- "INVALID_NODE_TYPE_ERR": WebInspector.IssueMessage.Type.TypeIssue,
- "TYPE_MISMATCH_ERR": WebInspector.IssueMessage.Type.TypeIssue,
-
- "SECURITY_ERR": WebInspector.IssueMessage.Type.SecurityIssue,
-
- "NETWORK_ERR": WebInspector.IssueMessage.Type.NetworkIssue,
-
- "ABORT_ERR": WebInspector.IssueMessage.Type.OtherIssue,
- "DATA_CLONE_ERR": WebInspector.IssueMessage.Type.OtherIssue,
- "INUSE_ATTRIBUTE_ERR": WebInspector.IssueMessage.Type.OtherIssue,
- "INVALID_ACCESS_ERR": WebInspector.IssueMessage.Type.OtherIssue,
- "INVALID_MODIFICATION_ERR": WebInspector.IssueMessage.Type.OtherIssue,
- "NAMESPACE_ERR": WebInspector.IssueMessage.Type.OtherIssue,
- "NOT_SUPPORTED_ERR": WebInspector.IssueMessage.Type.OtherIssue,
- "NO_DATA_ALLOWED_ERR": WebInspector.IssueMessage.Type.OtherIssue,
- "NO_MODIFICATION_ALLOWED_ERR": WebInspector.IssueMessage.Type.OtherIssue,
- "QUOTA_EXCEEDED_ERR": WebInspector.IssueMessage.Type.OtherIssue,
- "TIMEOUT_ERR": WebInspector.IssueMessage.Type.OtherIssue,
- "URL_MISMATCH_ERR": WebInspector.IssueMessage.Type.OtherIssue,
- "VALIDATION_ERR": WebInspector.IssueMessage.Type.OtherIssue
-};
-
-WebInspector.IssueMessage.Type.displayName = function(type)
-{
- switch(type) {
- case WebInspector.IssueMessage.Type.SemanticIssue:
- return WebInspector.UIString("Semantic Issue");
- case WebInspector.IssueMessage.Type.RangeIssue:
- return WebInspector.UIString("Range Issue");
- case WebInspector.IssueMessage.Type.ReferenceIssue:
- return WebInspector.UIString("Reference Issue");
- case WebInspector.IssueMessage.Type.TypeIssue:
- return WebInspector.UIString("Type Issue");
- case WebInspector.IssueMessage.Type.PageIssue:
- return WebInspector.UIString("Page Issue");
- case WebInspector.IssueMessage.Type.NetworkIssue:
- return WebInspector.UIString("Network Issue");
- case WebInspector.IssueMessage.Type.SecurityIssue:
- return WebInspector.UIString("Security Issue");
- case WebInspector.IssueMessage.Type.OtherIssue:
- return WebInspector.UIString("Other Issue");
- default:
- console.error("Unknown issue message type:", type);
- return WebInspector.UIString("Other Issue");
</del><ins>+ static displayName(type)
+ {
+ switch(type) {
+ case WebInspector.IssueMessage.Type.SemanticIssue:
+ return WebInspector.UIString("Semantic Issue");
+ case WebInspector.IssueMessage.Type.RangeIssue:
+ return WebInspector.UIString("Range Issue");
+ case WebInspector.IssueMessage.Type.ReferenceIssue:
+ return WebInspector.UIString("Reference Issue");
+ case WebInspector.IssueMessage.Type.TypeIssue:
+ return WebInspector.UIString("Type Issue");
+ case WebInspector.IssueMessage.Type.PageIssue:
+ return WebInspector.UIString("Page Issue");
+ case WebInspector.IssueMessage.Type.NetworkIssue:
+ return WebInspector.UIString("Network Issue");
+ case WebInspector.IssueMessage.Type.SecurityIssue:
+ return WebInspector.UIString("Security Issue");
+ case WebInspector.IssueMessage.Type.OtherIssue:
+ return WebInspector.UIString("Other Issue");
+ default:
+ console.error("Unknown issue message type:", type);
+ return WebInspector.UIString("Other Issue");
+ }
</ins><span class="cx"> }
</span><del>-};
</del><span class="cx">
</span><del>-WebInspector.IssueMessage.prototype = {
- constructor: WebInspector.IssueMessage,
- __proto__: WebInspector.Object.prototype,
</del><ins>+ // Public
</ins><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get level()
</span><span class="cx"> {
</span><span class="cx"> return this._level;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get text()
</span><span class="cx"> {
</span><span class="cx"> return this._text;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get url()
</span><span class="cx"> {
</span><span class="cx"> return this._url;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get lineNumber()
</span><span class="cx"> {
</span><span class="cx"> return this._lineNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get columnNumber()
</span><span class="cx"> {
</span><span class="cx"> return this._columnNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><span class="lines">@@ -251,3 +197,59 @@
</span><span class="cx"> this._text = resultText;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.IssueMessage.Level = {
+ Error: "error",
+ Warning: "warning"
+};
+
+WebInspector.IssueMessage.Type = {
+ SemanticIssue: "issue-message-type-semantic-issue",
+ RangeIssue: "issue-message-type-range-issue",
+ ReferenceIssue: "issue-message-type-reference-issue",
+ TypeIssue: "issue-message-type-type-issue",
+ PageIssue: "issue-message-type-page-issue",
+ NetworkIssue: "issue-message-type-network-issue",
+ SecurityIssue: "issue-message-type-security-issue",
+ OtherIssue: "issue-message-type-other-issue"
+};
+
+WebInspector.IssueMessage.Type._prefixTypeMap = {
+ "SyntaxError": WebInspector.IssueMessage.Type.SemanticIssue,
+ "URIError": WebInspector.IssueMessage.Type.SemanticIssue,
+ "EvalError": WebInspector.IssueMessage.Type.SemanticIssue,
+ "INVALID_CHARACTER_ERR": WebInspector.IssueMessage.Type.SemanticIssue,
+ "SYNTAX_ERR": WebInspector.IssueMessage.Type.SemanticIssue,
+
+ "RangeError": WebInspector.IssueMessage.Type.RangeIssue,
+ "INDEX_SIZE_ERR": WebInspector.IssueMessage.Type.RangeIssue,
+ "DOMSTRING_SIZE_ERR": WebInspector.IssueMessage.Type.RangeIssue,
+
+ "ReferenceError": WebInspector.IssueMessage.Type.ReferenceIssue,
+ "HIERARCHY_REQUEST_ERR": WebInspector.IssueMessage.Type.ReferenceIssue,
+ "INVALID_STATE_ERR": WebInspector.IssueMessage.Type.ReferenceIssue,
+ "NOT_FOUND_ERR": WebInspector.IssueMessage.Type.ReferenceIssue,
+ "WRONG_DOCUMENT_ERR": WebInspector.IssueMessage.Type.ReferenceIssue,
+
+ "TypeError": WebInspector.IssueMessage.Type.TypeIssue,
+ "INVALID_NODE_TYPE_ERR": WebInspector.IssueMessage.Type.TypeIssue,
+ "TYPE_MISMATCH_ERR": WebInspector.IssueMessage.Type.TypeIssue,
+
+ "SECURITY_ERR": WebInspector.IssueMessage.Type.SecurityIssue,
+
+ "NETWORK_ERR": WebInspector.IssueMessage.Type.NetworkIssue,
+
+ "ABORT_ERR": WebInspector.IssueMessage.Type.OtherIssue,
+ "DATA_CLONE_ERR": WebInspector.IssueMessage.Type.OtherIssue,
+ "INUSE_ATTRIBUTE_ERR": WebInspector.IssueMessage.Type.OtherIssue,
+ "INVALID_ACCESS_ERR": WebInspector.IssueMessage.Type.OtherIssue,
+ "INVALID_MODIFICATION_ERR": WebInspector.IssueMessage.Type.OtherIssue,
+ "NAMESPACE_ERR": WebInspector.IssueMessage.Type.OtherIssue,
+ "NOT_SUPPORTED_ERR": WebInspector.IssueMessage.Type.OtherIssue,
+ "NO_DATA_ALLOWED_ERR": WebInspector.IssueMessage.Type.OtherIssue,
+ "NO_MODIFICATION_ALLOWED_ERR": WebInspector.IssueMessage.Type.OtherIssue,
+ "QUOTA_EXCEEDED_ERR": WebInspector.IssueMessage.Type.OtherIssue,
+ "TIMEOUT_ERR": WebInspector.IssueMessage.Type.OtherIssue,
+ "URL_MISMATCH_ERR": WebInspector.IssueMessage.Type.OtherIssue,
+ "VALIDATION_ERR": WebInspector.IssueMessage.Type.OtherIssue
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsKeyboardShortcutjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/KeyboardShortcut.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/KeyboardShortcut.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/KeyboardShortcut.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,156 +23,82 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.KeyboardShortcut = function(modifiers, key, callback, targetElement)
</del><ins>+WebInspector.KeyboardShortcut = class KeyboardShortcut extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(modifiers, key, callback, targetElement)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(key);
- console.assert(!callback || typeof callback === "function");
- console.assert(!targetElement || targetElement instanceof Element);
</del><ins>+ console.assert(key);
+ console.assert(!callback || typeof callback === "function");
+ console.assert(!targetElement || targetElement instanceof Element);
</ins><span class="cx">
</span><del>- if (typeof key === "string") {
- key = key[0].toUpperCase();
- key = new WebInspector.Key(key.charCodeAt(0), key);
- }
</del><ins>+ if (typeof key === "string") {
+ key = key[0].toUpperCase();
+ key = new WebInspector.Key(key.charCodeAt(0), key);
+ }
</ins><span class="cx">
</span><del>- if (callback && !targetElement)
- targetElement = document;
</del><ins>+ if (callback && !targetElement)
+ targetElement = document;
</ins><span class="cx">
</span><del>- this._modifiers = modifiers || WebInspector.KeyboardShortcut.Modifier.None;
- this._key = key;
- this._targetElement = targetElement;
- this._callback = callback;
- this._disabled = false;
- this._implicitlyPreventsDefault = true;
</del><ins>+ this._modifiers = modifiers || WebInspector.KeyboardShortcut.Modifier.None;
+ this._key = key;
+ this._targetElement = targetElement;
+ this._callback = callback;
+ this._disabled = false;
+ this._implicitlyPreventsDefault = true;
</ins><span class="cx">
</span><del>- if (targetElement) {
- var targetKeyboardShortcuts = targetElement._keyboardShortcuts;
- if (!targetKeyboardShortcuts)
- targetKeyboardShortcuts = targetElement._keyboardShortcuts = [];
</del><ins>+ if (targetElement) {
+ var targetKeyboardShortcuts = targetElement._keyboardShortcuts;
+ if (!targetKeyboardShortcuts)
+ targetKeyboardShortcuts = targetElement._keyboardShortcuts = [];
</ins><span class="cx">
</span><del>- targetKeyboardShortcuts.push(this);
</del><ins>+ targetKeyboardShortcuts.push(this);
</ins><span class="cx">
</span><del>- if (!WebInspector.KeyboardShortcut._registeredKeyDownListener) {
- WebInspector.KeyboardShortcut._registeredKeyDownListener = true;
- window.addEventListener("keydown", WebInspector.KeyboardShortcut._handleKeyDown);
</del><ins>+ if (!WebInspector.KeyboardShortcut._registeredKeyDownListener) {
+ WebInspector.KeyboardShortcut._registeredKeyDownListener = true;
+ window.addEventListener("keydown", WebInspector.KeyboardShortcut._handleKeyDown);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-};
</del><span class="cx">
</span><del>-WebInspector.KeyboardShortcut._handleKeyDown = function(event)
-{
- if (event.defaultPrevented)
- return;
</del><ins>+ // Static
</ins><span class="cx">
</span><del>- for (var targetElement = event.target; targetElement; targetElement = targetElement.parentNode) {
- if (!targetElement._keyboardShortcuts)
- continue;
</del><ins>+ static _handleKeyDown(event)
+ {
+ if (event.defaultPrevented)
+ return;
</ins><span class="cx">
</span><del>- for (var i = 0; i < targetElement._keyboardShortcuts.length; ++i) {
- var keyboardShortcut = targetElement._keyboardShortcuts[i];
- if (!keyboardShortcut.matchesEvent(event))
</del><ins>+ for (var targetElement = event.target; targetElement; targetElement = targetElement.parentNode) {
+ if (!targetElement._keyboardShortcuts)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- keyboardShortcut.callback(event, keyboardShortcut);
</del><ins>+ for (var i = 0; i < targetElement._keyboardShortcuts.length; ++i) {
+ var keyboardShortcut = targetElement._keyboardShortcuts[i];
+ if (!keyboardShortcut.matchesEvent(event))
+ continue;
</ins><span class="cx">
</span><del>- if (keyboardShortcut.implicitlyPreventsDefault)
- event.preventDefault();
</del><ins>+ keyboardShortcut.callback(event, keyboardShortcut);
</ins><span class="cx">
</span><del>- return;
</del><ins>+ if (keyboardShortcut.implicitlyPreventsDefault)
+ event.preventDefault();
+
+ return;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-};
</del><span class="cx">
</span><del>-WebInspector.KeyboardShortcut.Modifier = {
- None: 0,
- Shift: 1,
- Control: 2,
- Option: 4,
- Command: 8,
-
- get CommandOrControl()
- {
- return WebInspector.Platform.name === "mac" ? this.Command : this.Control;
- }
-};
-
-WebInspector.Key = function(keyCode, displayName)
-{
- this._keyCode = keyCode;
- this._displayName = displayName;
-};
-
-WebInspector.Key.prototype = {
- get keyCode()
- {
- return this._keyCode;
- },
-
- get displayName()
- {
- return this._displayName;
- },
-
- toString: function()
- {
- return this._displayName;
- }
-};
-
-WebInspector.KeyboardShortcut.Key = {
- Backspace: new WebInspector.Key(8, "\u232b"),
- Tab: new WebInspector.Key(9, "\u21e5"),
- Enter: new WebInspector.Key(13, "\u21a9"),
- Escape: new WebInspector.Key(27, "\u238b"),
- Space: new WebInspector.Key(32, "Space"),
- PageUp: new WebInspector.Key(33, "\u21de"),
- PageDown: new WebInspector.Key(34, "\u21df"),
- End: new WebInspector.Key(35, "\u2198"),
- Home: new WebInspector.Key(36, "\u2196"),
- Left: new WebInspector.Key(37, "\u2190"),
- Up: new WebInspector.Key(38, "\u2191"),
- Right: new WebInspector.Key(39, "\u2192"),
- Down: new WebInspector.Key(40, "\u2193"),
- Delete: new WebInspector.Key(46, "\u2326"),
- Zero: new WebInspector.Key(48, "0"),
- F1: new WebInspector.Key(112, "F1"),
- F2: new WebInspector.Key(113, "F2"),
- F3: new WebInspector.Key(114, "F3"),
- F4: new WebInspector.Key(115, "F4"),
- F5: new WebInspector.Key(116, "F5"),
- F6: new WebInspector.Key(117, "F6"),
- F7: new WebInspector.Key(118, "F7"),
- F8: new WebInspector.Key(119, "F8"),
- F9: new WebInspector.Key(120, "F9"),
- F10: new WebInspector.Key(121, "F10"),
- F11: new WebInspector.Key(122, "F11"),
- F12: new WebInspector.Key(123, "F12"),
- Semicolon: new WebInspector.Key(186, ";"),
- Plus: new WebInspector.Key(187, "+"),
- Comma: new WebInspector.Key(188, ","),
- Minus: new WebInspector.Key(189, "-"),
- Period: new WebInspector.Key(190, "."),
- Slash: new WebInspector.Key(191, "/"),
- Backslash: new WebInspector.Key(220, "\\"),
- Apostrophe: new WebInspector.Key(192, "`"),
- SingleQuote: new WebInspector.Key(222, "\'")
-};
-
-WebInspector.KeyboardShortcut.prototype = {
- constructor: WebInspector.KeyboardShortcut,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get modifiers()
</span><span class="cx"> {
</span><span class="cx"> return this._modifiers;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get key()
</span><span class="cx"> {
</span><span class="cx"> return this._key;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get displayName()
</span><span class="cx"> {
</span><span class="lines">@@ -190,34 +116,34 @@
</span><span class="cx"> result += this._key.toString();
</span><span class="cx">
</span><span class="cx"> return result;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get callback()
</span><span class="cx"> {
</span><span class="cx"> return this._callback;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get disabled()
</span><span class="cx"> {
</span><span class="cx"> return this._disabled;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set disabled(disabled)
</span><span class="cx"> {
</span><span class="cx"> this._disabled = disabled || false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get implicitlyPreventsDefault()
</span><span class="cx"> {
</span><span class="cx"> return this._implicitlyPreventsDefault;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set implicitlyPreventsDefault(implicitly)
</span><span class="cx"> {
</span><span class="cx"> this._implicitlyPreventsDefault = implicitly;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- unbind: function()
</del><ins>+ unbind()
</ins><span class="cx"> {
</span><span class="cx"> this._disabled = true;
</span><span class="cx">
</span><span class="lines">@@ -229,9 +155,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> targetKeyboardShortcuts.remove(this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- matchesEvent: function(event)
</del><ins>+ matchesEvent(event)
</ins><span class="cx"> {
</span><span class="cx"> if (this._disabled)
</span><span class="cx"> return false;
</span><span class="lines">@@ -252,4 +178,80 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.KeyboardShortcut.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.Key = class Key
+{
+ constructor(keyCode, displayName)
+ {
+ this._keyCode = keyCode;
+ this._displayName = displayName;
+ }
+
+ // Public
+
+ get keyCode()
+ {
+ return this._keyCode;
+ }
+
+ get displayName()
+ {
+ return this._displayName;
+ }
+
+ toString()
+ {
+ return this._displayName;
+ }
+};
+
+WebInspector.KeyboardShortcut.Modifier = {
+ None: 0,
+ Shift: 1,
+ Control: 2,
+ Option: 4,
+ Command: 8,
+
+ get CommandOrControl()
+ {
+ return WebInspector.Platform.name === "mac" ? this.Command : this.Control;
+ }
+};
+
+WebInspector.KeyboardShortcut.Key = {
+ Backspace: new WebInspector.Key(8, "\u232b"),
+ Tab: new WebInspector.Key(9, "\u21e5"),
+ Enter: new WebInspector.Key(13, "\u21a9"),
+ Escape: new WebInspector.Key(27, "\u238b"),
+ Space: new WebInspector.Key(32, "Space"),
+ PageUp: new WebInspector.Key(33, "\u21de"),
+ PageDown: new WebInspector.Key(34, "\u21df"),
+ End: new WebInspector.Key(35, "\u2198"),
+ Home: new WebInspector.Key(36, "\u2196"),
+ Left: new WebInspector.Key(37, "\u2190"),
+ Up: new WebInspector.Key(38, "\u2191"),
+ Right: new WebInspector.Key(39, "\u2192"),
+ Down: new WebInspector.Key(40, "\u2193"),
+ Delete: new WebInspector.Key(46, "\u2326"),
+ Zero: new WebInspector.Key(48, "0"),
+ F1: new WebInspector.Key(112, "F1"),
+ F2: new WebInspector.Key(113, "F2"),
+ F3: new WebInspector.Key(114, "F3"),
+ F4: new WebInspector.Key(115, "F4"),
+ F5: new WebInspector.Key(116, "F5"),
+ F6: new WebInspector.Key(117, "F6"),
+ F7: new WebInspector.Key(118, "F7"),
+ F8: new WebInspector.Key(119, "F8"),
+ F9: new WebInspector.Key(120, "F9"),
+ F10: new WebInspector.Key(121, "F10"),
+ F11: new WebInspector.Key(122, "F11"),
+ F12: new WebInspector.Key(123, "F12"),
+ Semicolon: new WebInspector.Key(186, ";"),
+ Plus: new WebInspector.Key(187, "+"),
+ Comma: new WebInspector.Key(188, ","),
+ Minus: new WebInspector.Key(189, "-"),
+ Period: new WebInspector.Key(190, "."),
+ Slash: new WebInspector.Key(191, "/"),
+ Backslash: new WebInspector.Key(220, "\\"),
+ Apostrophe: new WebInspector.Key(192, "`"),
+ SingleQuote: new WebInspector.Key(222, "\'")
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsLayoutTimelineRecordjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/LayoutTimelineRecord.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/LayoutTimelineRecord.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/LayoutTimelineRecord.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,106 +23,105 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.LayoutTimelineRecord = function(eventType, startTime, endTime, callFrames, sourceCodeLocation, x, y, width, height, quad)
</del><ins>+WebInspector.LayoutTimelineRecord = class LayoutTimelineRecord extends WebInspector.TimelineRecord
</ins><span class="cx"> {
</span><del>- WebInspector.TimelineRecord.call(this, WebInspector.TimelineRecord.Type.Layout, startTime, endTime, callFrames, sourceCodeLocation);
</del><ins>+ constructor(eventType, startTime, endTime, callFrames, sourceCodeLocation, x, y, width, height, quad)
+ {
+ super(WebInspector.TimelineRecord.Type.Layout, startTime, endTime, callFrames, sourceCodeLocation);
</ins><span class="cx">
</span><del>- console.assert(eventType);
</del><ins>+ console.assert(eventType);
</ins><span class="cx">
</span><del>- if (eventType in WebInspector.LayoutTimelineRecord.EventType)
- eventType = WebInspector.LayoutTimelineRecord.EventType[eventType];
</del><ins>+ if (eventType in WebInspector.LayoutTimelineRecord.EventType)
+ eventType = WebInspector.LayoutTimelineRecord.EventType[eventType];
</ins><span class="cx">
</span><del>- this._eventType = eventType;
- this._x = typeof x === "number" ? x : NaN;
- this._y = typeof y === "number" ? y : NaN;
- this._width = typeof width === "number" ? width : NaN;
- this._height = typeof height === "number" ? height : NaN;
- this._quad = quad instanceof WebInspector.Quad ? quad : null;
-};
</del><ins>+ this._eventType = eventType;
+ this._x = typeof x === "number" ? x : NaN;
+ this._y = typeof y === "number" ? y : NaN;
+ this._width = typeof width === "number" ? width : NaN;
+ this._height = typeof height === "number" ? height : NaN;
+ this._quad = quad instanceof WebInspector.Quad ? quad : null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.LayoutTimelineRecord.EventType = {
- InvalidateStyles: "layout-timeline-record-invalidate-styles",
- RecalculateStyles: "layout-timeline-record-recalculate-styles",
- InvalidateLayout: "layout-timeline-record-invalidate-layout",
- ForcedLayout: "layout-timeline-record-forced-layout",
- Layout: "layout-timeline-record-layout",
- Paint: "layout-timeline-record-paint"
-};
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.LayoutTimelineRecord.displayNameForEventType = function(eventType)
-{
- switch(eventType) {
- case WebInspector.LayoutTimelineRecord.EventType.InvalidateStyles:
- return WebInspector.UIString("Styles Invalidated");
- case WebInspector.LayoutTimelineRecord.EventType.RecalculateStyles:
- return WebInspector.UIString("Styles Recalculated");
- case WebInspector.LayoutTimelineRecord.EventType.InvalidateLayout:
- return WebInspector.UIString("Layout Invalidated");
- case WebInspector.LayoutTimelineRecord.EventType.ForcedLayout:
- return WebInspector.UIString("Forced Layout");
- case WebInspector.LayoutTimelineRecord.EventType.Layout:
- return WebInspector.UIString("Layout");
- case WebInspector.LayoutTimelineRecord.EventType.Paint:
- return WebInspector.UIString("Paint");
</del><ins>+ static displayNameForEventType(eventType)
+ {
+ switch(eventType) {
+ case WebInspector.LayoutTimelineRecord.EventType.InvalidateStyles:
+ return WebInspector.UIString("Styles Invalidated");
+ case WebInspector.LayoutTimelineRecord.EventType.RecalculateStyles:
+ return WebInspector.UIString("Styles Recalculated");
+ case WebInspector.LayoutTimelineRecord.EventType.InvalidateLayout:
+ return WebInspector.UIString("Layout Invalidated");
+ case WebInspector.LayoutTimelineRecord.EventType.ForcedLayout:
+ return WebInspector.UIString("Forced Layout");
+ case WebInspector.LayoutTimelineRecord.EventType.Layout:
+ return WebInspector.UIString("Layout");
+ case WebInspector.LayoutTimelineRecord.EventType.Paint:
+ return WebInspector.UIString("Paint");
+ }
</ins><span class="cx"> }
</span><del>-};
</del><span class="cx">
</span><del>-WebInspector.LayoutTimelineRecord.TypeIdentifier = "layout-timeline-record";
-WebInspector.LayoutTimelineRecord.EventTypeCookieKey = "layout-timeline-record-event-type";
-
-WebInspector.LayoutTimelineRecord.prototype = {
- constructor: WebInspector.LayoutTimelineRecord,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get eventType()
</span><span class="cx"> {
</span><span class="cx"> return this._eventType;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get x()
</span><span class="cx"> {
</span><span class="cx"> return this._x;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get y()
</span><span class="cx"> {
</span><span class="cx"> return this._y;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get width()
</span><span class="cx"> {
</span><span class="cx"> return this._width;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get height()
</span><span class="cx"> {
</span><span class="cx"> return this._height;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get area()
</span><span class="cx"> {
</span><span class="cx"> return this._width * this._height;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get rect()
</span><span class="cx"> {
</span><span class="cx"> if (!isNaN(this._x) && !isNaN(this._y))
</span><span class="cx"> return new WebInspector.Rect(this._x, this._y, this._width, this._height);
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get quad()
</span><span class="cx"> {
</span><span class="cx"> return this._quad;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><del>- WebInspector.TimelineRecord.prototype.saveIdentityToCookie.call(this, cookie);
</del><ins>+ super.saveIdentityToCookie(cookie);
</ins><span class="cx">
</span><span class="cx"> cookie[WebInspector.LayoutTimelineRecord.EventTypeCookieKey] = this._eventType;
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.LayoutTimelineRecord.prototype.__proto__ = WebInspector.TimelineRecord.prototype;
</del><ins>+WebInspector.LayoutTimelineRecord.EventType = {
+ InvalidateStyles: "layout-timeline-record-invalidate-styles",
+ RecalculateStyles: "layout-timeline-record-recalculate-styles",
+ InvalidateLayout: "layout-timeline-record-invalidate-layout",
+ ForcedLayout: "layout-timeline-record-forced-layout",
+ Layout: "layout-timeline-record-layout",
+ Paint: "layout-timeline-record-paint"
+};
+
+WebInspector.LayoutTimelineRecord.TypeIdentifier = "layout-timeline-record";
+WebInspector.LayoutTimelineRecord.EventTypeCookieKey = "layout-timeline-record-event-type";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsLazySourceCodeLocationjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/LazySourceCodeLocation.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/LazySourceCodeLocation.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/LazySourceCodeLocation.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -30,80 +30,79 @@
</span><span class="cx"> // - formatted information does require initialization, done by overriding public APIs.
</span><span class="cx"> // - display information does require initialization, done by overriding private funnel API resolveMappedLocation.
</span><span class="cx">
</span><del>-WebInspector.LazySourceCodeLocation = function(sourceCode, lineNumber, columnNumber)
</del><ins>+WebInspector.LazySourceCodeLocation = class LazySourceCodeLocation extends WebInspector.SourceCodeLocation
</ins><span class="cx"> {
</span><del>- WebInspector.SourceCodeLocation.call(this, null, lineNumber, columnNumber);
</del><ins>+ constructor(sourceCode, lineNumber, columnNumber)
+ {
+ super(null, lineNumber, columnNumber);
</ins><span class="cx">
</span><del>- console.assert(sourceCode);
</del><ins>+ console.assert(sourceCode);
</ins><span class="cx">
</span><del>- this._initialized = false;
- this._lazySourceCode = sourceCode;
-};
</del><ins>+ this._initialized = false;
+ this._lazySourceCode = sourceCode;
+ }
</ins><span class="cx">
</span><del>-WebInspector.LazySourceCodeLocation.prototype = {
- constructor: WebInspector.LazySourceCodeLocation,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><del>- isEqual: function(other)
</del><ins>+ isEqual(other)
</ins><span class="cx"> {
</span><span class="cx"> if (!other)
</span><span class="cx"> return false;
</span><span class="cx"> return this._lazySourceCode === other._sourceCode && this._lineNumber === other._lineNumber && this._columnNumber === other._columnNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceCode()
</span><span class="cx"> {
</span><span class="cx"> return this._lazySourceCode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set sourceCode(sourceCode)
</span><span class="cx"> {
</span><span class="cx"> // Getter and setter must be provided together.
</span><span class="cx"> this.setSourceCode(sourceCode);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get formattedLineNumber()
</span><span class="cx"> {
</span><span class="cx"> this._lazyInitialization();
</span><span class="cx"> return this._formattedLineNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get formattedColumnNumber()
</span><span class="cx"> {
</span><span class="cx"> this._lazyInitialization();
</span><span class="cx"> return this._formattedColumnNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- formattedPosition: function()
</del><ins>+ formattedPosition()
</ins><span class="cx"> {
</span><span class="cx"> this._lazyInitialization();
</span><span class="cx"> return new WebInspector.SourceCodePosition(this._formattedLineNumber, this._formattedColumnNumber);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hasFormattedLocation: function()
</del><ins>+ hasFormattedLocation()
</ins><span class="cx"> {
</span><span class="cx"> this._lazyInitialization();
</span><del>- return WebInspector.SourceCodeLocation.prototype.hasFormattedLocation.call(this);
- },
</del><ins>+ return super.hasFormattedLocation();
+ }
</ins><span class="cx">
</span><del>- hasDifferentDisplayLocation: function()
</del><ins>+ hasDifferentDisplayLocation()
</ins><span class="cx"> {
</span><span class="cx"> this._lazyInitialization();
</span><del>- return WebInspector.SourceCodeLocation.prototype.hasDifferentDisplayLocation.call(this);
- },
</del><ins>+ return super.hasDifferentDisplayLocation();
+ }
</ins><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><del>- resolveMappedLocation: function()
</del><ins>+ resolveMappedLocation()
</ins><span class="cx"> {
</span><span class="cx"> this._lazyInitialization();
</span><del>- WebInspector.SourceCodeLocation.prototype.resolveMappedLocation.call(this);
- },
</del><ins>+ super.resolveMappedLocation();
+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _lazyInitialization: function()
</del><ins>+ _lazyInitialization()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._initialized) {
</span><span class="cx"> this._initialized = true;
</span><span class="lines">@@ -111,5 +110,3 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.LazySourceCodeLocation.prototype.__proto__ = WebInspector.SourceCodeLocation.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsLineWidgetjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/LineWidget.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/LineWidget.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/LineWidget.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,36 +23,34 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.LineWidget = function(codeMirrorLineWidget, widgetElement)
</del><ins>+WebInspector.LineWidget = class LineWidget extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(codeMirrorLineWidget, widgetElement)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(widgetElement instanceof Element);
</del><ins>+ console.assert(widgetElement instanceof Element);
</ins><span class="cx">
</span><del>- this._codeMirrorLineWidget = codeMirrorLineWidget;
- this._widgetElement = widgetElement;
-};
</del><ins>+ this._codeMirrorLineWidget = codeMirrorLineWidget;
+ this._widgetElement = widgetElement;
+ }
</ins><span class="cx">
</span><del>-WebInspector.LineWidget.prototype = {
- constructor: WebInspector.LineWidget,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get codeMirrorLineWidget()
</span><span class="cx"> {
</span><span class="cx"> return this._codeMirrorLineWidget;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get widgetElement()
</span><span class="cx"> {
</span><span class="cx"> return this._widgetElement;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> clear()
</span><span class="cx"> {
</span><span class="cx"> this._codeMirrorLineWidget.clear();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> update()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsLogObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/LogObject.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/LogObject.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/LogObject.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,16 +23,15 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.LogObject = function()
</del><ins>+WebInspector.LogObject = class LogObject extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor()
+ {
+ super();
</ins><span class="cx">
</span><del>- this._startDate = new Date();
-};
</del><ins>+ this._startDate = new Date;
+ }
</ins><span class="cx">
</span><del>-WebInspector.LogObject.prototype = {
- constructor: WebInspector.LogObject,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get startDate()
</span><span class="lines">@@ -40,5 +39,3 @@
</span><span class="cx"> return this._startDate;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.LogObject.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsNetworkTimelinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/NetworkTimeline.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/NetworkTimeline.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/NetworkTimeline.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,32 +23,31 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.NetworkTimeline = function(type)
</del><ins>+WebInspector.NetworkTimeline = class NetworkTimeline extends WebInspector.Timeline
</ins><span class="cx"> {
</span><del>- WebInspector.Timeline.call(this, type);
-};
</del><ins>+ constructor(type)
+ {
+ // FIXME: Remove once <https://webkit.org/b/142862> is fixed.
+ super(type);
+ }
</ins><span class="cx">
</span><del>-WebInspector.NetworkTimeline.prototype = {
- constructor: WebInspector.NetworkTimeline,
- __proto__: WebInspector.Timeline.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><del>- recordForResource: function(resource)
</del><ins>+ recordForResource(resource)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(resource instanceof WebInspector.Resource);
</span><span class="cx">
</span><span class="cx"> return this._resourceRecordMap.get(resource) || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- reset: function(suppressEvents)
</del><ins>+ reset(suppressEvents)
</ins><span class="cx"> {
</span><span class="cx"> this._resourceRecordMap = new Map;
</span><span class="cx">
</span><del>- WebInspector.Timeline.prototype.reset.call(this, suppressEvents);
- },
</del><ins>+ super.reset(suppressEvents);
+ }
</ins><span class="cx">
</span><del>- addRecord: function(record)
</del><ins>+ addRecord(record)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(record instanceof WebInspector.ResourceTimelineRecord);
</span><span class="cx">
</span><span class="lines">@@ -58,6 +57,6 @@
</span><span class="cx">
</span><span class="cx"> this._resourceRecordMap.set(record.resource, record);
</span><span class="cx">
</span><del>- WebInspector.Timeline.prototype.addRecord.call(this, record);
</del><ins>+ super.addRecord(record);
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsObjectPreviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ObjectPreview.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ObjectPreview.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ObjectPreview.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,92 +23,92 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ObjectPreview = function(type, subtype, description, lossless, overflow, properties, entries, size)
</del><ins>+WebInspector.ObjectPreview = class ObjectPreview extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(type, subtype, description, lossless, overflow, properties, entries, size)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(type);
- console.assert(typeof lossless === "boolean");
- console.assert(!properties || !properties.length || properties[0] instanceof WebInspector.PropertyPreview);
- console.assert(!entries || !entries.length || entries[0] instanceof WebInspector.CollectionEntryPreview);
</del><ins>+ console.assert(type);
+ console.assert(typeof lossless === "boolean");
+ console.assert(!properties || !properties.length || properties[0] instanceof WebInspector.PropertyPreview);
+ console.assert(!entries || !entries.length || entries[0] instanceof WebInspector.CollectionEntryPreview);
</ins><span class="cx">
</span><del>- this._type = type;
- this._subtype = subtype;
- this._description = description || "";
- this._lossless = lossless;
- this._overflow = overflow || false;
- this._size = size;
</del><ins>+ this._type = type;
+ this._subtype = subtype;
+ this._description = description || "";
+ this._lossless = lossless;
+ this._overflow = overflow || false;
+ this._size = size;
</ins><span class="cx">
</span><del>- this._properties = properties || null;
- this._entries = entries || null;
-};
</del><ins>+ this._properties = properties || null;
+ this._entries = entries || null;
+ }
</ins><span class="cx">
</span><del>-// Runtime.ObjectPreview.
-WebInspector.ObjectPreview.fromPayload = function(payload)
-{
- if (payload.properties)
- payload.properties = payload.properties.map(function(property) { return WebInspector.PropertyPreview.fromPayload(property); });
- if (payload.entries)
- payload.entries = payload.entries.map(function(entry) { return WebInspector.CollectionEntryPreview.fromPayload(entry); });
</del><ins>+ // Static
</ins><span class="cx">
</span><del>- if (payload.subtype === "array") {
- // COMPATIBILITY (iOS 8): Runtime.ObjectPreview did not have size property,
- // instead it was tacked onto the end of the description, like "Array[#]".
- var match = payload.description.match(/\[(\d+)\]$/);
- if (match) {
- payload.size = parseInt(match[1]);
- payload.description = payload.description.replace(/\[\d+\]$/, "");
</del><ins>+ // Runtime.ObjectPreview.
+ static fromPayload(payload)
+ {
+ if (payload.properties)
+ payload.properties = payload.properties.map(function(property) { return WebInspector.PropertyPreview.fromPayload(property); });
+ if (payload.entries)
+ payload.entries = payload.entries.map(function(entry) { return WebInspector.CollectionEntryPreview.fromPayload(entry); });
+
+ if (payload.subtype === "array") {
+ // COMPATIBILITY (iOS 8): Runtime.ObjectPreview did not have size property,
+ // instead it was tacked onto the end of the description, like "Array[#]".
+ var match = payload.description.match(/\[(\d+)\]$/);
+ if (match) {
+ payload.size = parseInt(match[1]);
+ payload.description = payload.description.replace(/\[\d+\]$/, "");
+ }
</ins><span class="cx"> }
</span><ins>+
+ return new WebInspector.ObjectPreview(payload.type, payload.subtype, payload.description, payload.lossless, payload.overflow, payload.properties, payload.entries, payload.size);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return new WebInspector.ObjectPreview(payload.type, payload.subtype, payload.description, payload.lossless, payload.overflow, payload.properties, payload.entries, payload.size);
-};
-
-WebInspector.ObjectPreview.prototype = {
- constructor: WebInspector.ObjectPreview,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get subtype()
</span><span class="cx"> {
</span><span class="cx"> return this._subtype;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get description()
</span><span class="cx"> {
</span><span class="cx"> return this._description;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get lossless()
</span><span class="cx"> {
</span><span class="cx"> return this._lossless;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get overflow()
</span><span class="cx"> {
</span><span class="cx"> return this._overflow;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get propertyPreviews()
</span><span class="cx"> {
</span><span class="cx"> return this._properties;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get collectionEntryPreviews()
</span><span class="cx"> {
</span><span class="cx"> return this._entries;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get size()
</span><span class="cx"> {
</span><span class="cx"> return this._size;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> hasSize()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsProbejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Probe.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Probe.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Probe.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,55 +24,50 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ProbeSample = function(sampleId, batchId, elapsedTime, payload)
</del><ins>+WebInspector.ProbeSample = class ProbeSample extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- this.sampleId = sampleId;
- this.batchId = batchId;
- this.timestamp = elapsedTime;
- this.object = WebInspector.RemoteObject.fromPayload(payload);
</del><ins>+ constructor(sampleId, batchId, elapsedTime, payload)
+ {
+ super();
+
+ this.sampleId = sampleId;
+ this.batchId = batchId;
+ this.timestamp = elapsedTime;
+ this.object = WebInspector.RemoteObject.fromPayload(payload);
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Probe = function(id, breakpoint, expression)
</del><ins>+WebInspector.Probe = class Probe extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(id, breakpoint, expression)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(id);
- console.assert(breakpoint instanceof WebInspector.Breakpoint);
</del><ins>+ console.assert(id);
+ console.assert(breakpoint instanceof WebInspector.Breakpoint);
</ins><span class="cx">
</span><del>- this._id = id;
- this._breakpoint = breakpoint;
- this._expression = expression;
- this._samples = [];
-};
</del><ins>+ this._id = id;
+ this._breakpoint = breakpoint;
+ this._expression = expression;
+ this._samples = [];
+ }
</ins><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.Probe);
-
-WebInspector.Probe.Event = {
- ExpressionChanged: "probe-object-expression-changed",
- SampleAdded: "probe-object-sample-added",
- SamplesCleared: "probe-object-samples-cleared"
-};
-
-WebInspector.Probe.prototype = {
- constructor: WebInspector.Probe,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> return this._id;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get breakpoint()
</span><span class="cx"> {
</span><span class="cx"> return this._breakpoint;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get expression()
</span><span class="cx"> {
</span><span class="cx"> return this._expression;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set expression(value)
</span><span class="cx"> {
</span><span class="lines">@@ -83,23 +78,29 @@
</span><span class="cx"> this._expression = value;
</span><span class="cx"> this.clearSamples();
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Probe.Event.ExpressionChanged, data);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get samples()
</span><span class="cx"> {
</span><span class="cx"> return this._samples.slice();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- clearSamples: function()
</del><ins>+ clearSamples()
</ins><span class="cx"> {
</span><span class="cx"> this._samples = [];
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Probe.Event.SamplesCleared);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addSample: function(sample)
</del><ins>+ addSample(sample)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(sample instanceof WebInspector.ProbeSample, "Wrong object type passed as probe sample: ", sample);
</span><span class="cx"> this._samples.push(sample);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Probe.Event.SampleAdded, sample);
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.Probe.Event = {
+ ExpressionChanged: "probe-object-expression-changed",
+ SampleAdded: "probe-object-sample-added",
+ SamplesCleared: "probe-object-samples-cleared"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsProbeSetjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ProbeSet.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ProbeSet.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ProbeSet.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -26,60 +26,48 @@
</span><span class="cx">
</span><span class="cx"> // A ProbeSet clusters Probes from the same Breakpoint and their samples.
</span><span class="cx">
</span><del>-WebInspector.ProbeSet = function(breakpoint)
</del><ins>+WebInspector.ProbeSet = class ProbeSet extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- console.assert(breakpoint instanceof WebInspector.Breakpoint, "Unknown breakpoint argument: ", breakpoint);
</del><ins>+ constructor(breakpoint)
+ {
+ super();
</ins><span class="cx">
</span><del>- WebInspector.Object.call(this);
- this._breakpoint = breakpoint;
- this._probes = [];
- this._probesByIdentifier = new Map;
</del><ins>+ console.assert(breakpoint instanceof WebInspector.Breakpoint, "Unknown breakpoint argument: ", breakpoint);
</ins><span class="cx">
</span><del>- this._createDataTable();
</del><ins>+ this._breakpoint = breakpoint;
+ this._probes = [];
+ this._probesByIdentifier = new Map;
</ins><span class="cx">
</span><del>- WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceChanged, this);
- WebInspector.Probe.addEventListener(WebInspector.Probe.Event.SampleAdded, this._sampleCollected, this);
- WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._breakpointResolvedStateDidChange, this);
-}
</del><ins>+ this._createDataTable();
</ins><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.ProbeSet);
</del><ins>+ WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceChanged, this);
+ WebInspector.Probe.addEventListener(WebInspector.Probe.Event.SampleAdded, this._sampleCollected, this);
+ WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._breakpointResolvedStateDidChange, this);
+ }
</ins><span class="cx">
</span><del>-WebInspector.ProbeSet.Event = {
- ProbeAdded: "probe-set-probe-added",
- ProbeRemoved: "probe-set-probe-removed",
- ResolvedStateDidChange: "probe-set-resolved-state-did-change",
- SamplesCleared: "probe-set-samples-cleared",
-};
-
-WebInspector.ProbeSet.SampleObjectTitle = "Object";
-
-WebInspector.ProbeSet.prototype = {
- constructor: WebInspector.ProbeSet,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><del>- get breakpoint()
- {
- return this._breakpoint;
- },
</del><ins>+ get breakpoint()
+ {
+ return this._breakpoint;
+ }
</ins><span class="cx">
</span><span class="cx"> get probes()
</span><span class="cx"> {
</span><span class="cx"> return this._probes.slice();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get dataTable()
</span><span class="cx"> {
</span><span class="cx"> return this._dataTable;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- clear: function()
</del><ins>+ clear()
</ins><span class="cx"> {
</span><span class="cx"> this._breakpoint.clearActions(WebInspector.BreakpointAction.Type.Probe);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- clearSamples: function()
</del><ins>+ clearSamples()
</ins><span class="cx"> {
</span><span class="cx"> for (var probe of this._probes)
</span><span class="cx"> probe.clearSamples();
</span><span class="lines">@@ -87,14 +75,14 @@
</span><span class="cx"> var oldTable = this._dataTable;
</span><span class="cx"> this._createDataTable();
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ProbeSet.Event.SamplesCleared, {oldTable});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- createProbe: function(expression)
</del><ins>+ createProbe(expression)
</ins><span class="cx"> {
</span><span class="cx"> this.breakpoint.createAction(WebInspector.BreakpointAction.Type.Probe, null, expression);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addProbe: function(probe)
</del><ins>+ addProbe(probe)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(probe instanceof WebInspector.Probe, "Tried to add non-probe ", probe, " to probe group", this);
</span><span class="cx"> console.assert(probe.breakpoint === this.breakpoint, "Probe and ProbeSet must have same breakpoint.", probe, this);
</span><span class="lines">@@ -104,9 +92,9 @@
</span><span class="cx">
</span><span class="cx"> this.dataTable.addProbe(probe);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ProbeSet.Event.ProbeAdded, probe);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeProbe: function(probe)
</del><ins>+ removeProbe(probe)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(probe instanceof WebInspector.Probe, "Tried to remove non-probe ", probe, " to probe group", this);
</span><span class="cx"> console.assert(this._probes.indexOf(probe) !== -1, "Tried to remove probe", probe, " not in group ", this);
</span><span class="lines">@@ -116,33 +104,33 @@
</span><span class="cx"> this._probesByIdentifier.delete(probe.id);
</span><span class="cx"> this.dataTable.removeProbe(probe);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ProbeSet.Event.ProbeRemoved, probe);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- willRemove: function()
</del><ins>+ willRemove()
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!this._probes.length, "ProbeSet.willRemove called, but probes still associated with group: ", this._probes);
</span><span class="cx">
</span><span class="cx"> WebInspector.Frame.removeEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceChanged, this);
</span><span class="cx"> WebInspector.Probe.removeEventListener(WebInspector.Probe.Event.SampleAdded, this._sampleCollected, this);
</span><span class="cx"> WebInspector.Breakpoint.removeEventListener(WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._breakpointResolvedStateDidChange, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _mainResourceChanged: function()
</del><ins>+ _mainResourceChanged()
</ins><span class="cx"> {
</span><span class="cx"> this.dataTable.mainResourceChanged();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _createDataTable: function()
</del><ins>+ _createDataTable()
</ins><span class="cx"> {
</span><span class="cx"> if (this.dataTable)
</span><span class="cx"> this.dataTable.willRemove();
</span><span class="cx">
</span><span class="cx"> this._dataTable = new WebInspector.ProbeSetDataTable(this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _sampleCollected: function(event)
</del><ins>+ _sampleCollected(event)
</ins><span class="cx"> {
</span><span class="cx"> var sample = event.data;
</span><span class="cx"> console.assert(sample instanceof WebInspector.ProbeSample, "Tried to add non-sample to probe group: ", sample);
</span><span class="lines">@@ -153,10 +141,17 @@
</span><span class="cx">
</span><span class="cx"> console.assert(this.dataTable);
</span><span class="cx"> this.dataTable.addSampleForProbe(probe, sample);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _breakpointResolvedStateDidChange: function(event)
</del><ins>+ _breakpointResolvedStateDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ProbeSet.Event.ResolvedStateDidChange);
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.ProbeSet.Event = {
+ ProbeAdded: "probe-set-probe-added",
+ ProbeRemoved: "probe-set-probe-removed",
+ ResolvedStateDidChange: "probe-set-resolved-state-did-change",
+ SamplesCleared: "probe-set-samples-cleared",
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsProbeSetDataFramejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ProbeSetDataFrame.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ProbeSetDataFrame.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ProbeSetDataFrame.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,74 +24,78 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ProbeSetDataFrame = function(index)
</del><ins>+WebInspector.ProbeSetDataFrame = class ProbeSetDataFrame extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- this._count = 0;
- this._index = index;
- this._separator = false;
-};
</del><ins>+ constructor(index)
+ {
+ super();
</ins><span class="cx">
</span><del>-WebInspector.ProbeSetDataFrame.compare = function(a, b) {
- console.assert(a instanceof WebInspector.ProbeSetDataFrame, a);
- console.assert(b instanceof WebInspector.ProbeSetDataFrame, b);
</del><ins>+ this._count = 0;
+ this._index = index;
+ this._separator = false;
+ }
</ins><span class="cx">
</span><del>- return a.index - b.index;
-}
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.ProbeSetDataFrame.MissingValue = "?";
</del><ins>+ static compare(a, b)
+ {
+ console.assert(a instanceof WebInspector.ProbeSetDataFrame, a);
+ console.assert(b instanceof WebInspector.ProbeSetDataFrame, b);
</ins><span class="cx">
</span><del>-WebInspector.ProbeSetDataFrame.prototype = {
- constructor: WebInspector.ProbeSetDataFrame,
</del><ins>+ return a.index - b.index;
+ }
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get key()
</span><span class="cx"> {
</span><span class="cx"> return String(this._index);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get count()
</span><span class="cx"> {
</span><span class="cx"> return this._count;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get index()
</span><span class="cx"> {
</span><span class="cx"> return this._index;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get isSeparator()
</span><span class="cx"> {
</span><span class="cx"> return this._separator;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // The last data frame before a main frame navigation is marked as a "separator" frame.
</span><span class="cx"> set isSeparator(value)
</span><span class="cx"> {
</span><span class="cx"> this._separator = !!value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addSampleForProbe: function(probe, sample)
</del><ins>+ addSampleForProbe(probe, sample)
</ins><span class="cx"> {
</span><span class="cx"> this[probe.id] = sample;
</span><span class="cx"> this._count++;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- missingKeys: function(probeSet)
</del><ins>+ missingKeys(probeSet)
</ins><span class="cx"> {
</span><span class="cx"> return probeSet.probes.filter(function(probe) {
</span><span class="cx"> return !this.hasOwnProperty(probe.id);
</span><span class="cx"> }, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isComplete: function(probeSet)
</del><ins>+ isComplete(probeSet)
</ins><span class="cx"> {
</span><span class="cx"> return !this.missingKeys(probeSet).length;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- fillMissingValues: function(probeSet)
</del><ins>+ fillMissingValues(probeSet)
</ins><span class="cx"> {
</span><span class="cx"> for (var key of this.missingKeys(probeSet))
</span><span class="cx"> this[key] = WebInspector.ProbeSetDataFrame.MissingValue;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.ProbeSetDataFrame.MissingValue = "?";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsProbeSetDataTablejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ProbeSetDataTable.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ProbeSetDataTable.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ProbeSetDataTable.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,53 +24,42 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ProbeSetDataTable = function(probeSet)
</del><ins>+WebInspector.ProbeSetDataTable = class ProbeSetDataTable extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(probeSet)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._probeSet = probeSet;
- this._frames = [];
- this._previousBatchIdentifier = WebInspector.ProbeSetDataTable.SentinelValue;
-};
</del><ins>+ this._probeSet = probeSet;
+ this._frames = [];
+ this._previousBatchIdentifier = WebInspector.ProbeSetDataTable.SentinelValue;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ProbeSetDataTable.Event = {
- FrameInserted: "probe-set-data-table-frame-inserted",
- SeparatorInserted: "probe-set-data-table-separator-inserted",
- WillRemove: "probe-set-data-table-will-remove"
-};
-
-WebInspector.ProbeSetDataTable.SentinelValue = -1;
-WebInspector.ProbeSetDataTable.UnknownValue = "?";
-
-WebInspector.ProbeSetDataTable.prototype = {
- constructor: WebInspector.ProbeSetDataTable,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get frames()
</span><span class="cx"> {
</span><span class="cx"> return this._frames.slice();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get separators()
</span><span class="cx"> {
</span><span class="cx"> return this._frames.filter(function(frame) { return frame.isSeparator; });
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- willRemove: function()
</del><ins>+ willRemove()
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ProbeSetDataTable.Event.WillRemove);
</span><span class="cx"> this._frames = [];
</span><span class="cx"> delete this._probeSet;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- mainResourceChanged: function()
</del><ins>+ mainResourceChanged()
</ins><span class="cx"> {
</span><span class="cx"> this.addSeparator();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addSampleForProbe: function(probe, sample)
</del><ins>+ addSampleForProbe(probe, sample)
</ins><span class="cx"> {
</span><span class="cx"> // Eagerly save the frame if the batch identifier differs, or we know the frame is full.
</span><span class="cx"> // Create a new frame when the batch identifier differs.
</span><span class="lines">@@ -89,35 +78,35 @@
</span><span class="cx"> this.addFrame(this._openFrame);
</span><span class="cx"> this._openFrame = null;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addProbe: function(probe)
</del><ins>+ addProbe(probe)
</ins><span class="cx"> {
</span><span class="cx"> for (var frame of this.frames)
</span><span class="cx"> if (!frame[probe.id])
</span><span class="cx"> frame[probe.id] = WebInspector.ProbeSetDataTable.UnknownValue;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeProbe: function(probe)
</del><ins>+ removeProbe(probe)
</ins><span class="cx"> {
</span><span class="cx"> for (var frame of this.frames)
</span><span class="cx"> delete frame[probe.id];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protected - can be overridden by subclasses.
</span><span class="cx">
</span><del>- createFrame: function()
</del><ins>+ createFrame()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.ProbeSetDataFrame(this._frames.length);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addFrame: function(frame)
</del><ins>+ addFrame(frame)
</ins><span class="cx"> {
</span><span class="cx"> this._frames.push(frame);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ProbeSetDataTable.Event.FrameInserted, frame);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addSeparator: function()
</del><ins>+ addSeparator()
</ins><span class="cx"> {
</span><span class="cx"> // Separators must be associated with a frame.
</span><span class="cx"> if (!this._frames.length)
</span><span class="lines">@@ -132,3 +121,12 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ProbeSetDataTable.Event.SeparatorInserted, previousFrame);
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.ProbeSetDataTable.Event = {
+ FrameInserted: "probe-set-data-table-frame-inserted",
+ SeparatorInserted: "probe-set-data-table-separator-inserted",
+ WillRemove: "probe-set-data-table-will-remove"
+};
+
+WebInspector.ProbeSetDataTable.SentinelValue = -1;
+WebInspector.ProbeSetDataTable.UnknownValue = "?";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsProfilejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Profile.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Profile.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Profile.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,28 +23,26 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.Profile = function(topDownRootNodes)
</del><ins>+WebInspector.Profile = class Profile extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(topDownRootNodes)
+ {
+ super();
</ins><span class="cx">
</span><del>- topDownRootNodes = topDownRootNodes || [];
</del><ins>+ topDownRootNodes = topDownRootNodes || [];
</ins><span class="cx">
</span><del>- console.assert(topDownRootNodes instanceof Array);
- console.assert(topDownRootNodes.reduce(function(previousValue, node) { return previousValue && node instanceof WebInspector.ProfileNode; }, true));
</del><ins>+ console.assert(topDownRootNodes instanceof Array);
+ console.assert(topDownRootNodes.reduce(function(previousValue, node) { return previousValue && node instanceof WebInspector.ProfileNode; }, true));
</ins><span class="cx">
</span><del>- this._topDownRootNodes = topDownRootNodes;
-};
</del><ins>+ this._topDownRootNodes = topDownRootNodes;
+ }
</ins><span class="cx">
</span><del>-WebInspector.Profile.prototype = {
- constructor: WebInspector.Profile,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get topDownRootNodes()
</span><span class="cx"> {
</span><span class="cx"> return this._topDownRootNodes;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get bottomUpRootNodes()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsProfileNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ProfileNode.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ProfileNode.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ProfileNode.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,127 +23,113 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ProfileNode = function(id, type, functionName, sourceCodeLocation, calls, childNodes)
</del><ins>+WebInspector.ProfileNode = class ProfileNode extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(id, type, functionName, sourceCodeLocation, calls, childNodes)
+ {
+ super();
</ins><span class="cx">
</span><del>- childNodes = childNodes || [];
</del><ins>+ childNodes = childNodes || [];
</ins><span class="cx">
</span><del>- console.assert(id);
- console.assert(calls instanceof Array);
- console.assert(calls.length >= 1);
- console.assert(calls.reduce(function(previousValue, call) { return previousValue && call instanceof WebInspector.ProfileNodeCall; }, true));
- console.assert(childNodes instanceof Array);
- console.assert(childNodes.reduce(function(previousValue, node) { return previousValue && node instanceof WebInspector.ProfileNode; }, true));
</del><ins>+ console.assert(id);
+ console.assert(calls instanceof Array);
+ console.assert(calls.length >= 1);
+ console.assert(calls.reduce(function(previousValue, call) { return previousValue && call instanceof WebInspector.ProfileNodeCall; }, true));
+ console.assert(childNodes instanceof Array);
+ console.assert(childNodes.reduce(function(previousValue, node) { return previousValue && node instanceof WebInspector.ProfileNode; }, true));
</ins><span class="cx">
</span><del>- this._id = id;
- this._type = type || WebInspector.ProfileNode.Type.Function;
- this._functionName = functionName || null;
- this._sourceCodeLocation = sourceCodeLocation || null;
- this._calls = calls;
- this._childNodes = childNodes;
- this._parentNode = null;
- this._previousSibling = null;
- this._nextSibling = null;
- this._computedTotalTimes = false;
</del><ins>+ this._id = id;
+ this._type = type || WebInspector.ProfileNode.Type.Function;
+ this._functionName = functionName || null;
+ this._sourceCodeLocation = sourceCodeLocation || null;
+ this._calls = calls;
+ this._childNodes = childNodes;
+ this._parentNode = null;
+ this._previousSibling = null;
+ this._nextSibling = null;
+ this._computedTotalTimes = false;
</ins><span class="cx">
</span><del>- for (var i = 0; i < this._childNodes.length; ++i)
- this._childNodes[i].establishRelationships(this, this._childNodes[i - 1], this._childNodes[i + 1]);
</del><ins>+ for (var i = 0; i < this._childNodes.length; ++i)
+ this._childNodes[i].establishRelationships(this, this._childNodes[i - 1], this._childNodes[i + 1]);
</ins><span class="cx">
</span><del>- for (var i = 0; i < this._calls.length; ++i)
- this._calls[i].establishRelationships(this, this._calls[i - 1], this._calls[i + 1]);
-};
</del><ins>+ for (var i = 0; i < this._calls.length; ++i)
+ this._calls[i].establishRelationships(this, this._calls[i - 1], this._calls[i + 1]);
+ }
</ins><span class="cx">
</span><del>-WebInspector.ProfileNode.Type = {
- Function: "profile-node-type-function",
- Program: "profile-node-type-program"
-};
-
-WebInspector.ProfileNode.TypeIdentifier = "profile-node";
-WebInspector.ProfileNode.TypeCookieKey = "profile-node-type";
-WebInspector.ProfileNode.FunctionNameCookieKey = "profile-node-function-name";
-WebInspector.ProfileNode.SourceCodeURLCookieKey = "profile-node-source-code-url";
-WebInspector.ProfileNode.SourceCodeLocationLineCookieKey = "profile-node-source-code-location-line";
-WebInspector.ProfileNode.SourceCodeLocationColumnCookieKey = "profile-node-source-code-location-column";
-
-WebInspector.ProfileNode.prototype = {
- constructor: WebInspector.ProfileNode,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> return this._id;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get functionName()
</span><span class="cx"> {
</span><span class="cx"> return this._functionName;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceCodeLocation()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCodeLocation;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get startTime()
</span><span class="cx"> {
</span><span class="cx"> if (this._startTime === undefined)
</span><span class="cx"> this._startTime = Math.max(0, this._calls[0].startTime);
</span><span class="cx"> return this._startTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get endTime()
</span><span class="cx"> {
</span><span class="cx"> if (this._endTime === undefined)
</span><span class="cx"> this._endTime = Math.min(this._calls.lastValue.endTime, Infinity);
</span><span class="cx"> return this._endTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get selfTime()
</span><span class="cx"> {
</span><span class="cx"> this._computeTotalTimesIfNeeded();
</span><span class="cx"> return this._selfTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get totalTime()
</span><span class="cx"> {
</span><span class="cx"> this._computeTotalTimesIfNeeded();
</span><span class="cx"> return this._totalTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get calls()
</span><span class="cx"> {
</span><span class="cx"> return this._calls;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get previousSibling()
</span><span class="cx"> {
</span><span class="cx"> return this._previousSibling;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get nextSibling()
</span><span class="cx"> {
</span><span class="cx"> return this._nextSibling;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get parentNode()
</span><span class="cx"> {
</span><span class="cx"> return this._parentNode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get childNodes()
</span><span class="cx"> {
</span><span class="cx"> return this._childNodes;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- computeCallInfoForTimeRange: function(rangeStartTime, rangeEndTime)
</del><ins>+ computeCallInfoForTimeRange(rangeStartTime, rangeEndTime)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(typeof rangeStartTime === "number");
</span><span class="cx"> console.assert(typeof rangeEndTime === "number");
</span><span class="lines">@@ -176,9 +162,9 @@
</span><span class="cx"> var averageTime = selfTime / callCount;
</span><span class="cx">
</span><span class="cx"> return {startTime, endTime, totalTime, selfTime, callCount, averageTime};
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- traverseNextProfileNode: function(stayWithin)
</del><ins>+ traverseNextProfileNode(stayWithin)
</ins><span class="cx"> {
</span><span class="cx"> var profileNode = this._childNodes[0];
</span><span class="cx"> if (profileNode)
</span><span class="lines">@@ -199,29 +185,29 @@
</span><span class="cx"> return null;
</span><span class="cx">
</span><span class="cx"> return profileNode.nextSibling;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.ProfileNode.TypeCookieKey] = this._type || null;
</span><span class="cx"> cookie[WebInspector.ProfileNode.FunctionNameCookieKey] = this._functionName || null;
</span><span class="cx"> cookie[WebInspector.ProfileNode.SourceCodeURLCookieKey] = this._sourceCodeLocation ? this._sourceCodeLocation.sourceCode.url ? this._sourceCodeLocation.sourceCode.url.hash : null : null;
</span><span class="cx"> cookie[WebInspector.ProfileNode.SourceCodeLocationLineCookieKey] = this._sourceCodeLocation ? this._sourceCodeLocation.lineNumber : null;
</span><span class="cx"> cookie[WebInspector.ProfileNode.SourceCodeLocationColumnCookieKey] = this._sourceCodeLocation ? this._sourceCodeLocation.columnNumber : null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><del>- establishRelationships: function(parentNode, previousSibling, nextSibling)
</del><ins>+ establishRelationships(parentNode, previousSibling, nextSibling)
</ins><span class="cx"> {
</span><span class="cx"> this._parentNode = parentNode || null;
</span><span class="cx"> this._previousSibling = previousSibling || null;
</span><span class="cx"> this._nextSibling = nextSibling || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _computeTotalTimes: function()
</del><ins>+ _computeTotalTimes()
</ins><span class="cx"> {
</span><span class="cx"> if (this._computedTotalTimes)
</span><span class="cx"> return;
</span><span class="lines">@@ -235,3 +221,15 @@
</span><span class="cx"> this._totalTime = info.totalTime;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.ProfileNode.Type = {
+ Function: "profile-node-type-function",
+ Program: "profile-node-type-program"
+};
+
+WebInspector.ProfileNode.TypeIdentifier = "profile-node";
+WebInspector.ProfileNode.TypeCookieKey = "profile-node-type";
+WebInspector.ProfileNode.FunctionNameCookieKey = "profile-node-function-name";
+WebInspector.ProfileNode.SourceCodeURLCookieKey = "profile-node-source-code-url";
+WebInspector.ProfileNode.SourceCodeLocationLineCookieKey = "profile-node-source-code-location-line";
+WebInspector.ProfileNode.SourceCodeLocationColumnCookieKey = "profile-node-source-code-location-column";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsProfileNodeCalljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ProfileNodeCall.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ProfileNodeCall.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ProfileNodeCall.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,43 +23,41 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ProfileNodeCall = function(startTime, totalTime)
</del><ins>+WebInspector.ProfileNodeCall = class ProfileNodeCall extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(startTime, totalTime)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(startTime);
</del><ins>+ console.assert(startTime);
</ins><span class="cx">
</span><del>- this._startTime = startTime;
- this._totalTime = totalTime || 0;
- this._parentNode = null;
- this._previousSibling = null;
- this._nextSibling = null;
-};
</del><ins>+ this._startTime = startTime;
+ this._totalTime = totalTime || 0;
+ this._parentNode = null;
+ this._previousSibling = null;
+ this._nextSibling = null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ProfileNodeCall.prototype = {
- constructor: WebInspector.ProfileNodeCall,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get startTime()
</span><span class="cx"> {
</span><span class="cx"> return this._startTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get totalTime()
</span><span class="cx"> {
</span><span class="cx"> return this._totalTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get endTime()
</span><span class="cx"> {
</span><span class="cx"> return this._startTime + this._totalTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><del>- establishRelationships: function(parentNode, previousSibling, nextSibling)
</del><ins>+ establishRelationships(parentNode, previousSibling, nextSibling)
</ins><span class="cx"> {
</span><span class="cx"> this._parentNode = parentNode || null;
</span><span class="cx"> this._previousSibling = previousSibling || null;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsPropertyDescriptorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/PropertyDescriptor.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/PropertyDescriptor.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/PropertyDescriptor.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,129 +23,129 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.PropertyDescriptor = function(descriptor, isOwnProperty, wasThrown, nativeGetter, isInternalProperty)
</del><ins>+WebInspector.PropertyDescriptor = class PropertyDescriptor extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(descriptor, isOwnProperty, wasThrown, nativeGetter, isInternalProperty)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(descriptor);
- console.assert(descriptor.name);
- console.assert(!descriptor.value || descriptor.value instanceof WebInspector.RemoteObject);
- console.assert(!descriptor.get || descriptor.get instanceof WebInspector.RemoteObject);
- console.assert(!descriptor.set || descriptor.set instanceof WebInspector.RemoteObject);
</del><ins>+ console.assert(descriptor);
+ console.assert(descriptor.name);
+ console.assert(!descriptor.value || descriptor.value instanceof WebInspector.RemoteObject);
+ console.assert(!descriptor.get || descriptor.get instanceof WebInspector.RemoteObject);
+ console.assert(!descriptor.set || descriptor.set instanceof WebInspector.RemoteObject);
</ins><span class="cx">
</span><del>- this._name = descriptor.name;
- this._value = descriptor.value;
- this._hasValue = "value" in descriptor;
- this._get = descriptor.get;
- this._set = descriptor.set;
</del><ins>+ this._name = descriptor.name;
+ this._value = descriptor.value;
+ this._hasValue = "value" in descriptor;
+ this._get = descriptor.get;
+ this._set = descriptor.set;
</ins><span class="cx">
</span><del>- this._writable = descriptor.writable || false;
- this._configurable = descriptor.configurable || false;
- this._enumerable = descriptor.enumerable || false;
</del><ins>+ this._writable = descriptor.writable || false;
+ this._configurable = descriptor.configurable || false;
+ this._enumerable = descriptor.enumerable || false;
</ins><span class="cx">
</span><del>- this._own = isOwnProperty || false;
- this._wasThrown = wasThrown || false;
- this._nativeGetterValue = nativeGetter || false;
- this._internal = isInternalProperty || false;
-};
</del><ins>+ this._own = isOwnProperty || false;
+ this._wasThrown = wasThrown || false;
+ this._nativeGetterValue = nativeGetter || false;
+ this._internal = isInternalProperty || false;
+ }
</ins><span class="cx">
</span><del>-// Runtime.PropertyDescriptor or Runtime.InternalPropertyDescriptor (second argument).
-WebInspector.PropertyDescriptor.fromPayload = function(payload, internal)
-{
- if (payload.value)
- payload.value = WebInspector.RemoteObject.fromPayload(payload.value);
- if (payload.get)
- payload.get = WebInspector.RemoteObject.fromPayload(payload.get);
- if (payload.set)
- payload.set = WebInspector.RemoteObject.fromPayload(payload.set);
</del><ins>+ // Static
</ins><span class="cx">
</span><del>- if (internal) {
- console.assert(payload.value);
- payload.writable = payload.configurable = payload.enumerable = false;
- payload.isOwn = true;
- }
</del><ins>+ // Runtime.PropertyDescriptor or Runtime.InternalPropertyDescriptor (second argument).
+ static fromPayload(payload, internal)
+ {
+ if (payload.value)
+ payload.value = WebInspector.RemoteObject.fromPayload(payload.value);
+ if (payload.get)
+ payload.get = WebInspector.RemoteObject.fromPayload(payload.get);
+ if (payload.set)
+ payload.set = WebInspector.RemoteObject.fromPayload(payload.set);
</ins><span class="cx">
</span><del>- return new WebInspector.PropertyDescriptor(payload, payload.isOwn, payload.wasThrown, payload.nativeGetter, internal);
-};
</del><ins>+ if (internal) {
+ console.assert(payload.value);
+ payload.writable = payload.configurable = payload.enumerable = false;
+ payload.isOwn = true;
+ }
</ins><span class="cx">
</span><del>-WebInspector.PropertyDescriptor.prototype = {
- constructor: WebInspector.PropertyDescriptor,
- __proto__: WebInspector.Object.prototype,
</del><ins>+ return new WebInspector.PropertyDescriptor(payload, payload.isOwn, payload.wasThrown, payload.nativeGetter, internal);
+ }
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get name()
</span><span class="cx"> {
</span><span class="cx"> return this._name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get value()
</span><span class="cx"> {
</span><span class="cx"> return this._value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get get()
</span><span class="cx"> {
</span><span class="cx"> return this._get;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get set()
</span><span class="cx"> {
</span><span class="cx"> return this._set;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get writable()
</span><span class="cx"> {
</span><span class="cx"> return this._writable;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get configurable()
</span><span class="cx"> {
</span><span class="cx"> return this._configurable;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get enumerable()
</span><span class="cx"> {
</span><span class="cx"> return this._enumerable;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get isOwnProperty()
</span><span class="cx"> {
</span><span class="cx"> return this._own;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get wasThrown()
</span><span class="cx"> {
</span><span class="cx"> return this._wasThrown;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get nativeGetter()
</span><span class="cx"> {
</span><span class="cx"> return this._nativeGetterValue;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get isInternalProperty()
</span><span class="cx"> {
</span><span class="cx"> return this._internal;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> hasValue()
</span><span class="cx"> {
</span><span class="cx"> return this._hasValue;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> hasGetter()
</span><span class="cx"> {
</span><span class="cx"> return this._get && this._get.type === "function";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> hasSetter()
</span><span class="cx"> {
</span><span class="cx"> return this._set && this._set.type === "function";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> isIndexProperty()
</span><span class="cx"> {
</span><span class="cx"> return !isNaN(Number(this._name));
</span><del>- },
</del><ins>+ }
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsPropertyPathjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/PropertyPath.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/PropertyPath.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/PropertyPath.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,71 +23,56 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.PropertyPath = function(object, pathComponent, parent, isPrototype)
</del><ins>+WebInspector.PropertyPath = class PropertyPath extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(object, pathComponent, parent, isPrototype)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(object instanceof WebInspector.RemoteObject || object === null);
- console.assert(!pathComponent || typeof pathComponent === "string");
- console.assert(!parent || parent instanceof WebInspector.PropertyPath);
- console.assert(!parent || pathComponent.length);
</del><ins>+ console.assert(object instanceof WebInspector.RemoteObject || object === null);
+ console.assert(!pathComponent || typeof pathComponent === "string");
+ console.assert(!parent || parent instanceof WebInspector.PropertyPath);
+ console.assert(!parent || pathComponent.length);
</ins><span class="cx">
</span><del>- // We allow property pathes with null objects as end-caps only.
- // Disallow appending to a PropertyPath with null objects.
- if (parent && !parent.object)
- throw new Error("Attempted to append to a PropertyPath with null object.");
</del><ins>+ // We allow property pathes with null objects as end-caps only.
+ // Disallow appending to a PropertyPath with null objects.
+ if (parent && !parent.object)
+ throw new Error("Attempted to append to a PropertyPath with null object.");
</ins><span class="cx">
</span><del>- this._object = object;
- this._pathComponent = typeof pathComponent === "string" ? pathComponent : null;
- this._parent = parent || null;
- this._isPrototype = isPrototype || false;
-};
</del><ins>+ this._object = object;
+ this._pathComponent = typeof pathComponent === "string" ? pathComponent : null;
+ this._parent = parent || null;
+ this._isPrototype = isPrototype || false;
+ }
</ins><span class="cx">
</span><del>-WebInspector.PropertyPath.SpecialPathComponent = {
- InternalPropertyName: "@internal",
- SymbolPropertyName: "@symbol",
- MapKey: "@mapkey",
- MapValue: "@mapvalue",
- SetIndex: "@setindex",
- EmptyPathComponentForScope: "",
-};
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.PropertyPath.Type = {
- Value: "value",
- Getter: "getter",
- Setter: "setter",
-};
</del><ins>+ static emptyPropertyPathForScope(object)
+ {
+ return new WebInspector.PropertyPath(object, WebInspector.PropertyPath.SpecialPathComponent.EmptyPathComponentForScope);
+ }
</ins><span class="cx">
</span><del>-WebInspector.PropertyPath.emptyPropertyPathForScope = function(object)
-{
- return new WebInspector.PropertyPath(object, WebInspector.PropertyPath.SpecialPathComponent.EmptyPathComponentForScope);
-}
-
-WebInspector.PropertyPath.prototype = {
- constructor: WebInspector.PropertyPath,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get object()
</span><span class="cx"> {
</span><span class="cx"> return this._object;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get parent()
</span><span class="cx"> {
</span><span class="cx"> return this._parent;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get isPrototype()
</span><span class="cx"> {
</span><span class="cx"> return this._isPrototype;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get rootObject()
</span><span class="cx"> {
</span><span class="cx"> return this._parent ? this._parent.rootObject : this._object;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get lastNonPrototypeObject()
</span><span class="cx"> {
</span><span class="lines">@@ -104,12 +89,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return p.object;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get pathComponent()
</span><span class="cx"> {
</span><span class="cx"> return this._pathComponent;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get fullPath()
</span><span class="cx"> {
</span><span class="lines">@@ -118,7 +103,7 @@
</span><span class="cx"> components.push(p.pathComponent);
</span><span class="cx"> components.reverse()
</span><span class="cx"> return components.join("");
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get reducedPath()
</span><span class="cx"> {
</span><span class="lines">@@ -142,27 +127,27 @@
</span><span class="cx">
</span><span class="cx"> components.reverse();
</span><span class="cx"> return components.join("");
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> displayPath(type)
</span><span class="cx"> {
</span><span class="cx"> return type === WebInspector.PropertyPath.Type.Value ? this.reducedPath : this.fullPath;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> isRoot()
</span><span class="cx"> {
</span><span class="cx"> return !this._parent;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> isScope()
</span><span class="cx"> {
</span><span class="cx"> return this._pathComponent === WebInspector.PropertyPath.SpecialPathComponent.EmptyPathComponentForScope;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> isPathComponentImpossible()
</span><span class="cx"> {
</span><span class="cx"> return this._pathComponent && this._pathComponent.startsWith("@");
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> isFullPathImpossible()
</span><span class="cx"> {
</span><span class="lines">@@ -173,7 +158,7 @@
</span><span class="cx"> return this._parent.isFullPathImpossible();
</span><span class="cx">
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> appendPropertyName(object, propertyName)
</span><span class="cx"> {
</span><span class="lines">@@ -184,43 +169,43 @@
</span><span class="cx">
</span><span class="cx"> var component = this._canPropertyNameBeDotAccess(propertyName) ? "." + propertyName : "[" + doubleQuotedString(propertyName) + "]";
</span><span class="cx"> return new WebInspector.PropertyPath(object, component, this, isPrototype);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> appendPropertySymbol(object, symbolName)
</span><span class="cx"> {
</span><span class="cx"> var component = WebInspector.PropertyPath.SpecialPathComponent.SymbolPropertyName + (symbolName.length ? "(" + symbolName + ")" : "");
</span><span class="cx"> return new WebInspector.PropertyPath(object, component, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> appendInternalPropertyName(object, propertyName)
</span><span class="cx"> {
</span><span class="cx"> var component = WebInspector.PropertyPath.SpecialPathComponent.InternalPropertyName + "[" + propertyName + "]";
</span><span class="cx"> return new WebInspector.PropertyPath(object, component, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> appendGetterPropertyName(object, propertyName)
</span><span class="cx"> {
</span><span class="cx"> var component = ".__lookupGetter__(" + doubleQuotedString(propertyName) + ")";
</span><span class="cx"> return new WebInspector.PropertyPath(object, component, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> appendSetterPropertyName(object, propertyName)
</span><span class="cx"> {
</span><span class="cx"> var component = ".__lookupSetter__(" + doubleQuotedString(propertyName) + ")";
</span><span class="cx"> return new WebInspector.PropertyPath(object, component, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> appendArrayIndex(object, indexString)
</span><span class="cx"> {
</span><span class="cx"> var component = "[" + indexString + "]";
</span><span class="cx"> return new WebInspector.PropertyPath(object, component, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> appendMapKey(object)
</span><span class="cx"> {
</span><span class="cx"> var component = WebInspector.PropertyPath.SpecialPathComponent.MapKey;
</span><span class="cx"> return new WebInspector.PropertyPath(object, component, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> appendMapValue(object, keyObject)
</span><span class="cx"> {
</span><span class="lines">@@ -238,13 +223,13 @@
</span><span class="cx">
</span><span class="cx"> var component = WebInspector.PropertyPath.SpecialPathComponent.MapValue;
</span><span class="cx"> return new WebInspector.PropertyPath(object, component, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> appendSetIndex(object)
</span><span class="cx"> {
</span><span class="cx"> var component = WebInspector.PropertyPath.SpecialPathComponent.SetIndex;
</span><span class="cx"> return new WebInspector.PropertyPath(object, component, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> appendPropertyDescriptor(object, descriptor, type)
</span><span class="cx"> {
</span><span class="lines">@@ -264,7 +249,7 @@
</span><span class="cx"> return this.appendArrayIndex(object, descriptor.name);
</span><span class="cx">
</span><span class="cx"> return this.appendPropertyName(object, descriptor.name)
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><span class="lines">@@ -273,3 +258,18 @@
</span><span class="cx"> return /^(?![0-9])\w+$/.test(propertyName);
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.PropertyPath.SpecialPathComponent = {
+ InternalPropertyName: "@internal",
+ SymbolPropertyName: "@symbol",
+ MapKey: "@mapkey",
+ MapValue: "@mapvalue",
+ SetIndex: "@setindex",
+ EmptyPathComponentForScope: "",
+};
+
+WebInspector.PropertyPath.Type = {
+ Value: "value",
+ Getter: "getter",
+ Setter: "setter",
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsPropertyPreviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/PropertyPreview.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/PropertyPreview.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/PropertyPreview.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,62 +23,62 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.PropertyPreview = function(name, type, subtype, value, valuePreview, isInternalProperty)
</del><ins>+WebInspector.PropertyPreview = class PropertyPreview extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(name, type, subtype, value, valuePreview, isInternalProperty)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(name);
- console.assert(type);
- console.assert(!value || typeof value === "string");
- console.assert(!valuePreview || valuePreview instanceof WebInspector.ObjectPreview);
</del><ins>+ console.assert(name);
+ console.assert(type);
+ console.assert(!value || typeof value === "string");
+ console.assert(!valuePreview || valuePreview instanceof WebInspector.ObjectPreview);
</ins><span class="cx">
</span><del>- this._name = name;
- this._type = type;
- this._subtype = subtype;
- this._value = value;
- this._valuePreview = valuePreview;
- this._internal = isInternalProperty;
-};
</del><ins>+ this._name = name;
+ this._type = type;
+ this._subtype = subtype;
+ this._value = value;
+ this._valuePreview = valuePreview;
+ this._internal = isInternalProperty;
+ }
</ins><span class="cx">
</span><del>-// Runtime.PropertyPreview.
-WebInspector.PropertyPreview.fromPayload = function(payload)
-{
- if (payload.valuePreview)
- payload.valuePreview = WebInspector.ObjectPreview.fromPayload(payload.valuePreview);
</del><ins>+ // Static
</ins><span class="cx">
</span><del>- return new WebInspector.PropertyPreview(payload.name, payload.type, payload.subtype, payload.value, payload.valuePreview, payload.internal);
-};
</del><ins>+ // Runtime.PropertyPreview.
+ static fromPayload(payload)
+ {
+ if (payload.valuePreview)
+ payload.valuePreview = WebInspector.ObjectPreview.fromPayload(payload.valuePreview);
</ins><span class="cx">
</span><del>-WebInspector.PropertyPreview.prototype = {
- constructor: WebInspector.PropertyPreview,
- __proto__: WebInspector.Object.prototype,
</del><ins>+ return new WebInspector.PropertyPreview(payload.name, payload.type, payload.subtype, payload.value, payload.valuePreview, payload.internal);
+ }
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get name()
</span><span class="cx"> {
</span><span class="cx"> return this._name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get subtype()
</span><span class="cx"> {
</span><span class="cx"> return this._subtype;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get value()
</span><span class="cx"> {
</span><span class="cx"> return this._value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get valuePreview()
</span><span class="cx"> {
</span><span class="cx"> return this._valuePreview;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get internal()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsReplayDashboardjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ReplayDashboard.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ReplayDashboard.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ReplayDashboard.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ReplayDashboard = function() {
- WebInspector.Object.call(this);
</del><ins>+WebInspector.ReplayDashboard = class ReplayDashboard extends WebInspector.Object
+{
+ constructor()
+ {
+ // FIXME: Remove once <https://webkit.org/b/142862> is fixed.
+ super();
+ }
</ins><span class="cx"> };
</span><del>-
-WebInspector.ReplayDashboard.prototype = {
- constructor: WebInspector.ReplayDashboard,
- __proto__: WebInspector.Object.prototype,
-};
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsReplaySessionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySession.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySession.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySession.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,43 +25,43 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx">
</span><del>-WebInspector.ReplaySession = function(identifier)
</del><ins>+WebInspector.ReplaySession = class ReplaySession extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(identifier)
+ {
+ super();
</ins><span class="cx">
</span><del>- this.identifier = identifier;
- this._segments = [];
- this._timestamp = null;
-};
</del><ins>+ this.identifier = identifier;
+ this._segments = [];
+ this._timestamp = null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ReplaySession.fromPayload = function(identifier, payload)
-{
- var session = new WebInspector.ReplaySession(identifier);
- session._updateFromPayload(payload);
- return session;
-}
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.ReplaySession.Event = {
- SegmentsChanged: "replay-session-segments-changed",
-};
</del><ins>+ static fromPayload(identifier, payload)
+ {
+ var session = new WebInspector.ReplaySession(identifier);
+ session._updateFromPayload(payload);
+ return session;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ReplaySession.prototype = {
- constructor: WebInspector.ReplaySession,
- __proto__: WebInspector.Object.prototype,
</del><ins>+ // Public
</ins><span class="cx">
</span><span class="cx"> get segments()
</span><span class="cx"> {
</span><span class="cx"> return this._segments.slice();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- segmentsChanged: function()
</del><ins>+ segmentsChanged()
</ins><span class="cx"> {
</span><span class="cx"> // The replay manager won't update the session's list of segments nor create a new session.
</span><span class="cx"> ReplayAgent.getSessionData.promise(this.identifier)
</span><span class="cx"> .then(this._updateFromPayload.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateFromPayload: function(payload)
</del><ins>+ // Private
+
+ _updateFromPayload(payload)
</ins><span class="cx"> {
</span><span class="cx"> var session = payload.session;
</span><span class="cx"> console.assert(session.id === this.identifier);
</span><span class="lines">@@ -84,3 +84,7 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.ReplaySession.Event = {
+ SegmentsChanged: "replay-session-segments-changed",
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsReplaySessionSegmentjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySessionSegment.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySessionSegment.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySessionSegment.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,17 +25,17 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx">
</span><del>-WebInspector.IncompleteSessionSegment = function(identifier)
</del><ins>+WebInspector.IncompleteSessionSegment = class IncompleteSessionSegment extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(identifier)
+ {
+ super();
</ins><span class="cx">
</span><del>- this.identifier = identifier;
- this._timestamp = Date.now();
-};
</del><ins>+ this.identifier = identifier;
+ this._timestamp = Date.now();
+ }
</ins><span class="cx">
</span><del>-WebInspector.IncompleteSessionSegment.prototype = {
- constructor: WebInspector.IncompleteSessionSegment,
- __proto__: WebInspector.Object.prototype,
</del><ins>+ // Public
</ins><span class="cx">
</span><span class="cx"> get isComplete()
</span><span class="cx"> {
</span><span class="lines">@@ -43,22 +43,22 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.ReplaySessionSegment = function(identifier, payload)
</del><ins>+WebInspector.ReplaySessionSegment = class ReplaySessionSegment extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(identifier, payload)
+ {
+ super();
</ins><span class="cx">
</span><del>- var segment = payload.segment;
- console.assert(identifier === segment.id);
</del><ins>+ var segment = payload.segment;
+ console.assert(identifier === segment.id);
</ins><span class="cx">
</span><del>- this.identifier = identifier;
- this._timestamp = segment.timestamp;
</del><ins>+ this.identifier = identifier;
+ this._timestamp = segment.timestamp;
</ins><span class="cx">
</span><del>- this._queues = segment.queues;
-};
</del><ins>+ this._queues = segment.queues;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ReplaySessionSegment.prototype = {
- constructor: WebInspector.ReplaySessionSegment,
- __proto__: WebInspector.Object.prototype,
</del><ins>+ // Public
</ins><span class="cx">
</span><span class="cx"> get isComplete()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,211 +23,138 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.Resource = function(url, mimeType, type, loaderIdentifier, requestIdentifier, requestMethod, requestHeaders, requestData, requestSentTimestamp, initiatorSourceCodeLocation)
</del><ins>+WebInspector.Resource = class Resource extends WebInspector.SourceCode
</ins><span class="cx"> {
</span><del>- WebInspector.SourceCode.call(this);
</del><ins>+ constructor(url, mimeType, type, loaderIdentifier, requestIdentifier, requestMethod, requestHeaders, requestData, requestSentTimestamp, initiatorSourceCodeLocation)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(url);
</del><ins>+ console.assert(url);
</ins><span class="cx">
</span><del>- if (type in WebInspector.Resource.Type)
- type = WebInspector.Resource.Type[type];
</del><ins>+ if (type in WebInspector.Resource.Type)
+ type = WebInspector.Resource.Type[type];
</ins><span class="cx">
</span><del>- this._url = url;
- this._mimeType = mimeType;
- this._type = type || WebInspector.Resource.typeFromMIMEType(mimeType);
- this._loaderIdentifier = loaderIdentifier || null;
- this._requestIdentifier = requestIdentifier || null;
- this._requestMethod = requestMethod || null;
- this._requestData = requestData || null;
- this._requestHeaders = requestHeaders || {};
- this._responseHeaders = {};
- this._parentFrame = null;
- this._initiatorSourceCodeLocation = initiatorSourceCodeLocation || null;
- this._requestSentTimestamp = requestSentTimestamp || NaN;
- this._responseReceivedTimestamp = NaN;
- this._lastRedirectReceivedTimestamp = NaN;
- this._lastDataReceivedTimestamp = NaN;
- this._finishedOrFailedTimestamp = NaN;
- this._size = NaN;
- this._transferSize = NaN;
- this._cached = false;
-};
</del><ins>+ this._url = url;
+ this._mimeType = mimeType;
+ this._type = type || WebInspector.Resource.typeFromMIMEType(mimeType);
+ this._loaderIdentifier = loaderIdentifier || null;
+ this._requestIdentifier = requestIdentifier || null;
+ this._requestMethod = requestMethod || null;
+ this._requestData = requestData || null;
+ this._requestHeaders = requestHeaders || {};
+ this._responseHeaders = {};
+ this._parentFrame = null;
+ this._initiatorSourceCodeLocation = initiatorSourceCodeLocation || null;
+ this._requestSentTimestamp = requestSentTimestamp || NaN;
+ this._responseReceivedTimestamp = NaN;
+ this._lastRedirectReceivedTimestamp = NaN;
+ this._lastDataReceivedTimestamp = NaN;
+ this._finishedOrFailedTimestamp = NaN;
+ this._size = NaN;
+ this._transferSize = NaN;
+ this._cached = false;
+ }
</ins><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.Resource);
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.Resource.TypeIdentifier = "resource";
-WebInspector.Resource.URLCookieKey = "resource-url";
-WebInspector.Resource.MainResourceCookieKey = "resource-is-main-resource";
</del><ins>+ static typeFromMIMEType(mimeType)
+ {
+ if (!mimeType)
+ return WebInspector.Resource.Type.Other;
</ins><span class="cx">
</span><del>-WebInspector.Resource.Event = {
- URLDidChange: "resource-url-did-change",
- MIMETypeDidChange: "resource-mime-type-did-change",
- TypeDidChange: "resource-type-did-change",
- RequestHeadersDidChange: "resource-request-headers-did-change",
- ResponseReceived: "resource-response-received",
- LoadingDidFinish: "resource-loading-did-finish",
- LoadingDidFail: "resource-loading-did-fail",
- TimestampsDidChange: "resource-timestamps-did-change",
- SizeDidChange: "resource-size-did-change",
- TransferSizeDidChange: "resource-transfer-size-did-change",
- CacheStatusDidChange: "resource-cached-did-change"
-};
</del><ins>+ mimeType = parseMIMEType(mimeType).type;
</ins><span class="cx">
</span><del>-// Keep these in sync with the "ResourceType" enum defined by the "Page" domain.
-WebInspector.Resource.Type = {
- Document: "resource-type-document",
- Stylesheet: "resource-type-stylesheet",
- Image: "resource-type-image",
- Font: "resource-type-font",
- Script: "resource-type-script",
- XHR: "resource-type-xhr",
- WebSocket: "resource-type-websocket",
- Other: "resource-type-other"
-};
</del><ins>+ if (mimeType in WebInspector.Resource._mimeTypeMap)
+ return WebInspector.Resource._mimeTypeMap[mimeType];
</ins><span class="cx">
</span><del>-// This MIME Type map is private, use WebInspector.Resource.typeFromMIMEType().
-WebInspector.Resource._mimeTypeMap = {
- "text/html": WebInspector.Resource.Type.Document,
- "text/xml": WebInspector.Resource.Type.Document,
- "text/plain": WebInspector.Resource.Type.Document,
- "application/xhtml+xml": WebInspector.Resource.Type.Document,
- "image/svg+xml": WebInspector.Resource.Type.Document,
</del><ins>+ if (mimeType.startsWith("image/"))
+ return WebInspector.Resource.Type.Image;
</ins><span class="cx">
</span><del>- "text/css": WebInspector.Resource.Type.Stylesheet,
- "text/xsl": WebInspector.Resource.Type.Stylesheet,
- "text/x-less": WebInspector.Resource.Type.Stylesheet,
- "text/x-sass": WebInspector.Resource.Type.Stylesheet,
- "text/x-scss": WebInspector.Resource.Type.Stylesheet,
</del><ins>+ if (mimeType.startsWith("font/"))
+ return WebInspector.Resource.Type.Font;
</ins><span class="cx">
</span><del>- "application/pdf": WebInspector.Resource.Type.Image,
-
- "application/x-font-type1": WebInspector.Resource.Type.Font,
- "application/x-font-ttf": WebInspector.Resource.Type.Font,
- "application/x-font-woff": WebInspector.Resource.Type.Font,
- "application/x-truetype-font": WebInspector.Resource.Type.Font,
-
- "text/javascript": WebInspector.Resource.Type.Script,
- "text/ecmascript": WebInspector.Resource.Type.Script,
- "application/javascript": WebInspector.Resource.Type.Script,
- "application/ecmascript": WebInspector.Resource.Type.Script,
- "application/x-javascript": WebInspector.Resource.Type.Script,
- "application/json": WebInspector.Resource.Type.Script,
- "application/x-json": WebInspector.Resource.Type.Script,
- "text/x-javascript": WebInspector.Resource.Type.Script,
- "text/x-json": WebInspector.Resource.Type.Script,
- "text/javascript1.1": WebInspector.Resource.Type.Script,
- "text/javascript1.2": WebInspector.Resource.Type.Script,
- "text/javascript1.3": WebInspector.Resource.Type.Script,
- "text/jscript": WebInspector.Resource.Type.Script,
- "text/livescript": WebInspector.Resource.Type.Script,
- "text/x-livescript": WebInspector.Resource.Type.Script,
- "text/typescript": WebInspector.Resource.Type.Script,
- "text/x-clojure": WebInspector.Resource.Type.Script,
- "text/x-coffeescript": WebInspector.Resource.Type.Script
-};
-
-WebInspector.Resource.typeFromMIMEType = function(mimeType)
-{
- if (!mimeType)
</del><span class="cx"> return WebInspector.Resource.Type.Other;
</span><ins>+ }
</ins><span class="cx">
</span><del>- mimeType = parseMIMEType(mimeType).type;
-
- if (mimeType in WebInspector.Resource._mimeTypeMap)
- return WebInspector.Resource._mimeTypeMap[mimeType];
-
- if (mimeType.startsWith("image/"))
- return WebInspector.Resource.Type.Image;
-
- if (mimeType.startsWith("font/"))
- return WebInspector.Resource.Type.Font;
-
- return WebInspector.Resource.Type.Other;
-};
-
-WebInspector.Resource.displayNameForType = function(type, plural)
-{
- switch(type) {
- case WebInspector.Resource.Type.Document:
- if (plural)
- return WebInspector.UIString("Documents");
- return WebInspector.UIString("Document");
- case WebInspector.Resource.Type.Stylesheet:
- if (plural)
- return WebInspector.UIString("Stylesheets");
- return WebInspector.UIString("Stylesheet");
- case WebInspector.Resource.Type.Image:
- if (plural)
- return WebInspector.UIString("Images");
- return WebInspector.UIString("Image");
- case WebInspector.Resource.Type.Font:
- if (plural)
- return WebInspector.UIString("Fonts");
- return WebInspector.UIString("Font");
- case WebInspector.Resource.Type.Script:
- if (plural)
- return WebInspector.UIString("Scripts");
- return WebInspector.UIString("Script");
- case WebInspector.Resource.Type.XHR:
- if (plural)
- return WebInspector.UIString("XHRs");
- return WebInspector.UIString("XHR");
- case WebInspector.Resource.Type.WebSocket:
- if (plural)
- return WebInspector.UIString("Sockets");
- return WebInspector.UIString("Socket");
- case WebInspector.Resource.Type.Other:
- return WebInspector.UIString("Other");
- default:
- console.error("Unknown resource type: ", type);
- return null;
</del><ins>+ static displayNameForType(type, plural)
+ {
+ switch(type) {
+ case WebInspector.Resource.Type.Document:
+ if (plural)
+ return WebInspector.UIString("Documents");
+ return WebInspector.UIString("Document");
+ case WebInspector.Resource.Type.Stylesheet:
+ if (plural)
+ return WebInspector.UIString("Stylesheets");
+ return WebInspector.UIString("Stylesheet");
+ case WebInspector.Resource.Type.Image:
+ if (plural)
+ return WebInspector.UIString("Images");
+ return WebInspector.UIString("Image");
+ case WebInspector.Resource.Type.Font:
+ if (plural)
+ return WebInspector.UIString("Fonts");
+ return WebInspector.UIString("Font");
+ case WebInspector.Resource.Type.Script:
+ if (plural)
+ return WebInspector.UIString("Scripts");
+ return WebInspector.UIString("Script");
+ case WebInspector.Resource.Type.XHR:
+ if (plural)
+ return WebInspector.UIString("XHRs");
+ return WebInspector.UIString("XHR");
+ case WebInspector.Resource.Type.WebSocket:
+ if (plural)
+ return WebInspector.UIString("Sockets");
+ return WebInspector.UIString("Socket");
+ case WebInspector.Resource.Type.Other:
+ return WebInspector.UIString("Other");
+ default:
+ console.error("Unknown resource type: ", type);
+ return null;
+ }
</ins><span class="cx"> }
</span><del>-};
</del><span class="cx">
</span><del>-WebInspector.Resource.prototype = {
- constructor: WebInspector.Resource,
- __proto__: WebInspector.SourceCode.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get url()
</span><span class="cx"> {
</span><span class="cx"> return this._url;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get urlComponents()
</span><span class="cx"> {
</span><span class="cx"> if (!this._urlComponents)
</span><span class="cx"> this._urlComponents = parseURL(this._url);
</span><span class="cx"> return this._urlComponents;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get displayName()
</span><span class="cx"> {
</span><span class="cx"> return WebInspector.displayNameForURL(this._url, this.urlComponents);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get initiatorSourceCodeLocation()
</span><span class="cx"> {
</span><span class="cx"> return this._initiatorSourceCodeLocation;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get mimeType()
</span><span class="cx"> {
</span><span class="cx"> return this._mimeType;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get mimeTypeComponents()
</span><span class="cx"> {
</span><span class="cx"> if (!this._mimeTypeComponents)
</span><span class="cx"> this._mimeTypeComponents = parseMIMEType(this._mimeType);
</span><span class="cx"> return this._mimeTypeComponents;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get syntheticMIMEType()
</span><span class="cx"> {
</span><span class="lines">@@ -252,9 +179,9 @@
</span><span class="cx">
</span><span class="cx"> // Return the actual MIME-type since we don't have a better synthesized one to return.
</span><span class="cx"> return this._mimeType;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- createObjectURL: function()
</del><ins>+ createObjectURL()
</ins><span class="cx"> {
</span><span class="cx"> // If content is not available, fallback to using original URL.
</span><span class="cx"> // The client may try to revoke it, but nothing will happen.
</span><span class="lines">@@ -265,137 +192,137 @@
</span><span class="cx"> console.assert(content instanceof Blob, content);
</span><span class="cx">
</span><span class="cx"> return URL.createObjectURL(content);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isMainResource: function()
</del><ins>+ isMainResource()
</ins><span class="cx"> {
</span><span class="cx"> return this._parentFrame ? this._parentFrame.mainResource === this : false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get parentFrame()
</span><span class="cx"> {
</span><span class="cx"> return this._parentFrame;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get loaderIdentifier()
</span><span class="cx"> {
</span><span class="cx"> return this._loaderIdentifier;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get requestIdentifier()
</span><span class="cx"> {
</span><span class="cx"> return this._requestIdentifier;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get finished()
</span><span class="cx"> {
</span><span class="cx"> return this._finished;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get failed()
</span><span class="cx"> {
</span><span class="cx"> return this._failed;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get canceled()
</span><span class="cx"> {
</span><span class="cx"> return this._canceled;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get requestMethod()
</span><span class="cx"> {
</span><span class="cx"> return this._requestMethod;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get requestData()
</span><span class="cx"> {
</span><span class="cx"> return this._requestData;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get requestDataContentType()
</span><span class="cx"> {
</span><span class="cx"> return this._requestHeaders.valueForCaseInsensitiveKey("Content-Type") || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get requestHeaders()
</span><span class="cx"> {
</span><span class="cx"> return this._requestHeaders;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get responseHeaders()
</span><span class="cx"> {
</span><span class="cx"> return this._responseHeaders;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get requestSentTimestamp()
</span><span class="cx"> {
</span><span class="cx"> return this._requestSentTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get lastRedirectReceivedTimestamp()
</span><span class="cx"> {
</span><span class="cx"> return this._lastRedirectReceivedTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get responseReceivedTimestamp()
</span><span class="cx"> {
</span><span class="cx"> return this._responseReceivedTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get lastDataReceivedTimestamp()
</span><span class="cx"> {
</span><span class="cx"> return this._lastDataReceivedTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get finishedOrFailedTimestamp()
</span><span class="cx"> {
</span><span class="cx"> return this._finishedOrFailedTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get firstTimestamp()
</span><span class="cx"> {
</span><span class="cx"> return this.requestSentTimestamp || this.lastRedirectReceivedTimestamp || this.responseReceivedTimestamp || this.lastDataReceivedTimestamp || this.finishedOrFailedTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get lastTimestamp()
</span><span class="cx"> {
</span><span class="cx"> return this.finishedOrFailedTimestamp || this.lastDataReceivedTimestamp || this.responseReceivedTimestamp || this.lastRedirectReceivedTimestamp || this.requestSentTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get duration()
</span><span class="cx"> {
</span><span class="cx"> return this._finishedOrFailedTimestamp - this._requestSentTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get latency()
</span><span class="cx"> {
</span><span class="cx"> return this._responseReceivedTimestamp - this._requestSentTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get receiveDuration()
</span><span class="cx"> {
</span><span class="cx"> return this._finishedOrFailedTimestamp - this._responseReceivedTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get cached()
</span><span class="cx"> {
</span><span class="cx"> return this._cached;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get statusCode()
</span><span class="cx"> {
</span><span class="cx"> return this._statusCode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get statusText()
</span><span class="cx"> {
</span><span class="cx"> return this._statusText;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get size()
</span><span class="cx"> {
</span><span class="cx"> return this._size;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get encodedSize()
</span><span class="cx"> {
</span><span class="lines">@@ -414,7 +341,7 @@
</span><span class="cx"> // get actual transfer size from the network stack.
</span><span class="cx">
</span><span class="cx"> return Number(this._responseHeaders.valueForCaseInsensitiveKey("Content-Length") || this._size);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get transferSize()
</span><span class="cx"> {
</span><span class="lines">@@ -425,20 +352,20 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> return this._responseHeadersSize + this.encodedSize;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get compressed()
</span><span class="cx"> {
</span><span class="cx"> var contentEncoding = this._responseHeaders.valueForCaseInsensitiveKey("Content-Encoding");
</span><span class="cx"> return contentEncoding && /\b(?:gzip|deflate)\b/.test(contentEncoding);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get scripts()
</span><span class="cx"> {
</span><span class="cx"> return this._scripts || [];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- scriptForLocation: function(sourceCodeLocation)
</del><ins>+ scriptForLocation(sourceCodeLocation)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!(this instanceof WebInspector.SourceMapResource));
</span><span class="cx"> console.assert(sourceCodeLocation.sourceCode === this, "SourceCodeLocation must be in this Resource");
</span><span class="lines">@@ -459,9 +386,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateForRedirectResponse: function(url, requestHeaders, elapsedTime)
</del><ins>+ updateForRedirectResponse(url, requestHeaders, elapsedTime)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!this._finished);
</span><span class="cx"> console.assert(!this._failed);
</span><span class="lines">@@ -482,9 +409,9 @@
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Resource.Event.RequestHeadersDidChange);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Resource.Event.TimestampsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateForResponse: function(url, mimeType, type, responseHeaders, statusCode, statusText, elapsedTime)
</del><ins>+ updateForResponse(url, mimeType, type, responseHeaders, statusCode, statusText, elapsedTime)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!this._finished);
</span><span class="cx"> console.assert(!this._failed);
</span><span class="lines">@@ -539,14 +466,14 @@
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Resource.Event.ResponseReceived);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Resource.Event.TimestampsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canRequestContent: function()
</del><ins>+ canRequestContent()
</ins><span class="cx"> {
</span><span class="cx"> return this._finished;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- requestContentFromBackend: function()
</del><ins>+ requestContentFromBackend()
</ins><span class="cx"> {
</span><span class="cx"> // If we have the requestIdentifier we can get the actual response for this specific resource.
</span><span class="cx"> // Otherwise the content will be cached resource data, which might not exist anymore.
</span><span class="lines">@@ -558,9 +485,9 @@
</span><span class="cx"> return PageAgent.getResourceContent.promise(this._parentFrame.id, this._url);
</span><span class="cx">
</span><span class="cx"> return Promise.reject(new Error("Content request failed."));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- increaseSize: function(dataLength, elapsedTime)
</del><ins>+ increaseSize(dataLength, elapsedTime)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(dataLength >= 0);
</span><span class="cx">
</span><span class="lines">@@ -578,9 +505,9 @@
</span><span class="cx"> // The transferSize is based off of size when status is not 304 or Content-Length is missing.
</span><span class="cx"> if (isNaN(this._transferSize) && this._statusCode !== 304 && !this._responseHeaders.valueForCaseInsensitiveKey("Content-Length"))
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Resource.Event.TransferSizeDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- increaseTransferSize: function(encodedDataLength)
</del><ins>+ increaseTransferSize(encodedDataLength)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(encodedDataLength >= 0);
</span><span class="cx">
</span><span class="lines">@@ -589,9 +516,9 @@
</span><span class="cx"> this._transferSize += encodedDataLength;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Resource.Event.TransferSizeDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- markAsCached: function()
</del><ins>+ markAsCached()
</ins><span class="cx"> {
</span><span class="cx"> this._cached = true;
</span><span class="cx">
</span><span class="lines">@@ -600,9 +527,9 @@
</span><span class="cx"> // The transferSize is starts returning 0 when cached is true, unless status is 304.
</span><span class="cx"> if (this._statusCode !== 304)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Resource.Event.TransferSizeDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- markAsFinished: function(elapsedTime)
</del><ins>+ markAsFinished(elapsedTime)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!this._failed);
</span><span class="cx"> console.assert(!this._canceled);
</span><span class="lines">@@ -615,9 +542,9 @@
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Resource.Event.LoadingDidFinish);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Resource.Event.TimestampsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- markAsFailed: function(canceled, elapsedTime)
</del><ins>+ markAsFailed(canceled, elapsedTime)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!this._finished);
</span><span class="cx">
</span><span class="lines">@@ -627,9 +554,9 @@
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Resource.Event.LoadingDidFail);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Resource.Event.TimestampsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revertMarkAsFinished: function()
</del><ins>+ revertMarkAsFinished()
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!this._failed);
</span><span class="cx"> console.assert(!this._canceled);
</span><span class="lines">@@ -637,9 +564,9 @@
</span><span class="cx">
</span><span class="cx"> this._finished = false;
</span><span class="cx"> this._finishedOrFailedTimestamp = NaN;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- getImageSize: function(callback)
</del><ins>+ getImageSize(callback)
</ins><span class="cx"> {
</span><span class="cx"> // Throw an error in the case this resource is not an image.
</span><span class="cx"> if (this.type !== WebInspector.Resource.Type.Image)
</span><span class="lines">@@ -677,12 +604,12 @@
</span><span class="cx"> this.requestContent().then(function(content) {
</span><span class="cx"> objectURL = image.src = content.sourceCode.createObjectURL();
</span><span class="cx"> });
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- requestContent: function()
</del><ins>+ requestContent()
</ins><span class="cx"> {
</span><span class="cx"> if (this._finished)
</span><del>- return WebInspector.SourceCode.prototype.requestContent.call(this);
</del><ins>+ return super.requestContent();
</ins><span class="cx">
</span><span class="cx"> if (this._failed)
</span><span class="cx"> return Promise.resolve({error: WebInspector.UIString("An error occurred trying to load the resource.")});
</span><span class="lines">@@ -695,9 +622,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return this._finishThenRequestContentPromise;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- associateWithScript: function(script)
</del><ins>+ associateWithScript(script)
</ins><span class="cx"> {
</span><span class="cx"> if (!this._scripts)
</span><span class="cx"> this._scripts = [];
</span><span class="lines">@@ -711,11 +638,82 @@
</span><span class="cx"> this._type = WebInspector.Resource.Type.Script;
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Resource.Event.TypeDidChange, {oldType});
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.Resource.URLCookieKey] = this.url.hash;
</span><span class="cx"> cookie[WebInspector.Resource.MainResourceCookieKey] = this.isMainResource();
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.Resource.TypeIdentifier = "resource";
+WebInspector.Resource.URLCookieKey = "resource-url";
+WebInspector.Resource.MainResourceCookieKey = "resource-is-main-resource";
+
+WebInspector.Resource.Event = {
+ URLDidChange: "resource-url-did-change",
+ MIMETypeDidChange: "resource-mime-type-did-change",
+ TypeDidChange: "resource-type-did-change",
+ RequestHeadersDidChange: "resource-request-headers-did-change",
+ ResponseReceived: "resource-response-received",
+ LoadingDidFinish: "resource-loading-did-finish",
+ LoadingDidFail: "resource-loading-did-fail",
+ TimestampsDidChange: "resource-timestamps-did-change",
+ SizeDidChange: "resource-size-did-change",
+ TransferSizeDidChange: "resource-transfer-size-did-change",
+ CacheStatusDidChange: "resource-cached-did-change"
+};
+
+// Keep these in sync with the "ResourceType" enum defined by the "Page" domain.
+WebInspector.Resource.Type = {
+ Document: "resource-type-document",
+ Stylesheet: "resource-type-stylesheet",
+ Image: "resource-type-image",
+ Font: "resource-type-font",
+ Script: "resource-type-script",
+ XHR: "resource-type-xhr",
+ WebSocket: "resource-type-websocket",
+ Other: "resource-type-other"
+};
+
+// This MIME Type map is private, use WebInspector.Resource.typeFromMIMEType().
+WebInspector.Resource._mimeTypeMap = {
+ "text/html": WebInspector.Resource.Type.Document,
+ "text/xml": WebInspector.Resource.Type.Document,
+ "text/plain": WebInspector.Resource.Type.Document,
+ "application/xhtml+xml": WebInspector.Resource.Type.Document,
+ "image/svg+xml": WebInspector.Resource.Type.Document,
+
+ "text/css": WebInspector.Resource.Type.Stylesheet,
+ "text/xsl": WebInspector.Resource.Type.Stylesheet,
+ "text/x-less": WebInspector.Resource.Type.Stylesheet,
+ "text/x-sass": WebInspector.Resource.Type.Stylesheet,
+ "text/x-scss": WebInspector.Resource.Type.Stylesheet,
+
+ "application/pdf": WebInspector.Resource.Type.Image,
+
+ "application/x-font-type1": WebInspector.Resource.Type.Font,
+ "application/x-font-ttf": WebInspector.Resource.Type.Font,
+ "application/x-font-woff": WebInspector.Resource.Type.Font,
+ "application/x-truetype-font": WebInspector.Resource.Type.Font,
+
+ "text/javascript": WebInspector.Resource.Type.Script,
+ "text/ecmascript": WebInspector.Resource.Type.Script,
+ "application/javascript": WebInspector.Resource.Type.Script,
+ "application/ecmascript": WebInspector.Resource.Type.Script,
+ "application/x-javascript": WebInspector.Resource.Type.Script,
+ "application/json": WebInspector.Resource.Type.Script,
+ "application/x-json": WebInspector.Resource.Type.Script,
+ "text/x-javascript": WebInspector.Resource.Type.Script,
+ "text/x-json": WebInspector.Resource.Type.Script,
+ "text/javascript1.1": WebInspector.Resource.Type.Script,
+ "text/javascript1.2": WebInspector.Resource.Type.Script,
+ "text/javascript1.3": WebInspector.Resource.Type.Script,
+ "text/jscript": WebInspector.Resource.Type.Script,
+ "text/livescript": WebInspector.Resource.Type.Script,
+ "text/x-livescript": WebInspector.Resource.Type.Script,
+ "text/typescript": WebInspector.Resource.Type.Script,
+ "text/x-clojure": WebInspector.Resource.Type.Script,
+ "text/x-coffeescript": WebInspector.Resource.Type.Script
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsResourceCollectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ResourceCollection.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ResourceCollection.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ResourceCollection.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,45 +23,44 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ResourceCollection = function()
</del><ins>+WebInspector.ResourceCollection = class ResourceCollection extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor()
+ {
+ super();
</ins><span class="cx">
</span><del>- this._resources = [];
- this._resourceURLMap = new Map;
- this._resourcesTypeMap = new Map;
-};
</del><ins>+ this._resources = [];
+ this._resourceURLMap = new Map;
+ this._resourcesTypeMap = new Map;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ResourceCollection.prototype = {
- constructor: WebInspector.ResourceCollection,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get resources()
</span><span class="cx"> {
</span><span class="cx"> return this._resources;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- resourceForURL: function(url)
</del><ins>+ resourceForURL(url)
</ins><span class="cx"> {
</span><span class="cx"> return this._resourceURLMap.get(url) || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- resourcesWithType: function(type)
</del><ins>+ resourcesWithType(type)
</ins><span class="cx"> {
</span><span class="cx"> return this._resourcesTypeMap.get(type) || [];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addResource: function(resource)
</del><ins>+ addResource(resource)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(resource instanceof WebInspector.Resource);
</span><span class="cx"> if (!(resource instanceof WebInspector.Resource))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._associateWithResource(resource);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeResource: function(resourceOrURL)
</del><ins>+ removeResource(resourceOrURL)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(resourceOrURL);
</span><span class="cx">
</span><span class="lines">@@ -81,9 +80,9 @@
</span><span class="cx"> this._disassociateWithResource(resource);
</span><span class="cx">
</span><span class="cx"> return resource;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeAllResources: function()
</del><ins>+ removeAllResources()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._resources.length)
</span><span class="cx"> return;
</span><span class="lines">@@ -94,11 +93,11 @@
</span><span class="cx"> this._resources = [];
</span><span class="cx"> this._resourceURLMap.clear();
</span><span class="cx"> this._resourcesTypeMap.clear();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _associateWithResource: function(resource)
</del><ins>+ _associateWithResource(resource)
</ins><span class="cx"> {
</span><span class="cx"> this._resources.push(resource);
</span><span class="cx"> this._resourceURLMap.set(resource.url, resource);
</span><span class="lines">@@ -110,9 +109,9 @@
</span><span class="cx">
</span><span class="cx"> resource.addEventListener(WebInspector.Resource.Event.URLDidChange, this._resourceURLDidChange, this);
</span><span class="cx"> resource.addEventListener(WebInspector.Resource.Event.TypeDidChange, this._resourceTypeDidChange, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _disassociateWithResource: function(resource, skipRemoval)
</del><ins>+ _disassociateWithResource(resource, skipRemoval)
</ins><span class="cx"> {
</span><span class="cx"> if (skipRemoval) {
</span><span class="cx"> this._resources.remove(resource);
</span><span class="lines">@@ -123,9 +122,9 @@
</span><span class="cx">
</span><span class="cx"> resource.removeEventListener(WebInspector.Resource.Event.URLDidChange, this._resourceURLDidChange, this);
</span><span class="cx"> resource.removeEventListener(WebInspector.Resource.Event.TypeDidChange, this._resourceTypeDidChange, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _resourceURLDidChange: function(event)
</del><ins>+ _resourceURLDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> var resource = event.target;
</span><span class="cx"> console.assert(resource instanceof WebInspector.Resource);
</span><span class="lines">@@ -139,9 +138,9 @@
</span><span class="cx">
</span><span class="cx"> this._resourceURLMap.set(resource.url, resource);
</span><span class="cx"> this._resourceURLMap.delete(oldURL);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _resourceTypeDidChange: function(event)
</del><ins>+ _resourceTypeDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> var resource = event.target;
</span><span class="cx"> console.assert(resource instanceof WebInspector.Resource);
</span><span class="lines">@@ -162,5 +161,3 @@
</span><span class="cx"> this._resourcesTypeMap.get(oldType).remove(resource);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.ResourceCollection.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsResourceTimelineRecordjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ResourceTimelineRecord.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ResourceTimelineRecord.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ResourceTimelineRecord.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,55 +23,52 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ResourceTimelineRecord = function(resource)
</del><ins>+WebInspector.ResourceTimelineRecord = class ResourceTimelineRecord extends WebInspector.TimelineRecord
</ins><span class="cx"> {
</span><del>- WebInspector.TimelineRecord.call(this, WebInspector.TimelineRecord.Type.Network);
</del><ins>+ constructor(resource)
+ {
+ super(WebInspector.TimelineRecord.Type.Network);
</ins><span class="cx">
</span><del>- this._resource = resource;
- this._resource.addEventListener(WebInspector.Resource.Event.TimestampsDidChange, this._dispatchUpdatedEvent, this);
-};
</del><ins>+ this._resource = resource;
+ this._resource.addEventListener(WebInspector.Resource.Event.TimestampsDidChange, this._dispatchUpdatedEvent, this);
+ }
</ins><span class="cx">
</span><del>-WebInspector.ResourceTimelineRecord.prototype = {
- constructor: WebInspector.ResourceTimelineRecord,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get resource()
</span><span class="cx"> {
</span><span class="cx"> return this._resource;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get updatesDynamically()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get usesActiveStartTime()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get startTime()
</span><span class="cx"> {
</span><span class="cx"> return this._resource.requestSentTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get activeStartTime()
</span><span class="cx"> {
</span><span class="cx"> return this._resource.responseReceivedTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get endTime()
</span><span class="cx"> {
</span><span class="cx"> return this._resource.finishedOrFailedTimestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _dispatchUpdatedEvent: function()
</del><ins>+ _dispatchUpdatedEvent()
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineRecord.Event.Updated);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.ResourceTimelineRecord.prototype.__proto__ = WebInspector.TimelineRecord.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsRevisionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Revision.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Revision.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Revision.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,33 +23,31 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.Revision = function()
</del><ins>+WebInspector.Revision = class Revision extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
-};
</del><ins>+ constructor()
+ {
+ // FIXME: Remove once <https://webkit.org/b/142862> is fixed.
+ super();
+ }
</ins><span class="cx">
</span><del>-WebInspector.Revision.prototype = {
- constructor: WebInspector.Revision,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><del>- apply: function()
</del><ins>+ apply()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> console.error("Needs to be implemented by a subclass.");
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revert: function()
</del><ins>+ revert()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> console.error("Needs to be implemented by a subclass.");
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- copy: function()
</del><ins>+ copy()
</ins><span class="cx"> {
</span><span class="cx"> // Override by subclasses.
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.Revision.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsRunLoopTimelineRecordjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/RunLoopTimelineRecord.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/RunLoopTimelineRecord.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/RunLoopTimelineRecord.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,27 +23,23 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.RunLoopTimelineRecord = function(startTime, endTime, children)
</del><ins>+WebInspector.RunLoopTimelineRecord = class RunLoopTimelineRecord extends WebInspector.TimelineRecord
</ins><span class="cx"> {
</span><del>- WebInspector.TimelineRecord.call(this, WebInspector.TimelineRecord.Type.RunLoop, startTime, endTime);
</del><ins>+ constructor(startTime, endTime, children)
+ {
+ super(WebInspector.TimelineRecord.Type.RunLoop, startTime, endTime);
</ins><span class="cx">
</span><del>- this._children = children || [];
- this._durationByRecordType = new Map;
- this._durationRemainder = NaN;
-};
</del><ins>+ this._children = children || [];
+ this._durationByRecordType = new Map;
+ this._durationRemainder = NaN;
+ }
</ins><span class="cx">
</span><del>-WebInspector.RunLoopTimelineRecord.TypeIdentifier = "runloop-timeline-record";
-
-WebInspector.RunLoopTimelineRecord.prototype = {
- constructor: WebInspector.RunLoopTimelineRecord,
- __proto__: WebInspector.TimelineRecord.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get children()
</span><span class="cx"> {
</span><span class="cx"> return this._children.slice();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get durationRemainder()
</span><span class="cx"> {
</span><span class="lines">@@ -51,11 +47,11 @@
</span><span class="cx"> return this._durationRemainder;
</span><span class="cx">
</span><span class="cx"> this._durationRemainder = this.duration;
</span><del>- for (recordType in WebInspector.TimelineRecord.Type)
</del><ins>+ for (var recordType in WebInspector.TimelineRecord.Type)
</ins><span class="cx"> this._durationRemainder -= this.durationForRecords(WebInspector.TimelineRecord.Type[recordType]);
</span><span class="cx">
</span><span class="cx"> return this._durationRemainder;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> durationForRecords(recordType)
</span><span class="cx"> {
</span><span class="lines">@@ -76,3 +72,5 @@
</span><span class="cx"> return duration;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.RunLoopTimelineRecord.TypeIdentifier = "runloop-timeline-record";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsScopeChainNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ScopeChainNode.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ScopeChainNode.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ScopeChainNode.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,38 +23,28 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ScopeChainNode = function(type, object)
</del><ins>+WebInspector.ScopeChainNode = class ScopeChainNode extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(type, object)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(typeof type === "string");
- console.assert(object instanceof WebInspector.RemoteObject);
</del><ins>+ console.assert(typeof type === "string");
+ console.assert(object instanceof WebInspector.RemoteObject);
</ins><span class="cx">
</span><del>- if (type in WebInspector.ScopeChainNode.Type)
- type = WebInspector.ScopeChainNode.Type[type];
</del><ins>+ if (type in WebInspector.ScopeChainNode.Type)
+ type = WebInspector.ScopeChainNode.Type[type];
</ins><span class="cx">
</span><del>- this._type = type || null;
- this._object = object || null;
-};
</del><ins>+ this._type = type || null;
+ this._object = object || null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ScopeChainNode.Type = {
- Local: "scope-chain-type-local",
- Global: "scope-chain-type-global",
- With: "scope-chain-type-with",
- Closure: "scope-chain-type-closure",
- Catch: "scope-chain-type-catch",
- FunctionName: "scope-chain-type-functionName"
-};
-
-WebInspector.ScopeChainNode.prototype = {
- constructor: WebInspector.ScopeChainNode,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get object()
</span><span class="cx"> {
</span><span class="lines">@@ -62,4 +52,11 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.ScopeChainNode.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.ScopeChainNode.Type = {
+ Local: "scope-chain-type-local",
+ Global: "scope-chain-type-global",
+ With: "scope-chain-type-with",
+ Closure: "scope-chain-type-closure",
+ Catch: "scope-chain-type-catch",
+ FunctionName: "scope-chain-type-functionName"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsScriptjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Script.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Script.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Script.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,71 +23,65 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.Script = function(id, range, url, injected, sourceMapURL)
</del><ins>+WebInspector.Script = class Script extends WebInspector.SourceCode
</ins><span class="cx"> {
</span><del>- WebInspector.SourceCode.call(this);
</del><ins>+ constructor(id, range, url, injected, sourceMapURL)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(id);
- console.assert(range instanceof WebInspector.TextRange);
</del><ins>+ console.assert(id);
+ console.assert(range instanceof WebInspector.TextRange);
</ins><span class="cx">
</span><del>- this._id = id || null;
- this._range = range || null;
- this._url = url || null;
- this._injected = injected || false;
</del><ins>+ this._id = id || null;
+ this._range = range || null;
+ this._url = url || null;
+ this._injected = injected || false;
</ins><span class="cx">
</span><del>- this._resource = this._resolveResource();
- if (this._resource)
- this._resource.associateWithScript(this);
</del><ins>+ this._resource = this._resolveResource();
+ if (this._resource)
+ this._resource.associateWithScript(this);
</ins><span class="cx">
</span><del>- if (sourceMapURL)
- WebInspector.sourceMapManager.downloadSourceMap(sourceMapURL, this._url, this);
</del><ins>+ if (sourceMapURL)
+ WebInspector.sourceMapManager.downloadSourceMap(sourceMapURL, this._url, this);
</ins><span class="cx">
</span><del>- this._scriptSyntaxTree = null;
-};
</del><ins>+ this._scriptSyntaxTree = null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.Script.TypeIdentifier = "script";
-WebInspector.Script.URLCookieKey = "script-url";
-WebInspector.Script.DisplayNameCookieKey = "script-display-name";
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.Script.resetUniqueDisplayNameNumbers = function()
-{
- WebInspector.Script._nextUniqueDisplayNameNumber = 1;
-};
</del><ins>+ static resetUniqueDisplayNameNumbers()
+ {
+ WebInspector.Script._nextUniqueDisplayNameNumber = 1;
+ }
</ins><span class="cx">
</span><del>-WebInspector.Script._nextUniqueDisplayNameNumber = 1;
-
-WebInspector.Script.prototype = {
- constructor: WebInspector.Script,
- __proto__: WebInspector.SourceCode.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get id()
</span><span class="cx"> {
</span><span class="cx"> return this._id;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get range()
</span><span class="cx"> {
</span><span class="cx"> return this._range;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get url()
</span><span class="cx"> {
</span><span class="cx"> return this._url;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get urlComponents()
</span><span class="cx"> {
</span><span class="cx"> if (!this._urlComponents)
</span><span class="cx"> this._urlComponents = parseURL(this._url);
</span><span class="cx"> return this._urlComponents;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get mimeType()
</span><span class="cx"> {
</span><span class="cx"> return this._resource.mimeType;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get displayName()
</span><span class="cx"> {
</span><span class="lines">@@ -99,24 +93,24 @@
</span><span class="cx"> this._uniqueDisplayNameNumber = this.constructor._nextUniqueDisplayNameNumber++;
</span><span class="cx">
</span><span class="cx"> return WebInspector.UIString("Anonymous Script %d").format(this._uniqueDisplayNameNumber);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get injected()
</span><span class="cx"> {
</span><span class="cx"> return this._injected;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get resource()
</span><span class="cx"> {
</span><span class="cx"> return this._resource;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get scriptSyntaxTree()
</span><span class="cx"> {
</span><span class="cx"> return this._scriptSyntaxTree;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- requestContentFromBackend: function()
</del><ins>+ requestContentFromBackend()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._id) {
</span><span class="cx"> // There is no identifier to request content with. Return false to cause the
</span><span class="lines">@@ -125,15 +119,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return DebuggerAgent.getScriptSource.promise(this._id);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.Script.URLCookieKey] = this.url;
</span><span class="cx"> cookie[WebInspector.Script.DisplayNameCookieKey] = this.displayName;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- requestScriptSyntaxTree: function(callback)
</del><ins>+ requestScriptSyntaxTree(callback)
</ins><span class="cx"> {
</span><span class="cx"> if (this._scriptSyntaxTree) {
</span><span class="cx"> setTimeout(function() { callback(this._scriptSyntaxTree); }.bind(this), 0);
</span><span class="lines">@@ -159,11 +153,11 @@
</span><span class="cx"> }).catch(function(error) {
</span><span class="cx"> makeSyntaxTreeAndCallCallback(null);
</span><span class="cx"> });
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _resolveResource: function()
</del><ins>+ _resolveResource()
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We should be able to associate a Script with a Resource through identifiers,
</span><span class="cx"> // we shouldn't need to lookup by URL, which is not safe with frames, where there might
</span><span class="lines">@@ -208,9 +202,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _makeSyntaxTree: function(sourceText)
</del><ins>+ _makeSyntaxTree(sourceText)
</ins><span class="cx"> {
</span><span class="cx"> if (this._scriptSyntaxTree || !sourceText)
</span><span class="cx"> return;
</span><span class="lines">@@ -218,3 +212,9 @@
</span><span class="cx"> this._scriptSyntaxTree = new WebInspector.ScriptSyntaxTree(sourceText, this);
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.Script.TypeIdentifier = "script";
+WebInspector.Script.URLCookieKey = "script-url";
+WebInspector.Script.DisplayNameCookieKey = "script-display-name";
+
+WebInspector.Script._nextUniqueDisplayNameNumber = 1;
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,97 +23,44 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ScriptSyntaxTree = function(sourceText, script)
</del><ins>+WebInspector.ScriptSyntaxTree = class ScriptSyntaxTree extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- console.assert(script && script instanceof WebInspector.Script, script);
</del><ins>+ constructor(sourceText, script)
+ {
+ super();
</ins><span class="cx">
</span><del>- WebInspector.Object.call(this);
- this._script = script;
</del><ins>+ console.assert(script && script instanceof WebInspector.Script, script);
</ins><span class="cx">
</span><del>- try {
- var esprimaSyntaxTree = esprima.parse(sourceText, {range: true});
- this._syntaxTree = this._createInternalSyntaxTree(esprimaSyntaxTree);
- this._parsedSuccessfully = true;
- } catch (error) {
- this._parsedSuccessfully = false;
- this._syntaxTree = null;
- console.error("Couldn't parse JavaScript File: " + script.url, error);
</del><ins>+ this._script = script;
+
+ try {
+ var esprimaSyntaxTree = esprima.parse(sourceText, {range: true});
+ this._syntaxTree = this._createInternalSyntaxTree(esprimaSyntaxTree);
+ this._parsedSuccessfully = true;
+ } catch (error) {
+ this._parsedSuccessfully = false;
+ this._syntaxTree = null;
+ console.error("Couldn't parse JavaScript File: " + script.url, error);
+ }
</ins><span class="cx"> }
</span><del>-};
</del><span class="cx">
</span><del>-// This should be kept in sync with an enum in JavaSciptCore/runtime/TypeProfiler.h
-WebInspector.ScriptSyntaxTree.TypeProfilerSearchDescriptor = {
- NormalExpression: 1,
- FunctionReturn: 2
-};
-
-WebInspector.ScriptSyntaxTree.NodeType = {
- AssignmentExpression: Symbol("assignment-expression"),
- ArrayExpression: Symbol("array-expression"),
- ArrayPattern: Symbol("array-pattern"),
- BlockStatement: Symbol("block-statement"),
- BinaryExpression: Symbol("binary-expression"),
- BreakStatement: Symbol("break-statement"),
- CallExpression: Symbol("call-expression"),
- CatchClause: Symbol("catch-clause"),
- ConditionalExpression: Symbol("conditional-expression"),
- ContinueStatement: Symbol("continue-statement"),
- DoWhileStatement: Symbol("do-while-statement"),
- DebuggerStatement: Symbol("debugger-statement"),
- EmptyStatement: Symbol("empty-statement"),
- ExpressionStatement: Symbol("expression-statement"),
- ForStatement: Symbol("for-statement"),
- ForInStatement: Symbol("for-in-statement"),
- ForOfStatement: Symbol("for-of-statement"),
- FunctionDeclaration: Symbol("function-declaration"),
- FunctionExpression: Symbol("function-expression"),
- Identifier: Symbol("identifier"),
- IfStatement: Symbol("if-statement"),
- Literal: Symbol("literal"),
- LabeledStatement: Symbol("labeled-statement"),
- LogicalExpression: Symbol("logical-expression"),
- MemberExpression: Symbol("member-expression"),
- NewExpression: Symbol("new-expression"),
- ObjectExpression: Symbol("object-expression"),
- ObjectPattern: Symbol("object-pattern"),
- Program: Symbol("program"),
- Property: Symbol("property"),
- ReturnStatement: Symbol("return-statement"),
- SequenceExpression: Symbol("sequence-expression"),
- SwitchStatement: Symbol("switch-statement"),
- SwitchCase: Symbol("switch-case"),
- ThisExpression: Symbol("this-expression"),
- ThrowStatement: Symbol("throw-statement"),
- TryStatement: Symbol("try-statement"),
- UnaryExpression: Symbol("unary-expression"),
- UpdateExpression: Symbol("update-expression"),
- VariableDeclaration: Symbol("variable-declaration"),
- VariableDeclarator: Symbol("variable-declarator"),
- WhileStatement: Symbol("while-statement"),
- WithStatement: Symbol("with-statement")
-};
-
-WebInspector.ScriptSyntaxTree.prototype = {
- constructor: WebInspector.ScriptSyntaxTree,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get parsedSuccessfully()
</span><span class="cx"> {
</span><span class="cx"> return this._parsedSuccessfully;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- forEachNode: function(callback)
</del><ins>+ forEachNode(callback)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(this._parsedSuccessfully);
</span><span class="cx"> if (!this._parsedSuccessfully)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._recurse(this._syntaxTree, callback, this._defaultParserState());
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- filter: function(predicate, startNode)
</del><ins>+ filter(predicate, startNode)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(startNode && this._parsedSuccessfully);
</span><span class="cx"> if (!this._parsedSuccessfully)
</span><span class="lines">@@ -131,17 +78,17 @@
</span><span class="cx"> this._recurse(startNode, filter, this._defaultParserState());
</span><span class="cx">
</span><span class="cx"> return nodes;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- filterByRange: function(startOffset, endOffset)
</del><ins>+ filterByRange(startOffset, endOffset)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(this._parsedSuccessfully);
</span><span class="cx"> if (!this._parsedSuccessfully)
</span><span class="cx"> return [];
</span><span class="cx">
</span><span class="cx"> var allNodes = [];
</span><del>- const start = 0;
- const end = 1;
</del><ins>+ var start = 0;
+ var end = 1;
</ins><span class="cx"> function filterForNodesInRange(node, state)
</span><span class="cx"> {
</span><span class="cx"> // program start range program end
</span><span class="lines">@@ -167,9 +114,9 @@
</span><span class="cx"> this.forEachNode(filterForNodesInRange);
</span><span class="cx">
</span><span class="cx"> return allNodes;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- containsNonEmptyReturnStatement: function(startNode)
</del><ins>+ containsNonEmptyReturnStatement(startNode)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(startNode && this._parsedSuccessfully);
</span><span class="cx"> if (!this._parsedSuccessfully)
</span><span class="lines">@@ -197,9 +144,9 @@
</span><span class="cx"> startNode.attachments._hasNonEmptyReturnStatement = hasNonEmptyReturnStatement;
</span><span class="cx">
</span><span class="cx"> return hasNonEmptyReturnStatement;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateTypes: function(nodesToUpdate, callback)
</del><ins>+ updateTypes(nodesToUpdate, callback)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(RuntimeAgent.getRuntimeTypesForVariablesAtOffsets);
</span><span class="cx"> console.assert(Array.isArray(nodesToUpdate) && this._parsedSuccessfully);
</span><span class="lines">@@ -268,11 +215,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RuntimeAgent.getRuntimeTypesForVariablesAtOffsets(allRequests, handleTypes);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _gatherIdentifiersInDeclaration: function(node)
</del><ins>+ _gatherIdentifiersInDeclaration(node)
</ins><span class="cx"> {
</span><span class="cx"> function gatherIdentifiers(node)
</span><span class="cx"> {
</span><span class="lines">@@ -304,17 +251,17 @@
</span><span class="cx"> console.assert(node.type === WebInspector.ScriptSyntaxTree.NodeType.Identifier || node.type === WebInspector.ScriptSyntaxTree.NodeType.ObjectPattern || node.type === WebInspector.ScriptSyntaxTree.NodeType.ArrayPattern);
</span><span class="cx">
</span><span class="cx"> return gatherIdentifiers(node);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _defaultParserState: function()
</del><ins>+ _defaultParserState()
</ins><span class="cx"> {
</span><span class="cx"> return {
</span><span class="cx"> shouldStopEarly: false,
</span><span class="cx"> skipChildNodes: false
</span><span class="cx"> };
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _recurse: function(node, callback, state)
</del><ins>+ _recurse(node, callback, state)
</ins><span class="cx"> {
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="lines">@@ -515,19 +462,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> state.skipChildNodes = false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _recurseArray: function(array, callback, state)
</del><ins>+ _recurseArray(array, callback, state)
</ins><span class="cx"> {
</span><span class="cx"> for (var node of array)
</span><span class="cx"> this._recurse(node, callback, state);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // This function translates from esprima's Abstract Syntax Tree to ours.
</span><span class="cx"> // Mostly, this is just the identity function. We've added an extra isGetterOrSetter property for functions.
</span><span class="cx"> // Our AST complies with the Mozilla parser API:
</span><span class="cx"> // https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Parser_API
</span><del>- _createInternalSyntaxTree: function(node)
</del><ins>+ _createInternalSyntaxTree(node)
</ins><span class="cx"> {
</span><span class="cx"> if (!node)
</span><span class="cx"> return null;
</span><span class="lines">@@ -849,3 +796,55 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+// This should be kept in sync with an enum in JavaSciptCore/runtime/TypeProfiler.h
+WebInspector.ScriptSyntaxTree.TypeProfilerSearchDescriptor = {
+ NormalExpression: 1,
+ FunctionReturn: 2
+};
+
+WebInspector.ScriptSyntaxTree.NodeType = {
+ AssignmentExpression: Symbol("assignment-expression"),
+ ArrayExpression: Symbol("array-expression"),
+ ArrayPattern: Symbol("array-pattern"),
+ BlockStatement: Symbol("block-statement"),
+ BinaryExpression: Symbol("binary-expression"),
+ BreakStatement: Symbol("break-statement"),
+ CallExpression: Symbol("call-expression"),
+ CatchClause: Symbol("catch-clause"),
+ ConditionalExpression: Symbol("conditional-expression"),
+ ContinueStatement: Symbol("continue-statement"),
+ DoWhileStatement: Symbol("do-while-statement"),
+ DebuggerStatement: Symbol("debugger-statement"),
+ EmptyStatement: Symbol("empty-statement"),
+ ExpressionStatement: Symbol("expression-statement"),
+ ForStatement: Symbol("for-statement"),
+ ForInStatement: Symbol("for-in-statement"),
+ ForOfStatement: Symbol("for-of-statement"),
+ FunctionDeclaration: Symbol("function-declaration"),
+ FunctionExpression: Symbol("function-expression"),
+ Identifier: Symbol("identifier"),
+ IfStatement: Symbol("if-statement"),
+ Literal: Symbol("literal"),
+ LabeledStatement: Symbol("labeled-statement"),
+ LogicalExpression: Symbol("logical-expression"),
+ MemberExpression: Symbol("member-expression"),
+ NewExpression: Symbol("new-expression"),
+ ObjectExpression: Symbol("object-expression"),
+ ObjectPattern: Symbol("object-pattern"),
+ Program: Symbol("program"),
+ Property: Symbol("property"),
+ ReturnStatement: Symbol("return-statement"),
+ SequenceExpression: Symbol("sequence-expression"),
+ SwitchStatement: Symbol("switch-statement"),
+ SwitchCase: Symbol("switch-case"),
+ ThisExpression: Symbol("this-expression"),
+ ThrowStatement: Symbol("throw-statement"),
+ TryStatement: Symbol("try-statement"),
+ UnaryExpression: Symbol("unary-expression"),
+ UpdateExpression: Symbol("update-expression"),
+ VariableDeclaration: Symbol("variable-declaration"),
+ VariableDeclarator: Symbol("variable-declarator"),
+ WhileStatement: Symbol("while-statement"),
+ WithStatement: Symbol("with-statement")
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsScriptTimelineRecordjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,19 +23,121 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ScriptTimelineRecord = function(eventType, startTime, endTime, callFrames, sourceCodeLocation, details, profilePayload)
</del><ins>+WebInspector.ScriptTimelineRecord = class ScriptTimelineRecord extends WebInspector.TimelineRecord
</ins><span class="cx"> {
</span><del>- WebInspector.TimelineRecord.call(this, WebInspector.TimelineRecord.Type.Script, startTime, endTime, callFrames, sourceCodeLocation);
</del><ins>+ constructor(eventType, startTime, endTime, callFrames, sourceCodeLocation, details, profilePayload)
+ {
+ super(WebInspector.TimelineRecord.Type.Script, startTime, endTime, callFrames, sourceCodeLocation);
</ins><span class="cx">
</span><del>- console.assert(eventType);
</del><ins>+ console.assert(eventType);
</ins><span class="cx">
</span><del>- if (eventType in WebInspector.ScriptTimelineRecord.EventType)
- eventType = WebInspector.ScriptTimelineRecord.EventType[eventType];
</del><ins>+ if (eventType in WebInspector.ScriptTimelineRecord.EventType)
+ eventType = WebInspector.ScriptTimelineRecord.EventType[eventType];
</ins><span class="cx">
</span><del>- this._eventType = eventType;
- this._details = details || "";
- this._profilePayload = profilePayload || null;
- this._profile = null;
</del><ins>+ this._eventType = eventType;
+ this._details = details || "";
+ this._profilePayload = profilePayload || null;
+ this._profile = null;
+ }
+
+ // Public
+
+ get eventType()
+ {
+ return this._eventType;
+ }
+
+ get details()
+ {
+ return this._details;
+ }
+
+ get profile()
+ {
+ this._initializeProfileFromPayload();
+ return this._profile;
+ }
+
+ saveIdentityToCookie(cookie)
+ {
+ super.saveIdentityToCookie(cookie);
+
+ cookie[WebInspector.ScriptTimelineRecord.EventTypeCookieKey] = this._eventType;
+ cookie[WebInspector.ScriptTimelineRecord.DetailsCookieKey] = this._details;
+ }
+
+ // Private
+
+ _initializeProfileFromPayload(payload)
+ {
+ if (this._profile || !this._profilePayload)
+ return;
+
+ var payload = this._profilePayload;
+ delete this._profilePayload;
+
+ console.assert(payload.rootNodes instanceof Array);
+
+ function profileNodeFromPayload(nodePayload)
+ {
+ console.assert("id" in nodePayload);
+ console.assert(nodePayload.calls instanceof Array);
+
+ if (nodePayload.url) {
+ var sourceCode = WebInspector.frameResourceManager.resourceForURL(nodePayload.url);
+ if (!sourceCode)
+ sourceCode = WebInspector.debuggerManager.scriptsForURL(nodePayload.url)[0];
+
+ // The lineNumber is 1-based, but we expect 0-based.
+ var lineNumber = nodePayload.lineNumber - 1;
+
+ var sourceCodeLocation = sourceCode ? sourceCode.createLazySourceCodeLocation(lineNumber, nodePayload.columnNumber) : null;
+ }
+
+ var isProgramCode = nodePayload.functionName === "(program)";
+ var isAnonymousFunction = nodePayload.functionName === "(anonymous function)";
+
+ var type = isProgramCode ? WebInspector.ProfileNode.Type.Program : WebInspector.ProfileNode.Type.Function;
+ var functionName = !isProgramCode && !isAnonymousFunction && nodePayload.functionName !== "(unknown)" ? nodePayload.functionName : null;
+ var calls = nodePayload.calls.map(profileNodeCallFromPayload);
+
+ return new WebInspector.ProfileNode(nodePayload.id, type, functionName, sourceCodeLocation, calls, nodePayload.children);
+ }
+
+ function profileNodeCallFromPayload(nodeCallPayload)
+ {
+ console.assert("startTime" in nodeCallPayload);
+ console.assert("totalTime" in nodeCallPayload);
+
+ return new WebInspector.ProfileNodeCall(nodeCallPayload.startTime, nodeCallPayload.totalTime);
+ }
+
+ var rootNodes = payload.rootNodes;
+
+ // Iterate over the node tree using a stack. Doing this recursively can easily cause a stack overflow.
+ // We traverse the profile in post-order and convert the payloads in place until we get back to the root.
+ var stack = [{parent: {children: rootNodes}, index: 0, root: true}];
+ while (stack.length) {
+ var entry = stack.lastValue;
+
+ if (entry.index < entry.parent.children.length) {
+ var childNodePayload = entry.parent.children[entry.index];
+ if (childNodePayload.children && childNodePayload.children.length)
+ stack.push({parent: childNodePayload, index: 0});
+
+ ++entry.index;
+ } else {
+ if (!entry.root)
+ entry.parent.children = entry.parent.children.map(profileNodeFromPayload);
+ else
+ rootNodes = rootNodes.map(profileNodeFromPayload);
+
+ stack.pop();
+ }
+ }
+
+ this._profile = new WebInspector.Profile(rootNodes);
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.ScriptTimelineRecord.EventType = {
</span><span class="lines">@@ -246,108 +348,3 @@
</span><span class="cx"> WebInspector.ScriptTimelineRecord.TypeIdentifier = "script-timeline-record";
</span><span class="cx"> WebInspector.ScriptTimelineRecord.EventTypeCookieKey = "script-timeline-record-event-type";
</span><span class="cx"> WebInspector.ScriptTimelineRecord.DetailsCookieKey = "script-timeline-record-details";
</span><del>-
-WebInspector.ScriptTimelineRecord.prototype = {
- constructor: WebInspector.ScriptTimelineRecord,
-
- // Public
-
- get eventType()
- {
- return this._eventType;
- },
-
- get details()
- {
- return this._details;
- },
-
- get profile()
- {
- this._initializeProfileFromPayload();
- return this._profile;
- },
-
- saveIdentityToCookie: function(cookie)
- {
- WebInspector.TimelineRecord.prototype.saveIdentityToCookie.call(this, cookie);
-
- cookie[WebInspector.ScriptTimelineRecord.EventTypeCookieKey] = this._eventType;
- cookie[WebInspector.ScriptTimelineRecord.DetailsCookieKey] = this._details;
- },
-
- // Private
-
- _initializeProfileFromPayload: function(payload)
- {
- if (this._profile || !this._profilePayload)
- return;
-
- var payload = this._profilePayload;
- delete this._profilePayload;
-
- console.assert(payload.rootNodes instanceof Array);
-
- function profileNodeFromPayload(nodePayload)
- {
- console.assert("id" in nodePayload);
- console.assert(nodePayload.calls instanceof Array);
-
- if (nodePayload.url) {
- var sourceCode = WebInspector.frameResourceManager.resourceForURL(nodePayload.url);
- if (!sourceCode)
- sourceCode = WebInspector.debuggerManager.scriptsForURL(nodePayload.url)[0];
-
- // The lineNumber is 1-based, but we expect 0-based.
- var lineNumber = nodePayload.lineNumber - 1;
-
- var sourceCodeLocation = sourceCode ? sourceCode.createLazySourceCodeLocation(lineNumber, nodePayload.columnNumber) : null;
- }
-
- var isProgramCode = nodePayload.functionName === "(program)";
- var isAnonymousFunction = nodePayload.functionName === "(anonymous function)";
-
- var type = isProgramCode ? WebInspector.ProfileNode.Type.Program : WebInspector.ProfileNode.Type.Function;
- var functionName = !isProgramCode && !isAnonymousFunction && nodePayload.functionName !== "(unknown)" ? nodePayload.functionName : null;
- var calls = nodePayload.calls.map(profileNodeCallFromPayload);
-
- return new WebInspector.ProfileNode(nodePayload.id, type, functionName, sourceCodeLocation, calls, nodePayload.children);
- }
-
- function profileNodeCallFromPayload(nodeCallPayload)
- {
- console.assert("startTime" in nodeCallPayload);
- console.assert("totalTime" in nodeCallPayload);
-
- return new WebInspector.ProfileNodeCall(nodeCallPayload.startTime, nodeCallPayload.totalTime);
- }
-
- var rootNodes = payload.rootNodes;
-
- // Iterate over the node tree using a stack. Doing this recursively can easily cause a stack overflow.
- // We traverse the profile in post-order and convert the payloads in place until we get back to the root.
- var stack = [{parent: {children: rootNodes}, index: 0, root: true}];
- while (stack.length) {
- var entry = stack.lastValue;
-
- if (entry.index < entry.parent.children.length) {
- var childNodePayload = entry.parent.children[entry.index];
- if (childNodePayload.children && childNodePayload.children.length)
- stack.push({parent: childNodePayload, index: 0});
-
- ++entry.index;
- } else {
- if (!entry.root)
- entry.parent.children = entry.parent.children.map(profileNodeFromPayload);
- else
- rootNodes = rootNodes.map(profileNodeFromPayload);
-
- stack.pop();
- }
- }
-
- this._profile = new WebInspector.Profile(rootNodes);
- }
-};
-
-WebInspector.ScriptTimelineRecord.prototype.__proto__ = WebInspector.TimelineRecord.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSettingjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Setting.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Setting.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Setting.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -29,30 +29,23 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.Setting = function(name, defaultValue)
</del><ins>+WebInspector.Setting = class Setting extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- this._name = name;
- this._localStorageKey = WebInspector.Setting.LocalStorageKeyPrefix + name;
- this._defaultValue = defaultValue;
-};
</del><ins>+ constructor(name, defaultValue)
+ {
+ super();
</ins><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.Setting);
</del><ins>+ this._name = name;
+ this._localStorageKey = WebInspector.Setting.LocalStorageKeyPrefix + name;
+ this._defaultValue = defaultValue;
+ }
</ins><span class="cx">
</span><del>-WebInspector.Setting.Event = {
- Changed: "setting-changed"
-};
-
-WebInspector.Setting.LocalStorageKeyPrefix = "com.apple.WebInspector.";
-
-WebInspector.Setting.prototype = {
- constructor: WebInspector.Setting,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get name()
</span><span class="cx"> {
</span><span class="cx"> return this._name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get value()
</span><span class="cx"> {
</span><span class="lines">@@ -71,7 +64,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return this._value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set value(value)
</span><span class="cx"> {
</span><span class="lines">@@ -93,4 +86,8 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Setting.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.Setting.LocalStorageKeyPrefix = "com.apple.WebInspector.";
+
+WebInspector.Setting.Event = {
+ Changed: "setting-changed"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceCodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceCode.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceCode.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceCode.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,32 +23,20 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.SourceCode = function()
</del><ins>+WebInspector.SourceCode = class SourceCode extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor()
+ {
+ super();
</ins><span class="cx">
</span><del>- this._originalRevision = new WebInspector.SourceCodeRevision(this, null, false);
- this._currentRevision = this._originalRevision;
</del><ins>+ this._originalRevision = new WebInspector.SourceCodeRevision(this, null, false);
+ this._currentRevision = this._originalRevision;
</ins><span class="cx">
</span><del>- this._sourceMaps = null;
- this._formatterSourceMap = null;
- this._requestContentPromise = null;
-};
</del><ins>+ this._sourceMaps = null;
+ this._formatterSourceMap = null;
+ this._requestContentPromise = null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.SourceCode);
-
-WebInspector.SourceCode.Event = {
- ContentDidChange: "source-code-content-did-change",
- SourceMapAdded: "source-code-source-map-added",
- FormatterDidChange: "source-code-formatter-did-change",
- LoadingDidFinish: "source-code-loading-did-finish",
- LoadingDidFail: "source-code-loading-did-fail"
-};
-
-WebInspector.SourceCode.prototype = {
- constructor: WebInspector.SourceCode,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get displayName()
</span><span class="lines">@@ -56,17 +44,17 @@
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> console.error("Needs to be implemented by a subclass.");
</span><span class="cx"> return "";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get originalRevision()
</span><span class="cx"> {
</span><span class="cx"> return this._originalRevision;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get currentRevision()
</span><span class="cx"> {
</span><span class="cx"> return this._currentRevision;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set currentRevision(revision)
</span><span class="cx"> {
</span><span class="lines">@@ -81,19 +69,19 @@
</span><span class="cx"> this._currentRevision = revision;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.SourceCode.Event.ContentDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get content()
</span><span class="cx"> {
</span><span class="cx"> return this._currentRevision.content;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceMaps()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceMaps || [];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addSourceMap: function(sourceMap)
</del><ins>+ addSourceMap(sourceMap)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(sourceMap instanceof WebInspector.SourceMap);
</span><span class="cx">
</span><span class="lines">@@ -103,12 +91,12 @@
</span><span class="cx"> this._sourceMaps.push(sourceMap);
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.SourceCode.Event.SourceMapAdded);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get formatterSourceMap()
</span><span class="cx"> {
</span><span class="cx"> return this._formatterSourceMap;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set formatterSourceMap(formatterSourceMap)
</span><span class="cx"> {
</span><span class="lines">@@ -118,33 +106,33 @@
</span><span class="cx"> this._formatterSourceMap = formatterSourceMap;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.SourceCode.Event.FormatterDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- requestContent: function()
</del><ins>+ requestContent()
</ins><span class="cx"> {
</span><span class="cx"> this._requestContentPromise = this._requestContentPromise || this.requestContentFromBackend().then(this._processContent.bind(this));
</span><span class="cx">
</span><span class="cx"> return this._requestContentPromise;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- createSourceCodeLocation: function(lineNumber, columnNumber)
</del><ins>+ createSourceCodeLocation(lineNumber, columnNumber)
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.SourceCodeLocation(this, lineNumber, columnNumber);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- createLazySourceCodeLocation: function(lineNumber, columnNumber)
</del><ins>+ createLazySourceCodeLocation(lineNumber, columnNumber)
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.LazySourceCodeLocation(this, lineNumber, columnNumber);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- createSourceCodeTextRange: function(textRange)
</del><ins>+ createSourceCodeTextRange(textRange)
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.SourceCodeTextRange(this, textRange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><del>- revisionContentDidChange: function(revision)
</del><ins>+ revisionContentDidChange(revision)
</ins><span class="cx"> {
</span><span class="cx"> if (this._ignoreRevisionContentDidChangeEvent)
</span><span class="cx"> return;
</span><span class="lines">@@ -155,41 +143,41 @@
</span><span class="cx"> this.handleCurrentRevisionContentChange();
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.SourceCode.Event.ContentDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- handleCurrentRevisionContentChange: function()
</del><ins>+ handleCurrentRevisionContentChange()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses if needed.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get revisionForRequestedContent()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses if needed.
</span><span class="cx"> return this._originalRevision;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- markContentAsStale: function()
</del><ins>+ markContentAsStale()
</ins><span class="cx"> {
</span><span class="cx"> this._requestContentPromise = null;
</span><span class="cx"> this._contentReceived = false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- requestContentFromBackend: function()
</del><ins>+ requestContentFromBackend()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> console.error("Needs to be implemented by a subclass.");
</span><span class="cx"> return Promise.reject(new Error("Needs to be implemented by a subclass."));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get mimeType()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> console.error("Needs to be implemented by a subclass.");
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _processContent: function(parameters)
</del><ins>+ _processContent(parameters)
</ins><span class="cx"> {
</span><span class="cx"> // Different backend APIs return one of `content, `body`, `text`, or `scriptSource`.
</span><span class="cx"> var content = parameters.content || parameters.body || parameters.text || parameters.scriptSource;
</span><span class="lines">@@ -210,3 +198,11 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.SourceCode.Event = {
+ ContentDidChange: "source-code-content-did-change",
+ SourceMapAdded: "source-code-source-map-added",
+ FormatterDidChange: "source-code-formatter-did-change",
+ LoadingDidFinish: "source-code-loading-did-finish",
+ LoadingDidFail: "source-code-loading-did-fail"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeLocationjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,87 +23,65 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.SourceCodeLocation = function(sourceCode, lineNumber, columnNumber)
</del><ins>+WebInspector.SourceCodeLocation = class SourceCodeLocation extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(sourceCode, lineNumber, columnNumber)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(sourceCode === null || sourceCode instanceof WebInspector.SourceCode);
- console.assert(!(sourceCode instanceof WebInspector.SourceMapResource));
- console.assert(typeof lineNumber === "number" && !isNaN(lineNumber) && lineNumber >= 0);
- console.assert(typeof columnNumber === "number" && !isNaN(columnNumber) && columnNumber >= 0);
</del><ins>+ console.assert(sourceCode === null || sourceCode instanceof WebInspector.SourceCode);
+ console.assert(!(sourceCode instanceof WebInspector.SourceMapResource));
+ console.assert(typeof lineNumber === "number" && !isNaN(lineNumber) && lineNumber >= 0);
+ console.assert(typeof columnNumber === "number" && !isNaN(columnNumber) && columnNumber >= 0);
</ins><span class="cx">
</span><del>- this._sourceCode = sourceCode || null;
- this._lineNumber = lineNumber;
- this._columnNumber = columnNumber;
- this._resolveFormattedLocation();
</del><ins>+ this._sourceCode = sourceCode || null;
+ this._lineNumber = lineNumber;
+ this._columnNumber = columnNumber;
+ this._resolveFormattedLocation();
</ins><span class="cx">
</span><del>- if (this._sourceCode) {
- this._sourceCode.addEventListener(WebInspector.SourceCode.Event.SourceMapAdded, this._sourceCodeSourceMapAdded, this);
- this._sourceCode.addEventListener(WebInspector.SourceCode.Event.FormatterDidChange, this._sourceCodeFormatterDidChange, this);
</del><ins>+ if (this._sourceCode) {
+ this._sourceCode.addEventListener(WebInspector.SourceCode.Event.SourceMapAdded, this._sourceCodeSourceMapAdded, this);
+ this._sourceCode.addEventListener(WebInspector.SourceCode.Event.FormatterDidChange, this._sourceCodeFormatterDidChange, this);
+ }
+
+ this._resetMappedLocation();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- this._resetMappedLocation();
-};
-
-WebInspector.SourceCodeLocation.DisplayLocationClassName = "display-location";
-
-WebInspector.SourceCodeLocation.LargeColumnNumber = 80;
-
-WebInspector.SourceCodeLocation.NameStyle = {
- None: "none", // File name not included.
- Short: "short", // Only the file name.
- Full: "full" // Full URL is used.
-};
-
-WebInspector.SourceCodeLocation.ColumnStyle = {
- Hidden: "hidden", // column numbers are not included.
- OnlyIfLarge: "only-if-large", // column numbers greater than 80 are shown.
- Shown: "shown" // non-zero column numbers are shown.
-};
-
-WebInspector.SourceCodeLocation.Event = {
- LocationChanged: "source-code-location-location-changed",
- DisplayLocationChanged: "source-code-location-display-location-changed"
-};
-
-WebInspector.SourceCodeLocation.prototype = {
- constructor: WebInspector.SourceCodeLocation,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><del>- isEqual: function(other)
</del><ins>+ isEqual(other)
</ins><span class="cx"> {
</span><span class="cx"> if (!other)
</span><span class="cx"> return false;
</span><span class="cx"> return this._sourceCode === other._sourceCode && this._lineNumber === other._lineNumber && this._columnNumber === other._columnNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceCode()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set sourceCode(sourceCode)
</span><span class="cx"> {
</span><span class="cx"> this.setSourceCode(sourceCode);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Raw line and column in the original source code.
</span><span class="cx">
</span><span class="cx"> get lineNumber()
</span><span class="cx"> {
</span><span class="cx"> return this._lineNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get columnNumber()
</span><span class="cx"> {
</span><span class="cx"> return this._columnNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- position: function()
</del><ins>+ position()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.SourceCodePosition(this.lineNumber, this.columnNumber);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Formatted line and column if the original source code is pretty printed.
</span><span class="cx"> // This is the same as the raw location if there is no formatter.
</span><span class="lines">@@ -111,17 +89,17 @@
</span><span class="cx"> get formattedLineNumber()
</span><span class="cx"> {
</span><span class="cx"> return this._formattedLineNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get formattedColumnNumber()
</span><span class="cx"> {
</span><span class="cx"> return this._formattedColumnNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- formattedPosition: function()
</del><ins>+ formattedPosition()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.SourceCodePosition(this.formattedLineNumber, this.formattedColumnNumber);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Display line and column:
</span><span class="cx"> // - Mapped line and column if the original source code has a source map.
</span><span class="lines">@@ -131,43 +109,43 @@
</span><span class="cx"> {
</span><span class="cx"> this.resolveMappedLocation();
</span><span class="cx"> return this._mappedResource || this._sourceCode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get displayLineNumber()
</span><span class="cx"> {
</span><span class="cx"> this.resolveMappedLocation();
</span><span class="cx"> return isNaN(this._mappedLineNumber) ? this._formattedLineNumber : this._mappedLineNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get displayColumnNumber()
</span><span class="cx"> {
</span><span class="cx"> this.resolveMappedLocation();
</span><span class="cx"> return isNaN(this._mappedColumnNumber) ? this._formattedColumnNumber : this._mappedColumnNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- displayPosition: function()
</del><ins>+ displayPosition()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.SourceCodePosition(this.displayLineNumber, this.displayColumnNumber);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // User presentable location strings: "file:lineNumber:columnNumber".
</span><span class="cx">
</span><del>- originalLocationString: function(columnStyle, nameStyle, prefix)
</del><ins>+ originalLocationString(columnStyle, nameStyle, prefix)
</ins><span class="cx"> {
</span><span class="cx"> return this._locationString(this.sourceCode, this.lineNumber, this.columnNumber, columnStyle, nameStyle, prefix);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- formattedLocationString: function(columnStyle, nameStyle, prefix)
</del><ins>+ formattedLocationString(columnStyle, nameStyle, prefix)
</ins><span class="cx"> {
</span><span class="cx"> return this._locationString(this.sourceCode, this.formattedLineNumber, this.formattedColumn, columnStyle, nameStyle, prefix);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- displayLocationString: function(columnStyle, nameStyle, prefix)
</del><ins>+ displayLocationString(columnStyle, nameStyle, prefix)
</ins><span class="cx"> {
</span><span class="cx"> return this._locationString(this.displaySourceCode, this.displayLineNumber, this.displayColumnNumber, columnStyle, nameStyle, prefix);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- tooltipString: function()
</del><ins>+ tooltipString()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.hasDifferentDisplayLocation())
</span><span class="cx"> return this.originalLocationString(WebInspector.SourceCodeLocation.ColumnStyle.Shown, WebInspector.SourceCodeLocation.NameStyle.Full);
</span><span class="lines">@@ -175,25 +153,25 @@
</span><span class="cx"> var tooltip = WebInspector.UIString("Located at %s").format(this.displayLocationString(WebInspector.SourceCodeLocation.ColumnStyle.Shown, WebInspector.SourceCodeLocation.NameStyle.Full));
</span><span class="cx"> tooltip += "\n" + WebInspector.UIString("Originally %s").format(this.originalLocationString(WebInspector.SourceCodeLocation.ColumnStyle.Shown, WebInspector.SourceCodeLocation.NameStyle.Full));
</span><span class="cx"> return tooltip;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hasMappedLocation: function()
</del><ins>+ hasMappedLocation()
</ins><span class="cx"> {
</span><span class="cx"> this.resolveMappedLocation();
</span><span class="cx"> return this._mappedResource !== null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hasFormattedLocation: function()
</del><ins>+ hasFormattedLocation()
</ins><span class="cx"> {
</span><span class="cx"> return this._formattedLineNumber !== this._lineNumber || this._formattedColumnNumber !== this._columnNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hasDifferentDisplayLocation: function()
</del><ins>+ hasDifferentDisplayLocation()
</ins><span class="cx"> {
</span><span class="cx"> return this.hasMappedLocation() || this.hasFormattedLocation();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- update: function(sourceCode, lineNumber, columnNumber)
</del><ins>+ update(sourceCode, lineNumber, columnNumber)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(sourceCode === this._sourceCode || (this._mappedResource && sourceCode === this._mappedResource));
</span><span class="cx"> console.assert(typeof lineNumber === "number" && !isNaN(lineNumber) && lineNumber >= 0);
</span><span class="lines">@@ -217,9 +195,9 @@
</span><span class="cx"> this._mappedColumnNumber = newSourceCodeLocation._mappedColumnNumber;
</span><span class="cx"> }
</span><span class="cx"> });
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- populateLiveDisplayLocationTooltip: function(element, prefix)
</del><ins>+ populateLiveDisplayLocationTooltip(element, prefix)
</ins><span class="cx"> {
</span><span class="cx"> prefix = prefix || "";
</span><span class="cx">
</span><span class="lines">@@ -229,9 +207,9 @@
</span><span class="cx"> if (this.sourceCode)
</span><span class="cx"> element.title = prefix + this.tooltipString();
</span><span class="cx"> }, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- populateLiveDisplayLocationString: function(element, propertyName, columnStyle, nameStyle, prefix)
</del><ins>+ populateLiveDisplayLocationString(element, propertyName, columnStyle, nameStyle, prefix)
</ins><span class="cx"> {
</span><span class="cx"> var currentDisplay = undefined;
</span><span class="cx">
</span><span class="lines">@@ -270,11 +248,11 @@
</span><span class="cx"> element.addEventListener("mouseout", function(event) {
</span><span class="cx"> updateDisplayString.call(this, false);
</span><span class="cx"> }.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><del>- setSourceCode: function(sourceCode)
</del><ins>+ setSourceCode(sourceCode)
</ins><span class="cx"> {
</span><span class="cx"> console.assert((this._sourceCode === null && sourceCode instanceof WebInspector.SourceCode) || (this._sourceCode instanceof WebInspector.SourceCode && sourceCode === null));
</span><span class="cx">
</span><span class="lines">@@ -294,9 +272,9 @@
</span><span class="cx"> this._sourceCode.addEventListener(WebInspector.SourceCode.Event.FormatterDidChange, this._sourceCodeFormatterDidChange, this);
</span><span class="cx"> }
</span><span class="cx"> });
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- resolveMappedLocation: function()
</del><ins>+ resolveMappedLocation()
</ins><span class="cx"> {
</span><span class="cx"> if (this._mappedLocationIsResolved)
</span><span class="cx"> return;
</span><span class="lines">@@ -329,11 +307,11 @@
</span><span class="cx"> this._mappedColumnNumber = entry[4];
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _locationString: function(sourceCode, lineNumber, columnNumber, columnStyle, nameStyle, prefix)
</del><ins>+ _locationString(sourceCode, lineNumber, columnNumber, columnStyle, nameStyle, prefix)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(sourceCode);
</span><span class="cx"> if (!sourceCode)
</span><span class="lines">@@ -362,26 +340,26 @@
</span><span class="cx"> console.error("Unknown nameStyle: " + nameStyle);
</span><span class="cx"> return prefix + lineString;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _resetMappedLocation: function()
</del><ins>+ _resetMappedLocation()
</ins><span class="cx"> {
</span><span class="cx"> this._mappedLocationIsResolved = false;
</span><span class="cx"> this._mappedResource = null;
</span><span class="cx"> this._mappedLineNumber = NaN;
</span><span class="cx"> this._mappedColumnNumber = NaN;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _setMappedLocation: function(mappedResource, mappedLineNumber, mappedColumnNumber)
</del><ins>+ _setMappedLocation(mappedResource, mappedLineNumber, mappedColumnNumber)
</ins><span class="cx"> {
</span><span class="cx"> // Called by SourceMapResource when it creates a SourceCodeLocation and already knows the resolved location.
</span><span class="cx"> this._mappedLocationIsResolved = true;
</span><span class="cx"> this._mappedResource = mappedResource;
</span><span class="cx"> this._mappedLineNumber = mappedLineNumber;
</span><span class="cx"> this._mappedColumnNumber = mappedColumnNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _resolveFormattedLocation: function()
</del><ins>+ _resolveFormattedLocation()
</ins><span class="cx"> {
</span><span class="cx"> if (this._sourceCode && this._sourceCode.formatterSourceMap) {
</span><span class="cx"> var formattedLocation = this._sourceCode.formatterSourceMap.originalToFormatted(this._lineNumber, this._columnNumber);
</span><span class="lines">@@ -391,9 +369,9 @@
</span><span class="cx"> this._formattedLineNumber = this._lineNumber;
</span><span class="cx"> this._formattedColumnNumber = this._columnNumber;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _makeChangeAndDispatchChangeEventIfNeeded: function(changeFunction)
</del><ins>+ _makeChangeAndDispatchChangeEventIfNeeded(changeFunction)
</ins><span class="cx"> {
</span><span class="cx"> var oldSourceCode = this._sourceCode;
</span><span class="cx"> var oldLineNumber = this._lineNumber;
</span><span class="lines">@@ -448,17 +426,36 @@
</span><span class="cx"> if (anyLocationChanged)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.SourceCodeLocation.Event.LocationChanged, oldData);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _sourceCodeSourceMapAdded: function()
</del><ins>+ _sourceCodeSourceMapAdded()
</ins><span class="cx"> {
</span><span class="cx"> this._makeChangeAndDispatchChangeEventIfNeeded(null);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _sourceCodeFormatterDidChange: function()
</del><ins>+ _sourceCodeFormatterDidChange()
</ins><span class="cx"> {
</span><span class="cx"> this._makeChangeAndDispatchChangeEventIfNeeded(null);
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.SourceCodeLocation.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.SourceCodeLocation.DisplayLocationClassName = "display-location";
+
+WebInspector.SourceCodeLocation.LargeColumnNumber = 80;
+
+WebInspector.SourceCodeLocation.NameStyle = {
+ None: "none", // File name not included.
+ Short: "short", // Only the file name.
+ Full: "full" // Full URL is used.
+};
+
+WebInspector.SourceCodeLocation.ColumnStyle = {
+ Hidden: "hidden", // column numbers are not included.
+ OnlyIfLarge: "only-if-large", // column numbers greater than 80 are shown.
+ Shown: "shown" // non-zero column numbers are shown.
+};
+
+WebInspector.SourceCodeLocation.Event = {
+ LocationChanged: "source-code-location-location-changed",
+ DisplayLocationChanged: "source-code-location-display-location-changed"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceCodePositionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodePosition.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodePosition.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodePosition.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,28 +23,25 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.SourceCodePosition = function(lineNumber, columNumber)
</del><ins>+WebInspector.SourceCodePosition = class SourceCodePosition extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(lineNumber, columNumber)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._lineNumber = lineNumber || 0;
- this._columnNumber = columNumber || 0;
-};
</del><ins>+ this._lineNumber = lineNumber || 0;
+ this._columnNumber = columNumber || 0;
+ }
</ins><span class="cx">
</span><del>-WebInspector.SourceCodePosition.prototype = {
- constructor: WebInspector.SourceCodePosition,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get lineNumber()
</span><span class="cx"> {
</span><span class="cx"> return this._lineNumber;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get columnNumber()
</span><span class="cx"> {
</span><span class="cx"> return this._columnNumber;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.SourceCodePosition.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeRevisionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeRevision.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeRevision.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeRevision.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,30 +23,29 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.SourceCodeRevision = function(sourceCode, content)
</del><ins>+WebInspector.SourceCodeRevision = class SourceCodeRevision extends WebInspector.Revision
</ins><span class="cx"> {
</span><del>- WebInspector.Revision.call(this);
</del><ins>+ constructor(sourceCode, content)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(sourceCode instanceof WebInspector.SourceCode);
</del><ins>+ console.assert(sourceCode instanceof WebInspector.SourceCode);
</ins><span class="cx">
</span><del>- this._sourceCode = sourceCode;
- this._content = content || "";
-};
</del><ins>+ this._sourceCode = sourceCode;
+ this._content = content || "";
+ }
</ins><span class="cx">
</span><del>-WebInspector.SourceCodeRevision.prototype = {
- constructor: WebInspector.SourceCodeRevision,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get sourceCode()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get content()
</span><span class="cx"> {
</span><span class="cx"> return this._content;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set content(content)
</span><span class="cx"> {
</span><span class="lines">@@ -58,22 +57,20 @@
</span><span class="cx"> this._content = content;
</span><span class="cx">
</span><span class="cx"> this._sourceCode.revisionContentDidChange(this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- apply: function()
</del><ins>+ apply()
</ins><span class="cx"> {
</span><span class="cx"> this._sourceCode.currentRevision = this;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revert: function()
</del><ins>+ revert()
</ins><span class="cx"> {
</span><span class="cx"> this._sourceCode.currentRevision = this._sourceCode.originalRevision;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- copy: function()
</del><ins>+ copy()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.SourceCodeRevision(this._sourceCode, this._content);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.SourceCodeRevision.prototype.__proto__ = WebInspector.Revision.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeSearchMatchObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeSearchMatchObject.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeSearchMatchObject.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeSearchMatchObject.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,52 +23,46 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.SourceCodeSearchMatchObject = function(sourceCode, lineText, searchTerm, textRange)
</del><ins>+WebInspector.SourceCodeSearchMatchObject = class SourceCodeSearchMatchObject extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- console.assert(sourceCode instanceof WebInspector.SourceCode);
</del><ins>+ constructor(sourceCode, lineText, searchTerm, textRange)
+ {
+ super();
</ins><span class="cx">
</span><del>- WebInspector.Object.call(this);
</del><ins>+ console.assert(sourceCode instanceof WebInspector.SourceCode);
</ins><span class="cx">
</span><del>- this._sourceCode = sourceCode;
- this._lineText = lineText;
- this._searchTerm = searchTerm;
- this._sourceCodeTextRange = sourceCode.createSourceCodeTextRange(textRange);
-};
</del><ins>+ this._sourceCode = sourceCode;
+ this._lineText = lineText;
+ this._searchTerm = searchTerm;
+ this._sourceCodeTextRange = sourceCode.createSourceCodeTextRange(textRange);
+ }
</ins><span class="cx">
</span><del>-WebInspector.SourceCodeSearchMatchObject.SourceCodeMatchIconStyleClassName = "source-code-match-icon";
</del><ins>+ // Public
</ins><span class="cx">
</span><del>-WebInspector.SourceCodeSearchMatchObject.TypeIdentifier = "source-code-search-match-object";
-WebInspector.SourceCodeSearchMatchObject.URLCookieKey = "source-code-url";
-WebInspector.SourceCodeSearchMatchObject.TextRangeKey = "text-range";
-
-WebInspector.SourceCodeSearchMatchObject.prototype = {
- constructor: WebInspector.SourceCodeSearchMatchObject,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> get sourceCode()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get title()
</span><span class="cx"> {
</span><span class="cx"> return this._lineText;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get className()
</span><span class="cx"> {
</span><span class="cx"> return WebInspector.SourceCodeSearchMatchObject.SourceCodeMatchIconStyleClassName;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get searchTerm()
</span><span class="cx"> {
</span><span class="cx"> return this._searchTerm;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceCodeTextRange()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCodeTextRange;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> saveIdentityToCookie(cookie)
</span><span class="cx"> {
</span><span class="lines">@@ -79,3 +73,9 @@
</span><span class="cx"> cookie[WebInspector.SourceCodeSearchMatchObject.TextRangeKey] = [textRange.startLine, textRange.startColumn, textRange.endLine, textRange.endColumn].join();
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.SourceCodeSearchMatchObject.SourceCodeMatchIconStyleClassName = "source-code-match-icon";
+
+WebInspector.SourceCodeSearchMatchObject.TypeIdentifier = "source-code-search-match-object";
+WebInspector.SourceCodeSearchMatchObject.URLCookieKey = "source-code-url";
+WebInspector.SourceCodeSearchMatchObject.TextRangeKey = "text-range";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeTextRangejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeTextRange.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeTextRange.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeTextRange.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,44 +23,39 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.SourceCodeTextRange = function(sourceCode) /* textRange || startLocation, endLocation */
</del><ins>+WebInspector.SourceCodeTextRange = class SourceCodeTextRange extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(sourceCode) /* textRange || startLocation, endLocation */
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(sourceCode instanceof WebInspector.SourceCode);
- console.assert(arguments.length === 2 || arguments.length === 3);
</del><ins>+ console.assert(sourceCode instanceof WebInspector.SourceCode);
+ console.assert(arguments.length === 2 || arguments.length === 3);
</ins><span class="cx">
</span><del>- this._sourceCode = sourceCode;
</del><ins>+ this._sourceCode = sourceCode;
</ins><span class="cx">
</span><del>- if (arguments.length === 2) {
- var textRange = arguments[1];
- console.assert(textRange instanceof WebInspector.TextRange);
- this._startLocation = sourceCode.createSourceCodeLocation(textRange.startLine, textRange.startColumn);
- this._endLocation = sourceCode.createSourceCodeLocation(textRange.endLine, textRange.endColumn);
- } else {
- console.assert(arguments[1] instanceof WebInspector.SourceCodeLocation);
- console.assert(arguments[2] instanceof WebInspector.SourceCodeLocation);
- this._startLocation = arguments[1];
- this._endLocation = arguments[2];
</del><ins>+ if (arguments.length === 2) {
+ var textRange = arguments[1];
+ console.assert(textRange instanceof WebInspector.TextRange);
+ this._startLocation = sourceCode.createSourceCodeLocation(textRange.startLine, textRange.startColumn);
+ this._endLocation = sourceCode.createSourceCodeLocation(textRange.endLine, textRange.endColumn);
+ } else {
+ console.assert(arguments[1] instanceof WebInspector.SourceCodeLocation);
+ console.assert(arguments[2] instanceof WebInspector.SourceCodeLocation);
+ this._startLocation = arguments[1];
+ this._endLocation = arguments[2];
+ }
+
+ this._startLocation.addEventListener(WebInspector.SourceCodeLocation.Event.LocationChanged, this._sourceCodeLocationChanged, this);
+ this._endLocation.addEventListener(WebInspector.SourceCodeLocation.Event.LocationChanged, this._sourceCodeLocationChanged, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- this._startLocation.addEventListener(WebInspector.SourceCodeLocation.Event.LocationChanged, this._sourceCodeLocationChanged, this);
- this._endLocation.addEventListener(WebInspector.SourceCodeLocation.Event.LocationChanged, this._sourceCodeLocationChanged, this);
-};
-
-WebInspector.SourceCodeTextRange.Event = {
- RangeChanged: "source-code-text-range-range-changed"
-};
-
-WebInspector.SourceCodeTextRange.prototype = {
- constructor: WebInspector.SourceCodeTextRange,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get sourceCode()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Raw text range in the original source code.
</span><span class="cx">
</span><span class="lines">@@ -71,7 +66,7 @@
</span><span class="cx"> var endLine = this._endLocation.lineNumber;
</span><span class="cx"> var endColumn = this._endLocation.columnNumber;
</span><span class="cx"> return new WebInspector.TextRange(startLine, startColumn, endLine, endColumn);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Formatted text range in the original source code if it is pretty printed.
</span><span class="cx"> // This is the same as the raw text range if the source code has no formatter.
</span><span class="lines">@@ -83,7 +78,7 @@
</span><span class="cx"> var endLine = this._endLocation.formattedLineNumber;
</span><span class="cx"> var endColumn = this._endLocation.formattedColumnNumber;
</span><span class="cx"> return new WebInspector.TextRange(startLine, startColumn, endLine, endColumn);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Display values:
</span><span class="cx"> // - Mapped resource and text range locations if the original source code has a
</span><span class="lines">@@ -96,7 +91,7 @@
</span><span class="cx"> return this._sourceCode;
</span><span class="cx">
</span><span class="cx"> return this._startLocation.displaySourceCode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get displayTextRange()
</span><span class="cx"> {
</span><span class="lines">@@ -108,19 +103,21 @@
</span><span class="cx"> var endLine = this._endLocation.displayLineNumber;
</span><span class="cx"> var endColumn = this._endLocation.displayColumnNumber;
</span><span class="cx"> return new WebInspector.TextRange(startLine, startColumn, endLine, endColumn);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _startAndEndLocationsInSameMappedResource: function()
</del><ins>+ _startAndEndLocationsInSameMappedResource()
</ins><span class="cx"> {
</span><span class="cx"> return this._startLocation.hasMappedLocation() && this._endLocation.hasMappedLocation() && this._startLocation.displaySourceCode === this._endLocation.displaySourceCode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _sourceCodeLocationChanged: function(event)
</del><ins>+ _sourceCodeLocationChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.SourceCodeLocation.Event.RangeChanged);
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.SourceCodeTextRange.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.SourceCodeTextRange.Event = {
+ RangeChanged: "source-code-text-range-range-changed"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeTimelinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeTimeline.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeTimeline.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeTimeline.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,55 +23,45 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.SourceCodeTimeline = function(sourceCode, sourceCodeLocation, recordType, recordEventType)
</del><ins>+WebInspector.SourceCodeTimeline = class SourceCodeTimeline extends WebInspector.Timeline
</ins><span class="cx"> {
</span><del>- WebInspector.Timeline.call(this);
</del><ins>+ constructor(sourceCode, sourceCodeLocation, recordType, recordEventType)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(sourceCode);
- console.assert(!sourceCodeLocation || sourceCodeLocation.sourceCode === sourceCode);
- console.assert(recordType);
</del><ins>+ console.assert(sourceCode);
+ console.assert(!sourceCodeLocation || sourceCodeLocation.sourceCode === sourceCode);
+ console.assert(recordType);
</ins><span class="cx">
</span><del>- this._sourceCode = sourceCode;
- this._sourceCodeLocation = sourceCodeLocation || null;
- this._recordType = recordType;
- this._recordEventType = recordEventType || null;
-};
</del><ins>+ this._sourceCode = sourceCode;
+ this._sourceCodeLocation = sourceCodeLocation || null;
+ this._recordType = recordType;
+ this._recordEventType = recordEventType || null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.SourceCodeTimeline.TypeIdentifier = "source-code-timeline";
-WebInspector.SourceCodeTimeline.SourceCodeURLCookieKey = "source-code-timeline-source-code-url";
-WebInspector.SourceCodeTimeline.SourceCodeLocationLineCookieKey = "source-code-timeline-source-code-location-line";
-WebInspector.SourceCodeTimeline.SourceCodeLocationColumnCookieKey = "source-code-timeline-source-code-location-column";
-WebInspector.SourceCodeTimeline.SourceCodeURLCookieKey = "source-code-timeline-source-code-url";
-WebInspector.SourceCodeTimeline.RecordTypeCookieKey = "source-code-timeline-record-type";
-WebInspector.SourceCodeTimeline.RecordEventTypeCookieKey = "source-code-timeline-record-event-type";
-
-WebInspector.SourceCodeTimeline.prototype = {
- constructor: WebInspector.SourceCodeTimeline,
- __proto__: WebInspector.Timeline.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get sourceCode()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceCodeLocation()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCodeLocation;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get recordType()
</span><span class="cx"> {
</span><span class="cx"> return this._recordType;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get recordEventType()
</span><span class="cx"> {
</span><span class="cx"> return this._recordEventType;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.SourceCodeTimeline.SourceCodeURLCookieKey] = this._sourceCode.url ? this._sourceCode.url.hash : null;
</span><span class="cx"> cookie[WebInspector.SourceCodeTimeline.SourceCodeLocationLineCookieKey] = this._sourceCodeLocation ? this._sourceCodeLocation.lineNumber : null;
</span><span class="lines">@@ -80,3 +70,11 @@
</span><span class="cx"> cookie[WebInspector.SourceCodeTimeline.RecordEventTypeCookieKey] = this._recordEventType || null;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.SourceCodeTimeline.TypeIdentifier = "source-code-timeline";
+WebInspector.SourceCodeTimeline.SourceCodeURLCookieKey = "source-code-timeline-source-code-url";
+WebInspector.SourceCodeTimeline.SourceCodeLocationLineCookieKey = "source-code-timeline-source-code-location-line";
+WebInspector.SourceCodeTimeline.SourceCodeLocationColumnCookieKey = "source-code-timeline-source-code-location-column";
+WebInspector.SourceCodeTimeline.SourceCodeURLCookieKey = "source-code-timeline-source-code-url";
+WebInspector.SourceCodeTimeline.RecordTypeCookieKey = "source-code-timeline-record-type";
+WebInspector.SourceCodeTimeline.RecordEventTypeCookieKey = "source-code-timeline-record-event-type";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceMapjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceMap.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceMap.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceMap.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,34 +23,38 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.SourceMap = function(sourceMappingURL, payload, originalSourceCode)
</del><ins>+WebInspector.SourceMap = class SourceMap extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- if (!WebInspector.SourceMap.prototype._base64Map) {
- const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- WebInspector.SourceMap.prototype._base64Map = {};
- for (var i = 0; i < base64Digits.length; ++i)
- WebInspector.SourceMap.prototype._base64Map[base64Digits.charAt(i)] = i;
- }
</del><ins>+ constructor(sourceMappingURL, payload, originalSourceCode)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._originalSourceCode = originalSourceCode || null;
- this._sourceMapResources = {};
- this._sourceMapResourcesList = [];
</del><ins>+ if (!WebInspector.SourceMap._base64Map) {
+ var base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ WebInspector.SourceMap._base64Map = {};
+ for (var i = 0; i < base64Digits.length; ++i)
+ WebInspector.SourceMap._base64Map[base64Digits.charAt(i)] = i;
+ }
</ins><span class="cx">
</span><del>- this._sourceMappingURL = sourceMappingURL;
- this._reverseMappingsBySourceURL = {};
- this._mappings = [];
- this._sources = {};
- this._sourceRoot = null;
- this._sourceContentByURL = {};
- this._parseMappingPayload(payload);
-};
</del><ins>+ this._originalSourceCode = originalSourceCode || null;
+ this._sourceMapResources = {};
+ this._sourceMapResourcesList = [];
</ins><span class="cx">
</span><del>-WebInspector.SourceMap.prototype = {
</del><ins>+ this._sourceMappingURL = sourceMappingURL;
+ this._reverseMappingsBySourceURL = {};
+ this._mappings = [];
+ this._sources = {};
+ this._sourceRoot = null;
+ this._sourceContentByURL = {};
+ this._parseMappingPayload(payload);
+ }
</ins><span class="cx">
</span><ins>+ // Public
+
</ins><span class="cx"> get originalSourceCode()
</span><span class="cx"> {
</span><span class="cx"> return this._originalSourceCode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceMappingBasePathURLComponents()
</span><span class="cx"> {
</span><span class="lines">@@ -74,52 +78,52 @@
</span><span class="cx"> urlComponents.lastPathComponent = null;
</span><span class="cx"> this._sourceMappingURLBasePathComponents = urlComponents;
</span><span class="cx"> return this._sourceMappingURLBasePathComponents;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get resources()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceMapResourcesList;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addResource: function(resource)
</del><ins>+ addResource(resource)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!(resource.url in this._sourceMapResources));
</span><span class="cx"> this._sourceMapResources[resource.url] = resource;
</span><span class="cx"> this._sourceMapResourcesList.push(resource);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- resourceForURL: function(url)
</del><ins>+ resourceForURL(url)
</ins><span class="cx"> {
</span><span class="cx"> return this._sourceMapResources[url];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- sources: function()
</del><ins>+ sources()
</ins><span class="cx"> {
</span><span class="cx"> return Object.keys(this._sources);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- sourceContent: function(sourceURL)
</del><ins>+ sourceContent(sourceURL)
</ins><span class="cx"> {
</span><span class="cx"> return this._sourceContentByURL[sourceURL];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _parseMappingPayload: function(mappingPayload)
</del><ins>+ _parseMappingPayload(mappingPayload)
</ins><span class="cx"> {
</span><span class="cx"> if (mappingPayload.sections)
</span><span class="cx"> this._parseSections(mappingPayload.sections);
</span><span class="cx"> else
</span><span class="cx"> this._parseMap(mappingPayload, 0, 0);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _parseSections: function(sections)
</del><ins>+ _parseSections(sections)
</ins><span class="cx"> {
</span><span class="cx"> for (var i = 0; i < sections.length; ++i) {
</span><span class="cx"> var section = sections[i];
</span><span class="cx"> this._parseMap(section.map, section.offset.line, section.offset.column);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- findEntry: function(lineNumber, columnNumber)
</del><ins>+ findEntry(lineNumber, columnNumber)
</ins><span class="cx"> {
</span><span class="cx"> var first = 0;
</span><span class="cx"> var count = this._mappings.length;
</span><span class="lines">@@ -138,9 +142,9 @@
</span><span class="cx"> if (!first && entry && (lineNumber < entry[0] || (lineNumber === entry[0] && columnNumber < entry[1])))
</span><span class="cx"> return null;
</span><span class="cx"> return entry;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- findEntryReversed: function(sourceURL, lineNumber)
</del><ins>+ findEntryReversed(sourceURL, lineNumber)
</ins><span class="cx"> {
</span><span class="cx"> var mappings = this._reverseMappingsBySourceURL[sourceURL];
</span><span class="cx"> for ( ; lineNumber < mappings.length; ++lineNumber) {
</span><span class="lines">@@ -149,9 +153,9 @@
</span><span class="cx"> return mapping;
</span><span class="cx"> }
</span><span class="cx"> return this._mappings[0];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _parseMap: function(map, lineNumber, columnNumber)
</del><ins>+ _parseMap(map, lineNumber, columnNumber)
</ins><span class="cx"> {
</span><span class="cx"> var sourceIndex = 0;
</span><span class="cx"> var sourceLineNumber = 0;
</span><span class="lines">@@ -223,53 +227,54 @@
</span><span class="cx"> if (!reverseMappings[sourceLine])
</span><span class="cx"> reverseMappings[sourceLine] = [mapping[0], mapping[1]];
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _isSeparator: function(char)
</del><ins>+ _isSeparator(char)
</ins><span class="cx"> {
</span><span class="cx"> return char === "," || char === ";";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _decodeVLQ: function(stringCharIterator)
</del><ins>+ _decodeVLQ(stringCharIterator)
</ins><span class="cx"> {
</span><span class="cx"> // Read unsigned value.
</span><span class="cx"> var result = 0;
</span><span class="cx"> var shift = 0;
</span><span class="cx"> do {
</span><del>- var digit = this._base64Map[stringCharIterator.next()];
- result += (digit & this._VLQ_BASE_MASK) << shift;
- shift += this._VLQ_BASE_SHIFT;
- } while (digit & this._VLQ_CONTINUATION_MASK);
</del><ins>+ var digit = WebInspector.SourceMap._base64Map[stringCharIterator.next()];
+ result += (digit & WebInspector.SourceMap.VLQ_BASE_MASK) << shift;
+ shift += WebInspector.SourceMap.VLQ_BASE_SHIFT;
+ } while (digit & WebInspector.SourceMap.VLQ_CONTINUATION_MASK);
</ins><span class="cx">
</span><span class="cx"> // Fix the sign.
</span><span class="cx"> var negative = result & 1;
</span><span class="cx"> result >>= 1;
</span><span class="cx"> return negative ? -result : result;
</span><del>- },
-
- _VLQ_BASE_SHIFT: 5,
- _VLQ_BASE_MASK: (1 << 5) - 1,
- _VLQ_CONTINUATION_MASK: 1 << 5
</del><ins>+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.SourceMap.StringCharIterator = function(string)
</del><ins>+WebInspector.SourceMap.VLQ_BASE_SHIFT = 5;
+WebInspector.SourceMap.VLQ_BASE_MASK = (1 << 5) - 1;
+WebInspector.SourceMap.VLQ_CONTINUATION_MASK = 1 << 5;
+
+WebInspector.SourceMap.StringCharIterator = class StringCharIterator
</ins><span class="cx"> {
</span><del>- this._string = string;
- this._position = 0;
-};
</del><ins>+ constructor(string)
+ {
+ this._string = string;
+ this._position = 0;
+ }
</ins><span class="cx">
</span><del>-WebInspector.SourceMap.StringCharIterator.prototype = {
- next: function()
</del><ins>+ next()
</ins><span class="cx"> {
</span><span class="cx"> return this._string.charAt(this._position++);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- peek: function()
</del><ins>+ peek()
</ins><span class="cx"> {
</span><span class="cx"> return this._string.charAt(this._position);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hasNext: function()
</del><ins>+ hasNext()
</ins><span class="cx"> {
</span><span class="cx"> return this._position < this._string.length;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceMapResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,40 +23,38 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.SourceMapResource = function(url, sourceMap)
</del><ins>+WebInspector.SourceMapResource = class SourceMapResource extends WebInspector.Resource
</ins><span class="cx"> {
</span><del>- WebInspector.Resource.call(this, url, null);
</del><ins>+ constructor(url, sourceMap)
+ {
+ super(url, null);
</ins><span class="cx">
</span><del>- console.assert(url);
- console.assert(sourceMap);
</del><ins>+ console.assert(url);
+ console.assert(sourceMap);
</ins><span class="cx">
</span><del>- this._sourceMap = sourceMap;
</del><ins>+ this._sourceMap = sourceMap;
</ins><span class="cx">
</span><del>- var inheritedMIMEType = this._sourceMap.originalSourceCode instanceof WebInspector.Resource ? this._sourceMap.originalSourceCode.syntheticMIMEType : null;
</del><ins>+ var inheritedMIMEType = this._sourceMap.originalSourceCode instanceof WebInspector.Resource ? this._sourceMap.originalSourceCode.syntheticMIMEType : null;
</ins><span class="cx">
</span><del>- var fileExtension = WebInspector.fileExtensionForURL(url);
- var fileExtensionMIMEType = WebInspector.mimeTypeForFileExtension(fileExtension, true);
</del><ins>+ var fileExtension = WebInspector.fileExtensionForURL(url);
+ var fileExtensionMIMEType = WebInspector.mimeTypeForFileExtension(fileExtension, true);
</ins><span class="cx">
</span><del>- // FIXME: This is a layering violation. It should use a helper function on the
- // Resource base-class to set _mimeType and _type.
- this._mimeType = fileExtensionMIMEType || inheritedMIMEType || "text/javascript";
- this._type = WebInspector.Resource.typeFromMIMEType(this._mimeType);
</del><ins>+ // FIXME: This is a layering violation. It should use a helper function on the
+ // Resource base-class to set _mimeType and _type.
+ this._mimeType = fileExtensionMIMEType || inheritedMIMEType || "text/javascript";
+ this._type = WebInspector.Resource.typeFromMIMEType(this._mimeType);
</ins><span class="cx">
</span><del>- // Mark the resource as loaded so it does not show a spinner in the sidebar.
- // We will really load the resource the first time content is requested.
- this.markAsFinished();
-};
</del><ins>+ // Mark the resource as loaded so it does not show a spinner in the sidebar.
+ // We will really load the resource the first time content is requested.
+ this.markAsFinished();
+ }
</ins><span class="cx">
</span><del>-WebInspector.SourceMapResource.prototype = {
- constructor: WebInspector.SourceMapResource,
- __proto__: WebInspector.Resource.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get sourceMap()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceMap;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceMapDisplaySubpath()
</span><span class="cx"> {
</span><span class="lines">@@ -73,9 +71,9 @@
</span><span class="cx">
</span><span class="cx"> // Same host. Just a subpath of the base.
</span><span class="cx"> return resourceURLComponents.path.substring(sourceMappingBasePathURLComponents.path.length, resourceURLComponents.length);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- requestContentFromBackend: function(callback)
</del><ins>+ requestContentFromBackend(callback)
</ins><span class="cx"> {
</span><span class="cx"> // Revert the markAsFinished that was done in the constructor.
</span><span class="cx"> this.revertMarkAsFinished();
</span><span class="lines">@@ -111,7 +109,7 @@
</span><span class="cx"> {
</span><span class="cx"> var {error, content, mimeType, statusCode} = parameters;
</span><span class="cx">
</span><del>- const base64encoded = false;
</del><ins>+ var base64encoded = false;
</ins><span class="cx">
</span><span class="cx"> if (statusCode >= 400 || error)
</span><span class="cx"> return sourceMapResourceNotAvailable(error, content, mimeType, statusCode);
</span><span class="lines">@@ -140,9 +138,9 @@
</span><span class="cx"> frameIdentifier = WebInspector.frameResourceManager.mainFrame.id;
</span><span class="cx">
</span><span class="cx"> return NetworkAgent.loadResource.promise(frameIdentifier, this.url).then(sourceMapResourceLoaded.bind(this)).catch(sourceMapResourceLoadError.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- createSourceCodeLocation: function(lineNumber, columnNumber)
</del><ins>+ createSourceCodeLocation(lineNumber, columnNumber)
</ins><span class="cx"> {
</span><span class="cx"> // SourceCodeLocations are always constructed with raw resources and raw locations. Lookup the raw location.
</span><span class="cx"> var entry = this._sourceMap.findEntryReversed(this.url, lineNumber);
</span><span class="lines">@@ -161,9 +159,9 @@
</span><span class="cx"> var location = originalSourceCode.createSourceCodeLocation(rawLineNumber, rawColumnNumber);
</span><span class="cx"> location._setMappedLocation(this, lineNumber, columnNumber);
</span><span class="cx"> return location;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- createSourceCodeTextRange: function(textRange)
</del><ins>+ createSourceCodeTextRange(textRange)
</ins><span class="cx"> {
</span><span class="cx"> // SourceCodeTextRanges are always constructed with raw resources and raw locations.
</span><span class="cx"> // However, we can provide the most accurate mapped locations in construction.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsTextMarkerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/TextMarker.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/TextMarker.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/TextMarker.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,42 +23,36 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.TextMarker = function(codeMirrorTextMarker, type)
</del><ins>+WebInspector.TextMarker = class TextMarker extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(codeMirrorTextMarker, type)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._codeMirrorTextMarker = codeMirrorTextMarker;
- codeMirrorTextMarker.__webInspectorTextMarker = this;
</del><ins>+ this._codeMirrorTextMarker = codeMirrorTextMarker;
+ codeMirrorTextMarker.__webInspectorTextMarker = this;
</ins><span class="cx">
</span><del>- this._type = type || WebInspector.TextMarker.Type.Plain;
-};
</del><ins>+ this._type = type || WebInspector.TextMarker.Type.Plain;
+ }
</ins><span class="cx">
</span><del>-WebInspector.TextMarker.Type = {
- Color: "text-marker-type-color",
- Gradient: "text-marker-type-gradient",
- Plain: "text-marker-type-plain"
-};
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.TextMarker.textMarkerForCodeMirrorTextMarker = function(codeMirrorTextMarker)
-{
- return codeMirrorTextMarker.__webInspectorTextMarker || new WebInspector.TextMarker(codeMirrorTextMarker);
-};
</del><ins>+ static textMarkerForCodeMirrorTextMarker(codeMirrorTextMarker)
+ {
+ return codeMirrorTextMarker.__webInspectorTextMarker || new WebInspector.TextMarker(codeMirrorTextMarker);
+ }
</ins><span class="cx">
</span><del>-WebInspector.TextMarker.prototype = {
- constructor: WebInspector.TextMarker,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get codeMirrorTextMarker()
</span><span class="cx"> {
</span><span class="cx"> return this._codeMirrorTextMarker;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get range()
</span><span class="cx"> {
</span><span class="lines">@@ -66,7 +60,7 @@
</span><span class="cx"> if (!range)
</span><span class="cx"> return null;
</span><span class="cx"> return new WebInspector.TextRange(range.from.line, range.from.ch, range.to.line, range.to.ch);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get rects()
</span><span class="cx"> {
</span><span class="lines">@@ -77,10 +71,16 @@
</span><span class="cx"> start: range.from,
</span><span class="cx"> end: range.to
</span><span class="cx"> });
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- clear: function()
</del><ins>+ clear()
</ins><span class="cx"> {
</span><span class="cx"> this._codeMirrorTextMarker.clear();
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.TextMarker.Type = {
+ Color: "text-marker-type-color",
+ Gradient: "text-marker-type-gradient",
+ Plain: "text-marker-type-plain"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsTextRangejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/TextRange.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/TextRange.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/TextRange.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,80 +23,79 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.TextRange = function(startLineOrStartOffset, startColumnOrEndOffset, endLine, endColumn)
</del><ins>+WebInspector.TextRange = class TextRange extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(startLineOrStartOffset, startColumnOrEndOffset, endLine, endColumn)
+ {
+ super();
</ins><span class="cx">
</span><del>- if (arguments.length === 4) {
- console.assert(startLineOrStartOffset <= endLine);
- console.assert(startLineOrStartOffset !== endLine || startColumnOrEndOffset <= endColumn);
</del><ins>+ if (arguments.length === 4) {
+ console.assert(startLineOrStartOffset <= endLine);
+ console.assert(startLineOrStartOffset !== endLine || startColumnOrEndOffset <= endColumn);
</ins><span class="cx">
</span><del>- this._startLine = typeof startLineOrStartOffset === "number" ? startLineOrStartOffset : NaN;
- this._startColumn = typeof startColumnOrEndOffset === "number" ? startColumnOrEndOffset : NaN;
- this._endLine = typeof endLine === "number" ? endLine : NaN;
- this._endColumn = typeof endColumn === "number" ? endColumn : NaN;
</del><ins>+ this._startLine = typeof startLineOrStartOffset === "number" ? startLineOrStartOffset : NaN;
+ this._startColumn = typeof startColumnOrEndOffset === "number" ? startColumnOrEndOffset : NaN;
+ this._endLine = typeof endLine === "number" ? endLine : NaN;
+ this._endColumn = typeof endColumn === "number" ? endColumn : NaN;
</ins><span class="cx">
</span><del>- this._startOffset = NaN;
- this._endOffset = NaN;
- } else if (arguments.length === 2) {
- console.assert(startLineOrStartOffset <= startColumnOrEndOffset);
</del><ins>+ this._startOffset = NaN;
+ this._endOffset = NaN;
+ } else if (arguments.length === 2) {
+ console.assert(startLineOrStartOffset <= startColumnOrEndOffset);
</ins><span class="cx">
</span><del>- this._startOffset = typeof startLineOrStartOffset === "number" ? startLineOrStartOffset : NaN;
- this._endOffset = typeof startColumnOrEndOffset === "number" ? startColumnOrEndOffset : NaN;
</del><ins>+ this._startOffset = typeof startLineOrStartOffset === "number" ? startLineOrStartOffset : NaN;
+ this._endOffset = typeof startColumnOrEndOffset === "number" ? startColumnOrEndOffset : NaN;
</ins><span class="cx">
</span><del>- this._startLine = NaN;
- this._startColumn = NaN;
- this._endLine = NaN;
- this._endColumn = NaN;
</del><ins>+ this._startLine = NaN;
+ this._startColumn = NaN;
+ this._endLine = NaN;
+ this._endColumn = NaN;
+ }
</ins><span class="cx"> }
</span><del>-};
</del><span class="cx">
</span><del>-WebInspector.TextRange.prototype = {
- constructor: WebInspector.TextRange,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get startLine()
</span><span class="cx"> {
</span><span class="cx"> return this._startLine;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get startColumn()
</span><span class="cx"> {
</span><span class="cx"> return this._startColumn;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get endLine()
</span><span class="cx"> {
</span><span class="cx"> return this._endLine;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get endColumn()
</span><span class="cx"> {
</span><span class="cx"> return this._endColumn;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get startOffset()
</span><span class="cx"> {
</span><span class="cx"> return this._startOffset;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get endOffset()
</span><span class="cx"> {
</span><span class="cx"> return this._endOffset;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- startPosition: function()
</del><ins>+ startPosition()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.SourceCodePosition(this._startLine, this._startColumn);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- endPosition: function()
</del><ins>+ endPosition()
</ins><span class="cx"> {
</span><span class="cx"> return new WebInspector.SourceCodePosition(this._endLine, this._endColumn);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- resolveLinesAndColumns: function(text)
</del><ins>+ resolveLinesAndColumns(text)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(typeof text === "string");
</span><span class="cx"> if (typeof text !== "string")
</span><span class="lines">@@ -130,9 +129,9 @@
</span><span class="cx">
</span><span class="cx"> if (this._startLine === this._endLine)
</span><span class="cx"> this._endColumn += this._startColumn;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- resolveOffsets: function(text)
</del><ins>+ resolveOffsets(text)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(typeof text === "string");
</span><span class="cx"> if (typeof text !== "string")
</span><span class="lines">@@ -157,5 +156,3 @@
</span><span class="cx"> this._endOffset = lastNewLineOffset + this._endColumn;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.TextRange.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsTimelinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Timeline.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Timeline.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Timeline.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,54 +23,48 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.Timeline = function(type)
</del><ins>+WebInspector.Timeline = class Timeline extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- if (this.constructor === WebInspector.Timeline) {
- // When instantiated directly, potentially return an instance of a concrete subclass.
- if (type === WebInspector.TimelineRecord.Type.Network)
- return new WebInspector.NetworkTimeline(type);
- }
</del><ins>+ constructor(type)
+ {
+ super();
</ins><span class="cx">
</span><del>- WebInspector.Object.call(this);
</del><ins>+ this._type = type;
</ins><span class="cx">
</span><del>- this._type = type;
</del><ins>+ this.reset(true);
+ }
</ins><span class="cx">
</span><del>- this.reset(true);
-};
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.Timeline.Event = {
- Reset: "timeline-reset",
- RecordAdded: "timeline-record-added",
- TimesUpdated: "timeline-times-updated"
-};
</del><ins>+ static create(type)
+ {
+ if (type === WebInspector.TimelineRecord.Type.Network)
+ return new WebInspector.NetworkTimeline(type);
</ins><span class="cx">
</span><del>-WebInspector.Timeline.TimelineTypeCookieKey = "timeline-type";
</del><ins>+ return new WebInspector.Timeline(type);
+ }
</ins><span class="cx">
</span><del>-WebInspector.Timeline.prototype = {
- constructor: WebInspector.Timeline,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get startTime()
</span><span class="cx"> {
</span><span class="cx"> return this._startTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get endTime()
</span><span class="cx"> {
</span><span class="cx"> return this._endTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get records()
</span><span class="cx"> {
</span><span class="cx"> return this._records;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get displayName()
</span><span class="cx"> {
</span><span class="lines">@@ -84,7 +78,7 @@
</span><span class="cx"> return WebInspector.UIString("Frames");
</span><span class="cx">
</span><span class="cx"> console.error("Timeline has unknown type:", this._type, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get iconClassName()
</span><span class="cx"> {
</span><span class="lines">@@ -98,9 +92,9 @@
</span><span class="cx"> return WebInspector.TimelineSidebarPanel.ScriptIconStyleClass;
</span><span class="cx">
</span><span class="cx"> console.error("Timeline has unknown type:", this._type, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- reset: function(suppressEvents)
</del><ins>+ reset(suppressEvents)
</ins><span class="cx"> {
</span><span class="cx"> this._records = [];
</span><span class="cx"> this._startTime = NaN;
</span><span class="lines">@@ -110,9 +104,9 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Timeline.Event.Reset);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Timeline.Event.TimesUpdated);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addRecord: function(record)
</del><ins>+ addRecord(record)
</ins><span class="cx"> {
</span><span class="cx"> if (record.updatesDynamically)
</span><span class="cx"> record.addEventListener(WebInspector.TimelineRecord.Event.Updated, this._recordUpdated, this);
</span><span class="lines">@@ -122,16 +116,16 @@
</span><span class="cx"> this._updateTimesIfNeeded(record);
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Timeline.Event.RecordAdded, {record});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.Timeline.TimelineTypeCookieKey] = this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _updateTimesIfNeeded: function(record)
</del><ins>+ _updateTimesIfNeeded(record)
</ins><span class="cx"> {
</span><span class="cx"> var changed = false;
</span><span class="cx">
</span><span class="lines">@@ -147,10 +141,18 @@
</span><span class="cx">
</span><span class="cx"> if (changed)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Timeline.Event.TimesUpdated);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _recordUpdated: function(event)
</del><ins>+ _recordUpdated(event)
</ins><span class="cx"> {
</span><span class="cx"> this._updateTimesIfNeeded(event.target);
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.Timeline.Event = {
+ Reset: "timeline-reset",
+ RecordAdded: "timeline-record-added",
+ TimesUpdated: "timeline-times-updated"
+};
+
+WebInspector.Timeline.TimelineTypeCookieKey = "timeline-type";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsTimelineMarkerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,37 +23,24 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.TimelineMarker = function(time, type)
</del><ins>+WebInspector.TimelineMarker = class TimelineMarker extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(time, type)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(type);
</del><ins>+ console.assert(type);
</ins><span class="cx">
</span><del>- this._time = time || 0;
- this._type = type;
-};
</del><ins>+ this._time = time || 0;
+ this._type = type;
+ }
</ins><span class="cx">
</span><del>-WebInspector.TimelineMarker.Event = {
- TimeChanged: "timeline-marker-time-changed"
-};
-
-WebInspector.TimelineMarker.Type = {
- CurrentTime: "current-time",
- LoadEvent: "load-event",
- DOMContentEvent: "dom-content-event",
- TimeStamp: "timestamp"
-};
-
-WebInspector.TimelineMarker.prototype = {
- constructor: WebInspector.TimelineMarker,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get time()
</span><span class="cx"> {
</span><span class="cx"> return this._time;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set time(x)
</span><span class="cx"> {
</span><span class="lines">@@ -63,10 +50,21 @@
</span><span class="cx"> this._time = x || 0;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineMarker.Event.TimeChanged);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.TimelineMarker.Event = {
+ TimeChanged: "timeline-marker-time-changed"
+};
+
+WebInspector.TimelineMarker.Type = {
+ CurrentTime: "current-time",
+ LoadEvent: "load-event",
+ DOMContentEvent: "dom-content-event",
+ TimeStamp: "timestamp"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsTimelineRecordjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/TimelineRecord.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/TimelineRecord.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/TimelineRecord.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,101 +23,83 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.TimelineRecord = function(type, startTime, endTime, callFrames, sourceCodeLocation)
</del><ins>+WebInspector.TimelineRecord = class TimelineRecord extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(type, startTime, endTime, callFrames, sourceCodeLocation)
+ {
+ super();
</ins><span class="cx">
</span><del>- console.assert(type);
</del><ins>+ console.assert(type);
</ins><span class="cx">
</span><del>- if (type in WebInspector.TimelineRecord.Type)
- type = WebInspector.TimelineRecord.Type[type];
</del><ins>+ if (type in WebInspector.TimelineRecord.Type)
+ type = WebInspector.TimelineRecord.Type[type];
</ins><span class="cx">
</span><del>- this._type = type;
- this._startTime = startTime || NaN;
- this._endTime = endTime || NaN;
- this._callFrames = callFrames || null;
- this._sourceCodeLocation = sourceCodeLocation || null;
-};
</del><ins>+ this._type = type;
+ this._startTime = startTime || NaN;
+ this._endTime = endTime || NaN;
+ this._callFrames = callFrames || null;
+ this._sourceCodeLocation = sourceCodeLocation || null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.TimelineRecord.Event = {
- Updated: "timeline-record-updated"
-};
-
-WebInspector.TimelineRecord.Type = {
- Network: "timeline-record-type-network",
- Layout: "timeline-record-type-layout",
- Script: "timeline-record-type-script",
- RunLoop: "timeline-record-type-runloop"
-};
-
-WebInspector.TimelineRecord.TypeIdentifier = "timeline-record";
-WebInspector.TimelineRecord.SourceCodeURLCookieKey = "timeline-record-source-code-url";
-WebInspector.TimelineRecord.SourceCodeLocationLineCookieKey = "timeline-record-source-code-location-line";
-WebInspector.TimelineRecord.SourceCodeLocationColumnCookieKey = "timeline-record-source-code-location-column";
-WebInspector.TimelineRecord.TypeCookieKey = "timeline-record-type";
-
-WebInspector.TimelineRecord.prototype = {
- constructor: WebInspector.TimelineRecord,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get startTime()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses if needed.
</span><span class="cx"> return this._startTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get activeStartTime()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses if needed.
</span><span class="cx"> return this._startTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get endTime()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses if needed.
</span><span class="cx"> return this._endTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get duration()
</span><span class="cx"> {
</span><span class="cx"> // Use the getters instead of the properties so this works for subclasses that override the getters.
</span><span class="cx"> return this.endTime - this.startTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get inactiveDuration()
</span><span class="cx"> {
</span><span class="cx"> // Use the getters instead of the properties so this works for subclasses that override the getters.
</span><span class="cx"> return this.activeStartTime - this.startTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get activeDuration()
</span><span class="cx"> {
</span><span class="cx"> // Use the getters instead of the properties so this works for subclasses that override the getters.
</span><span class="cx"> return this.endTime - this.activeStartTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get updatesDynamically()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses if needed.
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get usesActiveStartTime()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses if needed.
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get callFrames()
</span><span class="cx"> {
</span><span class="cx"> return this._callFrames;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get initiatorCallFrame()
</span><span class="cx"> {
</span><span class="lines">@@ -132,14 +114,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sourceCodeLocation()
</span><span class="cx"> {
</span><span class="cx"> return this._sourceCodeLocation;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function(cookie)
</del><ins>+ saveIdentityToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.TimelineRecord.SourceCodeURLCookieKey] = this._sourceCodeLocation ? this._sourceCodeLocation.sourceCode.url ? this._sourceCodeLocation.sourceCode.url.hash : null : null;
</span><span class="cx"> cookie[WebInspector.TimelineRecord.SourceCodeLocationLineCookieKey] = this._sourceCodeLocation ? this._sourceCodeLocation.lineNumber : null;
</span><span class="lines">@@ -148,4 +130,19 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.TimelineRecord.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.TimelineRecord.Event = {
+ Updated: "timeline-record-updated"
+};
+
+WebInspector.TimelineRecord.Type = {
+ Network: "timeline-record-type-network",
+ Layout: "timeline-record-type-layout",
+ Script: "timeline-record-type-script",
+ RunLoop: "timeline-record-type-runloop"
+};
+
+WebInspector.TimelineRecord.TypeIdentifier = "timeline-record";
+WebInspector.TimelineRecord.SourceCodeURLCookieKey = "timeline-record-source-code-url";
+WebInspector.TimelineRecord.SourceCodeLocationLineCookieKey = "timeline-record-source-code-location-line";
+WebInspector.TimelineRecord.SourceCodeLocationColumnCookieKey = "timeline-record-source-code-location-column";
+WebInspector.TimelineRecord.TypeCookieKey = "timeline-record-type";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsTimelineRecordingjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,75 +23,62 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.TimelineRecording = function(identifier, displayName)
</del><ins>+WebInspector.TimelineRecording = class TimelineRecording extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(identifier, displayName)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._identifier = identifier;
- this._timelines = new Map;
- this._displayName = displayName;
- this._isWritable = true;
</del><ins>+ this._identifier = identifier;
+ this._timelines = new Map;
+ this._displayName = displayName;
+ this._isWritable = true;
</ins><span class="cx">
</span><del>- // For legacy backends, we compute the elapsed time of records relative to this timestamp.
- this._legacyFirstRecordedTimestamp = NaN;
</del><ins>+ // For legacy backends, we compute the elapsed time of records relative to this timestamp.
+ this._legacyFirstRecordedTimestamp = NaN;
</ins><span class="cx">
</span><del>- this.reset(true);
-};
</del><ins>+ this.reset(true);
+ }
</ins><span class="cx">
</span><del>-WebInspector.TimelineRecording.Event = {
- Reset: "timeline-recording-reset",
- Unloaded: "timeline-recording-unloaded",
- SourceCodeTimelineAdded: "timeline-recording-source-code-timeline-added",
- TimelineAdded: "timeline-recording-timeline-added",
- TimelineRemoved: "timeline-recording-timeline-removed",
- TimesUpdated: "timeline-recording-times-updated"
-};
-
-WebInspector.TimelineRecording.TimestampThresholdForLegacyRecordConversion = 28800000; // Date.parse("Jan 1, 1970")
-
-WebInspector.TimelineRecording.prototype = {
- constructor: WebInspector.TimelineRecording,
- __proto__: WebInspector.Object.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get displayName()
</span><span class="cx"> {
</span><span class="cx"> return this._displayName;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get identifier()
</span><span class="cx"> {
</span><span class="cx"> return this._identifier;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get timelines()
</span><span class="cx"> {
</span><span class="cx"> return this._timelines;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get startTime()
</span><span class="cx"> {
</span><span class="cx"> return this._startTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get endTime()
</span><span class="cx"> {
</span><span class="cx"> return this._endTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveIdentityToCookie: function()
</del><ins>+ saveIdentityToCookie()
</ins><span class="cx"> {
</span><span class="cx"> // Do nothing. Timeline recordings are not persisted when the inspector is
</span><span class="cx"> // re-opened, so do not attempt to restore by identifier or display name.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isWritable: function()
</del><ins>+ isWritable()
</ins><span class="cx"> {
</span><span class="cx"> return this._isWritable;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- isEmpty: function()
</del><ins>+ isEmpty()
</ins><span class="cx"> {
</span><span class="cx"> for (var timeline of this._timelines.values()) {
</span><span class="cx"> if (timeline.records.length)
</span><span class="lines">@@ -99,18 +86,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- unloaded: function()
</del><ins>+ unloaded()
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!this.isEmpty(), "Shouldn't unload an empty recording; it should be reused instead.");
</span><span class="cx">
</span><span class="cx"> this._isWritable = false;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineRecording.Event.Unloaded);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- reset: function(suppressEvents)
</del><ins>+ reset(suppressEvents)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(this._isWritable, "Can't reset a read-only recording.");
</span><span class="cx">
</span><span class="lines">@@ -126,17 +113,17 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineRecording.Event.Reset);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineRecording.Event.TimesUpdated);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- sourceCodeTimelinesForSourceCode: function(sourceCode)
</del><ins>+ sourceCodeTimelinesForSourceCode(sourceCode)
</ins><span class="cx"> {
</span><span class="cx"> var timelines = this._sourceCodeTimelinesMap.get(sourceCode);
</span><span class="cx"> if (!timelines)
</span><span class="cx"> return [];
</span><span class="cx"> return [...timelines.values()];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addTimeline: function(timeline)
</del><ins>+ addTimeline(timeline)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(timeline instanceof WebInspector.Timeline, timeline);
</span><span class="cx"> console.assert(!this._timelines.has(timeline), this._timelines, timeline);
</span><span class="lines">@@ -145,9 +132,9 @@
</span><span class="cx">
</span><span class="cx"> timeline.addEventListener(WebInspector.Timeline.Event.TimesUpdated, this._timelineTimesUpdated, this);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineRecording.Event.TimelineAdded, {timeline});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeTimeline: function(timeline)
</del><ins>+ removeTimeline(timeline)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(timeline instanceof WebInspector.Timeline, timeline);
</span><span class="cx"> console.assert(this._timelines.has(timeline.type), this._timelines, timeline);
</span><span class="lines">@@ -157,14 +144,14 @@
</span><span class="cx">
</span><span class="cx"> timeline.removeEventListener(WebInspector.Timeline.Event.TimesUpdated, this._timelineTimesUpdated, this);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineRecording.Event.TimelineRemoved, {timeline});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addEventMarker: function(eventMarker)
</del><ins>+ addEventMarker(eventMarker)
</ins><span class="cx"> {
</span><span class="cx"> this._eventMarkers.push(eventMarker);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addRecord: function(record)
</del><ins>+ addRecord(record)
</ins><span class="cx"> {
</span><span class="cx"> var hasCorrespondingTimeline = this._timelines.has(record.type);
</span><span class="cx"> console.assert(hasCorrespondingTimeline, record, this._timelines);
</span><span class="lines">@@ -201,9 +188,9 @@
</span><span class="cx">
</span><span class="cx"> if (newTimeline)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineRecording.Event.SourceCodeTimelineAdded, {sourceCodeTimeline});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- computeElapsedTime: function(timestamp)
</del><ins>+ computeElapsedTime(timestamp)
</ins><span class="cx"> {
</span><span class="cx"> if (!timestamp || isNaN(timestamp))
</span><span class="cx"> return NaN;
</span><span class="lines">@@ -219,11 +206,11 @@
</span><span class="cx"> return (timestamp - this._legacyFirstRecordedTimestamp) / 1000.0;
</span><span class="cx">
</span><span class="cx"> return timestamp;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _keyForRecord: function(record)
</del><ins>+ _keyForRecord(record)
</ins><span class="cx"> {
</span><span class="cx"> var key = record.type;
</span><span class="cx"> if (record instanceof WebInspector.ScriptTimelineRecord || record instanceof WebInspector.LayoutTimelineRecord)
</span><span class="lines">@@ -233,9 +220,9 @@
</span><span class="cx"> if (record.sourceCodeLocation)
</span><span class="cx"> key += ":" + record.sourceCodeLocation.lineNumber + ":" + record.sourceCodeLocation.columnNumber;
</span><span class="cx"> return key;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _timelineTimesUpdated: function(event)
</del><ins>+ _timelineTimesUpdated(event)
</ins><span class="cx"> {
</span><span class="cx"> var timeline = event.target;
</span><span class="cx"> var changed = false;
</span><span class="lines">@@ -254,3 +241,14 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineRecording.Event.TimesUpdated);
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.TimelineRecording.Event = {
+ Reset: "timeline-recording-reset",
+ Unloaded: "timeline-recording-unloaded",
+ SourceCodeTimelineAdded: "timeline-recording-source-code-timeline-added",
+ TimelineAdded: "timeline-recording-timeline-added",
+ TimelineRemoved: "timeline-recording-timeline-removed",
+ TimesUpdated: "timeline-recording-times-updated"
+};
+
+WebInspector.TimelineRecording.TimestampThresholdForLegacyRecordConversion = 28800000; // Date.parse("Jan 1, 1970")
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsTypeSetjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/TypeSet.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/TypeSet.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/TypeSet.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,58 +24,49 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.TypeSet = function(runtimeTypeDescriptionPayload)
</del><ins>+WebInspector.TypeSet = class TypeSet extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- this._types = runtimeTypeDescriptionPayload;
</del><ins>+ constructor(runtimeTypeDescriptionPayload)
+ {
+ super();
</ins><span class="cx">
</span><del>- var typeSet = this._types.typeSet;
- var bitString = 0x0;
- if (typeSet.isFunction)
- bitString |= WebInspector.TypeSet.TypeBit.Function;
- if (typeSet.isUndefined)
- bitString |= WebInspector.TypeSet.TypeBit.Undefined;
- if (typeSet.isNull)
- bitString |= WebInspector.TypeSet.TypeBit.Null;
- if (typeSet.isBoolean)
- bitString |= WebInspector.TypeSet.TypeBit.Boolean;
- if (typeSet.isInteger)
- bitString |= WebInspector.TypeSet.TypeBit.Integer;
- if (typeSet.isNumber)
- bitString |= WebInspector.TypeSet.TypeBit.Number;
- if (typeSet.isString)
- bitString |= WebInspector.TypeSet.TypeBit.String;
- if (typeSet.isObject)
- bitString |= WebInspector.TypeSet.TypeBit.Object;
</del><ins>+ this._types = runtimeTypeDescriptionPayload;
</ins><span class="cx">
</span><del>- console.assert(bitString);
- this._bitString = bitString;
</del><ins>+ var typeSet = this._types.typeSet;
+ var bitString = 0x0;
+ if (typeSet.isFunction)
+ bitString |= WebInspector.TypeSet.TypeBit.Function;
+ if (typeSet.isUndefined)
+ bitString |= WebInspector.TypeSet.TypeBit.Undefined;
+ if (typeSet.isNull)
+ bitString |= WebInspector.TypeSet.TypeBit.Null;
+ if (typeSet.isBoolean)
+ bitString |= WebInspector.TypeSet.TypeBit.Boolean;
+ if (typeSet.isInteger)
+ bitString |= WebInspector.TypeSet.TypeBit.Integer;
+ if (typeSet.isNumber)
+ bitString |= WebInspector.TypeSet.TypeBit.Number;
+ if (typeSet.isString)
+ bitString |= WebInspector.TypeSet.TypeBit.String;
+ if (typeSet.isObject)
+ bitString |= WebInspector.TypeSet.TypeBit.Object;
</ins><span class="cx">
</span><del>- this._primitiveTypeNames = null;
-};
</del><ins>+ console.assert(bitString);
+ this._bitString = bitString;
</ins><span class="cx">
</span><del>-WebInspector.TypeSet.fromPayload = function(payload)
-{
- return new WebInspector.TypeSet(payload);
-};
</del><ins>+ this._primitiveTypeNames = null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.TypeSet.TypeBit = {
- "Function" : 0x1,
- "Undefined" : 0x2,
- "Null" : 0x4,
- "Boolean" : 0x8,
- "Integer" : 0x10,
- "Number" : 0x20,
- "String" : 0x40,
- "Object" : 0x80
-};
</del><ins>+ // Static
</ins><span class="cx">
</span><del>-WebInspector.TypeSet.NullOrUndefinedTypeBits = WebInspector.TypeSet.TypeBit.Null | WebInspector.TypeSet.TypeBit.Undefined;
</del><ins>+ static fromPayload(payload)
+ {
+ return new WebInspector.TypeSet(payload);
+ }
</ins><span class="cx">
</span><del>-WebInspector.TypeSet.prototype = {
- constructor: WebInspector.TypeSet,
- __proto__: WebInspector.Object.prototype,
</del><ins>+ // Public
</ins><span class="cx">
</span><del>- isContainedIn: function(test)
</del><ins>+ isContainedIn(test)
</ins><span class="cx"> {
</span><span class="cx"> // This function checks if types in bitString are contained in the types described by the 'test' bitstring. (i.e we haven't seen more types than 'test').
</span><span class="cx"> // We have seen fewer or equal number of types as 'test' if ANDing bitString with test doesn't zero out any of our bits.
</span><span class="lines">@@ -93,7 +84,7 @@
</span><span class="cx"> // 0b0010 != bitString
</span><span class="cx">
</span><span class="cx"> return this._bitString && (this._bitString & test) === this._bitString;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get primitiveTypeNames()
</span><span class="cx"> {
</span><span class="lines">@@ -122,3 +113,16 @@
</span><span class="cx"> return this._primitiveTypeNames;
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.TypeSet.TypeBit = {
+ "Function" : 0x1,
+ "Undefined" : 0x2,
+ "Null" : 0x4,
+ "Boolean" : 0x8,
+ "Integer" : 0x10,
+ "Number" : 0x20,
+ "String" : 0x40,
+ "Object" : 0x80
+};
+
+WebInspector.TypeSet.NullOrUndefinedTypeBits = WebInspector.TypeSet.TypeBit.Null | WebInspector.TypeSet.TypeBit.Undefined;
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsUnitBezierjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/UnitBezier.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/UnitBezier.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/UnitBezier.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -23,50 +23,47 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.UnitBezier = function(x1, y1, x2, y2)
</del><ins>+WebInspector.UnitBezier = class UnitBezier
</ins><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ constructor(x1, y1, x2, y2)
+ {
+ // Calculate the polynomial coefficients, implicit first and last control points are (0,0) and (1,1).
+ this._cx = 3.0 * x1;
+ this._bx = 3.0 * (x2 - x1) - this._cx;
+ this._ax = 1.0 - this._cx - this._bx;
</ins><span class="cx">
</span><del>- // Calculate the polynomial coefficients, implicit first and last control points are (0,0) and (1,1).
- this._cx = 3.0 * x1;
- this._bx = 3.0 * (x2 - x1) - this._cx;
- this._ax = 1.0 - this._cx - this._bx;
</del><ins>+ this._cy = 3.0 * y1;
+ this._by = 3.0 * (y2 - y1) - this._cy;
+ this._ay = 1.0 - this._cy - this._by;
+ }
</ins><span class="cx">
</span><del>- this._cy = 3.0 * y1;
- this._by = 3.0 * (y2 - y1) - this._cy;
- this._ay = 1.0 - this._cy - this._by;
-};
-
-WebInspector.UnitBezier.prototype = {
- constructor: WebInspector.UnitBezier,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><del>- solve: function(x, epsilon)
</del><ins>+ solve(x, epsilon)
</ins><span class="cx"> {
</span><span class="cx"> return this._sampleCurveY(this._solveCurveX(x, epsilon));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _sampleCurveX: function(t)
</del><ins>+ _sampleCurveX(t)
</ins><span class="cx"> {
</span><span class="cx"> // `ax t^3 + bx t^2 + cx t' expanded using Horner's rule.
</span><span class="cx"> return ((this._ax * t + this._bx) * t + this._cx) * t;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _sampleCurveY: function(t)
</del><ins>+ _sampleCurveY(t)
</ins><span class="cx"> {
</span><span class="cx"> return ((this._ay * t + this._by) * t + this._cy) * t;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _sampleCurveDerivativeX: function(t)
</del><ins>+ _sampleCurveDerivativeX(t)
</ins><span class="cx"> {
</span><span class="cx"> return (3.0 * this._ax * t + 2.0 * this._bx) * t + this._cx;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Given an x value, find a parametric value it came from.
</span><del>- _solveCurveX: function(x, epsilon)
</del><ins>+ _solveCurveX(x, epsilon)
</ins><span class="cx"> {
</span><span class="cx"> var t0, t1, t2, x2, d2, i;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolApplicationCacheObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/ApplicationCacheObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/ApplicationCacheObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/ApplicationCacheObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ApplicationCacheObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.ApplicationCacheObserver.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolCSSObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/CSSObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/CSSObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/CSSObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.CSSObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.CSSObserver.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolConsoleObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/ConsoleObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/ConsoleObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/ConsoleObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ConsoleObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.ConsoleObserver.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolDOMObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/DOMObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/DOMObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/DOMObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.DOMObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.DOMObserver.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolDOMStorageObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/DOMStorageObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/DOMStorageObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/DOMStorageObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -26,7 +26,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.DOMStorageObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.DOMStorageObserver.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolDatabaseObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/DatabaseObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/DatabaseObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/DatabaseObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.DatabaseObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.DatabaseObserver._callbacks = {};
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolDebuggerObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/DebuggerObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/DebuggerObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/DebuggerObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.DebuggerObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.DebuggerObserver.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.InspectorObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.InspectorObserver.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolLayerTreeObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/LayerTreeObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/LayerTreeObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/LayerTreeObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.LayerTreeObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.LayerTreeObserver.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolNetworkObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/NetworkObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/NetworkObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/NetworkObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.NetworkObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.NetworkObserver.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolPageObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/PageObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/PageObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/PageObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.PageObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.PageObserver.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolReplayObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/ReplayObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/ReplayObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/ReplayObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -37,7 +37,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ReplayObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.ReplayObserver.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolRuntimeObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/RuntimeObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/RuntimeObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/RuntimeObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.RuntimeObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.RuntimeObserver.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolTimelineObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/TimelineObserver.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/TimelineObserver.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/TimelineObserver.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineObserver = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineObserver.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceTesthtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Test.html (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Test.html 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Test.html 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> <script src="Models/ResourceCollection.js"></script>
</span><span class="cx"> <script src="Models/ResourceTimelineRecord.js"></script>
</span><span class="cx"> <script src="Models/Revision.js"></script>
</span><ins>+ <script src="Models/RunLoopTimelineRecord.js"></script>
</ins><span class="cx"> <script src="Models/ScopeChainNode.js"></script>
</span><span class="cx"> <script src="Models/Script.js"></script>
</span><span class="cx"> <script src="Models/ScriptSyntaxTree.js"></script>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsBreakpointActionViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.BreakpointActionView = function(action, delegate, omitFocus)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> console.assert(action);
</span><span class="cx"> console.assert(delegate);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.CSSStyleDeclarationSection = function(style)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> console.assert(style);
</span><span class="cx"> this._style = style || null;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.CSSStyleDeclarationTextEditor = function(delegate, style, element)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._element = element || document.createElement("div");
</span><span class="cx"> this._element.classList.add(WebInspector.CSSStyleDeclarationTextEditor.StyleClassName);
</span><span class="lines">@@ -70,7 +71,8 @@
</span><span class="cx"> this.style = style;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.CSSStyleDeclarationTextEditor);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.CSSStyleDeclarationTextEditor);
</ins><span class="cx">
</span><span class="cx"> WebInspector.CSSStyleDeclarationTextEditor.StyleClassName = "css-style-text-editor";
</span><span class="cx"> WebInspector.CSSStyleDeclarationTextEditor.ReadOnlyStyleClassName = "read-only";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsColorPickerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ColorPicker.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ColorPicker.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ColorPicker.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ColorPicker = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._colorWheel = new WebInspector.ColorWheel();
</span><span class="cx"> this._colorWheel.delegate = this;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsColorWheeljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ColorWheel.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ColorWheel.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ColorWheel.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ColorWheel = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._rawCanvas = document.createElement("canvas");
</span><span class="cx"> this._tintedCanvas = document.createElement("canvas");
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCompletionSuggestionsViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CompletionSuggestionsView.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CompletionSuggestionsView.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CompletionSuggestionsView.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.CompletionSuggestionsView = function(delegate)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._delegate = delegate || null;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleCommandjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleCommand.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleCommand.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleCommand.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -29,7 +29,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ConsoleCommand = function(command)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this.command = command;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleGroupjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleGroup.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleGroup.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleGroup.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -29,7 +29,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ConsoleGroup = function(parentGroup)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this.parentGroup = parentGroup;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsolePromptjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ConsolePrompt = function(delegate, mimeType, element)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> mimeType = parseMIMEType(mimeType).type;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleSessionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleSession.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleSession.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleSession.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ConsoleSession = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> var element = document.createElement("div");
</span><span class="cx"> element.className = "console-session";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ContentBrowser = function(element, delegate, disableBackForward)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._element = element || document.createElement("div");
</span><span class="cx"> this._element.classList.add(WebInspector.ContentBrowser.StyleClassName);
</span><span class="lines">@@ -89,7 +90,8 @@
</span><span class="cx"> this._currentContentViewNavigationItems = [];
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.ContentBrowser);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.ContentBrowser);
</ins><span class="cx">
</span><span class="cx"> WebInspector.ContentBrowser.StyleClassName = "content-browser";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -96,7 +96,8 @@
</span><span class="cx"> console.assert(this.constructor !== WebInspector.ContentView && this instanceof WebInspector.ContentView);
</span><span class="cx"> console.assert(WebInspector.ContentView.isViewable(representedObject));
</span><span class="cx">
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._representedObject = representedObject;
</span><span class="cx">
</span><span class="lines">@@ -106,7 +107,8 @@
</span><span class="cx"> this._parentContainer = null;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.ContentView);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.ContentView);
</ins><span class="cx">
</span><span class="cx"> WebInspector.ContentView.isViewable = function(representedObject)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentViewContainerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ContentViewContainer = function(element)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._element = element || document.createElement("div");
</span><span class="cx"> this._element.classList.add(WebInspector.ContentViewContainer.StyleClassName);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeOutlinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -63,7 +63,8 @@
</span><span class="cx"> WebInspector.showShadowDOMSetting.addEventListener(WebInspector.Setting.Event.Changed, this._showShadowDOMSettingChanged, this);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.DOMTreeOutline);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.DOMTreeOutline);
</ins><span class="cx">
</span><span class="cx"> WebInspector.DOMTreeOutline.StyleClassName = "dom-tree-outline";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDashboardContainerViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.DashboardContainerView = function() {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._toolbarItem = new WebInspector.NavigationItem("dashboard-container", "group", WebInspector.UIString("Activity Viewer"));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDashboardViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DashboardView.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DashboardView.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DashboardView.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -45,7 +45,8 @@
</span><span class="cx"> console.assert(this.constructor !== WebInspector.DashboardView && this instanceof WebInspector.DashboardView);
</span><span class="cx"> console.assert(identifier);
</span><span class="cx">
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._representedObject = representedObject;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.DetailsSection = function(identifier, title, groups, optionsElement, defaultCollapsedSettingValue) {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> console.assert(identifier);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectionGroupjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionGroup.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionGroup.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionGroup.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.DetailsSectionGroup = function(rows) {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._element = document.createElement("div");
</span><span class="cx"> this._element.className = WebInspector.DetailsSectionGroup.StyleClassName;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectionRowjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionRow.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionRow.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionRow.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.DetailsSectionRow = function(emptyMessage) {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._element = document.createElement("div");
</span><span class="cx"> this._element.className = WebInspector.DetailsSectionRow.StyleClassName;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFilterBarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FilterBar.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FilterBar.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FilterBar.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.FilterBar = function(element) {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._element = element || document.createElement("div");
</span><span class="cx"> this._element.classList.add(WebInspector.FilterBar.StyleClassName);
</span><span class="lines">@@ -37,7 +38,8 @@
</span><span class="cx"> this._element.appendChild(this._inputField);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.FilterBar);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.FilterBar);
</ins><span class="cx">
</span><span class="cx"> WebInspector.FilterBar.StyleClassName = "filter-bar";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFindBannerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.FindBanner = function(delegate, element) {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._delegate = delegate || null;
</span><span class="cx">
</span><span class="lines">@@ -86,7 +87,8 @@
</span><span class="cx"> this._generateButtonsGlyphsIfNeeded();
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.FindBanner);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.FindBanner);
</ins><span class="cx">
</span><span class="cx"> WebInspector.FindBanner.StyleClassName = "find-banner";
</span><span class="cx"> WebInspector.FindBanner.SupportsFindBannerStyleClassName = "supports-find-banner";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsGoToLineDialogjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/GoToLineDialog.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/GoToLineDialog.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/GoToLineDialog.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.GoToLineDialog = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._element = document.createElement("div");
</span><span class="cx"> this._element.className = WebInspector.GoToLineDialog.StyleClassName;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsHierarchicalPathComponentjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.HierarchicalPathComponent = function(displayName, styleClassNames, representedObject, textOnly, showSelectorArrows)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> console.assert(displayName);
</span><span class="cx"> console.assert(styleClassNames);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsHoverMenujs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HoverMenu.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/HoverMenu.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HoverMenu.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.HoverMenu = function(delegate)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this.delegate = delegate;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsIndeterminateProgressSpinnerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/IndeterminateProgressSpinner.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/IndeterminateProgressSpinner.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/IndeterminateProgressSpinner.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.IndeterminateProgressSpinner = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._element = document.createElement("div");
</span><span class="cx"> this._element.className = WebInspector.IndeterminateProgressSpinner.StyleClassName;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGridNode.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGridNode.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGridNode.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -31,7 +31,8 @@
</span><span class="cx"> this._baseStartTime = baseStartTime || 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.LayoutTimelineDataGridNode);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.LayoutTimelineDataGridNode);
</ins><span class="cx">
</span><span class="cx"> WebInspector.LayoutTimelineDataGridNode.IconStyleClassName = "icon";
</span><span class="cx"> WebInspector.LayoutTimelineDataGridNode.SubtitleStyleClassName = "subtitle";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNavigationBarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationBar.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationBar.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationBar.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.NavigationBar = function(element, navigationItems, role, label) {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._element = element || document.createElement("div");
</span><span class="cx"> this._element.classList.add(this.constructor.StyleClassName || WebInspector.NavigationBar.StyleClassName);
</span><span class="lines">@@ -54,7 +55,8 @@
</span><span class="cx"> document.head.appendChild(this._styleElement);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.NavigationBar);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.NavigationBar);
</ins><span class="cx">
</span><span class="cx"> WebInspector.NavigationBar.StyleClassName = "navigation-bar";
</span><span class="cx"> WebInspector.NavigationBar.CollapsedStyleClassName = "collapsed";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNavigationItemjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationItem.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationItem.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationItem.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.NavigationItem = function(identifier, role, label) {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._identifier = identifier || null;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectPreviewViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPreviewView.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPreviewView.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPreviewView.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ObjectPreviewView = function(preview, mode)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> console.assert(preview instanceof WebInspector.ObjectPreview);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeView.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ObjectTreeView = function(object, mode, propertyPath, forceExpanding)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> console.assert(object instanceof WebInspector.RemoteObject);
</span><span class="cx"> console.assert(!propertyPath || propertyPath instanceof WebInspector.PropertyPath);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsPopoverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Popover.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Popover.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Popover.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.Popover = function(delegate) {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this.delegate = delegate;
</span><span class="cx"> this._edge = null;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsProfileNodeDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -38,7 +38,8 @@
</span><span class="cx"> this._data.location = this._profileNode.sourceCodeLocation;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.ProfileNodeDataGridNode);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.ProfileNodeDataGridNode);
</ins><span class="cx">
</span><span class="cx"> WebInspector.ProfileNodeDataGridNode.IconStyleClassName = "icon";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsQuickConsolejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.QuickConsole = function(element)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._toggleOrFocusKeyboardShortcut = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.Escape, this._toggleOrFocus.bind(this));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -42,7 +42,8 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.ResourceTimelineDataGridNode);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.ResourceTimelineDataGridNode);
</ins><span class="cx">
</span><span class="cx"> WebInspector.ResourceTimelineDataGridNode.IconStyleClassName = "icon";
</span><span class="cx"> WebInspector.ResourceTimelineDataGridNode.ErrorStyleClassName = "error";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScopeBarItemjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBarItem.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBarItem.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBarItem.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.ScopeBarItem = function(id, label, isExclusive) {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this.id = id;
</span><span class="cx"> this.label = label;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScriptTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -33,7 +33,8 @@
</span><span class="cx"> this._rangeEndTime = typeof rangeEndTime === "number" ? rangeEndTime : Infinity;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.ScriptTimelineDataGridNode);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.ScriptTimelineDataGridNode);
</ins><span class="cx">
</span><span class="cx"> WebInspector.ScriptTimelineDataGridNode.IconStyleClassName = "icon";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Section.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Section.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Section.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.Section = function(title, subtitle)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this.element = document.createElement("div");
</span><span class="cx"> this.element.className = "section";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSidebarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.Sidebar = function(element, side, sidebarPanels, role, label) {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> console.assert(!side || side === WebInspector.Sidebar.Sides.Left || side === WebInspector.Sidebar.Sides.Right);
</span><span class="cx"> this._side = side || WebInspector.Sidebar.Sides.Left;
</span><span class="lines">@@ -51,7 +52,8 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.Sidebar);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.Sidebar);
</ins><span class="cx">
</span><span class="cx"> WebInspector.Sidebar.StyleClassName = "sidebar";
</span><span class="cx"> WebInspector.Sidebar.CollapsedStyleClassName = "collapsed";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SidebarPanel.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SidebarPanel.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SidebarPanel.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.SidebarPanel = function(identifier, displayName, showToolTip, hideToolTip, image, element, role, label)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._identifier = identifier;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -81,7 +81,8 @@
</span><span class="cx"> new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Control, "G", this.showGoToLineDialog.bind(this), this.element);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.SourceCodeTextEditor);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.SourceCodeTextEditor);
</ins><span class="cx">
</span><span class="cx"> WebInspector.SourceCodeTextEditor.StyleClassName = "source-code";
</span><span class="cx"> WebInspector.SourceCodeTextEditor.LineErrorStyleClassName = "error";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTimelineTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTimelineTimelineDataGridNode.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTimelineTimelineDataGridNode.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTimelineTimelineDataGridNode.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -31,7 +31,8 @@
</span><span class="cx"> this._sourceCodeTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._timelineRecordAdded, this);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.SourceCodeTimelineTimelineDataGridNode);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.SourceCodeTimelineTimelineDataGridNode);
</ins><span class="cx">
</span><span class="cx"> WebInspector.SourceCodeTimelineTimelineDataGridNode.prototype = {
</span><span class="cx"> constructor: WebInspector.SourceCodeTimelineTimelineDataGridNode,
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.TextEditor = function(element, mimeType, delegate)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> var text = (element ? element.textContent : "");
</span><span class="cx"> this._element = element || document.createElement("div");
</span><span class="lines">@@ -69,7 +70,8 @@
</span><span class="cx"> this._delegate = delegate || null;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.TextEditor);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.TextEditor);
</ins><span class="cx">
</span><span class="cx"> WebInspector.TextEditor.StyleClassName = "text-editor";
</span><span class="cx"> WebInspector.TextEditor.HighlightedStyleClassName = "highlighted";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGridNode.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGridNode.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGridNode.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -38,7 +38,8 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.TimelineDataGridNode);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.TimelineDataGridNode);
</ins><span class="cx">
</span><span class="cx"> WebInspector.TimelineDataGridNode.prototype = {
</span><span class="cx"> constructor: WebInspector.TimelineDataGridNode,
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineOverview = function(timelineRecording)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._recording = timelineRecording;
</span><span class="cx"> this._recording.addEventListener(WebInspector.TimelineRecording.Event.TimelineAdded, this._timelineAdded, this);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewGraphjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -49,7 +49,8 @@
</span><span class="cx"> // Concrete object instantiation.
</span><span class="cx"> console.assert(this.constructor !== WebInspector.TimelineOverviewGraph && this instanceof WebInspector.TimelineOverviewGraph);
</span><span class="cx">
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this.element = document.createElement("div");
</span><span class="cx"> this.element.classList.add(WebInspector.TimelineOverviewGraph.StyleClassName);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordBarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineRecordBar = function(records, renderMode)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._element = document.createElement("div");
</span><span class="cx"> this._element.classList.add(WebInspector.TimelineRecordBar.StyleClassName);
</span><span class="lines">@@ -34,7 +35,8 @@
</span><span class="cx"> this.records = records;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.TimelineRecordBar);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.TimelineRecordBar);
</ins><span class="cx">
</span><span class="cx"> WebInspector.TimelineRecordBar.StyleClassName = "timeline-record-bar";
</span><span class="cx"> WebInspector.TimelineRecordBar.BarSegmentStyleClassName = "segment";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordFramejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineRecordFrame = function(graphDataSource, records)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._element = document.createElement("div");
</span><span class="cx"> this._element.classList.add(WebInspector.TimelineRecordFrame.StyleClassName);
</span><span class="lines">@@ -34,7 +35,8 @@
</span><span class="cx"> this.records = records || [];
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.TimelineRecordFrame);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.TimelineRecordFrame);
</ins><span class="cx">
</span><span class="cx"> WebInspector.TimelineRecordFrame.StyleClassName = "timeline-record-frame";
</span><span class="cx"> WebInspector.TimelineRecordFrame.SixtyFpsFrameBudget = 0.0166;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineRuler = function()
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._element = document.createElement("div");
</span><span class="cx"> this._element.className = WebInspector.TimelineRuler.StyleClassName;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsToolbarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -50,7 +50,8 @@
</span><span class="cx"> this._element.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), false);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Object.addConstructorFunctions(WebInspector.Toolbar);
</del><ins>+// FIXME: Move to a WebInspector.Object subclass and we can remove this.
+WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.Toolbar);
</ins><span class="cx">
</span><span class="cx"> WebInspector.Toolbar.StyleClassName = "toolbar";
</span><span class="cx"> WebInspector.Toolbar.ControlSectionStyleClassName = "control-section";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTreeElementStatusButtonjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeElementStatusButton.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeElementStatusButton.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeElementStatusButton.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> WebInspector.TreeElementStatusButton = function(element) {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> console.assert(element);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx">
</span><span class="cx"> function TreeOutline(listNode)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this.element = listNode;
</span><span class="cx">
</span><span class="lines">@@ -503,7 +504,8 @@
</span><span class="cx">
</span><span class="cx"> function TreeElement(title, representedObject, hasChildren)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._title = title;
</span><span class="cx"> this.representedObject = (representedObject || {});
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlineDataGridSynchronizerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutlineDataGridSynchronizer.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutlineDataGridSynchronizer.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutlineDataGridSynchronizer.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.TreeOutlineDataGridSynchronizer = function(treeOutline, dataGrid, delegate)
</span><span class="cx"> {
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> this._treeOutline = treeOutline;
</span><span class="cx"> this._dataGrid = dataGrid;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTypeTokenViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js (181768 => 181769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js 2015-03-19 23:52:13 UTC (rev 181768)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js 2015-03-20 00:18:15 UTC (rev 181769)
</span><span class="lines">@@ -27,7 +27,8 @@
</span><span class="cx"> {
</span><span class="cx"> console.assert(titleType === WebInspector.TypeTokenView.TitleType.Variable || titleType === WebInspector.TypeTokenView.TitleType.ReturnStatement);
</span><span class="cx">
</span><del>- WebInspector.Object.call(this);
</del><ins>+ // FIXME: Convert this to a WebInspector.Object subclass, and call super().
+ // WebInspector.Object.call(this);
</ins><span class="cx">
</span><span class="cx"> var span = document.createElement("span");
</span><span class="cx"> span.classList.add("type-token");
</span></span></pre>
</div>
</div>
</body>
</html>