109619 2013-02-12 14:56:36 -0800 Use fancy new Vector-based String constructors in the WebVTT parser 2013-02-13 21:59:25 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 109617 1 eric eric abarth buildbot dglazkov ojan.autocc peter+ews philn rniwa webkit.review.bot xan.lopez oldest_to_newest 831293 0 eric 2013-02-12 14:56:36 -0800 Use fancy new Vector-based String constructors in the WebVTT parser 831298 1 187945 eric 2013-02-12 14:58:26 -0800 Created attachment 187945 Patch 831303 2 eric 2013-02-12 15:05:29 -0800 The build will fail until bug 109617 lands. 831307 3 187945 webkit.review.bot 2013-02-12 15:07:36 -0800 Comment on attachment 187945 Patch Attachment 187945 did not pass cr-linux-debug-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16440459 831314 4 187945 benjamin 2013-02-12 15:11:12 -0800 Comment on attachment 187945 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187945&action=review Looks great. > Source/WebCore/html/track/WebVTTParser.cpp:382 > + String content(m_token.characters()); // FIXME: Can this be 8bit? I would not put this Fixme. Without context of your current work, it will be impossible to know what you meant. > Source/WebCore/html/track/WebVTTParser.cpp:422 > + // FIXME: m_token.characters should normally be 8-bit! Maybe? // FIXME: m_token.characters should normally be 8-bit! Should we convert the input string to 8bits if possible. 831329 5 187945 webkit.review.bot 2013-02-12 15:18:18 -0800 Comment on attachment 187945 Patch Attachment 187945 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16517407 831352 6 187945 peter+ews 2013-02-12 15:33:06 -0800 Comment on attachment 187945 Patch Attachment 187945 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/16513440 831357 7 187945 eflews.bot 2013-02-12 15:37:29 -0800 Comment on attachment 187945 Patch Attachment 187945 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/16532108 831455 8 eric 2013-02-12 17:19:57 -0800 I'm certain that both of those cases should use 8bit strings, I just wanted to separate the behavior changes for later. I've made both FIXMEs stronger, will post. 831456 9 187970 eric 2013-02-12 17:20:15 -0800 Created attachment 187970 Patch for landing 831487 10 187970 webkit.review.bot 2013-02-12 18:01:48 -0800 Comment on attachment 187970 Patch for landing Rejecting attachment 187970 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=gce-cq-01', 'build', '--no-clean', '--no-update', '--build-style=release', '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: switch ../../Source/WebCore/html/track/WebVTTParser.cpp:380: error: enumeration value 'EndOfFile' not handled in switch ninja: build stopped: subcommand failed. Failed to run "['Tools/Scripts/build-webkit', '--release', '--chromium', '--update-chromium']" exit_code: 1 ser.cpp:380: error: enumeration value 'Uninitialized' not handled in switch ../../Source/WebCore/html/track/WebVTTParser.cpp:380: error: enumeration value 'EndOfFile' not handled in switch ninja: build stopped: subcommand failed. Full output: http://queues.webkit.org/results/16483476 832062 11 187970 buildbot 2013-02-13 10:49:07 -0800 Comment on attachment 187970 Patch for landing Attachment 187970 did not pass mac-wk2-ews (mac-wk2): Output: http://queues.webkit.org/results/16542193 832077 12 188121 eric 2013-02-13 10:58:15 -0800 Created attachment 188121 Patch for landing 832182 13 188121 webkit.review.bot 2013-02-13 12:25:28 -0800 Comment on attachment 188121 Patch for landing Clearing flags on attachment: 188121 Committed r142772: <http://trac.webkit.org/changeset/142772> 832183 14 webkit.review.bot 2013-02-13 12:25:33 -0800 All reviewed patches have been landed. Closing bug. 832724 15 eric 2013-02-13 21:59:25 -0800 I've since learned/re-learned that this is a change in behavior. Previously String(UChar*, length) will treat length=0 as the empty string. String(Vector) treats vector.size() == 0 as the null string. This patch may need to be amended. 187945 2013-02-12 14:58:26 -0800 2013-02-12 17:20:11 -0800 Patch bug-109619-20130212145504.patch text/plain 3770 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmI4YTIxNGUyM2MwN2M5 M2VmYjM1MjZhN2ZhMDJjMDM0Y2ZlNDg3MC4uM2U0ZTIzMmRlMjFjMDQ0MTJhZDFkZjFhYTMzMGY3 M2QzZDU1NjE0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAyLTEyICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBVc2UgZmFuY3kgbmV3IFZlY3Rv ci1iYXNlZCBTdHJpbmcgY29uc3RydWN0b3JzIGluIHRoZSBXZWJWVFQgcGFyc2VyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk2MTkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVo YXZpb3IuIEFkZGVkIHNvbWUgRklYTUVzIGZvciBmdXR1cmUgcGVyZiBvcHRpbWl6YXRpb24uCisK KyAgICAgICAgKiBodG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpXZWJWVFRQYXJzZXI6OmNvbnN0cnVjdFRyZWVGcm9tVG9rZW4pOgorCiAyMDEzLTAyLTEyICBB bnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBDYWNoZSB0aW1lciBo ZWFwIHBvaW50ZXIgdG8gdGltZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3Ry YWNrL1dlYlZUVFBhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBh cnNlci5jcHAKaW5kZXggMWU2MjZlNTZlNDIyOTcxNTZmNDljMWQ4ZDhjNjA3MjVkZmUxMTNmMi4u MDgxODFkYzhjNTYwODliNDVkNmJhOTJkOTg0ZGFlODkwY2Y3OGNmOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNwcApAQCAtMzczLDE0ICszNzMsMTMgQEAgc3Rh dGljIFdlYlZUVE5vZGVUeXBlIHRva2VuVG9Ob2RlVHlwZShXZWJWVFRUb2tlbiYgdG9rZW4pCiAK IHZvaWQgV2ViVlRUUGFyc2VyOjpjb25zdHJ1Y3RUcmVlRnJvbVRva2VuKERvY3VtZW50KiBkb2N1 bWVudCkKIHsKLSAgICBBdG9taWNTdHJpbmcgdG9rZW5UYWdOYW1lKG1fdG9rZW4ubmFtZSgpLmRh dGEoKSwgbV90b2tlbi5uYW1lKCkuc2l6ZSgpKTsKLSAgICBRdWFsaWZpZWROYW1lIHRhZ05hbWUo bnVsbEF0b20sIHRva2VuVGFnTmFtZSwgeGh0bWxOYW1lc3BhY2VVUkkpOworICAgIFF1YWxpZmll ZE5hbWUgdGFnTmFtZShudWxsQXRvbSwgQXRvbWljU3RyaW5nKG1fdG9rZW4ubmFtZSgpKSwgeGh0 bWxOYW1lc3BhY2VVUkkpOwogCiAgICAgLy8gaHR0cDovL2Rldi53My5vcmcvaHRtbDUvd2VidnR0 LyN3ZWJ2dHQtY3VlLXRleHQtZG9tLWNvbnN0cnVjdGlvbi1ydWxlcwogCiAgICAgc3dpdGNoICht X3Rva2VuLnR5cGUoKSkgewogICAgIGNhc2UgV2ViVlRUVG9rZW5UeXBlczo6Q2hhcmFjdGVyOiB7 Ci0gICAgICAgIFN0cmluZyBjb250ZW50KG1fdG9rZW4uY2hhcmFjdGVycygpLmRhdGEoKSwgbV90 b2tlbi5jaGFyYWN0ZXJzKCkuc2l6ZSgpKTsKKyAgICAgICAgU3RyaW5nIGNvbnRlbnQobV90b2tl bi5jaGFyYWN0ZXJzKCkpOyAvLyBGSVhNRTogQ2FuIHRoaXMgYmUgOGJpdD8KICAgICAgICAgUmVm UHRyPFRleHQ+IGNoaWxkID0gVGV4dDo6Y3JlYXRlKGRvY3VtZW50LCBjb250ZW50KTsKICAgICAg ICAgbV9jdXJyZW50Tm9kZS0+cGFyc2VyQXBwZW5kQ2hpbGQoY2hpbGQpOwogICAgICAgICBicmVh azsKQEAgLTM5MiwxMiArMzkxLDEyIEBAIHZvaWQgV2ViVlRUUGFyc2VyOjpjb25zdHJ1Y3RUcmVl RnJvbVRva2VuKERvY3VtZW50KiBkb2N1bWVudCkKICAgICAgICAgICAgIGNoaWxkID0gV2ViVlRU RWxlbWVudDo6Y3JlYXRlKG5vZGVUeXBlLCBkb2N1bWVudCk7CiAgICAgICAgIGlmIChjaGlsZCkg ewogICAgICAgICAgICAgaWYgKG1fdG9rZW4uY2xhc3NlcygpLnNpemUoKSA+IDApCi0gICAgICAg ICAgICAgICAgY2hpbGQtPnNldEF0dHJpYnV0ZShjbGFzc0F0dHIsIEF0b21pY1N0cmluZyhtX3Rv a2VuLmNsYXNzZXMoKS5kYXRhKCksIG1fdG9rZW4uY2xhc3NlcygpLnNpemUoKSkpOworICAgICAg ICAgICAgICAgIGNoaWxkLT5zZXRBdHRyaWJ1dGUoY2xhc3NBdHRyLCBBdG9taWNTdHJpbmcobV90 b2tlbi5jbGFzc2VzKCkpKTsKIAogICAgICAgICAgICAgaWYgKGNoaWxkLT53ZWJWVFROb2RlVHlw ZSgpID09IFdlYlZUVE5vZGVUeXBlVm9pY2UpCi0gICAgICAgICAgICAgICAgY2hpbGQtPnNldEF0 dHJpYnV0ZShXZWJWVFRFbGVtZW50Ojp2b2ljZUF0dHJpYnV0ZU5hbWUoKSwgQXRvbWljU3RyaW5n KG1fdG9rZW4uYW5ub3RhdGlvbigpLmRhdGEoKSwgbV90b2tlbi5hbm5vdGF0aW9uKCkuc2l6ZSgp KSk7CisgICAgICAgICAgICAgICAgY2hpbGQtPnNldEF0dHJpYnV0ZShXZWJWVFRFbGVtZW50Ojp2 b2ljZUF0dHJpYnV0ZU5hbWUoKSwgQXRvbWljU3RyaW5nKG1fdG9rZW4uYW5ub3RhdGlvbigpKSk7 CiAgICAgICAgICAgICBlbHNlIGlmIChjaGlsZC0+d2ViVlRUTm9kZVR5cGUoKSA9PSBXZWJWVFRO b2RlVHlwZUxhbmd1YWdlKSB7Ci0gICAgICAgICAgICAgICAgbV9sYW5ndWFnZVN0YWNrLmFwcGVu ZChBdG9taWNTdHJpbmcobV90b2tlbi5hbm5vdGF0aW9uKCkuZGF0YSgpLCBtX3Rva2VuLmFubm90 YXRpb24oKS5zaXplKCkpKTsKKyAgICAgICAgICAgICAgICBtX2xhbmd1YWdlU3RhY2suYXBwZW5k KEF0b21pY1N0cmluZyhtX3Rva2VuLmFubm90YXRpb24oKSkpOwogICAgICAgICAgICAgICAgIGNo aWxkLT5zZXRBdHRyaWJ1dGUoV2ViVlRURWxlbWVudDo6bGFuZ0F0dHJpYnV0ZU5hbWUoKSwgbV9s YW5ndWFnZVN0YWNrLmxhc3QoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoIW1f bGFuZ3VhZ2VTdGFjay5pc0VtcHR5KCkpCkBAIC00MjAsMTIgKzQxOSwxMSBAQCB2b2lkIFdlYlZU VFBhcnNlcjo6Y29uc3RydWN0VHJlZUZyb21Ub2tlbihEb2N1bWVudCogZG9jdW1lbnQpCiAgICAg Y2FzZSBXZWJWVFRUb2tlblR5cGVzOjpUaW1lc3RhbXBUYWc6IHsKICAgICAgICAgdW5zaWduZWQg cG9zaXRpb24gPSAwOwogICAgICAgICBkb3VibGUgdGltZSA9IGNvbGxlY3RUaW1lU3RhbXAobV90 b2tlbi5jaGFyYWN0ZXJzKCkuZGF0YSgpLCAmcG9zaXRpb24pOworICAgICAgICAvLyBGSVhNRTog bV90b2tlbi5jaGFyYWN0ZXJzIHNob3VsZCBub3JtYWxseSBiZSA4LWJpdCEKICAgICAgICAgaWYg KHRpbWUgIT0gbWFsZm9ybWVkVGltZSkKLSAgICAgICAgICAgIG1fY3VycmVudE5vZGUtPnBhcnNl ckFwcGVuZENoaWxkKFByb2Nlc3NpbmdJbnN0cnVjdGlvbjo6Y3JlYXRlKGRvY3VtZW50LCAidGlt ZXN0YW1wIiwgU3RyaW5nKG1fdG9rZW4uY2hhcmFjdGVycygpLmRhdGEoKSwgbV90b2tlbi5jaGFy YWN0ZXJzKCkuc2l6ZSgpKSkpOworICAgICAgICAgICAgbV9jdXJyZW50Tm9kZS0+cGFyc2VyQXBw ZW5kQ2hpbGQoUHJvY2Vzc2luZ0luc3RydWN0aW9uOjpjcmVhdGUoZG9jdW1lbnQsICJ0aW1lc3Rh bXAiLCBTdHJpbmcobV90b2tlbi5jaGFyYWN0ZXJzKCkpKSk7CiAgICAgICAgIGJyZWFrOwogICAg IH0KLSAgICBkZWZhdWx0OgotICAgICAgICBicmVhazsKICAgICB9CiAgICAgbV90b2tlbi5jbGVh cigpOwogfQo= 187970 2013-02-12 17:20:15 -0800 2013-02-13 10:58:11 -0800 Patch for landing bug-109619-20130212171646.patch text/plain 3808 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNjk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDBhMGYxNWVhMmU2YTE3 N2Q3MzI1OGI1ZDVkZDA0MDQ1MzEwMjEwNi4uYjc5NjYwNTQxNjYyMWY5MWVmY2ViNmVmZGI1NTQ0 ZjMwYTMxZTNhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAyLTEyICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBVc2UgZmFuY3kgbmV3IFZlY3Rv ci1iYXNlZCBTdHJpbmcgY29uc3RydWN0b3JzIGluIHRoZSBXZWJWVFQgcGFyc2VyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk2MTkKKworICAgICAg ICBSZXZpZXdlZCBieSBCZW5qYW1pbiBQb3VsYWluLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBi ZWhhdmlvci4gQWRkZWQgc29tZSBGSVhNRXMgZm9yIGZ1dHVyZSBwZXJmIG9wdGltaXphdGlvbi4K KworICAgICAgICAqIGh0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OldlYlZUVFBhcnNlcjo6Y29uc3RydWN0VHJlZUZyb21Ub2tlbik6CisKIDIwMTMtMDItMTIg IFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2gg d2hlbiBzY3JvbGxpbmcgc29vbiBhZnRlciBwYWdlIHN0YXJ0cyBsb2FkaW5nCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHAKaW5kZXggMWU2MjZlNTZlNDIyOTcxNTZm NDljMWQ4ZDhjNjA3MjVkZmUxMTNmMi4uMDM4MzU2YzRkODRkYWQ2MWVjNGM1MmZlNTFmNGFiNTY1 NjUxYzY3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJz ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNwcApA QCAtMzczLDE0ICszNzMsMTMgQEAgc3RhdGljIFdlYlZUVE5vZGVUeXBlIHRva2VuVG9Ob2RlVHlw ZShXZWJWVFRUb2tlbiYgdG9rZW4pCiAKIHZvaWQgV2ViVlRUUGFyc2VyOjpjb25zdHJ1Y3RUcmVl RnJvbVRva2VuKERvY3VtZW50KiBkb2N1bWVudCkKIHsKLSAgICBBdG9taWNTdHJpbmcgdG9rZW5U YWdOYW1lKG1fdG9rZW4ubmFtZSgpLmRhdGEoKSwgbV90b2tlbi5uYW1lKCkuc2l6ZSgpKTsKLSAg ICBRdWFsaWZpZWROYW1lIHRhZ05hbWUobnVsbEF0b20sIHRva2VuVGFnTmFtZSwgeGh0bWxOYW1l c3BhY2VVUkkpOworICAgIFF1YWxpZmllZE5hbWUgdGFnTmFtZShudWxsQXRvbSwgQXRvbWljU3Ry aW5nKG1fdG9rZW4ubmFtZSgpKSwgeGh0bWxOYW1lc3BhY2VVUkkpOwogCiAgICAgLy8gaHR0cDov L2Rldi53My5vcmcvaHRtbDUvd2VidnR0LyN3ZWJ2dHQtY3VlLXRleHQtZG9tLWNvbnN0cnVjdGlv bi1ydWxlcwogCiAgICAgc3dpdGNoIChtX3Rva2VuLnR5cGUoKSkgewogICAgIGNhc2UgV2ViVlRU VG9rZW5UeXBlczo6Q2hhcmFjdGVyOiB7Ci0gICAgICAgIFN0cmluZyBjb250ZW50KG1fdG9rZW4u Y2hhcmFjdGVycygpLmRhdGEoKSwgbV90b2tlbi5jaGFyYWN0ZXJzKCkuc2l6ZSgpKTsKKyAgICAg ICAgU3RyaW5nIGNvbnRlbnQobV90b2tlbi5jaGFyYWN0ZXJzKCkpOyAvLyBGSVhNRTogVGhpcyBz aG91bGQgYmUgOGJpdCBpZiBwb3NzaWJsZS4KICAgICAgICAgUmVmUHRyPFRleHQ+IGNoaWxkID0g VGV4dDo6Y3JlYXRlKGRvY3VtZW50LCBjb250ZW50KTsKICAgICAgICAgbV9jdXJyZW50Tm9kZS0+ cGFyc2VyQXBwZW5kQ2hpbGQoY2hpbGQpOwogICAgICAgICBicmVhazsKQEAgLTM5MiwxMiArMzkx LDEyIEBAIHZvaWQgV2ViVlRUUGFyc2VyOjpjb25zdHJ1Y3RUcmVlRnJvbVRva2VuKERvY3VtZW50 KiBkb2N1bWVudCkKICAgICAgICAgICAgIGNoaWxkID0gV2ViVlRURWxlbWVudDo6Y3JlYXRlKG5v ZGVUeXBlLCBkb2N1bWVudCk7CiAgICAgICAgIGlmIChjaGlsZCkgewogICAgICAgICAgICAgaWYg KG1fdG9rZW4uY2xhc3NlcygpLnNpemUoKSA+IDApCi0gICAgICAgICAgICAgICAgY2hpbGQtPnNl dEF0dHJpYnV0ZShjbGFzc0F0dHIsIEF0b21pY1N0cmluZyhtX3Rva2VuLmNsYXNzZXMoKS5kYXRh KCksIG1fdG9rZW4uY2xhc3NlcygpLnNpemUoKSkpOworICAgICAgICAgICAgICAgIGNoaWxkLT5z ZXRBdHRyaWJ1dGUoY2xhc3NBdHRyLCBBdG9taWNTdHJpbmcobV90b2tlbi5jbGFzc2VzKCkpKTsK IAogICAgICAgICAgICAgaWYgKGNoaWxkLT53ZWJWVFROb2RlVHlwZSgpID09IFdlYlZUVE5vZGVU eXBlVm9pY2UpCi0gICAgICAgICAgICAgICAgY2hpbGQtPnNldEF0dHJpYnV0ZShXZWJWVFRFbGVt ZW50Ojp2b2ljZUF0dHJpYnV0ZU5hbWUoKSwgQXRvbWljU3RyaW5nKG1fdG9rZW4uYW5ub3RhdGlv bigpLmRhdGEoKSwgbV90b2tlbi5hbm5vdGF0aW9uKCkuc2l6ZSgpKSk7CisgICAgICAgICAgICAg ICAgY2hpbGQtPnNldEF0dHJpYnV0ZShXZWJWVFRFbGVtZW50Ojp2b2ljZUF0dHJpYnV0ZU5hbWUo KSwgQXRvbWljU3RyaW5nKG1fdG9rZW4uYW5ub3RhdGlvbigpKSk7CiAgICAgICAgICAgICBlbHNl IGlmIChjaGlsZC0+d2ViVlRUTm9kZVR5cGUoKSA9PSBXZWJWVFROb2RlVHlwZUxhbmd1YWdlKSB7 Ci0gICAgICAgICAgICAgICAgbV9sYW5ndWFnZVN0YWNrLmFwcGVuZChBdG9taWNTdHJpbmcobV90 b2tlbi5hbm5vdGF0aW9uKCkuZGF0YSgpLCBtX3Rva2VuLmFubm90YXRpb24oKS5zaXplKCkpKTsK KyAgICAgICAgICAgICAgICBtX2xhbmd1YWdlU3RhY2suYXBwZW5kKEF0b21pY1N0cmluZyhtX3Rv a2VuLmFubm90YXRpb24oKSkpOwogICAgICAgICAgICAgICAgIGNoaWxkLT5zZXRBdHRyaWJ1dGUo V2ViVlRURWxlbWVudDo6bGFuZ0F0dHJpYnV0ZU5hbWUoKSwgbV9sYW5ndWFnZVN0YWNrLmxhc3Qo KSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoIW1fbGFuZ3VhZ2VTdGFjay5pc0Vt cHR5KCkpCkBAIC00MjAsMTIgKzQxOSwxMSBAQCB2b2lkIFdlYlZUVFBhcnNlcjo6Y29uc3RydWN0 VHJlZUZyb21Ub2tlbihEb2N1bWVudCogZG9jdW1lbnQpCiAgICAgY2FzZSBXZWJWVFRUb2tlblR5 cGVzOjpUaW1lc3RhbXBUYWc6IHsKICAgICAgICAgdW5zaWduZWQgcG9zaXRpb24gPSAwOwogICAg ICAgICBkb3VibGUgdGltZSA9IGNvbGxlY3RUaW1lU3RhbXAobV90b2tlbi5jaGFyYWN0ZXJzKCku ZGF0YSgpLCAmcG9zaXRpb24pOworICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgdXNlIGFu IDhiaXQgc3RyaW5nIGlmIHBvc3NpYmxlLgogICAgICAgICBpZiAodGltZSAhPSBtYWxmb3JtZWRU aW1lKQotICAgICAgICAgICAgbV9jdXJyZW50Tm9kZS0+cGFyc2VyQXBwZW5kQ2hpbGQoUHJvY2Vz c2luZ0luc3RydWN0aW9uOjpjcmVhdGUoZG9jdW1lbnQsICJ0aW1lc3RhbXAiLCBTdHJpbmcobV90 b2tlbi5jaGFyYWN0ZXJzKCkuZGF0YSgpLCBtX3Rva2VuLmNoYXJhY3RlcnMoKS5zaXplKCkpKSk7 CisgICAgICAgICAgICBtX2N1cnJlbnROb2RlLT5wYXJzZXJBcHBlbmRDaGlsZChQcm9jZXNzaW5n SW5zdHJ1Y3Rpb246OmNyZWF0ZShkb2N1bWVudCwgInRpbWVzdGFtcCIsIFN0cmluZyhtX3Rva2Vu LmNoYXJhY3RlcnMoKSkpKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIGRlZmF1bHQ6Ci0g ICAgICAgIGJyZWFrOwogICAgIH0KICAgICBtX3Rva2VuLmNsZWFyKCk7CiB9Cg== 188121 2013-02-13 10:58:15 -0800 2013-02-13 12:25:28 -0800 Patch for landing bug-109619-20130213105444.patch text/plain 3762 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNzU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDM3YTBkMWU4MzRkODIw MjQ3YTUyNWQ4ZjdmYzZjOTE2YWI1NDkwYi4uMTlmNDhjMzg3MWE0YjBmNzNkMzQ5ODY5NDAxYmE5 MmIzZmZhNDlkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAyLTEzICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBVc2UgZmFuY3kgbmV3IFZlY3Rv ci1iYXNlZCBTdHJpbmcgY29uc3RydWN0b3JzIGluIHRoZSBXZWJWVFQgcGFyc2VyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk2MTkKKworICAgICAg ICBSZXZpZXdlZCBieSBCZW5qYW1pbiBQb3VsYWluLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBi ZWhhdmlvci4gQWRkZWQgc29tZSBGSVhNRXMgZm9yIGZ1dHVyZSBwZXJmIG9wdGltaXphdGlvbi4K KworICAgICAgICAqIGh0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OldlYlZUVFBhcnNlcjo6Y29uc3RydWN0VHJlZUZyb21Ub2tlbik6CisKIDIwMTMtMDItMTMg IEZsb3JpbiBNYWxpdGEgIDxmbWFsaXRhQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbU1ZHXSBP T0IgYWNjZXNzIGluIFNWR0xpc3RQcm9wZXJ0eTo6cmVwbGFjZUl0ZW1WYWx1ZXMoKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuY3BwCmluZGV4IDFlNjI2ZTU2ZTQyMjk3 MTU2ZjQ5YzFkOGQ4YzYwNzI1ZGZlMTEzZjIuLjQwYWJhOWM2MTkwMzUyNWIzOGM5NmJiM2U3NWM4 MjVlNWIyY2E1ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRU UGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNlci5j cHAKQEAgLTM3MywxNCArMzczLDEzIEBAIHN0YXRpYyBXZWJWVFROb2RlVHlwZSB0b2tlblRvTm9k ZVR5cGUoV2ViVlRUVG9rZW4mIHRva2VuKQogCiB2b2lkIFdlYlZUVFBhcnNlcjo6Y29uc3RydWN0 VHJlZUZyb21Ub2tlbihEb2N1bWVudCogZG9jdW1lbnQpCiB7Ci0gICAgQXRvbWljU3RyaW5nIHRv a2VuVGFnTmFtZShtX3Rva2VuLm5hbWUoKS5kYXRhKCksIG1fdG9rZW4ubmFtZSgpLnNpemUoKSk7 Ci0gICAgUXVhbGlmaWVkTmFtZSB0YWdOYW1lKG51bGxBdG9tLCB0b2tlblRhZ05hbWUsIHhodG1s TmFtZXNwYWNlVVJJKTsKKyAgICBRdWFsaWZpZWROYW1lIHRhZ05hbWUobnVsbEF0b20sIEF0b21p Y1N0cmluZyhtX3Rva2VuLm5hbWUoKSksIHhodG1sTmFtZXNwYWNlVVJJKTsKIAogICAgIC8vIGh0 dHA6Ly9kZXYudzMub3JnL2h0bWw1L3dlYnZ0dC8jd2VidnR0LWN1ZS10ZXh0LWRvbS1jb25zdHJ1 Y3Rpb24tcnVsZXMKIAogICAgIHN3aXRjaCAobV90b2tlbi50eXBlKCkpIHsKICAgICBjYXNlIFdl YlZUVFRva2VuVHlwZXM6OkNoYXJhY3RlcjogewotICAgICAgICBTdHJpbmcgY29udGVudChtX3Rv a2VuLmNoYXJhY3RlcnMoKS5kYXRhKCksIG1fdG9rZW4uY2hhcmFjdGVycygpLnNpemUoKSk7Cisg ICAgICAgIFN0cmluZyBjb250ZW50KG1fdG9rZW4uY2hhcmFjdGVycygpKTsgLy8gRklYTUU6IFRo aXMgc2hvdWxkIGJlIDhiaXQgaWYgcG9zc2libGUuCiAgICAgICAgIFJlZlB0cjxUZXh0PiBjaGls ZCA9IFRleHQ6OmNyZWF0ZShkb2N1bWVudCwgY29udGVudCk7CiAgICAgICAgIG1fY3VycmVudE5v ZGUtPnBhcnNlckFwcGVuZENoaWxkKGNoaWxkKTsKICAgICAgICAgYnJlYWs7CkBAIC0zOTIsMTIg KzM5MSwxMiBAQCB2b2lkIFdlYlZUVFBhcnNlcjo6Y29uc3RydWN0VHJlZUZyb21Ub2tlbihEb2N1 bWVudCogZG9jdW1lbnQpCiAgICAgICAgICAgICBjaGlsZCA9IFdlYlZUVEVsZW1lbnQ6OmNyZWF0 ZShub2RlVHlwZSwgZG9jdW1lbnQpOwogICAgICAgICBpZiAoY2hpbGQpIHsKICAgICAgICAgICAg IGlmIChtX3Rva2VuLmNsYXNzZXMoKS5zaXplKCkgPiAwKQotICAgICAgICAgICAgICAgIGNoaWxk LT5zZXRBdHRyaWJ1dGUoY2xhc3NBdHRyLCBBdG9taWNTdHJpbmcobV90b2tlbi5jbGFzc2VzKCku ZGF0YSgpLCBtX3Rva2VuLmNsYXNzZXMoKS5zaXplKCkpKTsKKyAgICAgICAgICAgICAgICBjaGls ZC0+c2V0QXR0cmlidXRlKGNsYXNzQXR0ciwgQXRvbWljU3RyaW5nKG1fdG9rZW4uY2xhc3Nlcygp KSk7CiAKICAgICAgICAgICAgIGlmIChjaGlsZC0+d2ViVlRUTm9kZVR5cGUoKSA9PSBXZWJWVFRO b2RlVHlwZVZvaWNlKQotICAgICAgICAgICAgICAgIGNoaWxkLT5zZXRBdHRyaWJ1dGUoV2ViVlRU RWxlbWVudDo6dm9pY2VBdHRyaWJ1dGVOYW1lKCksIEF0b21pY1N0cmluZyhtX3Rva2VuLmFubm90 YXRpb24oKS5kYXRhKCksIG1fdG9rZW4uYW5ub3RhdGlvbigpLnNpemUoKSkpOworICAgICAgICAg ICAgICAgIGNoaWxkLT5zZXRBdHRyaWJ1dGUoV2ViVlRURWxlbWVudDo6dm9pY2VBdHRyaWJ1dGVO YW1lKCksIEF0b21pY1N0cmluZyhtX3Rva2VuLmFubm90YXRpb24oKSkpOwogICAgICAgICAgICAg ZWxzZSBpZiAoY2hpbGQtPndlYlZUVE5vZGVUeXBlKCkgPT0gV2ViVlRUTm9kZVR5cGVMYW5ndWFn ZSkgewotICAgICAgICAgICAgICAgIG1fbGFuZ3VhZ2VTdGFjay5hcHBlbmQoQXRvbWljU3RyaW5n KG1fdG9rZW4uYW5ub3RhdGlvbigpLmRhdGEoKSwgbV90b2tlbi5hbm5vdGF0aW9uKCkuc2l6ZSgp KSk7CisgICAgICAgICAgICAgICAgbV9sYW5ndWFnZVN0YWNrLmFwcGVuZChBdG9taWNTdHJpbmco bV90b2tlbi5hbm5vdGF0aW9uKCkpKTsKICAgICAgICAgICAgICAgICBjaGlsZC0+c2V0QXR0cmli dXRlKFdlYlZUVEVsZW1lbnQ6OmxhbmdBdHRyaWJ1dGVOYW1lKCksIG1fbGFuZ3VhZ2VTdGFjay5s YXN0KCkpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKCFtX2xhbmd1YWdlU3RhY2su aXNFbXB0eSgpKQpAQCAtNDIwLDggKzQxOSw5IEBAIHZvaWQgV2ViVlRUUGFyc2VyOjpjb25zdHJ1 Y3RUcmVlRnJvbVRva2VuKERvY3VtZW50KiBkb2N1bWVudCkKICAgICBjYXNlIFdlYlZUVFRva2Vu VHlwZXM6OlRpbWVzdGFtcFRhZzogewogICAgICAgICB1bnNpZ25lZCBwb3NpdGlvbiA9IDA7CiAg ICAgICAgIGRvdWJsZSB0aW1lID0gY29sbGVjdFRpbWVTdGFtcChtX3Rva2VuLmNoYXJhY3RlcnMo KS5kYXRhKCksICZwb3NpdGlvbik7CisgICAgICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCB1c2Ug YW4gOGJpdCBzdHJpbmcgaWYgcG9zc2libGUuCiAgICAgICAgIGlmICh0aW1lICE9IG1hbGZvcm1l ZFRpbWUpCi0gICAgICAgICAgICBtX2N1cnJlbnROb2RlLT5wYXJzZXJBcHBlbmRDaGlsZChQcm9j ZXNzaW5nSW5zdHJ1Y3Rpb246OmNyZWF0ZShkb2N1bWVudCwgInRpbWVzdGFtcCIsIFN0cmluZyht X3Rva2VuLmNoYXJhY3RlcnMoKS5kYXRhKCksIG1fdG9rZW4uY2hhcmFjdGVycygpLnNpemUoKSkp KTsKKyAgICAgICAgICAgIG1fY3VycmVudE5vZGUtPnBhcnNlckFwcGVuZENoaWxkKFByb2Nlc3Np bmdJbnN0cnVjdGlvbjo6Y3JlYXRlKGRvY3VtZW50LCAidGltZXN0YW1wIiwgU3RyaW5nKG1fdG9r ZW4uY2hhcmFjdGVycygpKSkpOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgZGVmYXVsdDoK