Source/WebCore/editing/CompositeEditCommand.cpp - Issue 12286016: Merge 142642

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/editing/CompositeEditCommand.cpp

Issue 12286016: Merge 142642 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Patch Set: Created 7 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:

Index: Source/WebCore/editing/CompositeEditCommand.cpp

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

--- Source/WebCore/editing/CompositeEditCommand.cpp (revision 143077)

+++ Source/WebCore/editing/CompositeEditCommand.cpp (working copy)

@@ -93,7 +93,7 @@

void EditCommandComposition::unapply()

{

ASSERT(m_document);

- Frame* frame = m_document->frame();

+ RefPtr<Frame> frame = m_document->frame();

ASSERT(frame);

// Changes to the document may have been made since the last editing operation that require a layout, as in <rdar://problem/5658603>.

@@ -114,7 +114,7 @@

void EditCommandComposition::reapply()

{

ASSERT(m_document);

- Frame* frame = m_document->frame();

+ RefPtr<Frame> frame = m_document->frame();

ASSERT(frame);

// Changes to the document may have been made since the last editing operation that require a layout, as in <rdar://problem/5658603>.

« no previous file with comments | « no previous file | no next file » | no next file with comments »