Bug 78231 - [chromium] always initialize makeArgs in buildChromiumNinja
Summary: [chromium] always initialize makeArgs in buildChromiumNinja
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: jochen
Depends on:
Reported: 2012-02-09 06:29 PST by jochen
Modified: 2012-02-09 09:26 PST (History)
1 user (show)

See Also:

Patch (1.16 KB, patch)
2012-02-09 06:31 PST, jochen
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description jochen 2012-02-09 06:29:22 PST
[chromium] always initialize makeArgs in buildChromiumNinja
Comment 1 jochen 2012-02-09 06:31:39 PST
Created attachment 126294 [details]
Comment 2 WebKit Review Bot 2012-02-09 06:36:15 PST
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.
Comment 3 WebKit Review Bot 2012-02-09 09:26:11 PST
Comment on attachment 126294 [details]

Clearing flags on attachment: 126294

Committed r107255: <http://trac.webkit.org/changeset/107255>
Comment 4 WebKit Review Bot 2012-02-09 09:26:15 PST
All reviewed patches have been landed.  Closing bug.