69997 2011-10-12 21:41:57 -0700 [Chromium] Reduce dependencies of ImageDiff to compile it for Android. 2011-12-01 22:18:30 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Android Android RESOLVED FIXED P2 Normal --- 66687 73623 0 zhenghao webkit-unassigned dglazkov tony webkit.review.bot oldest_to_newest 482995 0 zhenghao 2011-10-12 21:41:57 -0700 Make ImageDiff depend on webkit_support_gfx only. Build it as toolsets:host for Android. This change is required to make ImageDiff for Android, and can benefit other platforms, too. On Android, most targets are built as toolsets:target. while ImageDiff needs to be built as toolsets:host. Currently, building the standalone target of ImageDiff depends on about 85 other targets (try make ImageDiff'), which is inefficient. After the change, ImageDiff only depends on webkit_support_gfx, which in turn depends on libpng and zlib. Related to chromium change: http://codereview.chromium.org/8226018/ 485783 1 111376 zhenghao 2011-10-17 21:32:42 -0700 Created attachment 111376 Proposed patch. 486098 2 111376 webkit.review.bot 2011-10-18 09:36:06 -0700 Comment on attachment 111376 Proposed patch. Rejecting attachment 111376 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: iff] Error 1 make: *** Waiting for unfinished jobs.... Failed to run "['Tools/Scripts/build-webkit', '--debug', '--chromium', '--update-chromium']" exit_code: 2 target/ImageDiff/Tools/DumpRenderTree/chromium/ImageDiff.o: in function Image::setPixelAt(int, int, unsigned int) const:Tools/DumpRenderTree/chromium/ImageDiff.cpp:153: error: undefined reference to 'WTFReportBacktrace' collect2: ld returned 1 exit status make: *** [out/Debug/ImageDiff] Error 1 make: *** Waiting for unfinished jobs.... Full output: http://queues.webkit.org/results/10124291 486534 3 111557 zhenghao 2011-10-18 20:47:37 -0700 Created attachment 111557 Proposed patch 2. Sorry, I didn't try Debug build. Now I completely removed code dependent on JavaScriptCore. 486535 4 111558 zhenghao 2011-10-18 20:49:40 -0700 Created attachment 111558 Proposed patch 3. 486536 5 webkit.review.bot 2011-10-18 20:51:33 -0700 Attachment 111557 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Tools/DumpRenderTree/chromium/ImageDiff.cpp:43: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 486537 6 111558 webkit.review.bot 2011-10-18 20:55:30 -0700 Comment on attachment 111558 Proposed patch 3. Attachment 111558 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10142236 486632 7 111580 zhenghao 2011-10-19 02:08:05 -0700 Created attachment 111580 Proposed patch 4. 486856 8 111580 tony 2011-10-19 09:52:40 -0700 Comment on attachment 111580 Proposed patch 4. View in context: https://bugs.webkit.org/attachment.cgi?id=111580&action=review I think we should just depend on wtf because it's pretty small. Or are you trying to avoid having host and target in JavaScriptCore.gyp? > Tools/DumpRenderTree/chromium/ImageDiff.cpp:51 > +#include <limits.h> I would just include this on all platforms if a single platform needs it. 487242 9 111711 zhenghao 2011-10-19 19:46:03 -0700 Created attachment 111711 Proposed patch 5. 487246 10 zhenghao 2011-10-19 19:48:12 -0700 (In reply to comment #8) > (From update of attachment 111580 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=111580&action=review > > I think we should just depend on wtf because it's pretty small. Or are you trying to avoid having host and target in JavaScriptCore.gyp? No, it's because wtf would depend on icu, which in turn would depend on others... > > > Tools/DumpRenderTree/chromium/ImageDiff.cpp:51 > > +#include <limits.h> > > I would just include this on all platforms if a single platform needs it. Done. 487702 11 111711 webkit.review.bot 2011-10-20 10:45:29 -0700 Comment on attachment 111711 Proposed patch 5. Clearing flags on attachment: 111711 Committed r97998: <http://trac.webkit.org/changeset/97998> 487703 12 webkit.review.bot 2011-10-20 10:45:35 -0700 All reviewed patches have been landed. Closing bug. 111376 2011-10-17 21:32:42 -0700 2011-10-18 20:47:37 -0700 Proposed patch. patch text/plain 5235 zhenghao ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggN2YzZTY1YS4uZDZhZTEyOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0xMC0xNyAgSGFvIFpoZW5n ICA8emhlbmdoYW9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gUmVkdWNlIGRl cGVuZGVuY2llcyBvZiBJbWFnZURpZmYgdG8gY29tcGlsZSBpdCBmb3IgQW5kcm9pZC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5OTk3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgaXMg cmVxdWlyZWQgdG8gbWFrZSBJbWFnZURpZmYgZm9yIEFuZHJvaWQsIGFuZCBjYW4gYmVuZWZpdAor ICAgICAgICBvdGhlciBwbGF0Zm9ybXMsIHRvby4gT24gQW5kcm9pZCwgbW9zdCB0YXJnZXRzIGFy ZSBidWlsdCBhcworICAgICAgICB0b29sc2V0czp0YXJnZXQuIHdoaWxlIEltYWdlRGlmZiBuZWVk cyB0byBiZSBidWlsdCBhcyB0b29sc2V0czpob3N0LgorICAgICAgICBDdXJyZW50bHksIGJ1aWxk aW5nIHRoZSBzdGFuZGFsb25lIHRhcmdldCBvZiBJbWFnZURpZmYgZGVwZW5kcyBvbiBhYm91dAor ICAgICAgICA4NSBvdGhlciB0YXJnZXRzICh0cnkgIG1ha2UgSW1hZ2VEaWZmJyksIHdoaWNoIGlz IGluZWZmaWNpZW50LiBBZnRlciB0aGUKKyAgICAgICAgY2hhbmdlLCBJbWFnZURpZmYgb25seSBk ZXBlbmRzIG9uIHdlYmtpdF9zdXBwb3J0X2dmeCwgd2hpY2ggaW4gdHVybgorICAgICAgICBkZXBl bmRzIG9uIGxpYnBuZyBhbmQgemxpYi4KKworICAgICAgICAqIFdlYktpdC5neXA6CisKIDIwMTEt MTAtMTcgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQuICBSb2xsZWQgREVQUy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vV2ViS2l0Lmd5cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApp bmRleCAzZjQ2YTI0Li5kNjUwZGRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L1dlYktpdC5neXAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCkBAIC0x MDI4LDkgKzEwMjgsNyBAQAogICAgICAgICAgICAgJ3RhcmdldF9uYW1lJzogJ0ltYWdlRGlmZics CiAgICAgICAgICAgICAndHlwZSc6ICdleGVjdXRhYmxlJywKICAgICAgICAgICAgICdkZXBlbmRl bmNpZXMnOiBbCi0gICAgICAgICAgICAgICAgJ3dlYmtpdCcsCi0gICAgICAgICAgICAgICAgJy4u Ly4uL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmd5cC9KYXZhU2NyaXB0Q29yZS5neXA6 d3RmJywKLSAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS93ZWJraXQvc3VwcG9y dC93ZWJraXRfc3VwcG9ydC5neXA6d2Via2l0X3N1cHBvcnQnLAorICAgICAgICAgICAgICAgICc8 KGNocm9taXVtX3NyY19kaXIpL3dlYmtpdC9zdXBwb3J0L3dlYmtpdF9zdXBwb3J0Lmd5cDp3ZWJr aXRfc3VwcG9ydF9nZngnLAogICAgICAgICAgICAgXSwKICAgICAgICAgICAgICdpbmNsdWRlX2Rp cnMnOiBbCiAgICAgICAgICAgICAgICAgJy4uLy4uL0phdmFTY3JpcHRDb3JlJywKQEAgLTEwMzks MTMgKzEwMzcsMTcgQEAKICAgICAgICAgICAgICdzb3VyY2VzJzogWwogICAgICAgICAgICAgICAg ICcuLi8uLi8uLi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9JbWFnZURpZmYuY3BwJywK ICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAnY29uZGl0aW9ucyc6IFsKKyAgICAgICAgICAg ICAgICBbJ09TPT0iYW5kcm9pZCInLCB7CisgICAgICAgICAgICAgICAgICAgICd0b29sc2V0cyc6 IFsnaG9zdCddLAorICAgICAgICAgICAgICAgIH1dLAorICAgICAgICAgICAgXSwKICAgICAgICAg fSwKICAgICAgICAgewogICAgICAgICAgICAgJ3RhcmdldF9uYW1lJzogJ0R1bXBSZW5kZXJUcmVl JywKICAgICAgICAgICAgICd0eXBlJzogJ2V4ZWN1dGFibGUnLAogICAgICAgICAgICAgJ21hY19i dW5kbGUnOiAxLAogICAgICAgICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKLSAgICAgICAgICAgICAg ICAnSW1hZ2VEaWZmJywKICAgICAgICAgICAgICAgICAnaW5zcGVjdG9yX3Jlc291cmNlcycsCiAg ICAgICAgICAgICAgICAgJ3dlYmtpdCcsCiAgICAgICAgICAgICAgICAgJy4uLy4uL0phdmFTY3Jp cHRDb3JlL0phdmFTY3JpcHRDb3JlLmd5cC9KYXZhU2NyaXB0Q29yZS5neXA6d3RmX2NvbmZpZycs CkBAIC0xMTk0LDExICsxMTk2LDE2IEBACiAgICAgICAgICAgICAgICAgICAgICAgICBbJ2V4Y2x1 ZGUnLCAnR3RrXFwuY3BwJCddCiAgICAgICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgICAg ICB9XSwKLSAgICAgICAgICAgICAgICBbJ09TIT0iYW5kcm9pZCInLCB7CisgICAgICAgICAgICAg ICAgWydPUz09ImFuZHJvaWQiJywgeworICAgICAgICAgICAgICAgICAgICAnZGVwZW5kZW5jaWVz JzogWworICAgICAgICAgICAgICAgICAgICAgICAgJ0ltYWdlRGlmZiNob3N0JywKKyAgICAgICAg ICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICB9LHsgIyBPUyE9ImFuZHJvaWQiCiAgICAg ICAgICAgICAgICAgICAgICdzb3VyY2VzLyc6IFsKICAgICAgICAgICAgICAgICAgICAgICAgIFsn ZXhjbHVkZScsICcoQW5kcm9pZClcXC5jcHAkJ10KICAgICAgICAgICAgICAgICAgICAgXSwKICAg ICAgICAgICAgICAgICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKKyAgICAgICAgICAgICAgICAgICAg ICAgICdJbWFnZURpZmYnLAogICAgICAgICAgICAgICAgICAgICAgICAgJ2NvcHlfVGVzdE5ldHNj YXBlUGx1Z0luJywKICAgICAgICAgICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIp L3RoaXJkX3BhcnR5L21lc2EvbWVzYS5neXA6b3NtZXNhJywKICAgICAgICAgICAgICAgICAgICAg XSwKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBh ZmU4ODg5Li45ZTQwMDBkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMTAtMTcgIEhhbyBaaGVuZyAgPHpoZW5n aGFvQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlZHVjZSBkZXBlbmRlbmNp ZXMgb2YgSW1hZ2VEaWZmIHRvIGNvbXBpbGUgaXQgZm9yIEFuZHJvaWQuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTk5NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGlzIHJlcXVpcmVk IHRvIG1ha2UgSW1hZ2VEaWZmIGZvciBBbmRyb2lkLCBhbmQgY2FuIGJlbmVmaXQKKyAgICAgICAg b3RoZXIgcGxhdGZvcm1zLCB0b28uIE9uIEFuZHJvaWQsIG1vc3QgdGFyZ2V0cyBhcmUgYnVpbHQg YXMKKyAgICAgICAgdG9vbHNldHM6dGFyZ2V0LiB3aGlsZSBJbWFnZURpZmYgbmVlZHMgdG8gYmUg YnVpbHQgYXMgdG9vbHNldHM6aG9zdC4KKyAgICAgICAgQ3VycmVudGx5LCBidWlsZGluZyB0aGUg c3RhbmRhbG9uZSB0YXJnZXQgb2YgSW1hZ2VEaWZmIGRlcGVuZHMgb24gYWJvdXQKKyAgICAgICAg ODUgb3RoZXIgdGFyZ2V0cyAodHJ5ICBtYWtlIEltYWdlRGlmZicpLCB3aGljaCBpcyBpbmVmZmlj aWVudC4gQWZ0ZXIgdGhlCisgICAgICAgIGNoYW5nZSwgSW1hZ2VEaWZmIG9ubHkgZGVwZW5kcyBv biB3ZWJraXRfc3VwcG9ydF9nZngsIHdoaWNoIGluIHR1cm4KKyAgICAgICAgZGVwZW5kcyBvbiBs aWJwbmcgYW5kIHpsaWIuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9JbWFn ZURpZmYuY3BwOgorICAgICAgICAobWFpbik6CisKIDIwMTEtMTAtMTcgIFJhcGhhZWwgS3VibyBk YSBDb3N0YSAgPGt1Ym9AcHJvZnVzaW9uLm1vYmk+CiAKICAgICAgICAgW0VGTF0gRFJUOiBNYWtl IG5vbi1yZWNvZ25pemVkIGtleXMgd29yayBpbiBldmVudHMgYXMgd2VsbC4KZGlmZiAtLWdpdCBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0ltYWdlRGlmZi5jcHAgYi9Ub29scy9EdW1w UmVuZGVyVHJlZS9jaHJvbWl1bS9JbWFnZURpZmYuY3BwCmluZGV4IGMzMGRkNTAuLjc1NjEwMDIg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0ltYWdlRGlmZi5jcHAK KysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vSW1hZ2VEaWZmLmNwcApAQCAtNDMs MTEgKzQzLDEyIEBACiAjaW5jbHVkZSA8c3RyaW5nLmg+CiAjaW5jbHVkZSA8dmVjdG9yPgogI2lu Y2x1ZGUgPHd0Zi9Pd25BcnJheVB0ci5oPgotI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAogI2lm IE9TKFdJTkRPV1MpCiAjaW5jbHVkZSA8d2luZG93cy5oPgogI2RlZmluZSBQQVRIX01BWCBNQVhf UEFUSAorI2Vsc2UKKyNpbmNsdWRlIDxsaW1pdHMuaD4KICNlbmRpZgogCiB1c2luZyBuYW1lc3Bh Y2Ugc3RkOwpAQCAtNDQ5LDcgKzQ1MCw3IEBAIGludCBkaWZmSW1hZ2VzKGNvbnN0IGNoYXIqIGZp bGUxLCBjb25zdCBjaGFyKiBmaWxlMiwgY29uc3QgY2hhciogb3V0RmlsZSwKIAogaW50IG1haW4o aW50IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKIHsKLSAgICBWZWN0b3I8Y29uc3QgY2hhcio+ IHZhbHVlczsKKyAgICBzdGQ6OnZlY3Rvcjxjb25zdCBjaGFyKj4gdmFsdWVzOwogICAgIGJvb2wg cG9sbFN0ZGluID0gZmFsc2U7CiAgICAgYm9vbCBnZW5lcmF0ZURpZmYgPSBmYWxzZTsKICAgICBi b29sIHNob3VsZFdyaXRlUGVyY2VudGFnZXMgPSBmYWxzZTsKQEAgLTQ2NCw3ICs0NjUsNyBAQCBp bnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltdKQogICAgICAgICBlbHNlIGlmICgh c3RyY21wKGFyZ3ZbaV0sIG9wdGlvbldlaWdodGVkSW50ZW5zaXR5KSkKICAgICAgICAgICAgIGNv bXBhcmF0b3IgPSB3ZWlnaHRlZFBlcmNlbnRhZ2VEaWZmZXJlbnQ7CiAgICAgICAgIGVsc2UKLSAg ICAgICAgICAgIHZhbHVlcy5hcHBlbmQoYXJndltpXSk7CisgICAgICAgICAgICB2YWx1ZXMucHVz aF9iYWNrKGFyZ3ZbaV0pOwogICAgIH0KIAogICAgIGlmIChwb2xsU3RkaW4pIHsK 111557 2011-10-18 20:47:37 -0700 2011-10-18 20:49:40 -0700 Proposed patch 2. patch text/plain 6470 zhenghao ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggN2YzZTY1YS4uZDZhZTEyOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0xMC0xNyAgSGFvIFpoZW5n ICA8emhlbmdoYW9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gUmVkdWNlIGRl cGVuZGVuY2llcyBvZiBJbWFnZURpZmYgdG8gY29tcGlsZSBpdCBmb3IgQW5kcm9pZC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5OTk3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgaXMg cmVxdWlyZWQgdG8gbWFrZSBJbWFnZURpZmYgZm9yIEFuZHJvaWQsIGFuZCBjYW4gYmVuZWZpdAor ICAgICAgICBvdGhlciBwbGF0Zm9ybXMsIHRvby4gT24gQW5kcm9pZCwgbW9zdCB0YXJnZXRzIGFy ZSBidWlsdCBhcworICAgICAgICB0b29sc2V0czp0YXJnZXQuIHdoaWxlIEltYWdlRGlmZiBuZWVk cyB0byBiZSBidWlsdCBhcyB0b29sc2V0czpob3N0LgorICAgICAgICBDdXJyZW50bHksIGJ1aWxk aW5nIHRoZSBzdGFuZGFsb25lIHRhcmdldCBvZiBJbWFnZURpZmYgZGVwZW5kcyBvbiBhYm91dAor ICAgICAgICA4NSBvdGhlciB0YXJnZXRzICh0cnkgIG1ha2UgSW1hZ2VEaWZmJyksIHdoaWNoIGlz IGluZWZmaWNpZW50LiBBZnRlciB0aGUKKyAgICAgICAgY2hhbmdlLCBJbWFnZURpZmYgb25seSBk ZXBlbmRzIG9uIHdlYmtpdF9zdXBwb3J0X2dmeCwgd2hpY2ggaW4gdHVybgorICAgICAgICBkZXBl bmRzIG9uIGxpYnBuZyBhbmQgemxpYi4KKworICAgICAgICAqIFdlYktpdC5neXA6CisKIDIwMTEt MTAtMTcgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQuICBSb2xsZWQgREVQUy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vV2ViS2l0Lmd5cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApp bmRleCAzZjQ2YTI0Li42MzMwYzJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L1dlYktpdC5neXAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCkBAIC0x MDI4LDI0ICsxMDI4LDI1IEBACiAgICAgICAgICAgICAndGFyZ2V0X25hbWUnOiAnSW1hZ2VEaWZm JywKICAgICAgICAgICAgICd0eXBlJzogJ2V4ZWN1dGFibGUnLAogICAgICAgICAgICAgJ2RlcGVu ZGVuY2llcyc6IFsKLSAgICAgICAgICAgICAgICAnd2Via2l0JywKLSAgICAgICAgICAgICAgICAn Li4vLi4vSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZ3lwL0phdmFTY3JpcHRDb3JlLmd5 cDp3dGYnLAotICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3dlYmtpdC9zdXBw b3J0L3dlYmtpdF9zdXBwb3J0Lmd5cDp3ZWJraXRfc3VwcG9ydCcsCisgICAgICAgICAgICAgICAg JzwoY2hyb21pdW1fc3JjX2Rpcikvd2Via2l0L3N1cHBvcnQvd2Via2l0X3N1cHBvcnQuZ3lwOndl YmtpdF9zdXBwb3J0X2dmeCcsCiAgICAgICAgICAgICBdLAogICAgICAgICAgICAgJ2luY2x1ZGVf ZGlycyc6IFsKLSAgICAgICAgICAgICAgICAnLi4vLi4vSmF2YVNjcmlwdENvcmUnLAogICAgICAg ICAgICAgICAgICc8KERFUFRIKScsCiAgICAgICAgICAgICBdLAogICAgICAgICAgICAgJ3NvdXJj ZXMnOiBbCiAgICAgICAgICAgICAgICAgJy4uLy4uLy4uL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL0ltYWdlRGlmZi5jcHAnLAogICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICdjb25k aXRpb25zJzogWworICAgICAgICAgICAgICAgIFsnT1M9PSJhbmRyb2lkIicsIHsKKyAgICAgICAg ICAgICAgICAgICAgJ3Rvb2xzZXRzJzogWydob3N0J10sCisgICAgICAgICAgICAgICAgfV0sCisg ICAgICAgICAgICBdLAogICAgICAgICB9LAogICAgICAgICB7CiAgICAgICAgICAgICAndGFyZ2V0 X25hbWUnOiAnRHVtcFJlbmRlclRyZWUnLAogICAgICAgICAgICAgJ3R5cGUnOiAnZXhlY3V0YWJs ZScsCiAgICAgICAgICAgICAnbWFjX2J1bmRsZSc6IDEsCiAgICAgICAgICAgICAnZGVwZW5kZW5j aWVzJzogWwotICAgICAgICAgICAgICAgICdJbWFnZURpZmYnLAogICAgICAgICAgICAgICAgICdp bnNwZWN0b3JfcmVzb3VyY2VzJywKICAgICAgICAgICAgICAgICAnd2Via2l0JywKICAgICAgICAg ICAgICAgICAnLi4vLi4vSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZ3lwL0phdmFTY3Jp cHRDb3JlLmd5cDp3dGZfY29uZmlnJywKQEAgLTExOTQsMTEgKzExOTUsMTYgQEAKICAgICAgICAg ICAgICAgICAgICAgICAgIFsnZXhjbHVkZScsICdHdGtcXC5jcHAkJ10KICAgICAgICAgICAgICAg ICAgICAgXQogICAgICAgICAgICAgICAgIH1dLAotICAgICAgICAgICAgICAgIFsnT1MhPSJhbmRy b2lkIicsIHsKKyAgICAgICAgICAgICAgICBbJ09TPT0iYW5kcm9pZCInLCB7CisgICAgICAgICAg ICAgICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCisgICAgICAgICAgICAgICAgICAgICAgICAnSW1h Z2VEaWZmI2hvc3QnLAorICAgICAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgIH0s eyAjIE9TIT0iYW5kcm9pZCIKICAgICAgICAgICAgICAgICAgICAgJ3NvdXJjZXMvJzogWwogICAg ICAgICAgICAgICAgICAgICAgICAgWydleGNsdWRlJywgJyhBbmRyb2lkKVxcLmNwcCQnXQogICAg ICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICAgICAnZGVwZW5kZW5jaWVzJzog WworICAgICAgICAgICAgICAgICAgICAgICAgJ0ltYWdlRGlmZicsCiAgICAgICAgICAgICAgICAg ICAgICAgICAnY29weV9UZXN0TmV0c2NhcGVQbHVnSW4nLAogICAgICAgICAgICAgICAgICAgICAg ICAgJzwoY2hyb21pdW1fc3JjX2RpcikvdGhpcmRfcGFydHkvbWVzYS9tZXNhLmd5cDpvc21lc2En LAogICAgICAgICAgICAgICAgICAgICBdLApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIv VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGFmZTg4ODkuLjllNDAwMGQgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0x MC0xNyAgSGFvIFpoZW5nICA8emhlbmdoYW9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJv bWl1bV0gUmVkdWNlIGRlcGVuZGVuY2llcyBvZiBJbWFnZURpZmYgdG8gY29tcGlsZSBpdCBmb3Ig QW5kcm9pZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTY5OTk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhpcyBjaGFuZ2UgaXMgcmVxdWlyZWQgdG8gbWFrZSBJbWFnZURpZmYgZm9yIEFuZHJvaWQsIGFu ZCBjYW4gYmVuZWZpdAorICAgICAgICBvdGhlciBwbGF0Zm9ybXMsIHRvby4gT24gQW5kcm9pZCwg bW9zdCB0YXJnZXRzIGFyZSBidWlsdCBhcworICAgICAgICB0b29sc2V0czp0YXJnZXQuIHdoaWxl IEltYWdlRGlmZiBuZWVkcyB0byBiZSBidWlsdCBhcyB0b29sc2V0czpob3N0LgorICAgICAgICBD dXJyZW50bHksIGJ1aWxkaW5nIHRoZSBzdGFuZGFsb25lIHRhcmdldCBvZiBJbWFnZURpZmYgZGVw ZW5kcyBvbiBhYm91dAorICAgICAgICA4NSBvdGhlciB0YXJnZXRzICh0cnkgIG1ha2UgSW1hZ2VE aWZmJyksIHdoaWNoIGlzIGluZWZmaWNpZW50LiBBZnRlciB0aGUKKyAgICAgICAgY2hhbmdlLCBJ bWFnZURpZmYgb25seSBkZXBlbmRzIG9uIHdlYmtpdF9zdXBwb3J0X2dmeCwgd2hpY2ggaW4gdHVy bgorICAgICAgICBkZXBlbmRzIG9uIGxpYnBuZyBhbmQgemxpYi4KKworICAgICAgICAqIER1bXBS ZW5kZXJUcmVlL2Nocm9taXVtL0ltYWdlRGlmZi5jcHA6CisgICAgICAgIChtYWluKToKKwogMjAx MS0xMC0xNyAgUmFwaGFlbCBLdWJvIGRhIENvc3RhICA8a3Vib0Bwcm9mdXNpb24ubW9iaT4KIAog ICAgICAgICBbRUZMXSBEUlQ6IE1ha2Ugbm9uLXJlY29nbml6ZWQga2V5cyB3b3JrIGluIGV2ZW50 cyBhcyB3ZWxsLgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vSW1h Z2VEaWZmLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0ltYWdlRGlmZi5jcHAK aW5kZXggYzMwZGQ1MC4uZmNkZjBhYSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vSW1hZ2VEaWZmLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9JbWFnZURpZmYuY3BwCkBAIC00MCwxNiArNDAsMjUgQEAKICNpbmNsdWRlIDxhbGdvcml0aG0+ CiAjaW5jbHVkZSA8aXRlcmF0b3I+CiAjaW5jbHVkZSA8c3RkaW8uaD4KKyNpbmNsdWRlIDxzdGRp bnQuaD4KICNpbmNsdWRlIDxzdHJpbmcuaD4KICNpbmNsdWRlIDx2ZWN0b3I+Ci0jaW5jbHVkZSA8 d3RmL093bkFycmF5UHRyLmg+Ci0jaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiAjaWYgT1MoV0lO RE9XUykKICNpbmNsdWRlIDx3aW5kb3dzLmg+CiAjZGVmaW5lIFBBVEhfTUFYIE1BWF9QQVRICisj ZWxzZQorI2luY2x1ZGUgPGxpbWl0cy5oPgogI2VuZGlmCiAKKy8vIERlZmluZSBtYWNybyBoZXJl IHRvIG1ha2UgSW1hZ2VEaWZmIGluZGVwZW5kZW50IG9mIEphdmFTY3JpcHRDb3JlLgorI2RlZmlu ZSBBU1NFUlQoYXNzZXJ0aW9uKSBkbyBcCisgICAgaWYgKCEoYXNzZXJ0aW9uKSkgeyBcCisgICAg ICAgIGZwcmludGYoc3RkZXJyLCAiQVNTRVJUIGZhaWxlZCBhdCAlczolczogIiAjYXNzZXJ0aW9u ICIuIiwgX19GSUxFX18sIF9fTElORV9fKTsgXAorICAgICAgICBleGl0KDEpOyBcCisgICAgfSBc Cit3aGlsZSAoMCkKKwogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogLy8gQ2F1c2VzIHRoZSBhcHAg dG8gcmVtYWluIG9wZW4sIHdhaXRpbmcgZm9yIHBhaXJzIG9mIGZpbGVuYW1lcyBvbiBzdGRpbi4K QEAgLTk3LDE0ICsxMDYsMTggQEAgcHVibGljOgogICAgICAgICBpZiAoIWJ5dGVMZW5ndGgpCiAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAgICAgT3duQXJyYXlQdHI8dW5zaWduZWQg Y2hhcj4gc291cmNlID0gYWRvcHRBcnJheVB0cihuZXcgdW5zaWduZWQgY2hhcltieXRlTGVuZ3Ro XSk7Ci0gICAgICAgIGlmIChmcmVhZChzb3VyY2UuZ2V0KCksIDEsIGJ5dGVMZW5ndGgsIHN0ZGlu KSAhPSBieXRlTGVuZ3RoKQorICAgICAgICB1bnNpZ25lZCBjaGFyKiBzb3VyY2UgPSBuZXcgdW5z aWduZWQgY2hhcltieXRlTGVuZ3RoXTsKKyAgICAgICAgaWYgKGZyZWFkKHNvdXJjZSwgMSwgYnl0 ZUxlbmd0aCwgc3RkaW4pICE9IGJ5dGVMZW5ndGgpIHsKKyAgICAgICAgICAgIGRlbGV0ZSBbXSBz b3VyY2U7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KIAotICAgICAgICBp ZiAoIXdlYmtpdF9zdXBwb3J0OjpEZWNvZGVQTkcoc291cmNlLmdldCgpLCBieXRlTGVuZ3RoLCAm bV9kYXRhLCAmbV93aWR0aCwgJm1faGVpZ2h0KSkgeworICAgICAgICBpZiAoIXdlYmtpdF9zdXBw b3J0OjpEZWNvZGVQTkcoc291cmNlLCBieXRlTGVuZ3RoLCAmbV9kYXRhLCAmbV93aWR0aCwgJm1f aGVpZ2h0KSkgeworICAgICAgICAgICAgZGVsZXRlIFtdIHNvdXJjZTsKICAgICAgICAgICAgIGNs ZWFyKCk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KKyAgICAgICAgZGVs ZXRlIFtdIHNvdXJjZTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCkBAIC00NDksNyAr NDYyLDcgQEAgaW50IGRpZmZJbWFnZXMoY29uc3QgY2hhciogZmlsZTEsIGNvbnN0IGNoYXIqIGZp bGUyLCBjb25zdCBjaGFyKiBvdXRGaWxlLAogCiBpbnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hh ciogYXJndltdKQogewotICAgIFZlY3Rvcjxjb25zdCBjaGFyKj4gdmFsdWVzOworICAgIHN0ZDo6 dmVjdG9yPGNvbnN0IGNoYXIqPiB2YWx1ZXM7CiAgICAgYm9vbCBwb2xsU3RkaW4gPSBmYWxzZTsK ICAgICBib29sIGdlbmVyYXRlRGlmZiA9IGZhbHNlOwogICAgIGJvb2wgc2hvdWxkV3JpdGVQZXJj ZW50YWdlcyA9IGZhbHNlOwpAQCAtNDY0LDcgKzQ3Nyw3IEBAIGludCBtYWluKGludCBhcmdjLCBj b25zdCBjaGFyKiBhcmd2W10pCiAgICAgICAgIGVsc2UgaWYgKCFzdHJjbXAoYXJndltpXSwgb3B0 aW9uV2VpZ2h0ZWRJbnRlbnNpdHkpKQogICAgICAgICAgICAgY29tcGFyYXRvciA9IHdlaWdodGVk UGVyY2VudGFnZURpZmZlcmVudDsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgdmFsdWVzLmFw cGVuZChhcmd2W2ldKTsKKyAgICAgICAgICAgIHZhbHVlcy5wdXNoX2JhY2soYXJndltpXSk7CiAg ICAgfQogCiAgICAgaWYgKHBvbGxTdGRpbikgewo= 111558 2011-10-18 20:49:40 -0700 2011-10-19 02:08:05 -0700 Proposed patch 3. patch text/plain 6518 zhenghao ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggN2YzZTY1YS4uZDZhZTEyOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0xMC0xNyAgSGFvIFpoZW5n ICA8emhlbmdoYW9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gUmVkdWNlIGRl cGVuZGVuY2llcyBvZiBJbWFnZURpZmYgdG8gY29tcGlsZSBpdCBmb3IgQW5kcm9pZC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5OTk3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgaXMg cmVxdWlyZWQgdG8gbWFrZSBJbWFnZURpZmYgZm9yIEFuZHJvaWQsIGFuZCBjYW4gYmVuZWZpdAor ICAgICAgICBvdGhlciBwbGF0Zm9ybXMsIHRvby4gT24gQW5kcm9pZCwgbW9zdCB0YXJnZXRzIGFy ZSBidWlsdCBhcworICAgICAgICB0b29sc2V0czp0YXJnZXQuIHdoaWxlIEltYWdlRGlmZiBuZWVk cyB0byBiZSBidWlsdCBhcyB0b29sc2V0czpob3N0LgorICAgICAgICBDdXJyZW50bHksIGJ1aWxk aW5nIHRoZSBzdGFuZGFsb25lIHRhcmdldCBvZiBJbWFnZURpZmYgZGVwZW5kcyBvbiBhYm91dAor ICAgICAgICA4NSBvdGhlciB0YXJnZXRzICh0cnkgIG1ha2UgSW1hZ2VEaWZmJyksIHdoaWNoIGlz IGluZWZmaWNpZW50LiBBZnRlciB0aGUKKyAgICAgICAgY2hhbmdlLCBJbWFnZURpZmYgb25seSBk ZXBlbmRzIG9uIHdlYmtpdF9zdXBwb3J0X2dmeCwgd2hpY2ggaW4gdHVybgorICAgICAgICBkZXBl bmRzIG9uIGxpYnBuZyBhbmQgemxpYi4KKworICAgICAgICAqIFdlYktpdC5neXA6CisKIDIwMTEt MTAtMTcgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQuICBSb2xsZWQgREVQUy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vV2ViS2l0Lmd5cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApp bmRleCAzZjQ2YTI0Li42MzMwYzJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L1dlYktpdC5neXAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCkBAIC0x MDI4LDI0ICsxMDI4LDI1IEBACiAgICAgICAgICAgICAndGFyZ2V0X25hbWUnOiAnSW1hZ2VEaWZm JywKICAgICAgICAgICAgICd0eXBlJzogJ2V4ZWN1dGFibGUnLAogICAgICAgICAgICAgJ2RlcGVu ZGVuY2llcyc6IFsKLSAgICAgICAgICAgICAgICAnd2Via2l0JywKLSAgICAgICAgICAgICAgICAn Li4vLi4vSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZ3lwL0phdmFTY3JpcHRDb3JlLmd5 cDp3dGYnLAotICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3dlYmtpdC9zdXBw b3J0L3dlYmtpdF9zdXBwb3J0Lmd5cDp3ZWJraXRfc3VwcG9ydCcsCisgICAgICAgICAgICAgICAg JzwoY2hyb21pdW1fc3JjX2Rpcikvd2Via2l0L3N1cHBvcnQvd2Via2l0X3N1cHBvcnQuZ3lwOndl YmtpdF9zdXBwb3J0X2dmeCcsCiAgICAgICAgICAgICBdLAogICAgICAgICAgICAgJ2luY2x1ZGVf ZGlycyc6IFsKLSAgICAgICAgICAgICAgICAnLi4vLi4vSmF2YVNjcmlwdENvcmUnLAogICAgICAg ICAgICAgICAgICc8KERFUFRIKScsCiAgICAgICAgICAgICBdLAogICAgICAgICAgICAgJ3NvdXJj ZXMnOiBbCiAgICAgICAgICAgICAgICAgJy4uLy4uLy4uL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL0ltYWdlRGlmZi5jcHAnLAogICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICdjb25k aXRpb25zJzogWworICAgICAgICAgICAgICAgIFsnT1M9PSJhbmRyb2lkIicsIHsKKyAgICAgICAg ICAgICAgICAgICAgJ3Rvb2xzZXRzJzogWydob3N0J10sCisgICAgICAgICAgICAgICAgfV0sCisg ICAgICAgICAgICBdLAogICAgICAgICB9LAogICAgICAgICB7CiAgICAgICAgICAgICAndGFyZ2V0 X25hbWUnOiAnRHVtcFJlbmRlclRyZWUnLAogICAgICAgICAgICAgJ3R5cGUnOiAnZXhlY3V0YWJs ZScsCiAgICAgICAgICAgICAnbWFjX2J1bmRsZSc6IDEsCiAgICAgICAgICAgICAnZGVwZW5kZW5j aWVzJzogWwotICAgICAgICAgICAgICAgICdJbWFnZURpZmYnLAogICAgICAgICAgICAgICAgICdp bnNwZWN0b3JfcmVzb3VyY2VzJywKICAgICAgICAgICAgICAgICAnd2Via2l0JywKICAgICAgICAg ICAgICAgICAnLi4vLi4vSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZ3lwL0phdmFTY3Jp cHRDb3JlLmd5cDp3dGZfY29uZmlnJywKQEAgLTExOTQsMTEgKzExOTUsMTYgQEAKICAgICAgICAg ICAgICAgICAgICAgICAgIFsnZXhjbHVkZScsICdHdGtcXC5jcHAkJ10KICAgICAgICAgICAgICAg ICAgICAgXQogICAgICAgICAgICAgICAgIH1dLAotICAgICAgICAgICAgICAgIFsnT1MhPSJhbmRy b2lkIicsIHsKKyAgICAgICAgICAgICAgICBbJ09TPT0iYW5kcm9pZCInLCB7CisgICAgICAgICAg ICAgICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCisgICAgICAgICAgICAgICAgICAgICAgICAnSW1h Z2VEaWZmI2hvc3QnLAorICAgICAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgIH0s eyAjIE9TIT0iYW5kcm9pZCIKICAgICAgICAgICAgICAgICAgICAgJ3NvdXJjZXMvJzogWwogICAg ICAgICAgICAgICAgICAgICAgICAgWydleGNsdWRlJywgJyhBbmRyb2lkKVxcLmNwcCQnXQogICAg ICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICAgICAnZGVwZW5kZW5jaWVzJzog WworICAgICAgICAgICAgICAgICAgICAgICAgJ0ltYWdlRGlmZicsCiAgICAgICAgICAgICAgICAg ICAgICAgICAnY29weV9UZXN0TmV0c2NhcGVQbHVnSW4nLAogICAgICAgICAgICAgICAgICAgICAg ICAgJzwoY2hyb21pdW1fc3JjX2RpcikvdGhpcmRfcGFydHkvbWVzYS9tZXNhLmd5cDpvc21lc2En LAogICAgICAgICAgICAgICAgICAgICBdLApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIv VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGFmZTg4ODkuLjllNDAwMGQgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0x MC0xNyAgSGFvIFpoZW5nICA8emhlbmdoYW9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJv bWl1bV0gUmVkdWNlIGRlcGVuZGVuY2llcyBvZiBJbWFnZURpZmYgdG8gY29tcGlsZSBpdCBmb3Ig QW5kcm9pZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTY5OTk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhpcyBjaGFuZ2UgaXMgcmVxdWlyZWQgdG8gbWFrZSBJbWFnZURpZmYgZm9yIEFuZHJvaWQsIGFu ZCBjYW4gYmVuZWZpdAorICAgICAgICBvdGhlciBwbGF0Zm9ybXMsIHRvby4gT24gQW5kcm9pZCwg bW9zdCB0YXJnZXRzIGFyZSBidWlsdCBhcworICAgICAgICB0b29sc2V0czp0YXJnZXQuIHdoaWxl IEltYWdlRGlmZiBuZWVkcyB0byBiZSBidWlsdCBhcyB0b29sc2V0czpob3N0LgorICAgICAgICBD dXJyZW50bHksIGJ1aWxkaW5nIHRoZSBzdGFuZGFsb25lIHRhcmdldCBvZiBJbWFnZURpZmYgZGVw ZW5kcyBvbiBhYm91dAorICAgICAgICA4NSBvdGhlciB0YXJnZXRzICh0cnkgIG1ha2UgSW1hZ2VE aWZmJyksIHdoaWNoIGlzIGluZWZmaWNpZW50LiBBZnRlciB0aGUKKyAgICAgICAgY2hhbmdlLCBJ bWFnZURpZmYgb25seSBkZXBlbmRzIG9uIHdlYmtpdF9zdXBwb3J0X2dmeCwgd2hpY2ggaW4gdHVy bgorICAgICAgICBkZXBlbmRzIG9uIGxpYnBuZyBhbmQgemxpYi4KKworICAgICAgICAqIER1bXBS ZW5kZXJUcmVlL2Nocm9taXVtL0ltYWdlRGlmZi5jcHA6CisgICAgICAgIChtYWluKToKKwogMjAx MS0xMC0xNyAgUmFwaGFlbCBLdWJvIGRhIENvc3RhICA8a3Vib0Bwcm9mdXNpb24ubW9iaT4KIAog ICAgICAgICBbRUZMXSBEUlQ6IE1ha2Ugbm9uLXJlY29nbml6ZWQga2V5cyB3b3JrIGluIGV2ZW50 cyBhcyB3ZWxsLgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vSW1h Z2VEaWZmLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0ltYWdlRGlmZi5jcHAK aW5kZXggYzMwZGQ1MC4uODdlNjhlMSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vSW1hZ2VEaWZmLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9JbWFnZURpZmYuY3BwCkBAIC0zOSwxNyArMzksMjYgQEAKICNpbmNsdWRlICJ3ZWJraXQvc3Vw cG9ydC93ZWJraXRfc3VwcG9ydF9nZnguaCIKICNpbmNsdWRlIDxhbGdvcml0aG0+CiAjaW5jbHVk ZSA8aXRlcmF0b3I+CisjaW5jbHVkZSA8c3RkaW50Lmg+CiAjaW5jbHVkZSA8c3RkaW8uaD4KICNp bmNsdWRlIDxzdHJpbmcuaD4KICNpbmNsdWRlIDx2ZWN0b3I+Ci0jaW5jbHVkZSA8d3RmL093bkFy cmF5UHRyLmg+Ci0jaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiAjaWYgT1MoV0lORE9XUykKICNp bmNsdWRlIDx3aW5kb3dzLmg+CiAjZGVmaW5lIFBBVEhfTUFYIE1BWF9QQVRICisjZWxzZQorI2lu Y2x1ZGUgPGxpbWl0cy5oPgogI2VuZGlmCiAKKy8vIERlZmluZSBtYWNybyBoZXJlIHRvIG1ha2Ug SW1hZ2VEaWZmIGluZGVwZW5kZW50IG9mIEphdmFTY3JpcHRDb3JlLgorI2RlZmluZSBBU1NFUlQo YXNzZXJ0aW9uKSBkbyBcCisgICAgaWYgKCEoYXNzZXJ0aW9uKSkgeyBcCisgICAgICAgIGZwcmlu dGYoc3RkZXJyLCAiQVNTRVJUIGZhaWxlZCBhdCAlczolczogIiAjYXNzZXJ0aW9uICIuIiwgX19G SUxFX18sIF9fTElORV9fKTsgXAorICAgICAgICBleGl0KDEpOyBcCisgICAgfSBcCit3aGlsZSAo MCkKKwogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogLy8gQ2F1c2VzIHRoZSBhcHAgdG8gcmVtYWlu IG9wZW4sIHdhaXRpbmcgZm9yIHBhaXJzIG9mIGZpbGVuYW1lcyBvbiBzdGRpbi4KQEAgLTk3LDE0 ICsxMDYsMTggQEAgcHVibGljOgogICAgICAgICBpZiAoIWJ5dGVMZW5ndGgpCiAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CiAKLSAgICAgICAgT3duQXJyYXlQdHI8dW5zaWduZWQgY2hhcj4gc291 cmNlID0gYWRvcHRBcnJheVB0cihuZXcgdW5zaWduZWQgY2hhcltieXRlTGVuZ3RoXSk7Ci0gICAg ICAgIGlmIChmcmVhZChzb3VyY2UuZ2V0KCksIDEsIGJ5dGVMZW5ndGgsIHN0ZGluKSAhPSBieXRl TGVuZ3RoKQorICAgICAgICB1bnNpZ25lZCBjaGFyKiBzb3VyY2UgPSBuZXcgdW5zaWduZWQgY2hh cltieXRlTGVuZ3RoXTsKKyAgICAgICAgaWYgKGZyZWFkKHNvdXJjZSwgMSwgYnl0ZUxlbmd0aCwg c3RkaW4pICE9IGJ5dGVMZW5ndGgpIHsKKyAgICAgICAgICAgIGRlbGV0ZSBbXSBzb3VyY2U7CiAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KIAotICAgICAgICBpZiAoIXdlYmtp dF9zdXBwb3J0OjpEZWNvZGVQTkcoc291cmNlLmdldCgpLCBieXRlTGVuZ3RoLCAmbV9kYXRhLCAm bV93aWR0aCwgJm1faGVpZ2h0KSkgeworICAgICAgICBpZiAoIXdlYmtpdF9zdXBwb3J0OjpEZWNv ZGVQTkcoc291cmNlLCBieXRlTGVuZ3RoLCAmbV9kYXRhLCAmbV93aWR0aCwgJm1faGVpZ2h0KSkg eworICAgICAgICAgICAgZGVsZXRlIFtdIHNvdXJjZTsKICAgICAgICAgICAgIGNsZWFyKCk7CiAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KKyAgICAgICAgZGVsZXRlIFtdIHNv dXJjZTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCkBAIC00NDksNyArNDYyLDcgQEAg aW50IGRpZmZJbWFnZXMoY29uc3QgY2hhciogZmlsZTEsIGNvbnN0IGNoYXIqIGZpbGUyLCBjb25z dCBjaGFyKiBvdXRGaWxlLAogCiBpbnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltd KQogewotICAgIFZlY3Rvcjxjb25zdCBjaGFyKj4gdmFsdWVzOworICAgIHN0ZDo6dmVjdG9yPGNv bnN0IGNoYXIqPiB2YWx1ZXM7CiAgICAgYm9vbCBwb2xsU3RkaW4gPSBmYWxzZTsKICAgICBib29s IGdlbmVyYXRlRGlmZiA9IGZhbHNlOwogICAgIGJvb2wgc2hvdWxkV3JpdGVQZXJjZW50YWdlcyA9 IGZhbHNlOwpAQCAtNDY0LDcgKzQ3Nyw3IEBAIGludCBtYWluKGludCBhcmdjLCBjb25zdCBjaGFy KiBhcmd2W10pCiAgICAgICAgIGVsc2UgaWYgKCFzdHJjbXAoYXJndltpXSwgb3B0aW9uV2VpZ2h0 ZWRJbnRlbnNpdHkpKQogICAgICAgICAgICAgY29tcGFyYXRvciA9IHdlaWdodGVkUGVyY2VudGFn ZURpZmZlcmVudDsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgdmFsdWVzLmFwcGVuZChhcmd2 W2ldKTsKKyAgICAgICAgICAgIHZhbHVlcy5wdXNoX2JhY2soYXJndltpXSk7CiAgICAgfQogCiAg ICAgaWYgKHBvbGxTdGRpbikgewo= 111580 2011-10-19 02:08:05 -0700 2011-10-19 19:46:03 -0700 Proposed patch 4. patch text/plain 6495 zhenghao ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggN2YzZTY1YS4uZDZhZTEyOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0xMC0xNyAgSGFvIFpoZW5n ICA8emhlbmdoYW9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gUmVkdWNlIGRl cGVuZGVuY2llcyBvZiBJbWFnZURpZmYgdG8gY29tcGlsZSBpdCBmb3IgQW5kcm9pZC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5OTk3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgaXMg cmVxdWlyZWQgdG8gbWFrZSBJbWFnZURpZmYgZm9yIEFuZHJvaWQsIGFuZCBjYW4gYmVuZWZpdAor ICAgICAgICBvdGhlciBwbGF0Zm9ybXMsIHRvby4gT24gQW5kcm9pZCwgbW9zdCB0YXJnZXRzIGFy ZSBidWlsdCBhcworICAgICAgICB0b29sc2V0czp0YXJnZXQuIHdoaWxlIEltYWdlRGlmZiBuZWVk cyB0byBiZSBidWlsdCBhcyB0b29sc2V0czpob3N0LgorICAgICAgICBDdXJyZW50bHksIGJ1aWxk aW5nIHRoZSBzdGFuZGFsb25lIHRhcmdldCBvZiBJbWFnZURpZmYgZGVwZW5kcyBvbiBhYm91dAor ICAgICAgICA4NSBvdGhlciB0YXJnZXRzICh0cnkgIG1ha2UgSW1hZ2VEaWZmJyksIHdoaWNoIGlz IGluZWZmaWNpZW50LiBBZnRlciB0aGUKKyAgICAgICAgY2hhbmdlLCBJbWFnZURpZmYgb25seSBk ZXBlbmRzIG9uIHdlYmtpdF9zdXBwb3J0X2dmeCwgd2hpY2ggaW4gdHVybgorICAgICAgICBkZXBl bmRzIG9uIGxpYnBuZyBhbmQgemxpYi4KKworICAgICAgICAqIFdlYktpdC5neXA6CisKIDIwMTEt MTAtMTcgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQuICBSb2xsZWQgREVQUy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vV2ViS2l0Lmd5cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApp bmRleCAzZjQ2YTI0Li5kNjUwZGRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L1dlYktpdC5neXAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCkBAIC0x MDI4LDkgKzEwMjgsNyBAQAogICAgICAgICAgICAgJ3RhcmdldF9uYW1lJzogJ0ltYWdlRGlmZics CiAgICAgICAgICAgICAndHlwZSc6ICdleGVjdXRhYmxlJywKICAgICAgICAgICAgICdkZXBlbmRl bmNpZXMnOiBbCi0gICAgICAgICAgICAgICAgJ3dlYmtpdCcsCi0gICAgICAgICAgICAgICAgJy4u Ly4uL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmd5cC9KYXZhU2NyaXB0Q29yZS5neXA6 d3RmJywKLSAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS93ZWJraXQvc3VwcG9y dC93ZWJraXRfc3VwcG9ydC5neXA6d2Via2l0X3N1cHBvcnQnLAorICAgICAgICAgICAgICAgICc8 KGNocm9taXVtX3NyY19kaXIpL3dlYmtpdC9zdXBwb3J0L3dlYmtpdF9zdXBwb3J0Lmd5cDp3ZWJr aXRfc3VwcG9ydF9nZngnLAogICAgICAgICAgICAgXSwKICAgICAgICAgICAgICdpbmNsdWRlX2Rp cnMnOiBbCiAgICAgICAgICAgICAgICAgJy4uLy4uL0phdmFTY3JpcHRDb3JlJywKQEAgLTEwMzks MTMgKzEwMzcsMTcgQEAKICAgICAgICAgICAgICdzb3VyY2VzJzogWwogICAgICAgICAgICAgICAg ICcuLi8uLi8uLi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9JbWFnZURpZmYuY3BwJywK ICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAnY29uZGl0aW9ucyc6IFsKKyAgICAgICAgICAg ICAgICBbJ09TPT0iYW5kcm9pZCInLCB7CisgICAgICAgICAgICAgICAgICAgICd0b29sc2V0cyc6 IFsnaG9zdCddLAorICAgICAgICAgICAgICAgIH1dLAorICAgICAgICAgICAgXSwKICAgICAgICAg fSwKICAgICAgICAgewogICAgICAgICAgICAgJ3RhcmdldF9uYW1lJzogJ0R1bXBSZW5kZXJUcmVl JywKICAgICAgICAgICAgICd0eXBlJzogJ2V4ZWN1dGFibGUnLAogICAgICAgICAgICAgJ21hY19i dW5kbGUnOiAxLAogICAgICAgICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKLSAgICAgICAgICAgICAg ICAnSW1hZ2VEaWZmJywKICAgICAgICAgICAgICAgICAnaW5zcGVjdG9yX3Jlc291cmNlcycsCiAg ICAgICAgICAgICAgICAgJ3dlYmtpdCcsCiAgICAgICAgICAgICAgICAgJy4uLy4uL0phdmFTY3Jp cHRDb3JlL0phdmFTY3JpcHRDb3JlLmd5cC9KYXZhU2NyaXB0Q29yZS5neXA6d3RmX2NvbmZpZycs CkBAIC0xMTk0LDExICsxMTk2LDE2IEBACiAgICAgICAgICAgICAgICAgICAgICAgICBbJ2V4Y2x1 ZGUnLCAnR3RrXFwuY3BwJCddCiAgICAgICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgICAg ICB9XSwKLSAgICAgICAgICAgICAgICBbJ09TIT0iYW5kcm9pZCInLCB7CisgICAgICAgICAgICAg ICAgWydPUz09ImFuZHJvaWQiJywgeworICAgICAgICAgICAgICAgICAgICAnZGVwZW5kZW5jaWVz JzogWworICAgICAgICAgICAgICAgICAgICAgICAgJ0ltYWdlRGlmZiNob3N0JywKKyAgICAgICAg ICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICB9LHsgIyBPUyE9ImFuZHJvaWQiCiAgICAg ICAgICAgICAgICAgICAgICdzb3VyY2VzLyc6IFsKICAgICAgICAgICAgICAgICAgICAgICAgIFsn ZXhjbHVkZScsICcoQW5kcm9pZClcXC5jcHAkJ10KICAgICAgICAgICAgICAgICAgICAgXSwKICAg ICAgICAgICAgICAgICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKKyAgICAgICAgICAgICAgICAgICAg ICAgICdJbWFnZURpZmYnLAogICAgICAgICAgICAgICAgICAgICAgICAgJ2NvcHlfVGVzdE5ldHNj YXBlUGx1Z0luJywKICAgICAgICAgICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIp L3RoaXJkX3BhcnR5L21lc2EvbWVzYS5neXA6b3NtZXNhJywKICAgICAgICAgICAgICAgICAgICAg XSwKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBh ZmU4ODg5Li45ZTQwMDBkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMTAtMTcgIEhhbyBaaGVuZyAgPHpoZW5n aGFvQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlZHVjZSBkZXBlbmRlbmNp ZXMgb2YgSW1hZ2VEaWZmIHRvIGNvbXBpbGUgaXQgZm9yIEFuZHJvaWQuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTk5NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGlzIHJlcXVpcmVk IHRvIG1ha2UgSW1hZ2VEaWZmIGZvciBBbmRyb2lkLCBhbmQgY2FuIGJlbmVmaXQKKyAgICAgICAg b3RoZXIgcGxhdGZvcm1zLCB0b28uIE9uIEFuZHJvaWQsIG1vc3QgdGFyZ2V0cyBhcmUgYnVpbHQg YXMKKyAgICAgICAgdG9vbHNldHM6dGFyZ2V0LiB3aGlsZSBJbWFnZURpZmYgbmVlZHMgdG8gYmUg YnVpbHQgYXMgdG9vbHNldHM6aG9zdC4KKyAgICAgICAgQ3VycmVudGx5LCBidWlsZGluZyB0aGUg c3RhbmRhbG9uZSB0YXJnZXQgb2YgSW1hZ2VEaWZmIGRlcGVuZHMgb24gYWJvdXQKKyAgICAgICAg ODUgb3RoZXIgdGFyZ2V0cyAodHJ5ICBtYWtlIEltYWdlRGlmZicpLCB3aGljaCBpcyBpbmVmZmlj aWVudC4gQWZ0ZXIgdGhlCisgICAgICAgIGNoYW5nZSwgSW1hZ2VEaWZmIG9ubHkgZGVwZW5kcyBv biB3ZWJraXRfc3VwcG9ydF9nZngsIHdoaWNoIGluIHR1cm4KKyAgICAgICAgZGVwZW5kcyBvbiBs aWJwbmcgYW5kIHpsaWIuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9JbWFn ZURpZmYuY3BwOgorICAgICAgICAobWFpbik6CisKIDIwMTEtMTAtMTcgIFJhcGhhZWwgS3VibyBk YSBDb3N0YSAgPGt1Ym9AcHJvZnVzaW9uLm1vYmk+CiAKICAgICAgICAgW0VGTF0gRFJUOiBNYWtl IG5vbi1yZWNvZ25pemVkIGtleXMgd29yayBpbiBldmVudHMgYXMgd2VsbC4KZGlmZiAtLWdpdCBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0ltYWdlRGlmZi5jcHAgYi9Ub29scy9EdW1w UmVuZGVyVHJlZS9jaHJvbWl1bS9JbWFnZURpZmYuY3BwCmluZGV4IGMzMGRkNTAuLjg3ZTY4ZTEg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0ltYWdlRGlmZi5jcHAK KysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vSW1hZ2VEaWZmLmNwcApAQCAtMzks MTcgKzM5LDI2IEBACiAjaW5jbHVkZSAid2Via2l0L3N1cHBvcnQvd2Via2l0X3N1cHBvcnRfZ2Z4 LmgiCiAjaW5jbHVkZSA8YWxnb3JpdGhtPgogI2luY2x1ZGUgPGl0ZXJhdG9yPgorI2luY2x1ZGUg PHN0ZGludC5oPgogI2luY2x1ZGUgPHN0ZGlvLmg+CiAjaW5jbHVkZSA8c3RyaW5nLmg+CiAjaW5j bHVkZSA8dmVjdG9yPgotI2luY2x1ZGUgPHd0Zi9Pd25BcnJheVB0ci5oPgotI2luY2x1ZGUgPHd0 Zi9WZWN0b3IuaD4KIAogI2lmIE9TKFdJTkRPV1MpCiAjaW5jbHVkZSA8d2luZG93cy5oPgogI2Rl ZmluZSBQQVRIX01BWCBNQVhfUEFUSAorI2Vsc2UKKyNpbmNsdWRlIDxsaW1pdHMuaD4KICNlbmRp ZgogCisvLyBEZWZpbmUgbWFjcm8gaGVyZSB0byBtYWtlIEltYWdlRGlmZiBpbmRlcGVuZGVudCBv ZiBKYXZhU2NyaXB0Q29yZS4KKyNkZWZpbmUgQVNTRVJUKGFzc2VydGlvbikgZG8gXAorICAgIGlm ICghKGFzc2VydGlvbikpIHsgXAorICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkFTU0VSVCBmYWls ZWQgYXQgJXM6JXM6ICIgI2Fzc2VydGlvbiAiLiIsIF9fRklMRV9fLCBfX0xJTkVfXyk7IFwKKyAg ICAgICAgZXhpdCgxKTsgXAorICAgIH0gXAord2hpbGUgKDApCisKIHVzaW5nIG5hbWVzcGFjZSBz dGQ7CiAKIC8vIENhdXNlcyB0aGUgYXBwIHRvIHJlbWFpbiBvcGVuLCB3YWl0aW5nIGZvciBwYWly cyBvZiBmaWxlbmFtZXMgb24gc3RkaW4uCkBAIC05NywxNCArMTA2LDE4IEBAIHB1YmxpYzoKICAg ICAgICAgaWYgKCFieXRlTGVuZ3RoKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAg ICAgIE93bkFycmF5UHRyPHVuc2lnbmVkIGNoYXI+IHNvdXJjZSA9IGFkb3B0QXJyYXlQdHIobmV3 IHVuc2lnbmVkIGNoYXJbYnl0ZUxlbmd0aF0pOwotICAgICAgICBpZiAoZnJlYWQoc291cmNlLmdl dCgpLCAxLCBieXRlTGVuZ3RoLCBzdGRpbikgIT0gYnl0ZUxlbmd0aCkKKyAgICAgICAgdW5zaWdu ZWQgY2hhciogc291cmNlID0gbmV3IHVuc2lnbmVkIGNoYXJbYnl0ZUxlbmd0aF07CisgICAgICAg IGlmIChmcmVhZChzb3VyY2UsIDEsIGJ5dGVMZW5ndGgsIHN0ZGluKSAhPSBieXRlTGVuZ3RoKSB7 CisgICAgICAgICAgICBkZWxldGUgW10gc291cmNlOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgICAgICB9CiAKLSAgICAgICAgaWYgKCF3ZWJraXRfc3VwcG9ydDo6RGVjb2RlUE5HKHNv dXJjZS5nZXQoKSwgYnl0ZUxlbmd0aCwgJm1fZGF0YSwgJm1fd2lkdGgsICZtX2hlaWdodCkpIHsK KyAgICAgICAgaWYgKCF3ZWJraXRfc3VwcG9ydDo6RGVjb2RlUE5HKHNvdXJjZSwgYnl0ZUxlbmd0 aCwgJm1fZGF0YSwgJm1fd2lkdGgsICZtX2hlaWdodCkpIHsKKyAgICAgICAgICAgIGRlbGV0ZSBb XSBzb3VyY2U7CiAgICAgICAgICAgICBjbGVhcigpOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgICAgICB9CisgICAgICAgIGRlbGV0ZSBbXSBzb3VyY2U7CiAgICAgICAgIHJldHVybiB0 cnVlOwogICAgIH0KIApAQCAtNDQ5LDcgKzQ2Miw3IEBAIGludCBkaWZmSW1hZ2VzKGNvbnN0IGNo YXIqIGZpbGUxLCBjb25zdCBjaGFyKiBmaWxlMiwgY29uc3QgY2hhciogb3V0RmlsZSwKIAogaW50 IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKIHsKLSAgICBWZWN0b3I8Y29uc3Qg Y2hhcio+IHZhbHVlczsKKyAgICBzdGQ6OnZlY3Rvcjxjb25zdCBjaGFyKj4gdmFsdWVzOwogICAg IGJvb2wgcG9sbFN0ZGluID0gZmFsc2U7CiAgICAgYm9vbCBnZW5lcmF0ZURpZmYgPSBmYWxzZTsK ICAgICBib29sIHNob3VsZFdyaXRlUGVyY2VudGFnZXMgPSBmYWxzZTsKQEAgLTQ2NCw3ICs0Nzcs NyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltdKQogICAgICAgICBlbHNl IGlmICghc3RyY21wKGFyZ3ZbaV0sIG9wdGlvbldlaWdodGVkSW50ZW5zaXR5KSkKICAgICAgICAg ICAgIGNvbXBhcmF0b3IgPSB3ZWlnaHRlZFBlcmNlbnRhZ2VEaWZmZXJlbnQ7CiAgICAgICAgIGVs c2UKLSAgICAgICAgICAgIHZhbHVlcy5hcHBlbmQoYXJndltpXSk7CisgICAgICAgICAgICB2YWx1 ZXMucHVzaF9iYWNrKGFyZ3ZbaV0pOwogICAgIH0KIAogICAgIGlmIChwb2xsU3RkaW4pIHsK 111711 2011-10-19 19:46:03 -0700 2011-10-20 10:45:29 -0700 Proposed patch 5. patch text/plain 6488 zhenghao ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggN2YzZTY1YS4uZDZhZTEyOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0xMC0xNyAgSGFvIFpoZW5n ICA8emhlbmdoYW9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gUmVkdWNlIGRl cGVuZGVuY2llcyBvZiBJbWFnZURpZmYgdG8gY29tcGlsZSBpdCBmb3IgQW5kcm9pZC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5OTk3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgaXMg cmVxdWlyZWQgdG8gbWFrZSBJbWFnZURpZmYgZm9yIEFuZHJvaWQsIGFuZCBjYW4gYmVuZWZpdAor ICAgICAgICBvdGhlciBwbGF0Zm9ybXMsIHRvby4gT24gQW5kcm9pZCwgbW9zdCB0YXJnZXRzIGFy ZSBidWlsdCBhcworICAgICAgICB0b29sc2V0czp0YXJnZXQuIHdoaWxlIEltYWdlRGlmZiBuZWVk cyB0byBiZSBidWlsdCBhcyB0b29sc2V0czpob3N0LgorICAgICAgICBDdXJyZW50bHksIGJ1aWxk aW5nIHRoZSBzdGFuZGFsb25lIHRhcmdldCBvZiBJbWFnZURpZmYgZGVwZW5kcyBvbiBhYm91dAor ICAgICAgICA4NSBvdGhlciB0YXJnZXRzICh0cnkgIG1ha2UgSW1hZ2VEaWZmJyksIHdoaWNoIGlz IGluZWZmaWNpZW50LiBBZnRlciB0aGUKKyAgICAgICAgY2hhbmdlLCBJbWFnZURpZmYgb25seSBk ZXBlbmRzIG9uIHdlYmtpdF9zdXBwb3J0X2dmeCwgd2hpY2ggaW4gdHVybgorICAgICAgICBkZXBl bmRzIG9uIGxpYnBuZyBhbmQgemxpYi4KKworICAgICAgICAqIFdlYktpdC5neXA6CisKIDIwMTEt MTAtMTcgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQuICBSb2xsZWQgREVQUy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vV2ViS2l0Lmd5cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApp bmRleCAzZjQ2YTI0Li5kNjUwZGRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L1dlYktpdC5neXAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCkBAIC0x MDI4LDkgKzEwMjgsNyBAQAogICAgICAgICAgICAgJ3RhcmdldF9uYW1lJzogJ0ltYWdlRGlmZics CiAgICAgICAgICAgICAndHlwZSc6ICdleGVjdXRhYmxlJywKICAgICAgICAgICAgICdkZXBlbmRl bmNpZXMnOiBbCi0gICAgICAgICAgICAgICAgJ3dlYmtpdCcsCi0gICAgICAgICAgICAgICAgJy4u Ly4uL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmd5cC9KYXZhU2NyaXB0Q29yZS5neXA6 d3RmJywKLSAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS93ZWJraXQvc3VwcG9y dC93ZWJraXRfc3VwcG9ydC5neXA6d2Via2l0X3N1cHBvcnQnLAorICAgICAgICAgICAgICAgICc8 KGNocm9taXVtX3NyY19kaXIpL3dlYmtpdC9zdXBwb3J0L3dlYmtpdF9zdXBwb3J0Lmd5cDp3ZWJr aXRfc3VwcG9ydF9nZngnLAogICAgICAgICAgICAgXSwKICAgICAgICAgICAgICdpbmNsdWRlX2Rp cnMnOiBbCiAgICAgICAgICAgICAgICAgJy4uLy4uL0phdmFTY3JpcHRDb3JlJywKQEAgLTEwMzks MTMgKzEwMzcsMTcgQEAKICAgICAgICAgICAgICdzb3VyY2VzJzogWwogICAgICAgICAgICAgICAg ICcuLi8uLi8uLi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9JbWFnZURpZmYuY3BwJywK ICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAnY29uZGl0aW9ucyc6IFsKKyAgICAgICAgICAg ICAgICBbJ09TPT0iYW5kcm9pZCInLCB7CisgICAgICAgICAgICAgICAgICAgICd0b29sc2V0cyc6 IFsnaG9zdCddLAorICAgICAgICAgICAgICAgIH1dLAorICAgICAgICAgICAgXSwKICAgICAgICAg fSwKICAgICAgICAgewogICAgICAgICAgICAgJ3RhcmdldF9uYW1lJzogJ0R1bXBSZW5kZXJUcmVl JywKICAgICAgICAgICAgICd0eXBlJzogJ2V4ZWN1dGFibGUnLAogICAgICAgICAgICAgJ21hY19i dW5kbGUnOiAxLAogICAgICAgICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKLSAgICAgICAgICAgICAg ICAnSW1hZ2VEaWZmJywKICAgICAgICAgICAgICAgICAnaW5zcGVjdG9yX3Jlc291cmNlcycsCiAg ICAgICAgICAgICAgICAgJ3dlYmtpdCcsCiAgICAgICAgICAgICAgICAgJy4uLy4uL0phdmFTY3Jp cHRDb3JlL0phdmFTY3JpcHRDb3JlLmd5cC9KYXZhU2NyaXB0Q29yZS5neXA6d3RmX2NvbmZpZycs CkBAIC0xMTk0LDExICsxMTk2LDE2IEBACiAgICAgICAgICAgICAgICAgICAgICAgICBbJ2V4Y2x1 ZGUnLCAnR3RrXFwuY3BwJCddCiAgICAgICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgICAg ICB9XSwKLSAgICAgICAgICAgICAgICBbJ09TIT0iYW5kcm9pZCInLCB7CisgICAgICAgICAgICAg ICAgWydPUz09ImFuZHJvaWQiJywgeworICAgICAgICAgICAgICAgICAgICAnZGVwZW5kZW5jaWVz JzogWworICAgICAgICAgICAgICAgICAgICAgICAgJ0ltYWdlRGlmZiNob3N0JywKKyAgICAgICAg ICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICB9LHsgIyBPUyE9ImFuZHJvaWQiCiAgICAg ICAgICAgICAgICAgICAgICdzb3VyY2VzLyc6IFsKICAgICAgICAgICAgICAgICAgICAgICAgIFsn ZXhjbHVkZScsICcoQW5kcm9pZClcXC5jcHAkJ10KICAgICAgICAgICAgICAgICAgICAgXSwKICAg ICAgICAgICAgICAgICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKKyAgICAgICAgICAgICAgICAgICAg ICAgICdJbWFnZURpZmYnLAogICAgICAgICAgICAgICAgICAgICAgICAgJ2NvcHlfVGVzdE5ldHNj YXBlUGx1Z0luJywKICAgICAgICAgICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIp L3RoaXJkX3BhcnR5L21lc2EvbWVzYS5neXA6b3NtZXNhJywKICAgICAgICAgICAgICAgICAgICAg XSwKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBh ZmU4ODg5Li45ZTQwMDBkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMTAtMTcgIEhhbyBaaGVuZyAgPHpoZW5n aGFvQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFJlZHVjZSBkZXBlbmRlbmNp ZXMgb2YgSW1hZ2VEaWZmIHRvIGNvbXBpbGUgaXQgZm9yIEFuZHJvaWQuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTk5NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGlzIHJlcXVpcmVk IHRvIG1ha2UgSW1hZ2VEaWZmIGZvciBBbmRyb2lkLCBhbmQgY2FuIGJlbmVmaXQKKyAgICAgICAg b3RoZXIgcGxhdGZvcm1zLCB0b28uIE9uIEFuZHJvaWQsIG1vc3QgdGFyZ2V0cyBhcmUgYnVpbHQg YXMKKyAgICAgICAgdG9vbHNldHM6dGFyZ2V0LiB3aGlsZSBJbWFnZURpZmYgbmVlZHMgdG8gYmUg YnVpbHQgYXMgdG9vbHNldHM6aG9zdC4KKyAgICAgICAgQ3VycmVudGx5LCBidWlsZGluZyB0aGUg c3RhbmRhbG9uZSB0YXJnZXQgb2YgSW1hZ2VEaWZmIGRlcGVuZHMgb24gYWJvdXQKKyAgICAgICAg ODUgb3RoZXIgdGFyZ2V0cyAodHJ5ICBtYWtlIEltYWdlRGlmZicpLCB3aGljaCBpcyBpbmVmZmlj aWVudC4gQWZ0ZXIgdGhlCisgICAgICAgIGNoYW5nZSwgSW1hZ2VEaWZmIG9ubHkgZGVwZW5kcyBv biB3ZWJraXRfc3VwcG9ydF9nZngsIHdoaWNoIGluIHR1cm4KKyAgICAgICAgZGVwZW5kcyBvbiBs aWJwbmcgYW5kIHpsaWIuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9JbWFn ZURpZmYuY3BwOgorICAgICAgICAobWFpbik6CisKIDIwMTEtMTAtMTcgIFJhcGhhZWwgS3VibyBk YSBDb3N0YSAgPGt1Ym9AcHJvZnVzaW9uLm1vYmk+CiAKICAgICAgICAgW0VGTF0gRFJUOiBNYWtl IG5vbi1yZWNvZ25pemVkIGtleXMgd29yayBpbiBldmVudHMgYXMgd2VsbC4KZGlmZiAtLWdpdCBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0ltYWdlRGlmZi5jcHAgYi9Ub29scy9EdW1w UmVuZGVyVHJlZS9jaHJvbWl1bS9JbWFnZURpZmYuY3BwCmluZGV4IGMzMGRkNTAuLjAzNzhlZmYg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0ltYWdlRGlmZi5jcHAK KysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vSW1hZ2VEaWZmLmNwcApAQCAtMzks MTcgKzM5LDI1IEBACiAjaW5jbHVkZSAid2Via2l0L3N1cHBvcnQvd2Via2l0X3N1cHBvcnRfZ2Z4 LmgiCiAjaW5jbHVkZSA8YWxnb3JpdGhtPgogI2luY2x1ZGUgPGl0ZXJhdG9yPgorI2luY2x1ZGUg PGxpbWl0cy5oPgorI2luY2x1ZGUgPHN0ZGludC5oPgogI2luY2x1ZGUgPHN0ZGlvLmg+CiAjaW5j bHVkZSA8c3RyaW5nLmg+CiAjaW5jbHVkZSA8dmVjdG9yPgotI2luY2x1ZGUgPHd0Zi9Pd25BcnJh eVB0ci5oPgotI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAogI2lmIE9TKFdJTkRPV1MpCiAjaW5j bHVkZSA8d2luZG93cy5oPgogI2RlZmluZSBQQVRIX01BWCBNQVhfUEFUSAogI2VuZGlmCiAKKy8v IERlZmluZSBtYWNybyBoZXJlIHRvIG1ha2UgSW1hZ2VEaWZmIGluZGVwZW5kZW50IG9mIEphdmFT Y3JpcHRDb3JlLgorI2RlZmluZSBBU1NFUlQoYXNzZXJ0aW9uKSBkbyBcCisgICAgaWYgKCEoYXNz ZXJ0aW9uKSkgeyBcCisgICAgICAgIGZwcmludGYoc3RkZXJyLCAiQVNTRVJUIGZhaWxlZCBhdCAl czolczogIiAjYXNzZXJ0aW9uICIuIiwgX19GSUxFX18sIF9fTElORV9fKTsgXAorICAgICAgICBl eGl0KDEpOyBcCisgICAgfSBcCit3aGlsZSAoMCkKKwogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAog Ly8gQ2F1c2VzIHRoZSBhcHAgdG8gcmVtYWluIG9wZW4sIHdhaXRpbmcgZm9yIHBhaXJzIG9mIGZp bGVuYW1lcyBvbiBzdGRpbi4KQEAgLTk3LDE0ICsxMDUsMTggQEAgcHVibGljOgogICAgICAgICBp ZiAoIWJ5dGVMZW5ndGgpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAgICAgT3du QXJyYXlQdHI8dW5zaWduZWQgY2hhcj4gc291cmNlID0gYWRvcHRBcnJheVB0cihuZXcgdW5zaWdu ZWQgY2hhcltieXRlTGVuZ3RoXSk7Ci0gICAgICAgIGlmIChmcmVhZChzb3VyY2UuZ2V0KCksIDEs IGJ5dGVMZW5ndGgsIHN0ZGluKSAhPSBieXRlTGVuZ3RoKQorICAgICAgICB1bnNpZ25lZCBjaGFy KiBzb3VyY2UgPSBuZXcgdW5zaWduZWQgY2hhcltieXRlTGVuZ3RoXTsKKyAgICAgICAgaWYgKGZy ZWFkKHNvdXJjZSwgMSwgYnl0ZUxlbmd0aCwgc3RkaW4pICE9IGJ5dGVMZW5ndGgpIHsKKyAgICAg ICAgICAgIGRlbGV0ZSBbXSBzb3VyY2U7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgIH0KIAotICAgICAgICBpZiAoIXdlYmtpdF9zdXBwb3J0OjpEZWNvZGVQTkcoc291cmNlLmdl dCgpLCBieXRlTGVuZ3RoLCAmbV9kYXRhLCAmbV93aWR0aCwgJm1faGVpZ2h0KSkgeworICAgICAg ICBpZiAoIXdlYmtpdF9zdXBwb3J0OjpEZWNvZGVQTkcoc291cmNlLCBieXRlTGVuZ3RoLCAmbV9k YXRhLCAmbV93aWR0aCwgJm1faGVpZ2h0KSkgeworICAgICAgICAgICAgZGVsZXRlIFtdIHNvdXJj ZTsKICAgICAgICAgICAgIGNsZWFyKCk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg ICAgIH0KKyAgICAgICAgZGVsZXRlIFtdIHNvdXJjZTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgfQogCkBAIC00NDksNyArNDYxLDcgQEAgaW50IGRpZmZJbWFnZXMoY29uc3QgY2hhciogZmls ZTEsIGNvbnN0IGNoYXIqIGZpbGUyLCBjb25zdCBjaGFyKiBvdXRGaWxlLAogCiBpbnQgbWFpbihp bnQgYXJnYywgY29uc3QgY2hhciogYXJndltdKQogewotICAgIFZlY3Rvcjxjb25zdCBjaGFyKj4g dmFsdWVzOworICAgIHN0ZDo6dmVjdG9yPGNvbnN0IGNoYXIqPiB2YWx1ZXM7CiAgICAgYm9vbCBw b2xsU3RkaW4gPSBmYWxzZTsKICAgICBib29sIGdlbmVyYXRlRGlmZiA9IGZhbHNlOwogICAgIGJv b2wgc2hvdWxkV3JpdGVQZXJjZW50YWdlcyA9IGZhbHNlOwpAQCAtNDY0LDcgKzQ3Niw3IEBAIGlu dCBtYWluKGludCBhcmdjLCBjb25zdCBjaGFyKiBhcmd2W10pCiAgICAgICAgIGVsc2UgaWYgKCFz dHJjbXAoYXJndltpXSwgb3B0aW9uV2VpZ2h0ZWRJbnRlbnNpdHkpKQogICAgICAgICAgICAgY29t cGFyYXRvciA9IHdlaWdodGVkUGVyY2VudGFnZURpZmZlcmVudDsKICAgICAgICAgZWxzZQotICAg ICAgICAgICAgdmFsdWVzLmFwcGVuZChhcmd2W2ldKTsKKyAgICAgICAgICAgIHZhbHVlcy5wdXNo X2JhY2soYXJndltpXSk7CiAgICAgfQogCiAgICAgaWYgKHBvbGxTdGRpbikgewo=