49462 2010-11-12 11:36:51 -0800 Code dependency with INSPECTOR cause build break for android 2010-11-14 11:02:37 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Android Linux RESOLVED DUPLICATE 49500 P2 Normal --- 0 webkittenghui webkit-unassigned benm commit-queue jorlow kling steveblock webkittenghui oldest_to_newest 308669 0 webkittenghui 2010-11-12 11:36:51 -0800 When trying to build code from webkit version 71558 for android, some of the common code began to use OwnPtr<ScriptCallBack>. This leads to the dependency on InspectorObject and InspectorArray which is INSPECTOR specific code. 308732 1 webkittenghui 2010-11-12 13:25:59 -0800 BTW, I already have the fix ready , just need to run more tests before submitting the change. 308816 2 73785 webkittenghui 2010-11-12 15:55:22 -0800 Created attachment 73785 proposed patch 308833 3 73785 kling 2010-11-12 16:32:58 -0800 Comment on attachment 73785 proposed patch Needs a ChangeLog entry. See http://webkit.org/coding/contributing.html for more information. 308834 4 73790 webkittenghui 2010-11-12 16:33:38 -0800 Created attachment 73790 proposed patch, same as previous one, but better formatted patch file The change is essentially the same as previous attached patch, but the myInspectorPatch.txt is added with bug info and change description etc. 308845 5 73790 kling 2010-11-12 16:54:04 -0800 Comment on attachment 73790 proposed patch, same as previous one, but better formatted patch file LGTM. 308850 6 73790 commit-queue 2010-11-12 16:56:47 -0800 Comment on attachment 73790 proposed patch, same as previous one, but better formatted patch file Rejecting patch 73790 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=abarth-cq-sl', 'apply-attachment', '--force-clean', '--non-interactive', 73790]" exit_code: 2 Last 500 characters of output: 62. Failed to run "[u'/Users/abarth/git/webkit-queue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Andreas Kling', u'--force']" exit_code: 2 Parsed 3 diffs from patch file(s). patching file WebCore/ChangeLog patch: **** unexpected end of file in patch patching file WebCore/inspector/ScriptCallFrame.cpp patching file WebCore/inspector/ScriptCallStack.cpp Failed to run "[u'/Users/abarth/git/webkit-queue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Andreas Kling', u'--force']" exit_code: 2 Full output: http://queues.webkit.org/results/5902001 308862 7 webkittenghui 2010-11-12 17:14:39 -0800 Thanks Andreas for taking a look here. I am not sure what exactly the error info from commit-bot mean. And I can build everything locally without any trouble. Any suggestions? Thanks! 309087 8 kling 2010-11-14 11:02:37 -0800 This was fixed by someone else in <http://trac.webkit.org/changeset/71981>, closing. Next time please upload undoctored patches so commit-queue won't choke :-) *** This bug has been marked as a duplicate of bug 49500 *** 73785 2010-11-12 15:55:22 -0800 2010-11-12 16:32:58 -0800 proposed patch myInspectorPatch.txt text/plain 1326 webkittenghui SW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdENhbGxGcmFtZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9pbnNwZWN0b3IvU2NyaXB0Q2FsbEZyYW1lLmNwcAkocmV2aXNpb24gNzE5Mzcp CisrKyBXZWJDb3JlL2luc3BlY3Rvci9TY3JpcHRDYWxsRnJhbWUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC01NCw2ICs1NCw3IEBAIGJvb2wgU2NyaXB0Q2FsbEZyYW1lOjppc0VxdWFsKGNvbnN0IFNj cmkKICAgICAgICAgJiYgbV9saW5lTnVtYmVyID09IG8ubV9saW5lTnVtYmVyOwogfQogCisjaWYg RU5BQkxFKElOU1BFQ1RPUikKIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBTY3JpcHRDYWxs RnJhbWU6OmJ1aWxkSW5zcGVjdG9yT2JqZWN0KCkgY29uc3QKIHsKICAgICBSZWZQdHI8SW5zcGVj dG9yT2JqZWN0PiBmcmFtZSA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7CkBAIC02Miw1ICs2 Myw2IEBAIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBTY3JpcHRDYWxsRnIKICAgICBmcmFt ZS0+c2V0TnVtYmVyKCJsaW5lTnVtYmVyIiwgbV9saW5lTnVtYmVyKTsKICAgICByZXR1cm4gZnJh bWU7CiB9CisjZW5kaWYKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9p bnNwZWN0b3IvU2NyaXB0Q2FsbFN0YWNrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3Bl Y3Rvci9TY3JpcHRDYWxsU3RhY2suY3BwCShyZXZpc2lvbiA3MTkzNykKKysrIFdlYkNvcmUvaW5z cGVjdG9yL1NjcmlwdENhbGxTdGFjay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyLDYgKzcyLDcg QEAgYm9vbCBTY3JpcHRDYWxsU3RhY2s6OmlzRXF1YWwoU2NyaXB0Q2FsbAogICAgIHJldHVybiB0 cnVlOwogfQogCisjaWYgRU5BQkxFKElOU1BFQ1RPUikKIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJy YXk+IFNjcmlwdENhbGxTdGFjazo6YnVpbGRJbnNwZWN0b3JPYmplY3QoKSBjb25zdAogewogICAg IFJlZlB0cjxJbnNwZWN0b3JBcnJheT4gZnJhbWVzID0gSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgp OwpAQCAtNzksNSArODAsNiBAQCBQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5PiBTY3JpcHRDYWxs U3RhCiAgICAgICAgIGZyYW1lcy0+cHVzaE9iamVjdChtX2ZyYW1lcy5hdChpKS5idWlsZEluc3Bl Y3Rvck9iamVjdCgpKTsKICAgICByZXR1cm4gZnJhbWVzOwogfQorI2VuZGlmCiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUK 73790 2010-11-12 16:33:38 -0800 2010-11-12 16:56:47 -0800 proposed patch, same as previous one, but better formatted patch file myInspectorPatch.txt text/plain 2082 webkittenghui SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MTk1NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNzUgQEAKKzIwMTAtMTEtMTIgIFRlbmdodWkgWmh1ICA8enRlbmdodWlAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD b2RlIGRlcGVuZGVuY3kgd2l0aCBJTlNQRUNUT1IgY2F1c2UgYnVpbGQgYnJlYWsgZm9yIGFuZHJv aWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5NDYy CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAKKworICAgICAgICAqIGluc3BlY3Rvci9TY3JpcHRD YWxsRnJhbWUuY3BwOgorICAgICAgICAgIGFkZCAjaWYgdG8gc2VwYXJhdGUgdGhlIElOU1BFQ1RP UiBjb2RlIG91dCBmcm9tIHRoZSBjb21tb24gY29kZS4KKyAgICAgICAgKiBpbnNwZWN0b3IvU2Ny aXB0Q2FsbFN0YWNrLmNwcDoKKyAgICAgICAgICBhZGQgI2lmIHRvIHNlcGFyYXRlIHRoZSBJTlNQ RUNUT1IgY29kZSBvdXQgZnJvbSB0aGUgY29tbW9uIGNvZGUuCisKIDIwMTAtMTEtMTIgIEphbWVz IFNpbW9uc2VuICA8c2ltb25qYW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERhcmluIEZpc2hlci4KSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdENhbGxGcmFtZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvU2NyaXB0Q2FsbEZyYW1lLmNwcAko cmV2aXNpb24gNzE5MzcpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9TY3JpcHRDYWxsRnJhbWUuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC01NCw2ICs1NCw3IEBAIGJvb2wgU2NyaXB0Q2FsbEZyYW1lOjpp c0VxdWFsKGNvbnN0IFNjcmkKICAgICAgICAgJiYgbV9saW5lTnVtYmVyID09IG8ubV9saW5lTnVt YmVyOwogfQogCisjaWYgRU5BQkxFKElOU1BFQ1RPUikKIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2Jq ZWN0PiBTY3JpcHRDYWxsRnJhbWU6OmJ1aWxkSW5zcGVjdG9yT2JqZWN0KCkgY29uc3QKIHsKICAg ICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBmcmFtZSA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRl KCk7CkBAIC02Miw1ICs2Myw2IEBAIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBTY3JpcHRD YWxsRnIKICAgICBmcmFtZS0+c2V0TnVtYmVyKCJsaW5lTnVtYmVyIiwgbV9saW5lTnVtYmVyKTsK ICAgICByZXR1cm4gZnJhbWU7CiB9CisjZW5kaWYKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJ bmRleDogV2ViQ29yZS9pbnNwZWN0b3IvU2NyaXB0Q2FsbFN0YWNrLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2luc3BlY3Rvci9TY3JpcHRDYWxsU3RhY2suY3BwCShyZXZpc2lvbiA3MTkzNykK KysrIFdlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdENhbGxTdGFjay5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTcyLDYgKzcyLDcgQEAgYm9vbCBTY3JpcHRDYWxsU3RhY2s6OmlzRXF1YWwoU2NyaXB0Q2Fs bAogICAgIHJldHVybiB0cnVlOwogfQogCisjaWYgRU5BQkxFKElOU1BFQ1RPUikKIFBhc3NSZWZQ dHI8SW5zcGVjdG9yQXJyYXk+IFNjcmlwdENhbGxTdGFjazo6YnVpbGRJbnNwZWN0b3JPYmplY3Qo KSBjb25zdAogewogICAgIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4gZnJhbWVzID0gSW5zcGVjdG9y QXJyYXk6OmNyZWF0ZSgpOwpAQCAtNzksNSArODAsNiBAQCBQYXNzUmVmUHRyPEluc3BlY3RvckFy cmF5PiBTY3JpcHRDYWxsU3RhCiAgICAgICAgIGZyYW1lcy0+cHVzaE9iamVjdChtX2ZyYW1lcy5h dChpKS5idWlsZEluc3BlY3Rvck9iamVjdCgpKTsKICAgICByZXR1cm4gZnJhbWVzOwogfQorI2Vu ZGlmCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK