60380 2011-05-06 10:21:47 -0700 Fix compile with GCC 4.6.0 2011-05-20 05:57:53 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 adawit webkit-unassigned ade ademar dbates menard webkit.review.bot oldest_to_newest 399602 0 adawit 2011-05-06 10:21:47 -0700 Attempting to compile webkit trunk on my box (ArchLinux x86-64) stops the following error: Source/JavaScriptCore/runtime/StringPrototype.cpp: In function ‘void* JSC::stringProtoFuncMatch(JSC::ExecState*)’: Source/JavaScriptCore/runtime/StringPrototype.cpp:631:14: error: variable ‘lastIndex’ set but not used [-Werror=unused-but-set-variable] The attached patch comments of the offending set but unused variable to prevent this compile breakage. 399605 1 92599 adawit 2011-05-06 10:24:49 -0700 Created attachment 92599 proposed patch v1 399606 2 webkit.review.bot 2011-05-06 10:26:46 -0700 Attachment 92599 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source..." exit_code: 1 Source/JavaScriptCore/runtime/StringPrototype.cpp:631: Should have a space between // and comment [whitespace/comments] [4] Source/JavaScriptCore/runtime/StringPrototype.cpp:634: Should have a space between // and comment [whitespace/comments] [4] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 399613 3 92600 adawit 2011-05-06 10:32:30 -0700 Created attachment 92600 proposed patch v2 Fixed the style problems... 399638 4 92600 kling 2011-05-06 10:54:18 -0700 Comment on attachment 92600 proposed patch v2 If the variable is unused, it should be removed, not commented out. 399668 5 92614 adawit 2011-05-06 11:33:14 -0700 Created attachment 92614 proposed patch v3 Removed the set but unused variables instead of commenting them out. 399932 6 92614 ap 2011-05-06 17:15:34 -0700 Comment on attachment 92614 proposed patch v3 I saw (at least parts of) this is someone else's patch today, r- since this will conflict with it. 399933 7 ap 2011-05-06 17:16:37 -0700 Specifically, bug 60370. 399939 8 adawit 2011-05-06 17:27:39 -0700 (In reply to comment #7) > Specifically, bug 60370. Greate, but the patch in that report does not fix the JavascriptCore which was originally proposed in patch v2. 399945 9 92663 adawit 2011-05-06 17:34:02 -0700 Created attachment 92663 proposed patch v4 Removed fixes that have already been applied through bug# 60370. 400103 10 92663 dbates 2011-05-07 14:35:25 -0700 Comment on attachment 92663 proposed patch v4 OK. 400104 11 92663 dbates 2011-05-07 14:35:54 -0700 Comment on attachment 92663 proposed patch v4 r- you're missing a change log. 400111 12 92698 adawit 2011-05-07 15:30:08 -0700 Created attachment 92698 proposed patch v5 Added missing changelog information. 400113 13 92698 dbates 2011-05-07 15:55:15 -0700 Comment on attachment 92698 proposed patch v5 View in context: https://bugs.webkit.org/attachment.cgi?id=92698&action=review As far as I can tell you're not a committer. So, I will make these changes for you and land your patch. > Source/JavaScriptCore/ChangeLog:8 > + Remove unused local variable from code > + > + Fix compile with gcc 4.6.0 > + https://bugs.webkit.org/show_bug.cgi?id=60380 This change log entry does not have the right format. The format is bug title, bug url, then description. Also, GCC is an acronym so "gcc" should be "GCC" (although I can see from the diff that we landed change log entries with "gcc"). Also, we use complete sentences. 400115 14 dbates 2011-05-07 15:59:22 -0700 Committed r86008: <http://trac.webkit.org/changeset/86008> 400119 15 adawit 2011-05-07 16:11:07 -0700 (In reply to comment #13) > (From update of attachment 92698 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=92698&action=review > > As far as I can tell you're not a committer. So, I will make these changes for you and land your patch. > > > Source/JavaScriptCore/ChangeLog:8 > > + Remove unused local variable from code > > + > > + Fix compile with gcc 4.6.0 > > + https://bugs.webkit.org/show_bug.cgi?id=60380 > > This change log entry does not have the right format. The format is bug title, bug url, then description. Also, GCC is an acronym so "gcc" should be "GCC" (although I can see from the diff that we landed change log entries with "gcc"). For the record, the changelog message was prepared using ./Tools/Scripts/prepare-ChangeLog -b 60380 -g <git-commit-number> So the format is as generated by the script one is supposed to use to generate the changelog... 405033 16 ade 2011-05-17 06:42:25 -0700 Revision r86008 cherry-picked into qtwebkit-2.2 with commit 8620c0c <http://gitorious.org/webkit/qtwebkit/commit/8620c0c> 406797 17 adawit 2011-05-19 18:19:27 -0700 (In reply to comment #16) > Revision r86008 cherry-picked into qtwebkit-2.2 with commit 8620c0c <http://gitorious.org/webkit/qtwebkit/commit/8620c0c> Need to cherry pick the patch in bug# 60370 as well. See comment #8. http://trac.webkit.org/changeset/85973 407005 18 ademar 2011-05-20 05:20:26 -0700 (In reply to comment #17) > (In reply to comment #16) > > Revision r86008 cherry-picked into qtwebkit-2.2 with commit 8620c0c <http://gitorious.org/webkit/qtwebkit/commit/8620c0c> > > Need to cherry pick the patch in bug# 60370 as well. See comment #8. > http://trac.webkit.org/changeset/85973 Done, thanks! 407013 19 ademar 2011-05-20 05:48:35 -0700 Dawit: bugs should block the master bug until they're cherry-picked. Once they're included in the branch they're removed from the blocking list. 407017 20 adawit 2011-05-20 05:57:53 -0700 (In reply to comment #19) > Dawit: bugs should block the master bug until they're cherry-picked. Once they're included in the branch they're removed from the blocking list. Ahhh.... right. The reason I made this bug block the master bug is because not all the patches from this bug, actually the one from bug 60370, were cherry-picked. Since I did not create the 60370 bug and I could not change it to block master, I simply added a comment on this one and made it the blocker instead. 92599 2011-05-06 10:24:49 -0700 2011-05-06 10:32:30 -0700 proposed patch v1 bug_60380.patch text/plain 1389 adawit ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDhhZTZiZTkuLjc0ZGUxZmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTA1LTA2ICBEYXdpdCBBbGVtYXll aHUgIDxhZGF3aXRAa2RlLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNYWtlIGl0IGNvbXBpbGUgd2l0aCBnY2MgPj0gNC42CisKKyAgICAgICAg Rml4IGNvbXBpbGUgd2l0aCBnY2MgNC42LjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTYwMzgwCisKKyAgICAgICAgKiBydW50aW1lL1N0cmluZ1Byb3Rv dHlwZS5jcHA6CisgICAgICAgIChKU0M6OnN0cmluZ1Byb3RvRnVuY01hdGNoKToKKwogMjAxMS0w NS0wNiAgQWxleGlzIE1lbmFyZCAgPGFsZXhpcy5tZW5hcmRAb3BlbmJvc3NhLm9yZz4KIAogICAg ICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCB3aXRoIGdjYyA0LjYuMCBvbiBsaW51eCBhbmQgYysr MHggc3VwcG9ydC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0 cmluZ1Byb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJpbmdQ cm90b3R5cGUuY3BwCmluZGV4IDkxMTEyYTUuLjIxM2JmZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RyaW5nUHJvdG90eXBlLmNwcApAQCAtNjI4LDEwICs2Mjgs MTAgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBzdHJpbmdQcm90b0Z1bmNNYXRjaChF eGVjU3RhdGUqIGV4ZWMpCiAKICAgICAvLyByZXR1cm4gYXJyYXkgb2YgbWF0Y2hlcwogICAgIE1h cmtlZEFyZ3VtZW50QnVmZmVyIGxpc3Q7Ci0gICAgdW5zaWduZWQgbGFzdEluZGV4ID0gMDsKKyAg ICAvL3Vuc2lnbmVkIGxhc3RJbmRleCA9IDA7CiAgICAgd2hpbGUgKHBvcyA+PSAwKSB7CiAgICAg ICAgIGxpc3QuYXBwZW5kKGpzU3Vic3RyaW5nKGV4ZWMsIHMsIHBvcywgbWF0Y2hMZW5ndGgpKTsK LSAgICAgICAgbGFzdEluZGV4ID0gcG9zOworICAgICAgICAvL2xhc3RJbmRleCA9IHBvczsKICAg ICAgICAgcG9zICs9IG1hdGNoTGVuZ3RoID09IDAgPyAxIDogbWF0Y2hMZW5ndGg7CiAgICAgICAg IHJlZ0V4cENvbnN0cnVjdG9yLT5wZXJmb3JtTWF0Y2gocmVnLmdldCgpLCBzLCBwb3MsIHBvcywg bWF0Y2hMZW5ndGgpOwogICAgIH0K 92600 2011-05-06 10:32:30 -0700 2011-05-06 11:33:14 -0700 proposed patch v2 bug_60380.patch text/plain 1391 adawit ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDhhZTZiZTkuLjc0ZGUxZmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTA1LTA2ICBEYXdpdCBBbGVtYXll aHUgIDxhZGF3aXRAa2RlLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNYWtlIGl0IGNvbXBpbGUgd2l0aCBnY2MgPj0gNC42CisKKyAgICAgICAg Rml4IGNvbXBpbGUgd2l0aCBnY2MgNC42LjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTYwMzgwCisKKyAgICAgICAgKiBydW50aW1lL1N0cmluZ1Byb3Rv dHlwZS5jcHA6CisgICAgICAgIChKU0M6OnN0cmluZ1Byb3RvRnVuY01hdGNoKToKKwogMjAxMS0w NS0wNiAgQWxleGlzIE1lbmFyZCAgPGFsZXhpcy5tZW5hcmRAb3BlbmJvc3NhLm9yZz4KIAogICAg ICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCB3aXRoIGdjYyA0LjYuMCBvbiBsaW51eCBhbmQgYysr MHggc3VwcG9ydC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0 cmluZ1Byb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJpbmdQ cm90b3R5cGUuY3BwCmluZGV4IDkxMTEyYTUuLjRiZDExOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RyaW5nUHJvdG90eXBlLmNwcApAQCAtNjI4LDEwICs2Mjgs MTAgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBzdHJpbmdQcm90b0Z1bmNNYXRjaChF eGVjU3RhdGUqIGV4ZWMpCiAKICAgICAvLyByZXR1cm4gYXJyYXkgb2YgbWF0Y2hlcwogICAgIE1h cmtlZEFyZ3VtZW50QnVmZmVyIGxpc3Q7Ci0gICAgdW5zaWduZWQgbGFzdEluZGV4ID0gMDsKKyAg ICAvLyB1bnNpZ25lZCBsYXN0SW5kZXggPSAwOwogICAgIHdoaWxlIChwb3MgPj0gMCkgewogICAg ICAgICBsaXN0LmFwcGVuZChqc1N1YnN0cmluZyhleGVjLCBzLCBwb3MsIG1hdGNoTGVuZ3RoKSk7 Ci0gICAgICAgIGxhc3RJbmRleCA9IHBvczsKKyAgICAgICAgLy8gbGFzdEluZGV4ID0gcG9zOwog ICAgICAgICBwb3MgKz0gbWF0Y2hMZW5ndGggPT0gMCA/IDEgOiBtYXRjaExlbmd0aDsKICAgICAg ICAgcmVnRXhwQ29uc3RydWN0b3ItPnBlcmZvcm1NYXRjaChyZWcuZ2V0KCksIHMsIHBvcywgcG9z LCBtYXRjaExlbmd0aCk7CiAgICAgfQo= 92614 2011-05-06 11:33:14 -0700 2011-05-06 17:34:02 -0700 proposed patch v3 bug_60380.patch text/plain 4014 adawit ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDhhZTZiZTkuLjUzOTU2ZGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDExLTA1LTA2ICBEYXdpdCBBbGVtYXll aHUgIDxhZGF3aXRAa2RlLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNYWtlIGl0IGNvbXBpbGUgd2l0aCBnY2MgPj0gNC42CisKKyAgICAgICAg Rml4IGNvbXBpbGUgd2l0aCBnY2MgNC42LjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTYwMzgwCisKKyAgICAgICAgKiBydW50aW1lL1N0cmluZ1Byb3Rv dHlwZS5jcHA6CisgICAgICAgIChKU0M6OnN0cmluZ1Byb3RvRnVuY01hdGNoKToKKworMjAxMS0w NS0wNiAgRGF3aXQgQWxlbWF5ZWh1ICA8YWRhd2l0QGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBpdCBjb21waWxlIHdpdGggZ2Nj ID49IDQuNgorCisgICAgICAgIEZpeCBjb21waWxlIHdpdGggZ2NjIDQuNi4wCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDM4MAorCisgICAgICAgICog cnVudGltZS9TdHJpbmdQcm90b3R5cGUuY3BwOgorICAgICAgICAoSlNDOjpzdHJpbmdQcm90b0Z1 bmNNYXRjaCk6CisKIDIwMTEtMDUtMDYgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9w ZW5ib3NzYS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggd2l0aCBnY2MgNC42 LjAgb24gbGludXggYW5kIGMrKzB4IHN1cHBvcnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUuY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvU3RyaW5nUHJvdG90eXBlLmNwcAppbmRleCA5MTExMmE1Li40Mjk5MzQ0IDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUu Y3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5j cHAKQEAgLTYyOCwxMCArNjI4LDggQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBzdHJp bmdQcm90b0Z1bmNNYXRjaChFeGVjU3RhdGUqIGV4ZWMpCiAKICAgICAvLyByZXR1cm4gYXJyYXkg b2YgbWF0Y2hlcwogICAgIE1hcmtlZEFyZ3VtZW50QnVmZmVyIGxpc3Q7Ci0gICAgdW5zaWduZWQg bGFzdEluZGV4ID0gMDsKICAgICB3aGlsZSAocG9zID49IDApIHsKICAgICAgICAgbGlzdC5hcHBl bmQoanNTdWJzdHJpbmcoZXhlYywgcywgcG9zLCBtYXRjaExlbmd0aCkpOwotICAgICAgICBsYXN0 SW5kZXggPSBwb3M7CiAgICAgICAgIHBvcyArPSBtYXRjaExlbmd0aCA9PSAwID8gMSA6IG1hdGNo TGVuZ3RoOwogICAgICAgICByZWdFeHBDb25zdHJ1Y3Rvci0+cGVyZm9ybU1hdGNoKHJlZy5nZXQo KSwgcywgcG9zLCBwb3MsIG1hdGNoTGVuZ3RoKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjUyNWEx MC4uMmFhZjNjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTA1LTA2ICBEYXdp dCBBbGVtYXllaHUgIDxhZGF3aXRAa2RlLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIGl0IGNvbXBpbGUgd2l0aCBnY2MgPj0gNC42CisK KyAgICAgICAgRml4IGNvbXBpbGUgd2l0aCBnY2MgNC42LjAKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwMzgwCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz LiAoT09QUyEpCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxheW91dFZlcnRpY2FsQm94KToK KyAgICAgICAgKiBzdmcvYW5pbWF0aW9uL1NWR1NNSUxFbGVtZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNWR1NNSUxFbGVtZW50OjpjYWxjdWxhdGVOZXh0UHJvZ3Jlc3NUaW1lKToKKwogMjAx MS0wNS0wNCAgQWRyaWVubmUgV2Fsa2VyICA8ZW5uZUBnb29nbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggZTUwMmVhZi4uYjU1YmQ5ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC02MzEsMTAgKzYz MSw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEhvcml6b250YWxCb3goYm9vbCBy ZWxheW91dENoaWxkcmVuKQogCiB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRWZXJ0aWNh bEJveChib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiB7Ci0gICAgaW50IHhQb3MgPSBib3JkZXJMZWZ0 KCkgKyBwYWRkaW5nTGVmdCgpOwogICAgIGludCB5UG9zID0gYm9yZGVyVG9wKCkgKyBwYWRkaW5n VG9wKCk7Ci0gICAgaWYgKCFzdHlsZSgpLT5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkpCi0gICAg ICAgIHhQb3MgPSB3aWR0aCgpIC0gcGFkZGluZ1JpZ2h0KCkgLSBib3JkZXJSaWdodCgpOwogICAg IGludCB0b0FkZCA9IGJvcmRlckJvdHRvbSgpICsgcGFkZGluZ0JvdHRvbSgpICsgaG9yaXpvbnRh bFNjcm9sbGJhckhlaWdodCgpOwogICAgIGJvb2wgaGVpZ2h0U3BlY2lmaWVkID0gZmFsc2U7CiAg ICAgaW50IG9sZEhlaWdodCA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvYW5p bWF0aW9uL1NWR1NNSUxFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9hbmltYXRpb24v U1ZHU01JTEVsZW1lbnQuY3BwCmluZGV4IDdlYWYyZmIuLjVjYjU1NjMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N2Zy9hbmltYXRpb24vU1ZHU01JTEVsZW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3N2Zy9hbmltYXRpb24vU1ZHU01JTEVsZW1lbnQuY3BwCkBAIC04NDcsNyArODQ3 LDYgQEAgU01JTFRpbWUgU1ZHU01JTEVsZW1lbnQ6OmNhbGN1bGF0ZU5leHRQcm9ncmVzc1RpbWUo U01JTFRpbWUgZWxhcHNlZCkgY29uc3QKICAgICAgICAgLy8gSWYgZHVyYXRpb24gaXMgaW5kZWZp bml0ZSB0aGUgdmFsdWUgZG9lcyBub3QgYWN0dWFsbHkgY2hhbmdlIG92ZXIgdGltZS4gU2FtZSBp cyB0cnVlIGZvciA8c2V0Pi4KICAgICAgICAgU01JTFRpbWUgc2ltcGxlRHVyYXRpb24gPSB0aGlz LT5zaW1wbGVEdXJhdGlvbigpOwogICAgICAgICBpZiAoc2ltcGxlRHVyYXRpb24uaXNJbmRlZmlu aXRlKCkgfHwgaGFzVGFnTmFtZShTVkdOYW1lczo6c2V0VGFnKSkgewotICAgICAgICAgICAgU01J TFRpbWUgcmVwZWF0Q291bnQgPSB0aGlzLT5yZXBlYXRDb3VudCgpOwogICAgICAgICAgICAgU01J TFRpbWUgcmVwZWF0aW5nRHVyYXRpb25FbmQgPSBtX2ludGVydmFsQmVnaW4gKyByZXBlYXRpbmdE dXJhdGlvbigpOwogICAgICAgICAgICAgLy8gV2UgYXJlIHN1cHBvc2VkIHRvIGRvIGZyZWV6ZSBz ZW1hbnRpY3Mgd2hlbiByZXBlYXRpbmcgZW5kcywgZXZlbiBpZiB0aGUgZWxlbWVudCBpcyBzdGls bCBhY3RpdmUuIAogICAgICAgICAgICAgLy8gVGFrZSBjYXJlIHRoYXQgd2UgZ2V0IGEgdGltZXIg Y2FsbGJhY2sgYXQgdGhhdCBwb2ludC4K 92663 2011-05-06 17:34:02 -0700 2011-05-07 15:30:08 -0700 proposed patch v4 bug_60380.patch text/plain 690 adawit ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlw ZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUuY3Bw CmluZGV4IDkxMTEyYTUuLjQyOTkzNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvU3RyaW5nUHJvdG90eXBlLmNwcApAQCAtNjI4LDEwICs2MjgsOCBAQCBFbmNvZGVk SlNWYWx1ZSBKU0NfSE9TVF9DQUxMIHN0cmluZ1Byb3RvRnVuY01hdGNoKEV4ZWNTdGF0ZSogZXhl YykKIAogICAgIC8vIHJldHVybiBhcnJheSBvZiBtYXRjaGVzCiAgICAgTWFya2VkQXJndW1lbnRC dWZmZXIgbGlzdDsKLSAgICB1bnNpZ25lZCBsYXN0SW5kZXggPSAwOwogICAgIHdoaWxlIChwb3Mg Pj0gMCkgewogICAgICAgICBsaXN0LmFwcGVuZChqc1N1YnN0cmluZyhleGVjLCBzLCBwb3MsIG1h dGNoTGVuZ3RoKSk7Ci0gICAgICAgIGxhc3RJbmRleCA9IHBvczsKICAgICAgICAgcG9zICs9IG1h dGNoTGVuZ3RoID09IDAgPyAxIDogbWF0Y2hMZW5ndGg7CiAgICAgICAgIHJlZ0V4cENvbnN0cnVj dG9yLT5wZXJmb3JtTWF0Y2gocmVnLmdldCgpLCBzLCBwb3MsIHBvcywgbWF0Y2hMZW5ndGgpOwog ICAgIH0K 92698 2011-05-07 15:30:08 -0700 2011-05-07 15:55:15 -0700 proposed patch v5 bug_60380.patch text/plain 1336 adawit ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDhhZTZiZTkuLjNhYTRkNGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTA1LTA2ICBEYXdpdCBBbGVtYXll aHUgIDxhZGF3aXRAa2RlLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBSZW1vdmUgdW51c2VkIGxvY2FsIHZhcmlhYmxlIGZyb20gY29kZQorCisg ICAgICAgIEZpeCBjb21waWxlIHdpdGggZ2NjIDQuNi4wCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDM4MAorCisgICAgICAgICogcnVudGltZS9TdHJp bmdQcm90b3R5cGUuY3BwOgorICAgICAgICAoSlNDOjpzdHJpbmdQcm90b0Z1bmNNYXRjaCk6CisK IDIwMTEtMDUtMDYgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+ CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggd2l0aCBnY2MgNC42LjAgb24gbGludXgg YW5kIGMrKzB4IHN1cHBvcnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9TdHJpbmdQcm90b3R5cGUuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv U3RyaW5nUHJvdG90eXBlLmNwcAppbmRleCA5MTExMmE1Li40Mjk5MzQ0IDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUuY3BwCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHAKQEAgLTYyOCwx MCArNjI4LDggQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBzdHJpbmdQcm90b0Z1bmNN YXRjaChFeGVjU3RhdGUqIGV4ZWMpCiAKICAgICAvLyByZXR1cm4gYXJyYXkgb2YgbWF0Y2hlcwog ICAgIE1hcmtlZEFyZ3VtZW50QnVmZmVyIGxpc3Q7Ci0gICAgdW5zaWduZWQgbGFzdEluZGV4ID0g MDsKICAgICB3aGlsZSAocG9zID49IDApIHsKICAgICAgICAgbGlzdC5hcHBlbmQoanNTdWJzdHJp bmcoZXhlYywgcywgcG9zLCBtYXRjaExlbmd0aCkpOwotICAgICAgICBsYXN0SW5kZXggPSBwb3M7 CiAgICAgICAgIHBvcyArPSBtYXRjaExlbmd0aCA9PSAwID8gMSA6IG1hdGNoTGVuZ3RoOwogICAg ICAgICByZWdFeHBDb25zdHJ1Y3Rvci0+cGVyZm9ybU1hdGNoKHJlZy5nZXQoKSwgcywgcG9zLCBw b3MsIG1hdGNoTGVuZ3RoKTsKICAgICB9Cg==