64837 2011-07-19 16:38:55 -0700 [chromium] Media player controls do not fade out. 2011-07-19 22:52:43 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 sjl sjl dglazkov eric.carlson webkit.review.bot oldest_to_newest 439555 0 sjl 2011-07-19 16:38:55 -0700 Due to drift between MediaControlRootElement and MediaControlRootElementChromium, the fading out of controls is broken. I have a fix for this, but post-this fix will look at sharing more code between the base and chromium implementations. 439559 1 101410 sjl 2011-07-19 17:01:21 -0700 Created attachment 101410 Patch 439561 2 101410 dglazkov 2011-07-19 17:05:18 -0700 Comment on attachment 101410 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101410&action=review ew. I don't like code-copying. Can we do better? > Source/WebCore/ChangeLog:9 > + [chromium] Media player controls do not fade out. > + https://bugs.webkit.org/show_bug.cgi?id=64837 This should be on top. 439569 3 101412 sjl 2011-07-19 17:27:23 -0700 Created attachment 101412 Patch 439574 4 sjl 2011-07-19 17:32:56 -0700 (In reply to comment #2) > (From update of attachment 101410 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=101410&action=review > > ew. I don't like code-copying. Can we do better? I agree, a bit icky, but this change is for the current chromium media controls, not the new ones. Currently the default root element implementation and the chromium implementation are very similar, after the split to create the MediaControls interface from a while ago. Ideally there should probably be a base that handles common implementation, but I'd rather do that with the new media controls where there is a lot of differences - doing it now would cause more churn that'll end up changing with the new controls anyhow. Although this isn't ideal, it does fix an unpleasant bug with the current chromium controls which I need to fix before the M14 cut. I promise I'll make sure this is addressed for the new controls... > > > Source/WebCore/ChangeLog:9 > > + [chromium] Media player controls do not fade out. > > + https://bugs.webkit.org/show_bug.cgi?id=64837 > > This should be on top. Fixed. 439616 5 101425 sjl 2011-07-19 21:29:30 -0700 Created attachment 101425 Patch for landing 439621 6 101425 webkit.review.bot 2011-07-19 22:30:40 -0700 Comment on attachment 101425 Patch for landing Rejecting attachment 101425 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-01', '--port..." exit_code: 1 Last 500 characters of output: d81223d29e6fe8fece485860533c0860185c26cc r91334 = 2ad3711cc4535916954b89606e83af9757b7e091 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Updating chromium port dependencies using gclient... ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/9193134 439626 7 101427 sjl 2011-07-19 22:40:58 -0700 Created attachment 101427 Patch for landing 439630 8 101427 webkit.review.bot 2011-07-19 22:52:39 -0700 Comment on attachment 101427 Patch for landing Clearing flags on attachment: 101427 Committed r91337: <http://trac.webkit.org/changeset/91337> 439631 9 webkit.review.bot 2011-07-19 22:52:43 -0700 All reviewed patches have been landed. Closing bug. 101410 2011-07-19 17:01:21 -0700 2011-07-19 17:27:19 -0700 Patch bug-64837-20110719170120.patch text/plain 4228 sjl U3VidmVyc2lvbiBSZXZpc2lvbjogOTEzMTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzYzVkMjE2YzY5YjFiNzE5 ZjUyOWRhMWY3NzJlYmZhZTRkNTdlZDVkLi45YTQzM2M2MzY1Yzk3N2QzNjE0NWZkZThlMWYxYWIy MjlhN2M0MWNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDctMTkgIFN0ZXZl IExhY2V5ICA8c2psQGNocm9taXVtLm9yZz4KKworICAgICAgICBNZWRpYSBjb250cm9scyB3ZXJl IG5vdCBmYWRpbmcgb3V0IHdoZW4gdGhlIG1vdXNlIGxlYXZlcyB0aGUgdmlkZW8KKyAgICAgICAg ZHVlIHRvIHVuZGVybHlpbmcgY2hhbmdlcyBpbiB3ZWJraXQgbWVkaWEgY29udHJvbHMuCisgICAg ICAgIEZpeCB3YXMgdG8gY29weSBtaXNzaW5nIGNvZGUgZnJvbSBNZWRpYUNvbnRyb2xSb290RWxl bWVudCB0bworICAgICAgICBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLgorCisgICAg ICAgIFtjaHJvbWl1bV0gTWVkaWEgcGxheWVyIGNvbnRyb2xzIGRvIG5vdCBmYWRlIG91dC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0ODM3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBodG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW06Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50 Q2hyb21pdW0pOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJv bWl1bTo6cGxheWJhY2tQcm9ncmVzc2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJv bFJvb3RFbGVtZW50Q2hyb21pdW06OmNvbnRhaW5zUmVsYXRlZFRhcmdldCk6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpkZWZhdWx0RXZlbnRIYW5k bGVyKToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9t aXVtLmg6CisKIDIwMTEtMDctMTkgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4K IAogICAgICAgICBXb3JrIHRvd2FyZHMgZGV0ZXJtaW5pbmcgdGhlIGNhdXNlIG9mIGZyZXF1ZW50 IGNyYXNoZXMgZHVlIHRvIG51bGwgZnJhbWUgYmVsb3cKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5j cHAKaW5kZXggZjRlNmMzNWFhMGI4MWJmOTMzYWE1OWE0ZDE1MTBjYTJlZDMwYTM5Ni4uZGNlYWMw MmVlMjY5MWYxOGY0NTllMzAxN2ZmMTVlYzY0OTIwMjQ3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJv bWl1bS5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJNZWRpYUNvbnRyb2xSb290RWxl bWVudENocm9taXVtLmgiCiAKICNpbmNsdWRlICJNZWRpYUNvbnRyb2xFbGVtZW50cy5oIgorI2lu Y2x1ZGUgIk1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUmVuZGVy VGhlbWUuaCIKIApAQCAtNDksNiArNTAsNyBAQCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9t aXVtOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtKEhUTUxNZWRpYUVsZW1lbgogICAg ICwgbV92b2x1bWVTbGlkZXJDb250YWluZXIoMCkKICAgICAsIG1fcGFuZWwoMCkKICAgICAsIG1f b3BhcXVlKHRydWUpCisgICAgLCBtX2lzTW91c2VPdmVyQ29udHJvbHMoZmFsc2UpCiB7CiB9CiAK QEAgLTIwOSw2ICsyMTEsOSBAQCB2b2lkIE1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW06 OnBsYXliYWNrUHJvZ3Jlc3NlZCgpCiB7CiAgICAgbV90aW1lbGluZS0+c2V0UG9zaXRpb24obV9t ZWRpYUVsZW1lbnQtPmN1cnJlbnRUaW1lKCkpOwogICAgIHVwZGF0ZVRpbWVEaXNwbGF5KCk7CisK KyAgICBpZiAoIW1faXNNb3VzZU92ZXJDb250cm9scyAmJiBtX21lZGlhRWxlbWVudC0+aGFzVmlk ZW8oKSkKKyAgICAgICAgbWFrZVRyYW5zcGFyZW50KCk7CiB9CiAKIHZvaWQgTWVkaWFDb250cm9s Um9vdEVsZW1lbnRDaHJvbWl1bTo6cGxheWJhY2tTdG9wcGVkKCkKQEAgLTI1OSw2ICsyNjQsMzIg QEAgdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpsb2FkZWRNZXRhZGF0YSgp CiAgICAgcmVzZXQoKTsKIH0KIAorYm9vbCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVt Ojpjb250YWluc1JlbGF0ZWRUYXJnZXQoRXZlbnQqIGV2ZW50KQoreworICAgIGlmICghZXZlbnQt PmlzTW91c2VFdmVudCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgRXZlbnRUYXJnZXQq IHJlbGF0ZWRUYXJnZXQgPSBzdGF0aWNfY2FzdDxNb3VzZUV2ZW50Kj4oZXZlbnQpLT5yZWxhdGVk VGFyZ2V0KCk7CisgICAgaWYgKCFyZWxhdGVkVGFyZ2V0KQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgcmV0dXJuIGNvbnRhaW5zKHJlbGF0ZWRUYXJnZXQtPnRvTm9kZSgpKTsKK30KKwordm9p ZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2 ZW50KiBldmVudCkKK3sKKyAgICBNZWRpYUNvbnRyb2xzOjpkZWZhdWx0RXZlbnRIYW5kbGVyKGV2 ZW50KTsKKworICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZW92ZXJF dmVudCkgeworICAgICAgICBpZiAoIWNvbnRhaW5zUmVsYXRlZFRhcmdldChldmVudCkpIHsKKyAg ICAgICAgICAgIG1faXNNb3VzZU92ZXJDb250cm9scyA9IHRydWU7CisgICAgICAgICAgICBpZiAo IW1fbWVkaWFFbGVtZW50LT5jYW5QbGF5KCkpCisgICAgICAgICAgICAgICAgbWFrZU9wYXF1ZSgp OworICAgICAgICB9CisgICAgfSBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMo KS5tb3VzZW91dEV2ZW50KSB7CisgICAgICAgIGlmICghY29udGFpbnNSZWxhdGVkVGFyZ2V0KGV2 ZW50KSkKKyAgICAgICAgICAgIG1faXNNb3VzZU92ZXJDb250cm9scyA9IGZhbHNlOworICAgIH0K K30KKwogdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpjaGFuZ2VkQ2xvc2Vk Q2FwdGlvbnNWaXNpYmlsaXR5KCkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uaCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uaAppbmRleCA2 MmVlMTZjNjdkYjNjMWJhMzRjOTM3NjA0ZTkyZDQxN2IzODY3YTJkLi5lZjliYjBiODBhNzkxNTll M2I3NGJmNTViMDVjNWY5Mzk5YTA5OThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmgKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5oCkBAIC04 OSw4ICs4OSwxMiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIE1lZGlhQ29udHJvbFJvb3RFbGVt ZW50Q2hyb21pdW0oSFRNTE1lZGlhRWxlbWVudCopOwogCisgICAgdmlydHVhbCB2b2lkIGRlZmF1 bHRFdmVudEhhbmRsZXIoRXZlbnQqKTsKKwogICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5n JiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0OwogCisgICAgYm9vbCBjb250YWluc1JlbGF0ZWRUYXJn ZXQoRXZlbnQqKTsKKwogICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1fbWVkaWFFbGVtZW50OwogCiAg ICAgTWVkaWFDb250cm9sUGxheUJ1dHRvbkVsZW1lbnQqIG1fcGxheUJ1dHRvbjsKQEAgLTEwMyw2 ICsxMDcsNyBAQCBwcml2YXRlOgogICAgIE1lZGlhQ29udHJvbFBhbmVsRWxlbWVudCogbV9wYW5l bDsKIAogICAgIGJvb2wgbV9vcGFxdWU7CisgICAgYm9vbCBtX2lzTW91c2VPdmVyQ29udHJvbHM7 CiB9OwogCiB9Cg== 101412 2011-07-19 17:27:23 -0700 2011-07-19 21:29:27 -0700 Patch bug-64837-20110719172722.patch text/plain 4228 sjl U3VidmVyc2lvbiBSZXZpc2lvbjogOTEzMTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzYzVkMjE2YzY5YjFiNzE5 ZjUyOWRhMWY3NzJlYmZhZTRkNTdlZDVkLi41OGRhODg5ZTBlZjRhNzhkZjQ5MzdmZDA1YzJiNjk0 YzVkOGU4NjJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDctMTkgIFN0ZXZl IExhY2V5ICA8c2psQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIE1lZGlhIHBs YXllciBjb250cm9scyBkbyBub3QgZmFkZSBvdXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDgzNworCisgICAgICAgIE1lZGlhIGNvbnRyb2xzIHdl cmUgbm90IGZhZGluZyBvdXQgd2hlbiB0aGUgbW91c2UgbGVhdmVzIHRoZSB2aWRlbworICAgICAg ICBkdWUgdG8gdW5kZXJseWluZyBjaGFuZ2VzIGluIHdlYmtpdCBtZWRpYSBjb250cm9scy4KKyAg ICAgICAgRml4IHdhcyB0byBjb3B5IG1pc3NpbmcgY29kZSBmcm9tIE1lZGlhQ29udHJvbFJvb3RF bGVtZW50IHRvCisgICAgICAgIE1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBodG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW06Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50 Q2hyb21pdW0pOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJv bWl1bTo6cGxheWJhY2tQcm9ncmVzc2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJv bFJvb3RFbGVtZW50Q2hyb21pdW06OmNvbnRhaW5zUmVsYXRlZFRhcmdldCk6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpkZWZhdWx0RXZlbnRIYW5k bGVyKToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9t aXVtLmg6CisKIDIwMTEtMDctMTkgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4K IAogICAgICAgICBXb3JrIHRvd2FyZHMgZGV0ZXJtaW5pbmcgdGhlIGNhdXNlIG9mIGZyZXF1ZW50 IGNyYXNoZXMgZHVlIHRvIG51bGwgZnJhbWUgYmVsb3cKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5j cHAKaW5kZXggZjRlNmMzNWFhMGI4MWJmOTMzYWE1OWE0ZDE1MTBjYTJlZDMwYTM5Ni4uZGNlYWMw MmVlMjY5MWYxOGY0NTllMzAxN2ZmMTVlYzY0OTIwMjQ3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJv bWl1bS5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJNZWRpYUNvbnRyb2xSb290RWxl bWVudENocm9taXVtLmgiCiAKICNpbmNsdWRlICJNZWRpYUNvbnRyb2xFbGVtZW50cy5oIgorI2lu Y2x1ZGUgIk1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUmVuZGVy VGhlbWUuaCIKIApAQCAtNDksNiArNTAsNyBAQCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9t aXVtOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtKEhUTUxNZWRpYUVsZW1lbgogICAg ICwgbV92b2x1bWVTbGlkZXJDb250YWluZXIoMCkKICAgICAsIG1fcGFuZWwoMCkKICAgICAsIG1f b3BhcXVlKHRydWUpCisgICAgLCBtX2lzTW91c2VPdmVyQ29udHJvbHMoZmFsc2UpCiB7CiB9CiAK QEAgLTIwOSw2ICsyMTEsOSBAQCB2b2lkIE1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW06 OnBsYXliYWNrUHJvZ3Jlc3NlZCgpCiB7CiAgICAgbV90aW1lbGluZS0+c2V0UG9zaXRpb24obV9t ZWRpYUVsZW1lbnQtPmN1cnJlbnRUaW1lKCkpOwogICAgIHVwZGF0ZVRpbWVEaXNwbGF5KCk7CisK KyAgICBpZiAoIW1faXNNb3VzZU92ZXJDb250cm9scyAmJiBtX21lZGlhRWxlbWVudC0+aGFzVmlk ZW8oKSkKKyAgICAgICAgbWFrZVRyYW5zcGFyZW50KCk7CiB9CiAKIHZvaWQgTWVkaWFDb250cm9s Um9vdEVsZW1lbnRDaHJvbWl1bTo6cGxheWJhY2tTdG9wcGVkKCkKQEAgLTI1OSw2ICsyNjQsMzIg QEAgdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpsb2FkZWRNZXRhZGF0YSgp CiAgICAgcmVzZXQoKTsKIH0KIAorYm9vbCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVt Ojpjb250YWluc1JlbGF0ZWRUYXJnZXQoRXZlbnQqIGV2ZW50KQoreworICAgIGlmICghZXZlbnQt PmlzTW91c2VFdmVudCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgRXZlbnRUYXJnZXQq IHJlbGF0ZWRUYXJnZXQgPSBzdGF0aWNfY2FzdDxNb3VzZUV2ZW50Kj4oZXZlbnQpLT5yZWxhdGVk VGFyZ2V0KCk7CisgICAgaWYgKCFyZWxhdGVkVGFyZ2V0KQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgcmV0dXJuIGNvbnRhaW5zKHJlbGF0ZWRUYXJnZXQtPnRvTm9kZSgpKTsKK30KKwordm9p ZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2 ZW50KiBldmVudCkKK3sKKyAgICBNZWRpYUNvbnRyb2xzOjpkZWZhdWx0RXZlbnRIYW5kbGVyKGV2 ZW50KTsKKworICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZW92ZXJF dmVudCkgeworICAgICAgICBpZiAoIWNvbnRhaW5zUmVsYXRlZFRhcmdldChldmVudCkpIHsKKyAg ICAgICAgICAgIG1faXNNb3VzZU92ZXJDb250cm9scyA9IHRydWU7CisgICAgICAgICAgICBpZiAo IW1fbWVkaWFFbGVtZW50LT5jYW5QbGF5KCkpCisgICAgICAgICAgICAgICAgbWFrZU9wYXF1ZSgp OworICAgICAgICB9CisgICAgfSBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMo KS5tb3VzZW91dEV2ZW50KSB7CisgICAgICAgIGlmICghY29udGFpbnNSZWxhdGVkVGFyZ2V0KGV2 ZW50KSkKKyAgICAgICAgICAgIG1faXNNb3VzZU92ZXJDb250cm9scyA9IGZhbHNlOworICAgIH0K K30KKwogdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpjaGFuZ2VkQ2xvc2Vk Q2FwdGlvbnNWaXNpYmlsaXR5KCkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uaCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uaAppbmRleCA2 MmVlMTZjNjdkYjNjMWJhMzRjOTM3NjA0ZTkyZDQxN2IzODY3YTJkLi5lZjliYjBiODBhNzkxNTll M2I3NGJmNTViMDVjNWY5Mzk5YTA5OThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmgKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5oCkBAIC04 OSw4ICs4OSwxMiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIE1lZGlhQ29udHJvbFJvb3RFbGVt ZW50Q2hyb21pdW0oSFRNTE1lZGlhRWxlbWVudCopOwogCisgICAgdmlydHVhbCB2b2lkIGRlZmF1 bHRFdmVudEhhbmRsZXIoRXZlbnQqKTsKKwogICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5n JiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0OwogCisgICAgYm9vbCBjb250YWluc1JlbGF0ZWRUYXJn ZXQoRXZlbnQqKTsKKwogICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1fbWVkaWFFbGVtZW50OwogCiAg ICAgTWVkaWFDb250cm9sUGxheUJ1dHRvbkVsZW1lbnQqIG1fcGxheUJ1dHRvbjsKQEAgLTEwMyw2 ICsxMDcsNyBAQCBwcml2YXRlOgogICAgIE1lZGlhQ29udHJvbFBhbmVsRWxlbWVudCogbV9wYW5l bDsKIAogICAgIGJvb2wgbV9vcGFxdWU7CisgICAgYm9vbCBtX2lzTW91c2VPdmVyQ29udHJvbHM7 CiB9OwogCiB9Cg== 101425 2011-07-19 21:29:30 -0700 2011-07-19 22:40:55 -0700 Patch for landing bug-64837-20110719212929.patch text/plain 4234 sjl U3VidmVyc2lvbiBSZXZpc2lvbjogOTEzMzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiNTMwYzRjOTRiZDVjYjEz Mjc5NTNjZmU0YjUxY2ZhY2I5OTZhMjEzLi5lOTZkNDBiMWM0NzlkYTA0NTU4N2Q3MWYzNDA1ZGE2 ZTEyNmVhMGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDctMTkgIFN0ZXZl IExhY2V5ICA8c2psQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIE1lZGlhIHBs YXllciBjb250cm9scyBkbyBub3QgZmFkZSBvdXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDgzNworCisgICAgICAgIE1lZGlhIGNvbnRyb2xzIHdl cmUgbm90IGZhZGluZyBvdXQgd2hlbiB0aGUgbW91c2UgbGVhdmVzIHRoZSB2aWRlbworICAgICAg ICBkdWUgdG8gdW5kZXJseWluZyBjaGFuZ2VzIGluIHdlYmtpdCBtZWRpYSBjb250cm9scy4KKyAg ICAgICAgRml4IHdhcyB0byBjb3B5IG1pc3NpbmcgY29kZSBmcm9tIE1lZGlhQ29udHJvbFJvb3RF bGVtZW50IHRvCisgICAgICAgIE1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgZGdsYXNrb3ZAY2hyb21pdW0ub3JnLgorCisgICAgICAgICogaHRt bC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpNZWRpYUNvbnRyb2xSb290 RWxlbWVudENocm9taXVtKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RFbGVt ZW50Q2hyb21pdW06OnBsYXliYWNrUHJvZ3Jlc3NlZCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpjb250YWluc1JlbGF0ZWRUYXJnZXQpOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6ZGVmYXVsdEV2 ZW50SGFuZGxlcik6CisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1l bnRDaHJvbWl1bS5oOgorCiAyMDExLTA3LTE5ICBMZW8gWWFuZyAgPGxlb3lhbmcud2Via2l0QGdt YWlsLmNvbT4KIAogICAgICAgICBTVkc6IE1pc3NpbmcgaW1wbGVtZW50YXRpb24gb2YgPGFsdEds eXBoRGVmPiwgPGFsdEdseXBoSXRlbT4gYW5kIDxnbHlwaFJlZj4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uY3Bw IGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJv bWl1bS5jcHAKaW5kZXggZjRlNmMzNWFhMGI4MWJmOTMzYWE1OWE0ZDE1MTBjYTJlZDMwYTM5Ni4u ZGNlYWMwMmVlMjY5MWYxOGY0NTllMzAxN2ZmMTVlYzY0OTIwMjQ3MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1l bnRDaHJvbWl1bS5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJNZWRpYUNvbnRyb2xS b290RWxlbWVudENocm9taXVtLmgiCiAKICNpbmNsdWRlICJNZWRpYUNvbnRyb2xFbGVtZW50cy5o IgorI2luY2x1ZGUgIk1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAi UmVuZGVyVGhlbWUuaCIKIApAQCAtNDksNiArNTAsNyBAQCBNZWRpYUNvbnRyb2xSb290RWxlbWVu dENocm9taXVtOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtKEhUTUxNZWRpYUVsZW1l bgogICAgICwgbV92b2x1bWVTbGlkZXJDb250YWluZXIoMCkKICAgICAsIG1fcGFuZWwoMCkKICAg ICAsIG1fb3BhcXVlKHRydWUpCisgICAgLCBtX2lzTW91c2VPdmVyQ29udHJvbHMoZmFsc2UpCiB7 CiB9CiAKQEAgLTIwOSw2ICsyMTEsOSBAQCB2b2lkIE1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hy b21pdW06OnBsYXliYWNrUHJvZ3Jlc3NlZCgpCiB7CiAgICAgbV90aW1lbGluZS0+c2V0UG9zaXRp b24obV9tZWRpYUVsZW1lbnQtPmN1cnJlbnRUaW1lKCkpOwogICAgIHVwZGF0ZVRpbWVEaXNwbGF5 KCk7CisKKyAgICBpZiAoIW1faXNNb3VzZU92ZXJDb250cm9scyAmJiBtX21lZGlhRWxlbWVudC0+ aGFzVmlkZW8oKSkKKyAgICAgICAgbWFrZVRyYW5zcGFyZW50KCk7CiB9CiAKIHZvaWQgTWVkaWFD b250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6cGxheWJhY2tTdG9wcGVkKCkKQEAgLTI1OSw2ICsy NjQsMzIgQEAgdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpsb2FkZWRNZXRh ZGF0YSgpCiAgICAgcmVzZXQoKTsKIH0KIAorYm9vbCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENo cm9taXVtOjpjb250YWluc1JlbGF0ZWRUYXJnZXQoRXZlbnQqIGV2ZW50KQoreworICAgIGlmICgh ZXZlbnQtPmlzTW91c2VFdmVudCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgRXZlbnRU YXJnZXQqIHJlbGF0ZWRUYXJnZXQgPSBzdGF0aWNfY2FzdDxNb3VzZUV2ZW50Kj4oZXZlbnQpLT5y ZWxhdGVkVGFyZ2V0KCk7CisgICAgaWYgKCFyZWxhdGVkVGFyZ2V0KQorICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgcmV0dXJuIGNvbnRhaW5zKHJlbGF0ZWRUYXJnZXQtPnRvTm9kZSgpKTsKK30K Kwordm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpkZWZhdWx0RXZlbnRIYW5k bGVyKEV2ZW50KiBldmVudCkKK3sKKyAgICBNZWRpYUNvbnRyb2xzOjpkZWZhdWx0RXZlbnRIYW5k bGVyKGV2ZW50KTsKKworICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3Vz ZW92ZXJFdmVudCkgeworICAgICAgICBpZiAoIWNvbnRhaW5zUmVsYXRlZFRhcmdldChldmVudCkp IHsKKyAgICAgICAgICAgIG1faXNNb3VzZU92ZXJDb250cm9scyA9IHRydWU7CisgICAgICAgICAg ICBpZiAoIW1fbWVkaWFFbGVtZW50LT5jYW5QbGF5KCkpCisgICAgICAgICAgICAgICAgbWFrZU9w YXF1ZSgpOworICAgICAgICB9CisgICAgfSBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50 TmFtZXMoKS5tb3VzZW91dEV2ZW50KSB7CisgICAgICAgIGlmICghY29udGFpbnNSZWxhdGVkVGFy Z2V0KGV2ZW50KSkKKyAgICAgICAgICAgIG1faXNNb3VzZU92ZXJDb250cm9scyA9IGZhbHNlOwor ICAgIH0KK30KKwogdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpjaGFuZ2Vk Q2xvc2VkQ2FwdGlvbnNWaXNpYmlsaXR5KCkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uaCBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uaApp bmRleCA2MmVlMTZjNjdkYjNjMWJhMzRjOTM3NjA0ZTkyZDQxN2IzODY3YTJkLi5lZjliYjBiODBh NzkxNTllM2I3NGJmNTViMDVjNWY5Mzk5YTA5OThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5o CkBAIC04OSw4ICs4OSwxMiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIE1lZGlhQ29udHJvbFJv b3RFbGVtZW50Q2hyb21pdW0oSFRNTE1lZGlhRWxlbWVudCopOwogCisgICAgdmlydHVhbCB2b2lk IGRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqKTsKKwogICAgIHZpcnR1YWwgY29uc3QgQXRvbWlj U3RyaW5nJiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0OwogCisgICAgYm9vbCBjb250YWluc1JlbGF0 ZWRUYXJnZXQoRXZlbnQqKTsKKwogICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1fbWVkaWFFbGVtZW50 OwogCiAgICAgTWVkaWFDb250cm9sUGxheUJ1dHRvbkVsZW1lbnQqIG1fcGxheUJ1dHRvbjsKQEAg LTEwMyw2ICsxMDcsNyBAQCBwcml2YXRlOgogICAgIE1lZGlhQ29udHJvbFBhbmVsRWxlbWVudCog bV9wYW5lbDsKIAogICAgIGJvb2wgbV9vcGFxdWU7CisgICAgYm9vbCBtX2lzTW91c2VPdmVyQ29u dHJvbHM7CiB9OwogCiB9Cg== 101427 2011-07-19 22:40:58 -0700 2011-07-19 22:52:38 -0700 Patch for landing bug-64837-20110719224057.patch text/plain 4237 sjl U3VidmVyc2lvbiBSZXZpc2lvbjogOTEzMzUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzYmI1ZmFjODE3OGQ4MTAx ODY1YzVlOGY0YzZiZThmMjgxMjQzMmU1Li44YzM5MmNhZjAwMWM0NmJjNDgzZTZlYzkxNmQ1OGE2 ODNhYzM0ZDg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDctMTkgIFN0ZXZl IExhY2V5ICA8c2psQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIE1lZGlhIHBs YXllciBjb250cm9scyBkbyBub3QgZmFkZSBvdXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDgzNworCisgICAgICAgIE1lZGlhIGNvbnRyb2xzIHdl cmUgbm90IGZhZGluZyBvdXQgd2hlbiB0aGUgbW91c2UgbGVhdmVzIHRoZSB2aWRlbworICAgICAg ICBkdWUgdG8gdW5kZXJseWluZyBjaGFuZ2VzIGluIHdlYmtpdCBtZWRpYSBjb250cm9scy4KKyAg ICAgICAgRml4IHdhcyB0byBjb3B5IG1pc3NpbmcgY29kZSBmcm9tIE1lZGlhQ29udHJvbFJvb3RF bGVtZW50IHRvCisgICAgICAgIE1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgorCisgICAgICAgICogaHRtbC9zaGFk b3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpNZWRpYUNvbnRyb2xSb290RWxlbWVu dENocm9taXVtKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hy b21pdW06OnBsYXliYWNrUHJvZ3Jlc3NlZCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRy b2xSb290RWxlbWVudENocm9taXVtOjpjb250YWluc1JlbGF0ZWRUYXJnZXQpOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6ZGVmYXVsdEV2ZW50SGFu ZGxlcik6CisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJv bWl1bS5oOgorCiAyMDExLTA3LTE5ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4K IAogICAgICAgICBSRUdSRVNTSU9OKHI4OTAwNCk6IFZpZGVvIHBhdXNlcyBhbmQgbmV2ZXIgcmVz dW1lcyBwbGF5aW5nIGlmIHNjcnViYmVkIGR1cmluZyBwbGF5YmFjay4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0u Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRD aHJvbWl1bS5jcHAKaW5kZXggZjRlNmMzNWFhMGI4MWJmOTMzYWE1OWE0ZDE1MTBjYTJlZDMwYTM5 Ni4uZGNlYWMwMmVlMjY5MWYxOGY0NTllMzAxN2ZmMTVlYzY0OTIwMjQ3MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1 bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVs ZW1lbnRDaHJvbWl1bS5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJNZWRpYUNvbnRy b2xSb290RWxlbWVudENocm9taXVtLmgiCiAKICNpbmNsdWRlICJNZWRpYUNvbnRyb2xFbGVtZW50 cy5oIgorI2luY2x1ZGUgIk1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVk ZSAiUmVuZGVyVGhlbWUuaCIKIApAQCAtNDksNiArNTAsNyBAQCBNZWRpYUNvbnRyb2xSb290RWxl bWVudENocm9taXVtOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtKEhUTUxNZWRpYUVs ZW1lbgogICAgICwgbV92b2x1bWVTbGlkZXJDb250YWluZXIoMCkKICAgICAsIG1fcGFuZWwoMCkK ICAgICAsIG1fb3BhcXVlKHRydWUpCisgICAgLCBtX2lzTW91c2VPdmVyQ29udHJvbHMoZmFsc2Up CiB7CiB9CiAKQEAgLTIwOSw2ICsyMTEsOSBAQCB2b2lkIE1lZGlhQ29udHJvbFJvb3RFbGVtZW50 Q2hyb21pdW06OnBsYXliYWNrUHJvZ3Jlc3NlZCgpCiB7CiAgICAgbV90aW1lbGluZS0+c2V0UG9z aXRpb24obV9tZWRpYUVsZW1lbnQtPmN1cnJlbnRUaW1lKCkpOwogICAgIHVwZGF0ZVRpbWVEaXNw bGF5KCk7CisKKyAgICBpZiAoIW1faXNNb3VzZU92ZXJDb250cm9scyAmJiBtX21lZGlhRWxlbWVu dC0+aGFzVmlkZW8oKSkKKyAgICAgICAgbWFrZVRyYW5zcGFyZW50KCk7CiB9CiAKIHZvaWQgTWVk aWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6cGxheWJhY2tTdG9wcGVkKCkKQEAgLTI1OSw2 ICsyNjQsMzIgQEAgdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpsb2FkZWRN ZXRhZGF0YSgpCiAgICAgcmVzZXQoKTsKIH0KIAorYm9vbCBNZWRpYUNvbnRyb2xSb290RWxlbWVu dENocm9taXVtOjpjb250YWluc1JlbGF0ZWRUYXJnZXQoRXZlbnQqIGV2ZW50KQoreworICAgIGlm ICghZXZlbnQtPmlzTW91c2VFdmVudCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgRXZl bnRUYXJnZXQqIHJlbGF0ZWRUYXJnZXQgPSBzdGF0aWNfY2FzdDxNb3VzZUV2ZW50Kj4oZXZlbnQp LT5yZWxhdGVkVGFyZ2V0KCk7CisgICAgaWYgKCFyZWxhdGVkVGFyZ2V0KQorICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgcmV0dXJuIGNvbnRhaW5zKHJlbGF0ZWRUYXJnZXQtPnRvTm9kZSgpKTsK K30KKwordm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpkZWZhdWx0RXZlbnRI YW5kbGVyKEV2ZW50KiBldmVudCkKK3sKKyAgICBNZWRpYUNvbnRyb2xzOjpkZWZhdWx0RXZlbnRI YW5kbGVyKGV2ZW50KTsKKworICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5t b3VzZW92ZXJFdmVudCkgeworICAgICAgICBpZiAoIWNvbnRhaW5zUmVsYXRlZFRhcmdldChldmVu dCkpIHsKKyAgICAgICAgICAgIG1faXNNb3VzZU92ZXJDb250cm9scyA9IHRydWU7CisgICAgICAg ICAgICBpZiAoIW1fbWVkaWFFbGVtZW50LT5jYW5QbGF5KCkpCisgICAgICAgICAgICAgICAgbWFr ZU9wYXF1ZSgpOworICAgICAgICB9CisgICAgfSBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IGV2 ZW50TmFtZXMoKS5tb3VzZW91dEV2ZW50KSB7CisgICAgICAgIGlmICghY29udGFpbnNSZWxhdGVk VGFyZ2V0KGV2ZW50KSkKKyAgICAgICAgICAgIG1faXNNb3VzZU92ZXJDb250cm9scyA9IGZhbHNl OworICAgIH0KK30KKwogdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpjaGFu Z2VkQ2xvc2VkQ2FwdGlvbnNWaXNpYmlsaXR5KCkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uaCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0u aAppbmRleCA2MmVlMTZjNjdkYjNjMWJhMzRjOTM3NjA0ZTkyZDQxN2IzODY3YTJkLi5lZjliYjBi ODBhNzkxNTllM2I3NGJmNTViMDVjNWY5Mzk5YTA5OThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmgKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1 bS5oCkBAIC04OSw4ICs4OSwxMiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIE1lZGlhQ29udHJv bFJvb3RFbGVtZW50Q2hyb21pdW0oSFRNTE1lZGlhRWxlbWVudCopOwogCisgICAgdmlydHVhbCB2 b2lkIGRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqKTsKKwogICAgIHZpcnR1YWwgY29uc3QgQXRv bWljU3RyaW5nJiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0OwogCisgICAgYm9vbCBjb250YWluc1Jl bGF0ZWRUYXJnZXQoRXZlbnQqKTsKKwogICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1fbWVkaWFFbGVt ZW50OwogCiAgICAgTWVkaWFDb250cm9sUGxheUJ1dHRvbkVsZW1lbnQqIG1fcGxheUJ1dHRvbjsK QEAgLTEwMyw2ICsxMDcsNyBAQCBwcml2YXRlOgogICAgIE1lZGlhQ29udHJvbFBhbmVsRWxlbWVu dCogbV9wYW5lbDsKIAogICAgIGJvb2wgbV9vcGFxdWU7CisgICAgYm9vbCBtX2lzTW91c2VPdmVy Q29udHJvbHM7CiB9OwogCiB9Cg==