Title: [152242] branches/safari-537-branch
- Revision
- 152242
- Author
- [email protected]
- Date
- 2013-07-01 13:30:21 -0700 (Mon, 01 Jul 2013)
Log Message
Merged r152091. <rdar://problem/12679475>
Modified Paths
Diff
Modified: branches/safari-537-branch/LayoutTests/ChangeLog (152241 => 152242)
--- branches/safari-537-branch/LayoutTests/ChangeLog 2013-07-01 20:07:24 UTC (rev 152241)
+++ branches/safari-537-branch/LayoutTests/ChangeLog 2013-07-01 20:30:21 UTC (rev 152242)
@@ -1,3 +1,17 @@
+2013-07-01 Lucas Forschler <[email protected]>
+
+ Merge r152091
+
+ 2013-06-27 Timothy Hatcher <[email protected]>
+
+ Notify the debugger about functions created from source code via new Function() or WebCore::JSLazyEventListener.
+
+ https://bugs.webkit.org/show_bug.cgi?id=118063
+
+ Reviewed by Geoffrey Garen.
+
+ * inspector/debugger/debugger-script-preprocessor-expected.txt: Updated.
+
2013-06-28 Jessie Berlin <[email protected]>
Merge r151942
Modified: branches/safari-537-branch/LayoutTests/inspector/debugger/debugger-script-preprocessor-expected.txt (152241 => 152242)
--- branches/safari-537-branch/LayoutTests/inspector/debugger/debugger-script-preprocessor-expected.txt 2013-07-01 20:07:24 UTC (rev 152241)
+++ branches/safari-537-branch/LayoutTests/inspector/debugger/debugger-script-preprocessor-expected.txt 2013-07-01 20:30:21 UTC (rev 152242)
@@ -5,6 +5,7 @@
inspector-test.js
debugger-test.js
debugger-script-preprocessor.html
+debugger-script-preprocessor.html
Page reloaded.
Modified: branches/safari-537-branch/Source/_javascript_Core/ChangeLog (152241 => 152242)
--- branches/safari-537-branch/Source/_javascript_Core/ChangeLog 2013-07-01 20:07:24 UTC (rev 152241)
+++ branches/safari-537-branch/Source/_javascript_Core/ChangeLog 2013-07-01 20:30:21 UTC (rev 152242)
@@ -1,5 +1,20 @@
2013-07-01 Lucas Forschler <[email protected]>
+ Merge r152091
+
+ 2013-06-27 Timothy Hatcher <[email protected]>
+
+ Notify the debugger about functions created from source code via new Function() or WebCore::JSLazyEventListener.
+
+ https://bugs.webkit.org/show_bug.cgi?id=118063
+
+ Reviewed by Geoffrey Garen.
+
+ * bytecode/UnlinkedCodeBlock.cpp:
+ (JSC::UnlinkedFunctionExecutable::fromGlobalCode): Call Debugger::sourceParsed.
+
+2013-07-01 Lucas Forschler <[email protected]>
+
Merge r151978
2013-06-25 Ryosuke Niwa <[email protected]>
Modified: branches/safari-537-branch/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp (152241 => 152242)
--- branches/safari-537-branch/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp 2013-07-01 20:07:24 UTC (rev 152241)
+++ branches/safari-537-branch/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp 2013-07-01 20:30:21 UTC (rev 152242)
@@ -131,6 +131,10 @@
ParserError error;
CodeCache* codeCache = exec->vm().codeCache();
UnlinkedFunctionExecutable* executable = codeCache->getFunctionExecutableFromGlobalCode(exec->vm(), name, source, error);
+
+ if (exec->lexicalGlobalObject()->hasDebugger())
+ exec->lexicalGlobalObject()->debugger()->sourceParsed(exec, source.provider(), error.m_line, error.m_message);
+
if (error.m_type != ParserError::ErrorNone) {
*exception = error.toErrorObject(exec->lexicalGlobalObject(), source);
return 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
