Source/WebCore/bindings/js/ScriptDebugServer.cpp - Issue 6537003: Merge 78648 - 2011-02-15 James Robinson <jamesr@chromium.org>...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/bindings/js/ScriptDebugServer.cpp

Issue 6537003: Merge 78648 - 2011-02-15 James Robinson <jamesr@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/

Patch Set: Created 9 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Source/WebCore/bindings/js/ScriptDebugServer.cpp

===================================================================

--- Source/WebCore/bindings/js/ScriptDebugServer.cpp (revision 78732)

+++ Source/WebCore/bindings/js/ScriptDebugServer.cpp (working copy)

@@ -417,10 +417,13 @@

frame->script()->setPaused(paused);

Document* document = frame->document();

- if (paused)

+ if (paused) {

+ document->suspendScriptedAnimationControllerCallbacks();

document->suspendActiveDOMObjects(ActiveDOMObject::JavaScriptDebuggerPaused);

- else

+ } else {

document->resumeActiveDOMObjects();

+ document->resumeScriptedAnimationControllerCallbacks();

+ }

setJavaScriptPaused(frame->view(), paused);

}

« no previous file with comments | « Source/WebCore/WebCore.gypi ('k') | Source/WebCore/dom/Document.h » ('j') | no next file with comments »