78231 2012-02-09 06:29:22 -0800 [chromium] always initialize makeArgs in buildChromiumNinja 2012-02-09 09:26:15 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jochen jochen webkit.review.bot oldest_to_newest 553109 0 jochen 2012-02-09 06:29:22 -0800 [chromium] always initialize makeArgs in buildChromiumNinja 553110 1 126294 jochen 2012-02-09 06:31:39 -0800 Created attachment 126294 Patch 553115 2 webkit.review.bot 2012-02-09 06:36:15 -0800 Attachment 126294 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. 553221 3 126294 webkit.review.bot 2012-02-09 09:26:11 -0800 Comment on attachment 126294 Patch Clearing flags on attachment: 126294 Committed r107255: <http://trac.webkit.org/changeset/107255> 553222 4 webkit.review.bot 2012-02-09 09:26:15 -0800 All reviewed patches have been landed. Closing bug. 126294 2012-02-09 06:31:39 -0800 2012-02-09 09:26:11 -0800 Patch bug-78231-20120209153137.patch text/plain 1187 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2OTMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGYyZDcxMzZjZDIzZDhkOGU5OWNmNGVkZDZiMDEzYmEx NDI1MDJiZS4uMTI5NmQ0NWQ1YzJhMzE2MzBjYzhkNGEyODgzYTVmMmM3NjY4ZWM4MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDEyLTAyLTA5ICBKb2NoZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgor CisgICAgICAgIFtjaHJvbWl1bV0gYWx3YXlzIGluaXRpYWxpemUgbWFrZUFyZ3MgaW4gYnVpbGRD aHJvbWl1bU5pbmphCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03ODIzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoYnVpbGRDaHJvbWl1bU5pbmph KToKKwogMjAxMi0wMi0wNyAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5j b20+CiAKICAgICAgICAgW1F0XSBQcmV2ZW50IGVhcmx5IHRlc3QgdGVybWluYXRpb24gd2l0aCBu ZXdlciBRdCA1CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggZWIyMjUyMzQ4ZTNkM2M1ZGNjYWIxODJlYWU3 YmU2NGZhMDY4Yzk0Ni4uN2Y2MDFlMTUzYjZkNmQ0NzQ0NjhiYzdjOGFjZGZjNWY0NWI3NzQ3NCAx MDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQpAQCAtMjMwOSw3ICsyMzA5LDcgQEAgc3ViIGJ1aWxkQ2hyb21pdW1O aW5qYSgkJEApCiAgICAgIyBybSAtcmYgb3V0IHJlcXVpcmVzIHJlcnVubmluZyBneXAsIHNvIGRv bid0IHN1cHBvcnQgLS1jbGVhbiBmb3Igbm93LgogICAgIG15ICgkdGFyZ2V0LCBAb3B0aW9ucykg PSBAXzsKICAgICBteSAkY29uZmlnID0gY29uZmlndXJhdGlvbigpOwotICAgIG15ICRtYWtlQXJn czsKKyAgICBteSAkbWFrZUFyZ3MgPSAiIjsKICAgICBmb3IgKEBvcHRpb25zKSB7CiAgICAgICAg ICRtYWtlQXJncyA9ICQxIGlmIC9eLS1tYWtlYXJncz0oLiopL2k7CiAgICAgfQo=