Bug 78231 – [chromium] always initialize makeArgs in buildChromiumNinja

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[chromium] always initialize makeArgs in buildChromiumNinja

Created attachment 126294 [details]
Patch

[WebKit Review Bot]

Attachment 126294 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9

Updating OpenSource
From git://git.webkit.org/WebKit
 + b14c01e...dcb55ee master     -> origin/master  (forced update)
	M	Source/WebKit2/Target.pri
	M	Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h
	M	Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp
	M	Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp
	M	Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.h
	M	Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp
	A	Source/WebKit2/UIProcess/qt/QtFlickProvider.h
	M	Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp
	M	Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h
	A	Source/WebKit2/UIProcess/qt/QtFlickProvider.cpp
	M	Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp
	M	Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.h
	M	Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
	M	Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp
	M	Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
	M	Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
	M	Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
	M	Source/WebKit2/ChangeLog
r107234 = a76f5729e1753c57578b0cbce6d1330fde968548 (refs/remotes/origin/master)
First, rewinding head to replay your work on top of it...
Applying: [Qt][WK2] WebView should use Flickable instead of QScroller to handle positioning
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging Source/WebKit2/ChangeLog
CONFLICT (content): Merge conflict in Source/WebKit2/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 [Qt][WK2] WebView should use Flickable instead of QScroller to handle positioning

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/origin/master: command returned error: 1

Died at Tools/Scripts/update-webkit line 164.


If any of these errors are false positives, please file a bug against check-webkit-style.

[WebKit Review Bot]

Comment on attachment 126294 [details]
Patch

Clearing flags on attachment: 126294

Committed r107255: <http://trac.webkit.org/changeset/107255>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.