third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp - Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

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: third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)

Patch Set: More fixes - things build fine at this point. Created 3 years, 8 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

« no previous file with comments | « third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp ('k') | third_party/WebKit/Source/modules/filesystem/SyncCallbackHelper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp

diff --git a/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp b/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp

index 60a74eb192e6e0aed28debacee42f21cbbd664dc..e81e319aebbb8d260e7e66007dd07acf3ca1b4bd 100644

--- a/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp

+++ b/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp

@@ -107,9 +107,13 @@ void FileSystemCallbacksBase::handleEventOrScheduleCallback(CB* callback,

if (shouldScheduleCallback()) {

DOMFileSystem::scheduleCallback(

m_executionContext.get(),

+ /* DO NOT MERGE - merge conflict marker.

+ * Please spell |handleEvent| below. */

WTF::bind(&CB::handleEvent, wrapPersistent(callback),

wrapPersistent(arg)));

} else {

+ /* DO NOT MERGE - merge conflict marker.

+ * Please spell |handleEvent| below. */

callback->handleEvent(arg);

}

@@ -123,8 +127,12 @@ void FileSystemCallbacksBase::handleEventOrScheduleCallback(CB* callback) {

if (shouldScheduleCallback()) {

DOMFileSystem::scheduleCallback(

m_executionContext.get(),

+ /* DO NOT MERGE - merge conflict marker.

+ * Please spell |handleEvent| below. */

WTF::bind(&CB::handleEvent, wrapPersistent(callback)));

} else {

+ /* DO NOT MERGE - merge conflict marker.

+ * Please spell |handleEvent| below. */

callback->handleEvent();

}