<!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>[182038] trunk/Source</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/182038">182038</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-03-26 16:35:47 -0700 (Thu, 26 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>"lineNo" does not match WebKit coding style guidelines
https://bugs.webkit.org/show_bug.cgi?id=143119
Reviewed by Michael Saboff.
We can afford to use whole words.
Source/JavaScriptCore:
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::lineNumberForBytecodeOffset):
(JSC::CodeBlock::expressionRangeForBytecodeOffset):
* bytecode/UnlinkedCodeBlock.cpp:
(JSC::UnlinkedFunctionExecutable::link):
(JSC::UnlinkedFunctionExecutable::fromGlobalCode):
* bytecode/UnlinkedCodeBlock.h:
* bytecompiler/NodesCodegen.cpp:
(JSC::WhileNode::emitBytecode):
* debugger/Debugger.cpp:
(JSC::Debugger::toggleBreakpoint):
* interpreter/Interpreter.cpp:
(JSC::StackFrame::computeLineAndColumn):
(JSC::GetStackTraceFunctor::operator()):
(JSC::Interpreter::execute):
* interpreter/StackVisitor.cpp:
(JSC::StackVisitor::Frame::computeLineAndColumn):
* parser/Nodes.h:
(JSC::Node::firstLine):
(JSC::Node::lineNo): Deleted.
(JSC::StatementNode::firstLine): Deleted.
* parser/ParserError.h:
(JSC::ParserError::toErrorObject):
* profiler/LegacyProfiler.cpp:
(JSC::createCallIdentifierFromFunctionImp):
* runtime/CodeCache.cpp:
(JSC::CodeCache::getGlobalCodeBlock):
* runtime/Executable.cpp:
(JSC::ScriptExecutable::ScriptExecutable):
(JSC::ScriptExecutable::newCodeBlockFor):
(JSC::FunctionExecutable::fromGlobalCode):
* runtime/Executable.h:
(JSC::ScriptExecutable::firstLine):
(JSC::ScriptExecutable::setOverrideLineNumber):
(JSC::ScriptExecutable::hasOverrideLineNumber):
(JSC::ScriptExecutable::overrideLineNumber):
(JSC::ScriptExecutable::lineNo): Deleted.
(JSC::ScriptExecutable::setOverrideLineNo): Deleted.
(JSC::ScriptExecutable::hasOverrideLineNo): Deleted.
(JSC::ScriptExecutable::overrideLineNo): Deleted.
* runtime/FunctionConstructor.cpp:
(JSC::constructFunctionSkippingEvalEnabledCheck):
* runtime/FunctionConstructor.h:
* tools/CodeProfile.cpp:
(JSC::CodeProfile::report):
* tools/CodeProfile.h:
(JSC::CodeProfile::CodeProfile):
Source/WebCore:
* bindings/js/JSLazyEventListener.cpp:
(WebCore::JSLazyEventListener::initializeJSFunction):
* bindings/js/JSMainThreadExecStateInstrumentation.h:
(WebCore::JSMainThreadExecState::instrumentFunctionCall):
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::buildObjectForEventListener):
* testing/Internals.cpp:
(WebCore::Internals::parserMetaData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterStackVisitorcpp">trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodesh">trunk/Source/JavaScriptCore/parser/Nodes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserErrorh">trunk/Source/JavaScriptCore/parser/ParserError.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreprofilerLegacyProfilercpp">trunk/Source/JavaScriptCore/profiler/LegacyProfiler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCodeCachecpp">trunk/Source/JavaScriptCore/runtime/CodeCache.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutablecpp">trunk/Source/JavaScriptCore/runtime/Executable.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutableh">trunk/Source/JavaScriptCore/runtime/Executable.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeFunctionConstructorcpp">trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeFunctionConstructorh">trunk/Source/JavaScriptCore/runtime/FunctionConstructor.h</a></li>
<li><a href="#trunkSourceJavaScriptCoretoolsCodeProfilecpp">trunk/Source/JavaScriptCore/tools/CodeProfile.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretoolsCodeProfileh">trunk/Source/JavaScriptCore/tools/CodeProfile.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSLazyEventListenercpp">trunk/Source/WebCore/bindings/js/JSLazyEventListener.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMainThreadExecStateInstrumentationh">trunk/Source/WebCore/bindings/js/JSMainThreadExecStateInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -1,5 +1,62 @@
</span><span class="cx"> 2015-03-26 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ "lineNo" does not match WebKit coding style guidelines
+ https://bugs.webkit.org/show_bug.cgi?id=143119
+
+ Reviewed by Michael Saboff.
+
+ We can afford to use whole words.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::lineNumberForBytecodeOffset):
+ (JSC::CodeBlock::expressionRangeForBytecodeOffset):
+ * bytecode/UnlinkedCodeBlock.cpp:
+ (JSC::UnlinkedFunctionExecutable::link):
+ (JSC::UnlinkedFunctionExecutable::fromGlobalCode):
+ * bytecode/UnlinkedCodeBlock.h:
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::WhileNode::emitBytecode):
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::toggleBreakpoint):
+ * interpreter/Interpreter.cpp:
+ (JSC::StackFrame::computeLineAndColumn):
+ (JSC::GetStackTraceFunctor::operator()):
+ (JSC::Interpreter::execute):
+ * interpreter/StackVisitor.cpp:
+ (JSC::StackVisitor::Frame::computeLineAndColumn):
+ * parser/Nodes.h:
+ (JSC::Node::firstLine):
+ (JSC::Node::lineNo): Deleted.
+ (JSC::StatementNode::firstLine): Deleted.
+ * parser/ParserError.h:
+ (JSC::ParserError::toErrorObject):
+ * profiler/LegacyProfiler.cpp:
+ (JSC::createCallIdentifierFromFunctionImp):
+ * runtime/CodeCache.cpp:
+ (JSC::CodeCache::getGlobalCodeBlock):
+ * runtime/Executable.cpp:
+ (JSC::ScriptExecutable::ScriptExecutable):
+ (JSC::ScriptExecutable::newCodeBlockFor):
+ (JSC::FunctionExecutable::fromGlobalCode):
+ * runtime/Executable.h:
+ (JSC::ScriptExecutable::firstLine):
+ (JSC::ScriptExecutable::setOverrideLineNumber):
+ (JSC::ScriptExecutable::hasOverrideLineNumber):
+ (JSC::ScriptExecutable::overrideLineNumber):
+ (JSC::ScriptExecutable::lineNo): Deleted.
+ (JSC::ScriptExecutable::setOverrideLineNo): Deleted.
+ (JSC::ScriptExecutable::hasOverrideLineNo): Deleted.
+ (JSC::ScriptExecutable::overrideLineNo): Deleted.
+ * runtime/FunctionConstructor.cpp:
+ (JSC::constructFunctionSkippingEvalEnabledCheck):
+ * runtime/FunctionConstructor.h:
+ * tools/CodeProfile.cpp:
+ (JSC::CodeProfile::report):
+ * tools/CodeProfile.h:
+ (JSC::CodeProfile::CodeProfile):
+
+2015-03-26 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> Assertion firing in JavaScriptCore/parser/parser.h for statesman.com site
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142974
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -2831,7 +2831,7 @@
</span><span class="cx"> unsigned CodeBlock::lineNumberForBytecodeOffset(unsigned bytecodeOffset)
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(bytecodeOffset < instructions().size());
</span><del>- return m_ownerExecutable->lineNo() + m_unlinkedCode->lineNumberForBytecodeOffset(bytecodeOffset);
</del><ins>+ return m_ownerExecutable->firstLine() + m_unlinkedCode->lineNumberForBytecodeOffset(bytecodeOffset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned CodeBlock::columnNumberForBytecodeOffset(unsigned bytecodeOffset)
</span><span class="lines">@@ -2850,7 +2850,7 @@
</span><span class="cx"> m_unlinkedCode->expressionRangeForBytecodeOffset(bytecodeOffset, divot, startOffset, endOffset, line, column);
</span><span class="cx"> divot += m_sourceOffset;
</span><span class="cx"> column += line ? 1 : firstLineColumnOffset();
</span><del>- line += m_ownerExecutable->lineNo();
</del><ins>+ line += m_ownerExecutable->firstLine();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CodeBlock::hasOpDebugForLineAndColumn(unsigned line, unsigned column)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> visitor.append(&thisObject->m_symbolTableForConstruct);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FunctionExecutable* UnlinkedFunctionExecutable::link(VM& vm, const SourceCode& ownerSource, int overrideLineNo)
</del><ins>+FunctionExecutable* UnlinkedFunctionExecutable::link(VM& vm, const SourceCode& ownerSource, int overrideLineNumber)
</ins><span class="cx"> {
</span><span class="cx"> SourceCode source = m_sourceOverride ? SourceCode(m_sourceOverride) : ownerSource;
</span><span class="cx"> unsigned firstLine = source.firstLine() + m_firstLineOffset;
</span><span class="lines">@@ -146,14 +146,14 @@
</span><span class="cx">
</span><span class="cx"> SourceCode code(source.provider(), startOffset, startOffset + m_sourceLength, firstLine, startColumn);
</span><span class="cx"> FunctionExecutable* result = FunctionExecutable::create(vm, code, this, firstLine, firstLine + m_lineCount, startColumn, endColumn);
</span><del>- if (overrideLineNo != -1)
- result->setOverrideLineNo(overrideLineNo);
</del><ins>+ if (overrideLineNumber != -1)
+ result->setOverrideLineNumber(overrideLineNumber);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UnlinkedFunctionExecutable* UnlinkedFunctionExecutable::fromGlobalCode(
</span><span class="cx"> const Identifier& name, ExecState& exec, const SourceCode& source,
</span><del>- JSObject*& exception, int overrideLineNo)
</del><ins>+ JSObject*& exception, int overrideLineNumber)
</ins><span class="cx"> {
</span><span class="cx"> ParserError error;
</span><span class="cx"> VM& vm = exec.vm();
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> globalObject.debugger()->sourceParsed(&exec, source.provider(), error.line(), error.message());
</span><span class="cx">
</span><span class="cx"> if (error.isValid()) {
</span><del>- exception = error.toErrorObject(&globalObject, source, overrideLineNo);
</del><ins>+ exception = error.toErrorObject(&globalObject, source, overrideLineNumber);
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -138,9 +138,9 @@
</span><span class="cx">
</span><span class="cx"> static UnlinkedFunctionExecutable* fromGlobalCode(
</span><span class="cx"> const Identifier&, ExecState&, const SourceCode&, JSObject*& exception,
</span><del>- int overrideLineNo);
</del><ins>+ int overrideLineNumber);
</ins><span class="cx">
</span><del>- FunctionExecutable* link(VM&, const SourceCode&, int overrideLineNo = -1);
</del><ins>+ FunctionExecutable* link(VM&, const SourceCode&, int overrideLineNumber = -1);
</ins><span class="cx">
</span><span class="cx"> void clearCodeForRecompilation()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -1987,7 +1987,7 @@
</span><span class="cx"> LabelScopePtr scope = generator.newLabelScope(LabelScope::Loop);
</span><span class="cx"> RefPtr<Label> topOfLoop = generator.newLabel();
</span><span class="cx">
</span><del>- generator.emitDebugHook(WillExecuteStatement, m_expr->lineNo(), m_expr->startOffset(), m_expr->lineStartOffset());
</del><ins>+ generator.emitDebugHook(WillExecuteStatement, m_expr->firstLine(), m_expr->startOffset(), m_expr->lineStartOffset());
</ins><span class="cx"> generator.emitNodeInConditionContext(m_expr, topOfLoop.get(), scope->breakTarget(), FallThroughMeansTrue);
</span><span class="cx">
</span><span class="cx"> generator.emitLabel(topOfLoop.get());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> unsigned line = breakpoint.line;
</span><span class="cx"> unsigned column = breakpoint.column;
</span><span class="cx">
</span><del>- unsigned startLine = executable->lineNo();
</del><ins>+ unsigned startLine = executable->firstLine();
</ins><span class="cx"> unsigned startColumn = executable->startColumn();
</span><span class="cx"> unsigned endLine = executable->lastLine();
</span><span class="cx"> unsigned endColumn = executable->endColumn();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -441,8 +441,8 @@
</span><span class="cx"> line = divotLine + lineOffset;
</span><span class="cx"> column = divotColumn + (divotLine ? 1 : firstLineColumnOffset);
</span><span class="cx">
</span><del>- if (executable->hasOverrideLineNo())
- line = executable->overrideLineNo();
</del><ins>+ if (executable->hasOverrideLineNumber())
+ line = executable->overrideLineNumber();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StackFrame::expressionInfo(int& divot, int& startOffset, int& endOffset, unsigned& line, unsigned& column)
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> Strong<ScriptExecutable>(vm, codeBlock->ownerExecutable()),
</span><span class="cx"> Strong<UnlinkedCodeBlock>(vm, codeBlock->unlinkedCodeBlock()),
</span><span class="cx"> codeBlock->source(),
</span><del>- codeBlock->ownerExecutable()->lineNo(),
</del><ins>+ codeBlock->ownerExecutable()->firstLine(),
</ins><span class="cx"> codeBlock->firstLineColumnOffset(),
</span><span class="cx"> codeBlock->sourceOffset(),
</span><span class="cx"> visitor->bytecodeOffset(),
</span><span class="lines">@@ -845,7 +845,7 @@
</span><span class="cx"> protoCallFrame.init(codeBlock, JSCallee::create(vm, scope->globalObject(), scope), thisObj, 1);
</span><span class="cx">
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><del>- profiler->willExecute(callFrame, program->sourceURL(), program->lineNo(), program->startColumn());
</del><ins>+ profiler->willExecute(callFrame, program->sourceURL(), program->firstLine(), program->startColumn());
</ins><span class="cx">
</span><span class="cx"> // Execute the code:
</span><span class="cx"> JSValue result;
</span><span class="lines">@@ -857,7 +857,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><del>- profiler->didExecute(callFrame, program->sourceURL(), program->lineNo(), program->startColumn());
</del><ins>+ profiler->didExecute(callFrame, program->sourceURL(), program->firstLine(), program->startColumn());
</ins><span class="cx">
</span><span class="cx"> return checkedReturn(result);
</span><span class="cx"> }
</span><span class="lines">@@ -1132,7 +1132,7 @@
</span><span class="cx"> protoCallFrame.init(codeBlock, JSCallee::create(vm, scope->globalObject(), scope), thisValue, 1);
</span><span class="cx">
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><del>- profiler->willExecute(callFrame, eval->sourceURL(), eval->lineNo(), eval->startColumn());
</del><ins>+ profiler->willExecute(callFrame, eval->sourceURL(), eval->firstLine(), eval->startColumn());
</ins><span class="cx">
</span><span class="cx"> // Execute the code:
</span><span class="cx"> JSValue result;
</span><span class="lines">@@ -1144,7 +1144,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><del>- profiler->didExecute(callFrame, eval->sourceURL(), eval->lineNo(), eval->startColumn());
</del><ins>+ profiler->didExecute(callFrame, eval->sourceURL(), eval->firstLine(), eval->startColumn());
</ins><span class="cx">
</span><span class="cx"> return checkedReturn(result);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterStackVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -291,11 +291,11 @@
</span><span class="cx"> unsigned divotColumn = 0;
</span><span class="cx"> retrieveExpressionInfo(divot, unusedStartOffset, unusedEndOffset, divotLine, divotColumn);
</span><span class="cx">
</span><del>- line = divotLine + codeBlock->ownerExecutable()->lineNo();
</del><ins>+ line = divotLine + codeBlock->ownerExecutable()->firstLine();
</ins><span class="cx"> column = divotColumn + (divotLine ? 1 : codeBlock->firstLineColumnOffset());
</span><span class="cx">
</span><del>- if (codeBlock->ownerExecutable()->hasOverrideLineNo())
- line = codeBlock->ownerExecutable()->overrideLineNo();
</del><ins>+ if (codeBlock->ownerExecutable()->hasOverrideLineNumber())
+ line = codeBlock->ownerExecutable()->overrideLineNumber();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StackVisitor::Frame::retrieveExpressionInfo(int& divot, int& startOffset, int& endOffset, unsigned& line, unsigned& column)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.h (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.h 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/parser/Nodes.h 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~Node() { }
</span><span class="cx">
</span><del>- int lineNo() const { return m_position.line; }
</del><ins>+ int firstLine() const { return m_position.line; }
</ins><span class="cx"> int startOffset() const { return m_position.offset; }
</span><span class="cx"> int endOffset() const { return m_endOffset; }
</span><span class="cx"> int lineStartOffset() const { return m_position.lineStartOffset; }
</span><span class="lines">@@ -184,7 +184,6 @@
</span><span class="cx"> virtual void emitBytecode(BytecodeGenerator&, RegisterID* destination = 0) = 0;
</span><span class="cx">
</span><span class="cx"> void setLoc(unsigned firstLine, unsigned lastLine, int startOffset, int lineStartOffset);
</span><del>- unsigned firstLine() const { return lineNo(); }
</del><span class="cx"> unsigned lastLine() const { return m_lastLine; }
</span><span class="cx">
</span><span class="cx"> StatementNode* next() { return m_next; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ParserError.h (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ParserError.h 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/parser/ParserError.h 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> JSObject* toErrorObject(
</span><span class="cx"> JSGlobalObject* globalObject, const SourceCode& source,
</span><del>- int overrideLineNo = -1)
</del><ins>+ int overrideLineNumber = -1)
</ins><span class="cx"> {
</span><span class="cx"> switch (m_type) {
</span><span class="cx"> case ErrorNone:
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> return addErrorInfo(
</span><span class="cx"> globalObject->globalExec(),
</span><span class="cx"> createSyntaxError(globalObject, m_message),
</span><del>- overrideLineNo == -1 ? m_line : overrideLineNo, source);
</del><ins>+ overrideLineNumber == -1 ? m_line : overrideLineNumber, source);
</ins><span class="cx"> case EvalError:
</span><span class="cx"> return createSyntaxError(globalObject, m_message);
</span><span class="cx"> case StackOverflow: {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreprofilerLegacyProfilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/profiler/LegacyProfiler.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/profiler/LegacyProfiler.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/profiler/LegacyProfiler.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> const String& name = getCalculatedDisplayName(exec, function);
</span><span class="cx"> JSFunction* jsFunction = jsDynamicCast<JSFunction*>(function);
</span><span class="cx"> if (jsFunction && !jsFunction->isHostOrBuiltinFunction())
</span><del>- return CallIdentifier(name.isEmpty() ? ASCIILiteral(AnonymousFunction) : name, jsFunction->jsExecutable()->sourceURL(), jsFunction->jsExecutable()->lineNo(), jsFunction->jsExecutable()->startColumn());
</del><ins>+ return CallIdentifier(name.isEmpty() ? ASCIILiteral(AnonymousFunction) : name, jsFunction->jsExecutable()->sourceURL(), jsFunction->jsExecutable()->firstLine(), jsFunction->jsExecutable()->startColumn());
</ins><span class="cx"> return CallIdentifier(name.isEmpty() ? ASCIILiteral(AnonymousFunction) : name, defaultSourceURL, defaultLineNumber, defaultColumnNumber);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCodeCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CodeCache.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -98,15 +98,15 @@
</span><span class="cx"> if (!rootNode)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- unsigned lineCount = rootNode->lastLine() - rootNode->lineNo();
</del><ins>+ unsigned lineCount = rootNode->lastLine() - rootNode->firstLine();
</ins><span class="cx"> unsigned startColumn = rootNode->startColumn() + 1;
</span><span class="cx"> bool endColumnIsOnStartLine = !lineCount;
</span><span class="cx"> unsigned unlinkedEndColumn = rootNode->endColumn();
</span><span class="cx"> unsigned endColumn = unlinkedEndColumn + (endColumnIsOnStartLine ? startColumn : 1);
</span><del>- executable->recordParse(rootNode->features(), rootNode->hasCapturedVariables(), rootNode->lineNo(), rootNode->lastLine(), startColumn, endColumn);
</del><ins>+ executable->recordParse(rootNode->features(), rootNode->hasCapturedVariables(), rootNode->firstLine(), rootNode->lastLine(), startColumn, endColumn);
</ins><span class="cx">
</span><span class="cx"> UnlinkedCodeBlockType* unlinkedCodeBlock = UnlinkedCodeBlockType::create(&vm, executable->executableInfo());
</span><del>- unlinkedCodeBlock->recordParse(rootNode->features(), rootNode->hasCapturedVariables(), rootNode->lineNo() - source.firstLine(), lineCount, unlinkedEndColumn);
</del><ins>+ unlinkedCodeBlock->recordParse(rootNode->features(), rootNode->hasCapturedVariables(), rootNode->firstLine() - source.firstLine(), lineCount, unlinkedEndColumn);
</ins><span class="cx">
</span><span class="cx"> auto generator = std::make_unique<BytecodeGenerator>(vm, rootNode.get(), unlinkedCodeBlock, debuggerMode, profilerMode);
</span><span class="cx"> error = generator->generate();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/runtime/Executable.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> , m_hasCapturedVariables(false)
</span><span class="cx"> , m_neverInline(false)
</span><span class="cx"> , m_didTryToEnterInLoop(false)
</span><del>- , m_overrideLineNo(-1)
</del><ins>+ , m_overrideLineNumber(-1)
</ins><span class="cx"> , m_firstLine(-1)
</span><span class="cx"> , m_lastLine(-1)
</span><span class="cx"> , m_startColumn(UINT_MAX)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> UnlinkedFunctionCodeBlock* unlinkedCodeBlock =
</span><span class="cx"> executable->m_unlinkedExecutable->codeBlockFor(
</span><span class="cx"> *vm, executable->m_source, kind, debuggerMode, profilerMode, error);
</span><del>- recordParse(executable->m_unlinkedExecutable->features(), executable->m_unlinkedExecutable->hasCapturedVariables(), lineNo(), lastLine(), startColumn(), endColumn());
</del><ins>+ recordParse(executable->m_unlinkedExecutable->features(), executable->m_unlinkedExecutable->hasCapturedVariables(), firstLine(), lastLine(), startColumn(), endColumn());
</ins><span class="cx"> if (!unlinkedCodeBlock) {
</span><span class="cx"> exception = vm->throwException(
</span><span class="cx"> globalObject->globalExec(),
</span><span class="lines">@@ -611,15 +611,15 @@
</span><span class="cx">
</span><span class="cx"> FunctionExecutable* FunctionExecutable::fromGlobalCode(
</span><span class="cx"> const Identifier& name, ExecState& exec, const SourceCode& source,
</span><del>- JSObject*& exception, int overrideLineNo)
</del><ins>+ JSObject*& exception, int overrideLineNumber)
</ins><span class="cx"> {
</span><span class="cx"> UnlinkedFunctionExecutable* unlinkedExecutable =
</span><span class="cx"> UnlinkedFunctionExecutable::fromGlobalCode(
</span><del>- name, exec, source, exception, overrideLineNo);
</del><ins>+ name, exec, source, exception, overrideLineNumber);
</ins><span class="cx"> if (!unlinkedExecutable)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return unlinkedExecutable->link(exec.vm(), source, overrideLineNo);
</del><ins>+ return unlinkedExecutable->link(exec.vm(), source, overrideLineNumber);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ExecutableBase::dump(PrintStream& out) const
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.h (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.h 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/runtime/Executable.h 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -357,10 +357,10 @@
</span><span class="cx"> const SourceCode& source() const { return m_source; }
</span><span class="cx"> intptr_t sourceID() const { return m_source.providerID(); }
</span><span class="cx"> const String& sourceURL() const { return m_source.provider()->url(); }
</span><del>- int lineNo() const { return m_firstLine; }
- void setOverrideLineNo(int overrideLineNo) { m_overrideLineNo = overrideLineNo; }
- bool hasOverrideLineNo() const { return m_overrideLineNo != -1; }
- int overrideLineNo() const { return m_overrideLineNo; }
</del><ins>+ int firstLine() const { return m_firstLine; }
+ void setOverrideLineNumber(int overrideLineNumber) { m_overrideLineNumber = overrideLineNumber; }
+ bool hasOverrideLineNumber() const { return m_overrideLineNumber != -1; }
+ int overrideLineNumber() const { return m_overrideLineNumber; }
</ins><span class="cx"> int lastLine() const { return m_lastLine; }
</span><span class="cx"> unsigned startColumn() const { return m_startColumn; }
</span><span class="cx"> unsigned endColumn() const { return m_endColumn; }
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> bool m_hasCapturedVariables;
</span><span class="cx"> bool m_neverInline;
</span><span class="cx"> bool m_didTryToEnterInLoop;
</span><del>- int m_overrideLineNo;
</del><ins>+ int m_overrideLineNumber;
</ins><span class="cx"> int m_firstLine;
</span><span class="cx"> int m_lastLine;
</span><span class="cx"> unsigned m_startColumn;
</span><span class="lines">@@ -555,7 +555,7 @@
</span><span class="cx"> }
</span><span class="cx"> static FunctionExecutable* fromGlobalCode(
</span><span class="cx"> const Identifier& name, ExecState&, const SourceCode&,
</span><del>- JSObject*& exception, int overrideLineNo);
</del><ins>+ JSObject*& exception, int overrideLineNumber);
</ins><span class="cx">
</span><span class="cx"> static void destroy(JSCell*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeFunctionConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> JSObject* constructFunctionSkippingEvalEnabledCheck(
</span><span class="cx"> ExecState* exec, JSGlobalObject* globalObject, const ArgList& args,
</span><span class="cx"> const Identifier& functionName, const String& sourceURL,
</span><del>- const TextPosition& position, int overrideLineNo)
</del><ins>+ const TextPosition& position, int overrideLineNumber)
</ins><span class="cx"> {
</span><span class="cx"> // How we stringify functions is sometimes important for web compatibility.
</span><span class="cx"> // See https://bugs.webkit.org/show_bug.cgi?id=24350.
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> SourceCode source = makeSource(program, sourceURL, position);
</span><span class="cx"> JSObject* exception = nullptr;
</span><del>- FunctionExecutable* function = FunctionExecutable::fromGlobalCode(functionName, *exec, source, exception, overrideLineNo);
</del><ins>+ FunctionExecutable* function = FunctionExecutable::fromGlobalCode(functionName, *exec, source, exception, overrideLineNumber);
</ins><span class="cx"> if (!function) {
</span><span class="cx"> ASSERT(exception);
</span><span class="cx"> return exec->vm().throwException(exec, exception);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeFunctionConstructorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/FunctionConstructor.h (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/FunctionConstructor.h 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/runtime/FunctionConstructor.h 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE JSObject* constructFunctionSkippingEvalEnabledCheck(
</span><span class="cx"> ExecState*, JSGlobalObject*, const ArgList&, const Identifier&,
</span><del>- const String&, const WTF::TextPosition&, int overrideLineNo = -1);
</del><ins>+ const String&, const WTF::TextPosition&, int overrideLineNumber = -1);
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretoolsCodeProfilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tools/CodeProfile.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tools/CodeProfile.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/tools/CodeProfile.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> void CodeProfile::report()
</span><span class="cx"> {
</span><del>- dataLogF("<CodeProfiling %s:%d>\n", m_file.data(), m_lineNo);
</del><ins>+ dataLogF("<CodeProfiling %s:%d>\n", m_file.data(), m_lineNumber);
</ins><span class="cx">
</span><span class="cx"> // How many frames of C-code to print - 0, if not verbose, 1 if verbose, up to 1024 if very verbose.
</span><span class="cx"> unsigned recursionLimit = CodeProfiling::beVeryVerbose() ? 1024 : CodeProfiling::beVerbose();
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> for (size_t i = 0 ; i < m_children.size(); ++i)
</span><span class="cx"> m_children[i]->report();
</span><span class="cx">
</span><del>- dataLogF("</CodeProfiling %s:%d>\n", m_file.data(), m_lineNo);
</del><ins>+ dataLogF("</CodeProfiling %s:%d>\n", m_file.data(), m_lineNumber);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretoolsCodeProfileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tools/CodeProfile.h (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tools/CodeProfile.h 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/JavaScriptCore/tools/CodeProfile.h 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> public:
</span><span class="cx"> CodeProfile(const SourceCode& source, CodeProfile* parent)
</span><span class="cx"> : m_file(source.provider()->url().utf8())
</span><del>- , m_lineNo(source.firstLine())
</del><ins>+ , m_lineNumber(source.firstLine())
</ins><span class="cx"> , m_parent(parent)
</span><span class="cx"> {
</span><span class="cx"> if (parent)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> CString m_file;
</span><del>- unsigned m_lineNo;
</del><ins>+ unsigned m_lineNumber;
</ins><span class="cx"> CodeProfile* m_parent;
</span><span class="cx"> Vector<std::unique_ptr<CodeProfile>> m_children;
</span><span class="cx"> TieredMMapArray<CodeRecord> m_samples;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/WebCore/ChangeLog 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-03-26 Geoffrey Garen <ggaren@apple.com>
+
+ "lineNo" does not match WebKit coding style guidelines
+ https://bugs.webkit.org/show_bug.cgi?id=143119
+
+ Reviewed by Michael Saboff.
+
+ We can afford to use whole words.
+
+ * bindings/js/JSLazyEventListener.cpp:
+ (WebCore::JSLazyEventListener::initializeJSFunction):
+ * bindings/js/JSMainThreadExecStateInstrumentation.h:
+ (WebCore::JSMainThreadExecState::instrumentFunctionCall):
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::buildObjectForEventListener):
+ * testing/Internals.cpp:
+ (WebCore::Internals::parserMetaData):
+
</ins><span class="cx"> 2015-03-26 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Apply blur effect to media control background.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSLazyEventListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSLazyEventListener.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSLazyEventListener.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/WebCore/bindings/js/JSLazyEventListener.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -106,11 +106,11 @@
</span><span class="cx">
</span><span class="cx"> // We want all errors to refer back to the line on which our attribute was
</span><span class="cx"> // declared, regardless of any newlines in our JavaScript source text.
</span><del>- int overrideLineNo = m_position.m_line.oneBasedInt();
</del><ins>+ int overrideLineNumber = m_position.m_line.oneBasedInt();
</ins><span class="cx">
</span><span class="cx"> JSObject* jsFunction = constructFunctionSkippingEvalEnabledCheck(
</span><span class="cx"> exec, exec->lexicalGlobalObject(), args, Identifier(exec, m_functionName),
</span><del>- m_sourceURL, m_position, overrideLineNo);
</del><ins>+ m_sourceURL, m_position, overrideLineNumber);
</ins><span class="cx">
</span><span class="cx"> if (exec->hadException()) {
</span><span class="cx"> reportCurrentException(exec);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMainThreadExecStateInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMainThreadExecStateInstrumentation.h (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMainThreadExecStateInstrumentation.h 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/WebCore/bindings/js/JSMainThreadExecStateInstrumentation.h 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> int lineNumber = 1;
</span><span class="cx"> if (callType == JSC::CallTypeJS) {
</span><span class="cx"> resourceName = callData.js.functionExecutable->sourceURL();
</span><del>- lineNumber = callData.js.functionExecutable->lineNo();
</del><ins>+ lineNumber = callData.js.functionExecutable->firstLine();
</ins><span class="cx"> } else
</span><span class="cx"> resourceName = "undefined";
</span><span class="cx"> return InspectorInstrumentation::willCallFunction(context, resourceName, lineNumber);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -1375,7 +1375,7 @@
</span><span class="cx"> if (auto function = JSC::jsDynamicCast<JSC::JSFunction*>(handler)) {
</span><span class="cx"> if (!function->isHostOrBuiltinFunction()) {
</span><span class="cx"> if (auto executable = function->jsExecutable()) {
</span><del>- lineNumber = executable->lineNo() - 1;
</del><ins>+ lineNumber = executable->firstLine() - 1;
</ins><span class="cx"> scriptID = executable->sourceID() == JSC::SourceProvider::nullID ? emptyString() : String::number(executable->sourceID());
</span><span class="cx"> sourceName = executable->sourceURL();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (182037 => 182038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-03-26 23:24:02 UTC (rev 182037)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-03-26 23:35:47 UTC (rev 182038)
</span><span class="lines">@@ -1346,7 +1346,7 @@
</span><span class="cx"> } else
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- unsigned startLine = executable->lineNo();
</del><ins>+ unsigned startLine = executable->firstLine();
</ins><span class="cx"> unsigned startColumn = executable->startColumn();
</span><span class="cx"> unsigned endLine = executable->lastLine();
</span><span class="cx"> unsigned endColumn = executable->endColumn();
</span></span></pre>
</div>
</div>
</body>
</html>