82949 2012-04-02 14:38:19 -0700 [chromium] Apply viewport tag initial-scale only once 2012-05-22 22:02:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 80554 66687 1 aelias aelias abarth aelias fishd fsamuel hausmann kenneth tomz webkit.review.bot zalan oldest_to_newest 593864 0 aelias 2012-04-02 14:38:19 -0700 [chromium] Apply viewport tag initial-scale only once 593872 1 135194 aelias 2012-04-02 14:44:47 -0700 Created attachment 135194 Patch 593876 2 fsamuel 2012-04-02 14:48:19 -0700 This looks good to me. Do we know that isNewNavigation is only called on the first commit? Are there any other cases where it might get called? 593890 3 aelias 2012-04-02 15:00:40 -0700 Yes. The only time isNewNavigation will be set is when m_observedNewNavigation is true, and grepping shows that this is only set by BackForwardListChromium::addItem(). The comment there says: // If WebCore adds a new HistoryItem, it means this is a new navigation (ie, // not a reload or back/forward). m_webView->observeNewNavigation(); This matches the behavior we want. 593910 4 135194 fishd 2012-04-02 15:21:16 -0700 Comment on attachment 135194 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135194&action=review > Source/WebKit/chromium/ChangeLog:9 > + initial-scale.  We need to call dispatchViewportPropertiesDidChange() funny character before "We"? > Source/WebKit/chromium/ChangeLog:15 > + isPageScaleFactorIsSet in didCommitLoad.  We only want to clear it on again, funny character before "We" > Source/WebKit/chromium/ChangeLog:17 > + the user zooms in before the load is complete. i'm not sure I completely understand the bug you are fixing. what is your test case? 593935 5 aelias 2012-04-02 15:38:40 -0700 It's for when a user does a pinch or double-tap zoom while a slow-loading site hasn't finished loading. I'll try and write a test case in WebFrameTest, as it's too racey to be tested reliably in DRT. 594048 6 135234 aelias 2012-04-02 17:12:54 -0700 Created attachment 135234 Patch 594050 7 aelias 2012-04-02 17:14:53 -0700 OK, I wrote a test in WebFrameImpl and confirms it reliably fails if this patch is not applied. It's an extension of the test I originally wrote for http://webk.it/80554 so to avoid conflicts I moved the whole test into this patch. 594059 8 135238 aelias 2012-04-02 17:21:12 -0700 Created attachment 135238 Patch 594060 9 aelias 2012-04-02 17:21:53 -0700 Fixed copy-paste mistake. 602374 10 aelias 2012-04-13 13:43:42 -0700 Ping to review this CL and http://webk.it/80554 , as I believe they should be ready to submit now. 620010 11 135238 abarth 2012-05-09 16:35:29 -0700 Comment on attachment 135238 Patch I'm happy to R+ this given that Fady is happy and that you've added a test case. Thanks for the patch. (If I'm correct, we'll need to wait for Bug 80554 to land before we actually commit this change.) 620018 12 aelias 2012-05-09 16:40:16 -0700 (In reply to comment #11) > (From update of attachment 135238 [details]) > I'm happy to R+ this given that Fady is happy and that you've added a test case. Thanks for the patch. (If I'm correct, we'll need to wait for Bug 80554 to land before we actually commit this change.) Right, thanks for taking a look. Feel free to r+ cq+ Bug 80554 first, then we can commit this one. 624670 13 kenneth 2012-05-15 15:45:51 -0700 I am a bit afraid that removing this from FrameView will break Qt. I am cc'ing Zalan to see if this is the case. Zalan it might make sense to write a autotest similar to the one apparently asserting for Chromium. That should be possible using my new UI side testing framework. 624673 14 kenneth 2012-05-15 15:47:16 -0700 (In reply to comment #13) > I am a bit afraid that removing this from FrameView will break Qt. I am cc'ing Zalan to see if this is the case. > > Zalan it might make sense to write a autotest similar to the one apparently asserting for Chromium. That should be possible using my new UI side testing framework. Sorry, I meant to comment in bug 80554 :-) 625002 15 tomz 2012-05-15 22:50:34 -0700 Kenneth, I think this can be cq+ now since Bug 80554 is resolved, but wasn't sure because of your comment https://bugs.webkit.org/show_bug.cgi?id=80554#c30. What do you think? 625043 16 135238 kenneth 2012-05-16 00:11:33 -0700 Comment on attachment 135238 Patch Fine with me 625044 17 135238 webkit.review.bot 2012-05-16 00:14:23 -0700 Comment on attachment 135238 Patch Rejecting attachment 135238 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: ded at 2973 (offset 21 lines). patching file Source/WebKit/chromium/tests/WebFrameTest.cpp Hunk #1 FAILED at 31. Hunk #2 succeeded at 236 with fuzz 2 (offset 85 lines). 1 out of 2 hunks FAILED -- saving rejects to file Source/WebKit/chromium/tests/WebFrameTest.cpp.rej patching file Source/WebKit/chromium/tests/data/fixed_layout.html Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Adam Barth']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12694899 626052 18 abarth 2012-05-16 17:23:16 -0700 @Alex: That message from the commit-queue usually means that there's a conflict applying your patch to top-of-tree. Would you be willing to upload a new version that resolves the conflict? Thanks. 626360 19 142438 aelias 2012-05-17 01:03:25 -0700 Created attachment 142438 Patch 626361 20 aelias 2012-05-17 01:05:23 -0700 Resolved conflict and added new viewportEnabled setting to unit test. 631014 21 142438 webkit.review.bot 2012-05-22 18:03:23 -0700 Comment on attachment 142438 Patch Rejecting attachment 142438 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: ded at 3102 (offset 129 lines). patching file Source/WebKit/chromium/tests/WebFrameTest.cpp Hunk #1 FAILED at 31. Hunk #2 succeeded at 243 with fuzz 2 (offset 9 lines). 1 out of 2 hunks FAILED -- saving rejects to file Source/WebKit/chromium/tests/WebFrameTest.cpp.rej patching file Source/WebKit/chromium/tests/data/fixed_layout.html Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Adam Barth']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12772033 631016 22 abarth 2012-05-22 18:09:39 -0700 Looks like the conflict was in WebFrameTest.cpp. I'll try to merge it. 631038 23 143427 abarth 2012-05-22 18:28:41 -0700 Created attachment 143427 Patch for landing 631040 24 aelias 2012-05-22 18:29:38 -0700 Looks good, thanks! 631049 25 webkit.review.bot 2012-05-22 18:33:04 -0700 Attachment 143427 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 Source/WebKit/chromium/tests/WebFrameTest.cpp:50: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 631069 26 143433 abarth 2012-05-22 18:59:28 -0700 Created attachment 143433 Patch for landing 631204 27 143433 webkit.review.bot 2012-05-22 22:02:31 -0700 Comment on attachment 143433 Patch for landing Clearing flags on attachment: 143433 Committed r118121: <http://trac.webkit.org/changeset/118121> 631205 28 webkit.review.bot 2012-05-22 22:02:38 -0700 All reviewed patches have been landed. Closing bug. 135194 2012-04-02 14:44:47 -0700 2012-04-02 17:12:51 -0700 Patch bug-82949-20120402144446.patch text/plain 3308 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGRiZGM5MWE2YmEzYzhlNzllMzEwOGQ3MDBiNGNiZjNkZjlhZjA3MWUuLjAyNTk2ZmFlYjhlMGRj MmQzZTc0M2U0YjMyZjc2MDA3MTExMGNiMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTItMDQtMDIgIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0Bnb29n bGUuY29tPgorCisgICAgICAgIFtjaHJvbWl1bV0gQXBwbHkgdmlld3BvcnQgdGFnIGluaXRpYWwt c2NhbGUgb25seSBvbmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04Mjk0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEZpcnN0LCBjaGVjayB0aGF0IGlzUGFnZVNjYWxlRmFjdG9yU2V0IHJldHVybiBmYWxz ZSBiZWZvcmUgc2V0dGluZworICAgICAgICBpbml0aWFsLXNjYWxlLiDCoFdlIG5lZWQgdG8gY2Fs bCBkaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5nZSgpCisgICAgICAgIHdoZW4gdGhl IHZpZXdwb3J0IHdpZHRoIGNoYW5nZXMsIHNpbmNlIHRoYXQncyBhbiBpbnB1dCB0byB0aGUgdmll d3BvcnQKKyAgICAgICAgdGFnIGNhbGN1bGF0aW9uLiAgV2hlbiB0aGlzIGhhcHBlbnMsIHdlIHNo b3VsZG4ndCBwb3AgYmFjayB0byBpbml0aWFsCisgICAgICAgIHNjYWxlLgorCisgICAgICAgIFNl Y29uZCwgY2hlY2sgdGhhdCBpc05ld05hdmlnYXRpb24gaXMgdHJ1ZSB3aGVuIGRlY2lkaW5nIHRv IGNsZWFyCisgICAgICAgIGlzUGFnZVNjYWxlRmFjdG9ySXNTZXQgaW4gZGlkQ29tbWl0TG9hZC4g wqBXZSBvbmx5IHdhbnQgdG8gY2xlYXIgaXQgb24KKyAgICAgICAgdGhlIHZlcnkgZmlyc3QgY29t bWl0LCBvdGhlcndpc2Ugd2UnbGwgcG9wIGJhY2sgdG8gaW5pdGlhbCBzY2FsZcKgaWYKKyAgICAg ICAgdGhlIHVzZXIgem9vbXMgaW4gYmVmb3JlIHRoZSBsb2FkIGlzIGNvbXBsZXRlLgorCisgICAg ICAgICogc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVD bGllbnRJbXBsOjpkaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5nZSk6CisgICAgICAg ICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRp ZENvbW1pdExvYWQpOgorCiAyMDEyLTAzLTMwICBJYW4gVm9sbGljayAgPHZvbGxpY2tAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gRmxha3kgYW5pbWF0aW9uIHVuaXQgdGVzdCBD Q0xheWVyVHJlZUhvc3RUZXN0U3luY2hyb25pemVBbmltYXRpb25TdGFydFRpbWVzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCmluZGV4IDIzMDhi MGFlOGE2OTM0NDA4NzZlNGI5YWQ3ZDBjN2I4MjVmZmYxNmIuLjIzMjA5ODExZTk1YjU5ODNiNDZm YzRhNzhiOTMyNmUyMzQ1NTg1NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L0Nocm9tZUNsaWVudEltcGwuY3BwCkBAIC02NjksMTEgKzY2OSwxMSBAQCB2b2lkIENocm9tZUNs aWVudEltcGw6OmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdlKGNvbnN0IFZpZXdw b3J0QXJndW1lbgogICAgIGludCBsYXlvdXRIZWlnaHQgPSBjb21wdXRlZC5sYXlvdXRTaXplLmhl aWdodCgpOwogICAgIG1fd2ViVmlldy0+c2V0Rml4ZWRMYXlvdXRTaXplKEludFNpemUobGF5b3V0 V2lkdGgsIGxheW91dEhlaWdodCkpOwogCi0gICAgLy8gRklYTUU6IEludmVzdGlnYXRlIHRoZSBp bXBhY3QgdGhpcyBoYXMgb24gbGF5b3V0L3JlbmRlcmluZyBpZiBhbnkuCi0gICAgLy8gVGhpcyBl eHBvc2VzIHRoZSBjb3JyZWN0IGRldmljZSBzY2FsZSB0byBqYXZhc2NyaXB0IGFuZCBtZWRpYSBx dWVyaWVzLgorICAgIGJvb2wgbmVlZEluaXRpYWxpemVQYWdlU2NhbGUgPSAhbV93ZWJWaWV3LT5p c1BhZ2VTY2FsZUZhY3RvclNldCgpOwogICAgIG1fd2ViVmlldy0+c2V0RGV2aWNlU2NhbGVGYWN0 b3IoY29tcHV0ZWQuZGV2aWNlUGl4ZWxSYXRpbyk7CiAgICAgbV93ZWJWaWV3LT5zZXRQYWdlU2Nh bGVGYWN0b3JMaW1pdHMoY29tcHV0ZWQubWluaW11bVNjYWxlLCBjb21wdXRlZC5tYXhpbXVtU2Nh bGUpOwotICAgIG1fd2ViVmlldy0+c2V0UGFnZVNjYWxlRmFjdG9yUHJlc2VydmluZ1Njcm9sbE9m ZnNldChjb21wdXRlZC5pbml0aWFsU2NhbGUgKiBjb21wdXRlZC5kZXZpY2VQaXhlbFJhdGlvKTsK KyAgICBpZiAobmVlZEluaXRpYWxpemVQYWdlU2NhbGUpCisgICAgICAgIG1fd2ViVmlldy0+c2V0 UGFnZVNjYWxlRmFjdG9yUHJlc2VydmluZ1Njcm9sbE9mZnNldChjb21wdXRlZC5pbml0aWFsU2Nh bGUgKiBjb21wdXRlZC5kZXZpY2VQaXhlbFJhdGlvKTsKICNlbmRpZgogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggZGNiNTJiZjM2ZDViNDk2NzUw MjAwNTA3NDMzMTk1NDFjNWFkODM2OS4uMTQ1MGQzNWE1YzdjNDY4MGViMzFiNDU0MzlhNmY4ZWJk OTdkYWU4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApA QCAtMjk1Miw3ICsyOTUyLDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6ZGlkQ29tbWl0TG9hZChib29s KiBpc05ld05hdmlnYXRpb24sIGJvb2wgaXNOYXZpZ2F0aW9uV2l0aGluUGEKICAgICBtX25ld05h dmlnYXRpb25Mb2FkZXIgPSAwOwogI2VuZGlmCiAgICAgbV9vYnNlcnZlZE5ld05hdmlnYXRpb24g PSBmYWxzZTsKLSAgICBpZiAoIWlzTmF2aWdhdGlvbldpdGhpblBhZ2UpCisgICAgaWYgKCppc05l d05hdmlnYXRpb24gJiYgIWlzTmF2aWdhdGlvbldpdGhpblBhZ2UpCiAgICAgICAgIG1fcGFnZVNj YWxlRmFjdG9ySXNTZXQgPSBmYWxzZTsKIAogICAgIG1fZ2VzdHVyZUFuaW1hdGlvbi5jbGVhcigp Owo= 135234 2012-04-02 17:12:54 -0700 2012-04-02 17:21:05 -0700 Patch bug-82949-20120402171253.patch text/plain 6724 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGRiZGM5MWE2YmEzYzhlNzllMzEwOGQ3MDBiNGNiZjNkZjlhZjA3MWUuLmM1MDViODU3OWU2ZjY0 MWRmNGM5YjNmZGU4Nzg1MmI3YWJhYzc3ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjggQEAKKzIwMTItMDQtMDIgIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0Bnb29n bGUuY29tPgorCisgICAgICAgIFtjaHJvbWl1bV0gQXBwbHkgdmlld3BvcnQgdGFnIGluaXRpYWwt c2NhbGUgb25seSBvbmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04Mjk0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEZpcnN0LCBjaGVjayB0aGF0IGlzUGFnZVNjYWxlRmFjdG9yU2V0IHJldHVybiBmYWxz ZSBiZWZvcmUgc2V0dGluZworICAgICAgICBpbml0aWFsLXNjYWxlLiBXZSBuZWVkIHRvIGNhbGwg ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UoKQorICAgICAgICB3aGVuIHRoZSB2 aWV3cG9ydCB3aWR0aCBjaGFuZ2VzLCBzaW5jZSB0aGF0J3MgYW4gaW5wdXQgdG8gdGhlIHZpZXdw b3J0CisgICAgICAgIHRhZyBjYWxjdWxhdGlvbi4gV2hlbiB0aGlzIGhhcHBlbnMsIHdlIHNob3Vs ZG4ndCBwb3AgYmFjayB0byBpbml0aWFsCisgICAgICAgIHNjYWxlLgorCisgICAgICAgIFNlY29u ZCwgY2hlY2sgdGhhdCBpc05ld05hdmlnYXRpb24gaXMgdHJ1ZSB3aGVuIGRlY2lkaW5nIHRvIGNs ZWFyCisgICAgICAgIGlzUGFnZVNjYWxlRmFjdG9ySXNTZXQgaW4gZGlkQ29tbWl0TG9hZC4gV2Ug b25seSB3YW50IHRvIGNsZWFyIGl0IG9uCisgICAgICAgIHRoZSB2ZXJ5IGZpcnN0IGNvbW1pdCwg b3RoZXJ3aXNlIHdlJ2xsIHBvcCBiYWNrIHRvIGluaXRpYWwgc2NhbGUgaWYKKyAgICAgICAgdGhl IHVzZXIgem9vbXMgaW4gYmVmb3JlIHRoZSBsb2FkIGlzIGNvbXBsZXRlLgorCisgICAgICAgIE5l dyB0ZXN0IFdlYkZyYW1lVGVzdDo6Rml4ZWRMYXlvdXRJbml0aWFsaXplQXRNaW5pbXVtUGFnZVNj YWxlLgorCisgICAgICAgICogc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpDaHJvbWVDbGllbnRJbXBsOjpkaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5n ZSk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlld0ltcGw6OmRpZENvbW1pdExvYWQpOgorCiAyMDEyLTAzLTMwICBJYW4gVm9sbGljayAgPHZv bGxpY2tAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gRmxha3kgYW5pbWF0aW9u IHVuaXQgdGVzdCBDQ0xheWVyVHJlZUhvc3RUZXN0U3luY2hyb25pemVBbmltYXRpb25TdGFydFRp bWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJ bXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3Bw CmluZGV4IDIzMDhiMGFlOGE2OTM0NDA4NzZlNGI5YWQ3ZDBjN2I4MjVmZmYxNmIuLjIzMjA5ODEx ZTk1YjU5ODNiNDZmYzRhNzhiOTMyNmUyMzQ1NTg1NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCkBAIC02NjksMTEgKzY2OSwxMSBAQCB2 b2lkIENocm9tZUNsaWVudEltcGw6OmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdl KGNvbnN0IFZpZXdwb3J0QXJndW1lbgogICAgIGludCBsYXlvdXRIZWlnaHQgPSBjb21wdXRlZC5s YXlvdXRTaXplLmhlaWdodCgpOwogICAgIG1fd2ViVmlldy0+c2V0Rml4ZWRMYXlvdXRTaXplKElu dFNpemUobGF5b3V0V2lkdGgsIGxheW91dEhlaWdodCkpOwogCi0gICAgLy8gRklYTUU6IEludmVz dGlnYXRlIHRoZSBpbXBhY3QgdGhpcyBoYXMgb24gbGF5b3V0L3JlbmRlcmluZyBpZiBhbnkuCi0g ICAgLy8gVGhpcyBleHBvc2VzIHRoZSBjb3JyZWN0IGRldmljZSBzY2FsZSB0byBqYXZhc2NyaXB0 IGFuZCBtZWRpYSBxdWVyaWVzLgorICAgIGJvb2wgbmVlZEluaXRpYWxpemVQYWdlU2NhbGUgPSAh bV93ZWJWaWV3LT5pc1BhZ2VTY2FsZUZhY3RvclNldCgpOwogICAgIG1fd2ViVmlldy0+c2V0RGV2 aWNlU2NhbGVGYWN0b3IoY29tcHV0ZWQuZGV2aWNlUGl4ZWxSYXRpbyk7CiAgICAgbV93ZWJWaWV3 LT5zZXRQYWdlU2NhbGVGYWN0b3JMaW1pdHMoY29tcHV0ZWQubWluaW11bVNjYWxlLCBjb21wdXRl ZC5tYXhpbXVtU2NhbGUpOwotICAgIG1fd2ViVmlldy0+c2V0UGFnZVNjYWxlRmFjdG9yUHJlc2Vy dmluZ1Njcm9sbE9mZnNldChjb21wdXRlZC5pbml0aWFsU2NhbGUgKiBjb21wdXRlZC5kZXZpY2VQ aXhlbFJhdGlvKTsKKyAgICBpZiAobmVlZEluaXRpYWxpemVQYWdlU2NhbGUpCisgICAgICAgIG1f d2ViVmlldy0+c2V0UGFnZVNjYWxlRmFjdG9yUHJlc2VydmluZ1Njcm9sbE9mZnNldChjb21wdXRl ZC5pbml0aWFsU2NhbGUgKiBjb21wdXRlZC5kZXZpY2VQaXhlbFJhdGlvKTsKICNlbmRpZgogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggZGNiNTJi ZjM2ZDViNDk2NzUwMjAwNTA3NDMzMTk1NDFjNWFkODM2OS4uMTQ1MGQzNWE1YzdjNDY4MGViMzFi NDU0MzlhNmY4ZWJkOTdkYWU4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcApAQCAtMjk1Miw3ICsyOTUyLDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6ZGlkQ29t bWl0TG9hZChib29sKiBpc05ld05hdmlnYXRpb24sIGJvb2wgaXNOYXZpZ2F0aW9uV2l0aGluUGEK ICAgICBtX25ld05hdmlnYXRpb25Mb2FkZXIgPSAwOwogI2VuZGlmCiAgICAgbV9vYnNlcnZlZE5l d05hdmlnYXRpb24gPSBmYWxzZTsKLSAgICBpZiAoIWlzTmF2aWdhdGlvbldpdGhpblBhZ2UpCisg ICAgaWYgKCppc05ld05hdmlnYXRpb24gJiYgIWlzTmF2aWdhdGlvbldpdGhpblBhZ2UpCiAgICAg ICAgIG1fcGFnZVNjYWxlRmFjdG9ySXNTZXQgPSBmYWxzZTsKIAogICAgIG1fZ2VzdHVyZUFuaW1h dGlvbi5jbGVhcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9X ZWJGcmFtZVRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRl c3QuY3BwCmluZGV4IGE2NzIzMTk1YjY5M2Y2YzFmNGU3MGNiZmYzNWE5OWU4ZWQ1MzA5MTQuLjFk YzY0NjJkZjI1ODIyYjkwOGEwY2EzZjU5YWNkMzE1MzhiYmZmZmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5jcHAKQEAgLTMxLDE3ICszMSwyMCBAQAog I2luY2x1ZGUgImNvbmZpZy5oIgogCiAjaW5jbHVkZSAiRnJhbWVUZXN0SGVscGVycy5oIgorI2lu Y2x1ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIlJlc291cmNlRXJyb3IuaCIKICNpbmNsdWRl ICJXZWJEb2N1bWVudC5oIgogI2luY2x1ZGUgIldlYkZpbmRPcHRpb25zLmgiCiAjaW5jbHVkZSAi V2ViRm9ybUVsZW1lbnQuaCIKICNpbmNsdWRlICJXZWJGcmFtZS5oIgogI2luY2x1ZGUgIldlYkZy YW1lQ2xpZW50LmgiCisjaW5jbHVkZSAiV2ViRnJhbWVJbXBsLmgiCiAjaW5jbHVkZSAiV2ViUmFu Z2UuaCIKICNpbmNsdWRlICJXZWJTY3JpcHRTb3VyY2UuaCIKICNpbmNsdWRlICJXZWJTZWFyY2hh YmxlRm9ybURhdGEuaCIKICNpbmNsdWRlICJXZWJTZWN1cml0eVBvbGljeS5oIgogI2luY2x1ZGUg IldlYlNldHRpbmdzLmgiCisjaW5jbHVkZSAiV2ViVmlld0NsaWVudC5oIgogI2luY2x1ZGUgIldl YlZpZXdJbXBsLmgiCiAjaW5jbHVkZSAidjguaCIKICNpbmNsdWRlIDxndGVzdC9ndGVzdC5oPgpA QCAtMTUxLDYgKzE1NCw1MyBAQCBURVNUX0YoV2ViRnJhbWVUZXN0LCBDaHJvbWVQYWdlTm9KYXZh c2NyaXB0KQogICAgIEVYUEVDVF9FUShzdGQ6OnN0cmluZzo6bnBvcywgY29udGVudC5maW5kKCJD bG9iYmVyZWQiKSk7CiB9CiAKKyNpZiBFTkFCTEUoVklFV1BPUlQpCitjbGFzcyBGaXhlZExheW91 dFRlc3RXZWJWaWV3Q2xpZW50IDogcHVibGljIFdlYlZpZXdDbGllbnQgeworIHB1YmxpYzoKKyAg ICB2aXJ0dWFsIFdlYlJlY3Qgd2luZG93UmVjdCgpIE9WRVJSSURFIHsgcmV0dXJuIG1fd2luZG93 UmVjdDsgfQorICAgIHZpcnR1YWwgV2ViU2NyZWVuSW5mbyBzY3JlZW5JbmZvKCkgT1ZFUlJJREUg eyByZXR1cm4gbV9zY3JlZW5JbmZvOyB9CisKKyAgICBXZWJSZWN0IG1fd2luZG93UmVjdDsKKyAg ICBXZWJTY3JlZW5JbmZvIG1fc2NyZWVuSW5mbzsKK307CisKK1RFU1RfRihXZWJGcmFtZVRlc3Qs IEZpeGVkTGF5b3V0SW5pdGlhbGl6ZUF0TWluaW11bVBhZ2VTY2FsZSkKK3sKKyAgICByZWdpc3Rl ck1vY2tlZEh0dHBVUkxMb2FkKCJmaXhlZF9sYXlvdXQuaHRtbCIpOworCisgICAgRml4ZWRMYXlv dXRUZXN0V2ViVmlld0NsaWVudCBjbGllbnQ7CisgICAgY2xpZW50Lm1fc2NyZWVuSW5mby5ob3Jp em9udGFsRFBJID0gMTYwOworICAgIGludCB2aWV3cG9ydFdpZHRoID0gNjQwOworICAgIGludCB2 aWV3cG9ydEhlaWdodCA9IDQ4MDsKKyAgICBjbGllbnQubV93aW5kb3dSZWN0ID0gV2ViUmVjdCgw LCAwLCB2aWV3cG9ydFdpZHRoLCB2aWV3cG9ydEhlaWdodCk7CisKKyAgICAvLyBNYWtlIHN1cmUg d2UgaW5pdGlhbGl6ZSB0byBtaW5pbXVtIHNjYWxlLCBldmVuIGlmIHRoZSB3aW5kb3cgc2l6ZQor ICAgIC8vIG9ubHkgYmVjb21lcyBhdmFpbGFibGUgYWZ0ZXIgdGhlIGxvYWQgYmVnaW5zLgorICAg IFdlYlZpZXdJbXBsKiB3ZWJWaWV3SW1wbCA9IHN0YXRpY19jYXN0PFdlYlZpZXdJbXBsKj4oRnJh bWVUZXN0SGVscGVyczo6Y3JlYQorICAgIHdlYlZpZXdJbXBsLT5lbmFibGVGaXhlZExheW91dE1v ZGUodHJ1ZSk7CisgICAgd2ViVmlld0ltcGwtPnJlc2l6ZShXZWJTaXplKHZpZXdwb3J0V2lkdGgs IHZpZXdwb3J0SGVpZ2h0KSk7CisKKyAgICBpbnQgZGVmYXVsdEZpeGVkTGF5b3V0V2lkdGggPSA5 ODA7CisgICAgZmxvYXQgbWluaW11bVBhZ2VTY2FsZUZhY3RvciA9IHZpZXdwb3J0V2lkdGggLyAo ZmxvYXQpIGRlZmF1bHRGaXhlZExheW91dFdpCisgICAgRVhQRUNUX0VRKG1pbmltdW1QYWdlU2Nh bGVGYWN0b3IsIHdlYlZpZXdJbXBsLT5wYWdlU2NhbGVGYWN0b3IoKSk7CisKKyAgICAvLyBBc3N1 bWUgdGhlIHVzZXIgaGFzIHBpbmNoIHpvb21lZCB0byBwYWdlIHNjYWxlIGZhY3RvciAyLgorICAg IGZsb2F0IHVzZXJQaW5jaFBhZ2VTY2FsZUZhY3RvciA9IDI7CisgICAgd2ViVmlld0ltcGwtPnNl dFBhZ2VTY2FsZUZhY3RvclByZXNlcnZpbmdTY3JvbGxPZmZzZXQodXNlclBpbmNoUGFnZVNjYWxl RmFjCisgICAgd2ViVmlld0ltcGwtPm1haW5GcmFtZUltcGwoKS0+ZnJhbWVWaWV3KCktPmxheW91 dCgpOworCisgICAgLy8gTWFrZSBzdXJlIHdlIGRvbid0IHJlc2V0IHRvIGluaXRpYWwgc2NhbGUg aWYgdGhlIHBhZ2UgY29udGludWVzIHRvIGxvYWQuCisgICAgYm9vbCBpc05ld05hdmlnYXRpb247 CisgICAgd2ViVmlld0ltcGwtPmRpZENvbW1pdExvYWQoJmlzTmV3TmF2aWdhdGlvbiwgZmFsc2Up OworICAgIHdlYlZpZXdJbXBsLT5kaWRDaGFuZ2VDb250ZW50c1NpemUoKTsKKyAgICBFWFBFQ1Rf RVEodXNlclBpbmNoUGFnZVNjYWxlRmFjdG9yLCB3ZWJWaWV3SW1wbC0+cGFnZVNjYWxlRmFjdG9y KCkpOworCisgICAgLy8gTWFrZSBzdXJlIHdlIGRvbid0IHJlc2V0IHRvIGluaXRpYWwgc2NhbGUg aWYgdGhlIHZpZXdwb3J0IHNpemUgY2hhbmdlcy4KKyAgICB3ZWJWaWV3SW1wbC0+cmVzaXplKFdl YlNpemUodmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQgKyAxMDApKTsKKyAgICBFWFBFQ1Rf RVEodXNlclBpbmNoUGFnZVNjYWxlRmFjdG9yLCB3ZWJWaWV3SW1wbC0+cGFnZVNjYWxlRmFjdG9y KCkpOworfQorI2VuZGlmCisKICNpZiBFTkFCTEUoR0VTVFVSRV9FVkVOVFMpCiBURVNUX0YoV2Vi RnJhbWVUZXN0LCBGQUlMU19EaXZBdXRvWm9vbVBhcmFtc1Rlc3QpCiB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvZml4ZWRfbGF5b3V0Lmh0bWwgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvZml4ZWRfbGF5b3V0Lmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uYTg5Y2VjYWU5MjhlNzVlMTVlZGRkZmFkMTFlMWQ5N2Q2ZGVkNjVjNwotLS0gL2Rldi9udWxs CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvZGF0YS9maXhlZF9sYXlvdXQuaHRt bApAQCAtMCwwICsxIEBACis8Ym9keT5PcmRpbmFyeSBub24tbW9iaWxlIHBhZ2U8L2JvZHk+Cg== 135238 2012-04-02 17:21:12 -0700 2012-05-17 01:03:21 -0700 Patch bug-82949-20120402172111.patch text/plain 6802 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGRiZGM5MWE2YmEzYzhlNzllMzEwOGQ3MDBiNGNiZjNkZjlhZjA3MWUuLmM1MDViODU3OWU2ZjY0 MWRmNGM5YjNmZGU4Nzg1MmI3YWJhYzc3ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjggQEAKKzIwMTItMDQtMDIgIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0Bnb29n bGUuY29tPgorCisgICAgICAgIFtjaHJvbWl1bV0gQXBwbHkgdmlld3BvcnQgdGFnIGluaXRpYWwt c2NhbGUgb25seSBvbmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04Mjk0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEZpcnN0LCBjaGVjayB0aGF0IGlzUGFnZVNjYWxlRmFjdG9yU2V0IHJldHVybiBmYWxz ZSBiZWZvcmUgc2V0dGluZworICAgICAgICBpbml0aWFsLXNjYWxlLiBXZSBuZWVkIHRvIGNhbGwg ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UoKQorICAgICAgICB3aGVuIHRoZSB2 aWV3cG9ydCB3aWR0aCBjaGFuZ2VzLCBzaW5jZSB0aGF0J3MgYW4gaW5wdXQgdG8gdGhlIHZpZXdw b3J0CisgICAgICAgIHRhZyBjYWxjdWxhdGlvbi4gV2hlbiB0aGlzIGhhcHBlbnMsIHdlIHNob3Vs ZG4ndCBwb3AgYmFjayB0byBpbml0aWFsCisgICAgICAgIHNjYWxlLgorCisgICAgICAgIFNlY29u ZCwgY2hlY2sgdGhhdCBpc05ld05hdmlnYXRpb24gaXMgdHJ1ZSB3aGVuIGRlY2lkaW5nIHRvIGNs ZWFyCisgICAgICAgIGlzUGFnZVNjYWxlRmFjdG9ySXNTZXQgaW4gZGlkQ29tbWl0TG9hZC4gV2Ug b25seSB3YW50IHRvIGNsZWFyIGl0IG9uCisgICAgICAgIHRoZSB2ZXJ5IGZpcnN0IGNvbW1pdCwg b3RoZXJ3aXNlIHdlJ2xsIHBvcCBiYWNrIHRvIGluaXRpYWwgc2NhbGUgaWYKKyAgICAgICAgdGhl IHVzZXIgem9vbXMgaW4gYmVmb3JlIHRoZSBsb2FkIGlzIGNvbXBsZXRlLgorCisgICAgICAgIE5l dyB0ZXN0IFdlYkZyYW1lVGVzdDo6Rml4ZWRMYXlvdXRJbml0aWFsaXplQXRNaW5pbXVtUGFnZVNj YWxlLgorCisgICAgICAgICogc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpDaHJvbWVDbGllbnRJbXBsOjpkaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5n ZSk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlld0ltcGw6OmRpZENvbW1pdExvYWQpOgorCiAyMDEyLTAzLTMwICBJYW4gVm9sbGljayAgPHZv bGxpY2tAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gRmxha3kgYW5pbWF0aW9u IHVuaXQgdGVzdCBDQ0xheWVyVHJlZUhvc3RUZXN0U3luY2hyb25pemVBbmltYXRpb25TdGFydFRp bWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJ bXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3Bw CmluZGV4IDIzMDhiMGFlOGE2OTM0NDA4NzZlNGI5YWQ3ZDBjN2I4MjVmZmYxNmIuLjIzMjA5ODEx ZTk1YjU5ODNiNDZmYzRhNzhiOTMyNmUyMzQ1NTg1NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCkBAIC02NjksMTEgKzY2OSwxMSBAQCB2 b2lkIENocm9tZUNsaWVudEltcGw6OmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdl KGNvbnN0IFZpZXdwb3J0QXJndW1lbgogICAgIGludCBsYXlvdXRIZWlnaHQgPSBjb21wdXRlZC5s YXlvdXRTaXplLmhlaWdodCgpOwogICAgIG1fd2ViVmlldy0+c2V0Rml4ZWRMYXlvdXRTaXplKElu dFNpemUobGF5b3V0V2lkdGgsIGxheW91dEhlaWdodCkpOwogCi0gICAgLy8gRklYTUU6IEludmVz dGlnYXRlIHRoZSBpbXBhY3QgdGhpcyBoYXMgb24gbGF5b3V0L3JlbmRlcmluZyBpZiBhbnkuCi0g ICAgLy8gVGhpcyBleHBvc2VzIHRoZSBjb3JyZWN0IGRldmljZSBzY2FsZSB0byBqYXZhc2NyaXB0 IGFuZCBtZWRpYSBxdWVyaWVzLgorICAgIGJvb2wgbmVlZEluaXRpYWxpemVQYWdlU2NhbGUgPSAh bV93ZWJWaWV3LT5pc1BhZ2VTY2FsZUZhY3RvclNldCgpOwogICAgIG1fd2ViVmlldy0+c2V0RGV2 aWNlU2NhbGVGYWN0b3IoY29tcHV0ZWQuZGV2aWNlUGl4ZWxSYXRpbyk7CiAgICAgbV93ZWJWaWV3 LT5zZXRQYWdlU2NhbGVGYWN0b3JMaW1pdHMoY29tcHV0ZWQubWluaW11bVNjYWxlLCBjb21wdXRl ZC5tYXhpbXVtU2NhbGUpOwotICAgIG1fd2ViVmlldy0+c2V0UGFnZVNjYWxlRmFjdG9yUHJlc2Vy dmluZ1Njcm9sbE9mZnNldChjb21wdXRlZC5pbml0aWFsU2NhbGUgKiBjb21wdXRlZC5kZXZpY2VQ aXhlbFJhdGlvKTsKKyAgICBpZiAobmVlZEluaXRpYWxpemVQYWdlU2NhbGUpCisgICAgICAgIG1f d2ViVmlldy0+c2V0UGFnZVNjYWxlRmFjdG9yUHJlc2VydmluZ1Njcm9sbE9mZnNldChjb21wdXRl ZC5pbml0aWFsU2NhbGUgKiBjb21wdXRlZC5kZXZpY2VQaXhlbFJhdGlvKTsKICNlbmRpZgogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggZGNiNTJi ZjM2ZDViNDk2NzUwMjAwNTA3NDMzMTk1NDFjNWFkODM2OS4uMTQ1MGQzNWE1YzdjNDY4MGViMzFi NDU0MzlhNmY4ZWJkOTdkYWU4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcApAQCAtMjk1Miw3ICsyOTUyLDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6ZGlkQ29t bWl0TG9hZChib29sKiBpc05ld05hdmlnYXRpb24sIGJvb2wgaXNOYXZpZ2F0aW9uV2l0aGluUGEK ICAgICBtX25ld05hdmlnYXRpb25Mb2FkZXIgPSAwOwogI2VuZGlmCiAgICAgbV9vYnNlcnZlZE5l d05hdmlnYXRpb24gPSBmYWxzZTsKLSAgICBpZiAoIWlzTmF2aWdhdGlvbldpdGhpblBhZ2UpCisg ICAgaWYgKCppc05ld05hdmlnYXRpb24gJiYgIWlzTmF2aWdhdGlvbldpdGhpblBhZ2UpCiAgICAg ICAgIG1fcGFnZVNjYWxlRmFjdG9ySXNTZXQgPSBmYWxzZTsKIAogICAgIG1fZ2VzdHVyZUFuaW1h dGlvbi5jbGVhcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9X ZWJGcmFtZVRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRl c3QuY3BwCmluZGV4IGE2NzIzMTk1YjY5M2Y2YzFmNGU3MGNiZmYzNWE5OWU4ZWQ1MzA5MTQuLmJl NTJjMmVjMzM5MGVkZDE3M2VhMGI1YWNhZjY4YjliNGUxZDU2MjIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5jcHAKQEAgLTMxLDE3ICszMSwyMCBAQAog I2luY2x1ZGUgImNvbmZpZy5oIgogCiAjaW5jbHVkZSAiRnJhbWVUZXN0SGVscGVycy5oIgorI2lu Y2x1ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIlJlc291cmNlRXJyb3IuaCIKICNpbmNsdWRl ICJXZWJEb2N1bWVudC5oIgogI2luY2x1ZGUgIldlYkZpbmRPcHRpb25zLmgiCiAjaW5jbHVkZSAi V2ViRm9ybUVsZW1lbnQuaCIKICNpbmNsdWRlICJXZWJGcmFtZS5oIgogI2luY2x1ZGUgIldlYkZy YW1lQ2xpZW50LmgiCisjaW5jbHVkZSAiV2ViRnJhbWVJbXBsLmgiCiAjaW5jbHVkZSAiV2ViUmFu Z2UuaCIKICNpbmNsdWRlICJXZWJTY3JpcHRTb3VyY2UuaCIKICNpbmNsdWRlICJXZWJTZWFyY2hh YmxlRm9ybURhdGEuaCIKICNpbmNsdWRlICJXZWJTZWN1cml0eVBvbGljeS5oIgogI2luY2x1ZGUg IldlYlNldHRpbmdzLmgiCisjaW5jbHVkZSAiV2ViVmlld0NsaWVudC5oIgogI2luY2x1ZGUgIldl YlZpZXdJbXBsLmgiCiAjaW5jbHVkZSAidjguaCIKICNpbmNsdWRlIDxndGVzdC9ndGVzdC5oPgpA QCAtMTUxLDYgKzE1NCw1MyBAQCBURVNUX0YoV2ViRnJhbWVUZXN0LCBDaHJvbWVQYWdlTm9KYXZh c2NyaXB0KQogICAgIEVYUEVDVF9FUShzdGQ6OnN0cmluZzo6bnBvcywgY29udGVudC5maW5kKCJD bG9iYmVyZWQiKSk7CiB9CiAKKyNpZiBFTkFCTEUoVklFV1BPUlQpCitjbGFzcyBGaXhlZExheW91 dFRlc3RXZWJWaWV3Q2xpZW50IDogcHVibGljIFdlYlZpZXdDbGllbnQgeworIHB1YmxpYzoKKyAg ICB2aXJ0dWFsIFdlYlJlY3Qgd2luZG93UmVjdCgpIE9WRVJSSURFIHsgcmV0dXJuIG1fd2luZG93 UmVjdDsgfQorICAgIHZpcnR1YWwgV2ViU2NyZWVuSW5mbyBzY3JlZW5JbmZvKCkgT1ZFUlJJREUg eyByZXR1cm4gbV9zY3JlZW5JbmZvOyB9CisKKyAgICBXZWJSZWN0IG1fd2luZG93UmVjdDsKKyAg ICBXZWJTY3JlZW5JbmZvIG1fc2NyZWVuSW5mbzsKK307CisKK1RFU1RfRihXZWJGcmFtZVRlc3Qs IEZpeGVkTGF5b3V0SW5pdGlhbGl6ZUF0TWluaW11bVBhZ2VTY2FsZSkKK3sKKyAgICByZWdpc3Rl ck1vY2tlZEh0dHBVUkxMb2FkKCJmaXhlZF9sYXlvdXQuaHRtbCIpOworCisgICAgRml4ZWRMYXlv dXRUZXN0V2ViVmlld0NsaWVudCBjbGllbnQ7CisgICAgY2xpZW50Lm1fc2NyZWVuSW5mby5ob3Jp em9udGFsRFBJID0gMTYwOworICAgIGludCB2aWV3cG9ydFdpZHRoID0gNjQwOworICAgIGludCB2 aWV3cG9ydEhlaWdodCA9IDQ4MDsKKyAgICBjbGllbnQubV93aW5kb3dSZWN0ID0gV2ViUmVjdCgw LCAwLCB2aWV3cG9ydFdpZHRoLCB2aWV3cG9ydEhlaWdodCk7CisKKyAgICAvLyBNYWtlIHN1cmUg d2UgaW5pdGlhbGl6ZSB0byBtaW5pbXVtIHNjYWxlLCBldmVuIGlmIHRoZSB3aW5kb3cgc2l6ZQor ICAgIC8vIG9ubHkgYmVjb21lcyBhdmFpbGFibGUgYWZ0ZXIgdGhlIGxvYWQgYmVnaW5zLgorICAg IFdlYlZpZXdJbXBsKiB3ZWJWaWV3SW1wbCA9IHN0YXRpY19jYXN0PFdlYlZpZXdJbXBsKj4oRnJh bWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJMICsgImZpeGVkX2xh eW91dC5odG1sIiwgdHJ1ZSwgMCwgJmNsaWVudCkpOworICAgIHdlYlZpZXdJbXBsLT5lbmFibGVG aXhlZExheW91dE1vZGUodHJ1ZSk7CisgICAgd2ViVmlld0ltcGwtPnJlc2l6ZShXZWJTaXplKHZp ZXdwb3J0V2lkdGgsIHZpZXdwb3J0SGVpZ2h0KSk7CisKKyAgICBpbnQgZGVmYXVsdEZpeGVkTGF5 b3V0V2lkdGggPSA5ODA7CisgICAgZmxvYXQgbWluaW11bVBhZ2VTY2FsZUZhY3RvciA9IHZpZXdw b3J0V2lkdGggLyAoZmxvYXQpIGRlZmF1bHRGaXhlZExheW91dFdpZHRoOworICAgIEVYUEVDVF9F UShtaW5pbXVtUGFnZVNjYWxlRmFjdG9yLCB3ZWJWaWV3SW1wbC0+cGFnZVNjYWxlRmFjdG9yKCkp OworCisgICAgLy8gQXNzdW1lIHRoZSB1c2VyIGhhcyBwaW5jaCB6b29tZWQgdG8gcGFnZSBzY2Fs ZSBmYWN0b3IgMi4KKyAgICBmbG9hdCB1c2VyUGluY2hQYWdlU2NhbGVGYWN0b3IgPSAyOworICAg IHdlYlZpZXdJbXBsLT5zZXRQYWdlU2NhbGVGYWN0b3JQcmVzZXJ2aW5nU2Nyb2xsT2Zmc2V0KHVz ZXJQaW5jaFBhZ2VTY2FsZUZhY3Rvcik7CisgICAgd2ViVmlld0ltcGwtPm1haW5GcmFtZUltcGwo KS0+ZnJhbWVWaWV3KCktPmxheW91dCgpOworCisgICAgLy8gTWFrZSBzdXJlIHdlIGRvbid0IHJl c2V0IHRvIGluaXRpYWwgc2NhbGUgaWYgdGhlIHBhZ2UgY29udGludWVzIHRvIGxvYWQuCisgICAg Ym9vbCBpc05ld05hdmlnYXRpb247CisgICAgd2ViVmlld0ltcGwtPmRpZENvbW1pdExvYWQoJmlz TmV3TmF2aWdhdGlvbiwgZmFsc2UpOworICAgIHdlYlZpZXdJbXBsLT5kaWRDaGFuZ2VDb250ZW50 c1NpemUoKTsKKyAgICBFWFBFQ1RfRVEodXNlclBpbmNoUGFnZVNjYWxlRmFjdG9yLCB3ZWJWaWV3 SW1wbC0+cGFnZVNjYWxlRmFjdG9yKCkpOworCisgICAgLy8gTWFrZSBzdXJlIHdlIGRvbid0IHJl c2V0IHRvIGluaXRpYWwgc2NhbGUgaWYgdGhlIHZpZXdwb3J0IHNpemUgY2hhbmdlcy4KKyAgICB3 ZWJWaWV3SW1wbC0+cmVzaXplKFdlYlNpemUodmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQg KyAxMDApKTsKKyAgICBFWFBFQ1RfRVEodXNlclBpbmNoUGFnZVNjYWxlRmFjdG9yLCB3ZWJWaWV3 SW1wbC0+cGFnZVNjYWxlRmFjdG9yKCkpOworfQorI2VuZGlmCisKICNpZiBFTkFCTEUoR0VTVFVS RV9FVkVOVFMpCiBURVNUX0YoV2ViRnJhbWVUZXN0LCBGQUlMU19EaXZBdXRvWm9vbVBhcmFtc1Rl c3QpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvZml4 ZWRfbGF5b3V0Lmh0bWwgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvZml4ZWRf bGF5b3V0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTg5Y2VjYWU5MjhlNzVlMTVlZGRkZmFkMTFlMWQ5N2Q2 ZGVkNjVjNwotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv ZGF0YS9maXhlZF9sYXlvdXQuaHRtbApAQCAtMCwwICsxIEBACis8Ym9keT5PcmRpbmFyeSBub24t bW9iaWxlIHBhZ2U8L2JvZHk+Cg== 142438 2012-05-17 01:03:25 -0700 2012-05-22 18:28:35 -0700 Patch bug-82949-20120517010324.patch text/plain 6550 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDExODdiNjRjYzUwY2ZiNWFjYzAzNTE4MjczNGI4Y2I2MzhkNmU2OTMuLjEyZmI0OGFkMmI5NDcw YTdmZTczOWZkYWQ1ZmEyNTNmZmFhNmU2NGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjggQEAKKzIwMTItMDQtMDIgIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0Bnb29n bGUuY29tPgorCisgICAgICAgIFtjaHJvbWl1bV0gQXBwbHkgdmlld3BvcnQgdGFnIGluaXRpYWwt c2NhbGUgb25seSBvbmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04Mjk0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEZpcnN0LCBjaGVjayB0aGF0IGlzUGFnZVNjYWxlRmFjdG9yU2V0IHJldHVybiBmYWxz ZSBiZWZvcmUgc2V0dGluZworICAgICAgICBpbml0aWFsLXNjYWxlLiBXZSBuZWVkIHRvIGNhbGwg ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UoKQorICAgICAgICB3aGVuIHRoZSB2 aWV3cG9ydCB3aWR0aCBjaGFuZ2VzLCBzaW5jZSB0aGF0J3MgYW4gaW5wdXQgdG8gdGhlIHZpZXdw b3J0CisgICAgICAgIHRhZyBjYWxjdWxhdGlvbi4gV2hlbiB0aGlzIGhhcHBlbnMsIHdlIHNob3Vs ZG4ndCBwb3AgYmFjayB0byBpbml0aWFsCisgICAgICAgIHNjYWxlLgorCisgICAgICAgIFNlY29u ZCwgY2hlY2sgdGhhdCBpc05ld05hdmlnYXRpb24gaXMgdHJ1ZSB3aGVuIGRlY2lkaW5nIHRvIGNs ZWFyCisgICAgICAgIGlzUGFnZVNjYWxlRmFjdG9ySXNTZXQgaW4gZGlkQ29tbWl0TG9hZC4gV2Ug b25seSB3YW50IHRvIGNsZWFyIGl0IG9uCisgICAgICAgIHRoZSB2ZXJ5IGZpcnN0IGNvbW1pdCwg b3RoZXJ3aXNlIHdlJ2xsIHBvcCBiYWNrIHRvIGluaXRpYWwgc2NhbGUgaWYKKyAgICAgICAgdGhl IHVzZXIgem9vbXMgaW4gYmVmb3JlIHRoZSBsb2FkIGlzIGNvbXBsZXRlLgorCisgICAgICAgIE5l dyB0ZXN0IFdlYkZyYW1lVGVzdDo6Rml4ZWRMYXlvdXRJbml0aWFsaXplQXRNaW5pbXVtUGFnZVNj YWxlLgorCisgICAgICAgICogc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpDaHJvbWVDbGllbnRJbXBsOjpkaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5n ZSk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlld0ltcGw6OmRpZENvbW1pdExvYWQpOgorCiAyMDEyLTA1LTE2ICBZdXJ5IFNlbWlraGF0c2t5 ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gV2ViIEluc3BlY3Rv cjogRGV2VG9vbHNTYW5pdHlUZXN0LlRlc3RTY3JpcHRzVGFiSXNQb3B1bGF0ZWRPbkluc3BlY3Rl ZFBhZ2VSZWZyZXNoIGlzIGJyb2tlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9D aHJvbWVDbGllbnRJbXBsLmNwcAppbmRleCA3MGQ1NjVjMmVlZGI4Y2E5OGViYzBjNTUyNDViYjcy NmM3OGVlNDJjLi5lY2Q0OTYxYTI4OTAyMDBhNTQzZWE3OTU1MGNiNzVhMDc2ZTBhMjk1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcApAQCAt NjY1LDE0ICs2NjUsMTQgQEAgdm9pZCBDaHJvbWVDbGllbnRJbXBsOjpkaXNwYXRjaFZpZXdwb3J0 UHJvcGVydGllc0RpZENoYW5nZShjb25zdCBWaWV3cG9ydEFyZ3VtZW4KICAgICBpbnQgbGF5b3V0 SGVpZ2h0ID0gY29tcHV0ZWQubGF5b3V0U2l6ZS5oZWlnaHQoKTsKICAgICBtX3dlYlZpZXctPnNl dEZpeGVkTGF5b3V0U2l6ZShJbnRTaXplKGxheW91dFdpZHRoLCBsYXlvdXRIZWlnaHQpKTsKIAot ICAgIC8vIEZJWE1FOiBJbnZlc3RpZ2F0ZSB0aGUgaW1wYWN0IHRoaXMgaGFzIG9uIGxheW91dC9y ZW5kZXJpbmcgaWYgYW55LgotICAgIC8vIFRoaXMgZXhwb3NlcyB0aGUgY29ycmVjdCBkZXZpY2Ug c2NhbGUgdG8gamF2YXNjcmlwdCBhbmQgbWVkaWEgcXVlcmllcy4KKyAgICBib29sIG5lZWRJbml0 aWFsaXplUGFnZVNjYWxlID0gIW1fd2ViVmlldy0+aXNQYWdlU2NhbGVGYWN0b3JTZXQoKTsKICAg ICBpZiAodXNlRGVmYXVsdERldmljZVNjYWxlRmFjdG9yICYmIHNldHRpbmdzLT5kZWZhdWx0RGV2 aWNlU2NhbGVGYWN0b3IoKSkKICAgICAgICAgbV93ZWJWaWV3LT5zZXREZXZpY2VTY2FsZUZhY3Rv cihzZXR0aW5ncy0+ZGVmYXVsdERldmljZVNjYWxlRmFjdG9yKCkpOwogICAgIGVsc2UKICAgICAg ICAgbV93ZWJWaWV3LT5zZXREZXZpY2VTY2FsZUZhY3Rvcihjb21wdXRlZC5kZXZpY2VQaXhlbFJh dGlvKTsKICAgICBtX3dlYlZpZXctPnNldFBhZ2VTY2FsZUZhY3RvckxpbWl0cyhjb21wdXRlZC5t aW5pbXVtU2NhbGUsIGNvbXB1dGVkLm1heGltdW1TY2FsZSk7Ci0gICAgbV93ZWJWaWV3LT5zZXRQ YWdlU2NhbGVGYWN0b3JQcmVzZXJ2aW5nU2Nyb2xsT2Zmc2V0KGNvbXB1dGVkLmluaXRpYWxTY2Fs ZSAqIGNvbXB1dGVkLmRldmljZVBpeGVsUmF0aW8pOworICAgIGlmIChuZWVkSW5pdGlhbGl6ZVBh Z2VTY2FsZSkKKyAgICAgICAgbV93ZWJWaWV3LT5zZXRQYWdlU2NhbGVGYWN0b3JQcmVzZXJ2aW5n U2Nyb2xsT2Zmc2V0KGNvbXB1dGVkLmluaXRpYWxTY2FsZSAqIGNvbXB1dGVkLmRldmljZVBpeGVs UmF0aW8pOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmNwcAppbmRleCBhMDBlMmI1NDQ4NGQ1NWUzMzg2MjE2MWM4ZjkzNzAxZDRhYzIyMTRlLi45 Zjg5MTJlMDQ2ZTQ0NDJiMmY0M2I5YzAxMTUwOTNmMTBiMTkwNTMxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0yOTczLDcgKzI5NzMsNyBAQCB2b2lk IFdlYlZpZXdJbXBsOjpkaWRDb21taXRMb2FkKGJvb2wqIGlzTmV3TmF2aWdhdGlvbiwgYm9vbCBp c05hdmlnYXRpb25XaXRoaW5QYQogICAgIG1fbmV3TmF2aWdhdGlvbkxvYWRlciA9IDA7CiAjZW5k aWYKICAgICBtX29ic2VydmVkTmV3TmF2aWdhdGlvbiA9IGZhbHNlOwotICAgIGlmICghaXNOYXZp Z2F0aW9uV2l0aGluUGFnZSkKKyAgICBpZiAoKmlzTmV3TmF2aWdhdGlvbiAmJiAhaXNOYXZpZ2F0 aW9uV2l0aGluUGFnZSkKICAgICAgICAgbV9wYWdlU2NhbGVGYWN0b3JJc1NldCA9IGZhbHNlOwog CiAgICAgbV9nZXN0dXJlQW5pbWF0aW9uLmNsZWFyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5jcHAKaW5kZXggZjY4N2E4NDg1NDI5ZTlmMTI1ODVlNTU2 MWExMDc1NmYyZGZhOTdiYy4uMTFiOTQ5ZTI5NmE4MzBlZDM1ZmQ4NjA4ZWFlODFlOTFkNDgxYTc1 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3Qu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcApA QCAtMzEsMTIgKzMxLDE0IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAKICNpbmNsdWRlICJGcmFt ZVRlc3RIZWxwZXJzLmgiCisjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiUmVzb3Vy Y2VFcnJvci5oIgogI2luY2x1ZGUgIldlYkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiV2ViRmluZE9w dGlvbnMuaCIKICNpbmNsdWRlICJXZWJGb3JtRWxlbWVudC5oIgogI2luY2x1ZGUgIldlYkZyYW1l LmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVDbGllbnQuaCIKKyNpbmNsdWRlICJXZWJGcmFtZUltcGwu aCIKICNpbmNsdWRlICJXZWJSYW5nZS5oIgogI2luY2x1ZGUgIldlYlNjcmlwdFNvdXJjZS5oIgog I2luY2x1ZGUgIldlYlNlYXJjaGFibGVGb3JtRGF0YS5oIgpAQCAtMjM0LDYgKzIzNiw0MyBAQCBU RVNUX0YoV2ViRnJhbWVUZXN0LCBEZXZpY2VTY2FsZUZhY3RvclVzZXNEZWZhdWx0V2l0aG91dFZp ZXdwb3J0VGFnKQogCiAgICAgRVhQRUNUX0VRKDIsIHdlYlZpZXctPmRldmljZVNjYWxlRmFjdG9y KCkpOwogfQorCitURVNUX0YoV2ViRnJhbWVUZXN0LCBGaXhlZExheW91dEluaXRpYWxpemVBdE1p bmltdW1QYWdlU2NhbGUpCit7CisgICAgcmVnaXN0ZXJNb2NrZWRIdHRwVVJMTG9hZCgiZml4ZWRf bGF5b3V0Lmh0bWwiKTsKKworICAgIEZpeGVkTGF5b3V0VGVzdFdlYlZpZXdDbGllbnQgY2xpZW50 OworICAgIGNsaWVudC5tX3NjcmVlbkluZm8uaG9yaXpvbnRhbERQSSA9IDE2MDsKKyAgICBpbnQg dmlld3BvcnRXaWR0aCA9IDY0MDsKKyAgICBpbnQgdmlld3BvcnRIZWlnaHQgPSA0ODA7CisgICAg Y2xpZW50Lm1fd2luZG93UmVjdCA9IFdlYlJlY3QoMCwgMCwgdmlld3BvcnRXaWR0aCwgdmlld3Bv cnRIZWlnaHQpOworCisgICAgLy8gTWFrZSBzdXJlIHdlIGluaXRpYWxpemUgdG8gbWluaW11bSBz Y2FsZSwgZXZlbiBpZiB0aGUgd2luZG93IHNpemUKKyAgICAvLyBvbmx5IGJlY29tZXMgYXZhaWxh YmxlIGFmdGVyIHRoZSBsb2FkIGJlZ2lucy4KKyAgICBXZWJWaWV3SW1wbCogd2ViVmlld0ltcGwg PSBzdGF0aWNfY2FzdDxXZWJWaWV3SW1wbCo+KEZyYW1lVGVzdEhlbHBlcnM6OmNyZWF0ZVdlYlZp ZXdBbmRMb2FkKG1fYmFzZVVSTCArICJmaXhlZF9sYXlvdXQuaHRtbCIsIHRydWUsIDAsICZjbGll bnQpKTsKKyAgICB3ZWJWaWV3SW1wbC0+ZW5hYmxlRml4ZWRMYXlvdXRNb2RlKHRydWUpOworICAg IHdlYlZpZXdJbXBsLT5zZXR0aW5ncygpLT5zZXRWaWV3cG9ydEVuYWJsZWQodHJ1ZSk7CisgICAg d2ViVmlld0ltcGwtPnJlc2l6ZShXZWJTaXplKHZpZXdwb3J0V2lkdGgsIHZpZXdwb3J0SGVpZ2h0 KSk7CisKKyAgICBpbnQgZGVmYXVsdEZpeGVkTGF5b3V0V2lkdGggPSA5ODA7CisgICAgZmxvYXQg bWluaW11bVBhZ2VTY2FsZUZhY3RvciA9IHZpZXdwb3J0V2lkdGggLyAoZmxvYXQpIGRlZmF1bHRG aXhlZExheW91dFdpZHRoOworICAgIEVYUEVDVF9FUShtaW5pbXVtUGFnZVNjYWxlRmFjdG9yLCB3 ZWJWaWV3SW1wbC0+cGFnZVNjYWxlRmFjdG9yKCkpOworCisgICAgLy8gQXNzdW1lIHRoZSB1c2Vy IGhhcyBwaW5jaCB6b29tZWQgdG8gcGFnZSBzY2FsZSBmYWN0b3IgMi4KKyAgICBmbG9hdCB1c2Vy UGluY2hQYWdlU2NhbGVGYWN0b3IgPSAyOworICAgIHdlYlZpZXdJbXBsLT5zZXRQYWdlU2NhbGVG YWN0b3JQcmVzZXJ2aW5nU2Nyb2xsT2Zmc2V0KHVzZXJQaW5jaFBhZ2VTY2FsZUZhY3Rvcik7Cisg ICAgd2ViVmlld0ltcGwtPm1haW5GcmFtZUltcGwoKS0+ZnJhbWVWaWV3KCktPmxheW91dCgpOwor CisgICAgLy8gTWFrZSBzdXJlIHdlIGRvbid0IHJlc2V0IHRvIGluaXRpYWwgc2NhbGUgaWYgdGhl IHBhZ2UgY29udGludWVzIHRvIGxvYWQuCisgICAgYm9vbCBpc05ld05hdmlnYXRpb247CisgICAg d2ViVmlld0ltcGwtPmRpZENvbW1pdExvYWQoJmlzTmV3TmF2aWdhdGlvbiwgZmFsc2UpOworICAg IHdlYlZpZXdJbXBsLT5kaWRDaGFuZ2VDb250ZW50c1NpemUoKTsKKyAgICBFWFBFQ1RfRVEodXNl clBpbmNoUGFnZVNjYWxlRmFjdG9yLCB3ZWJWaWV3SW1wbC0+cGFnZVNjYWxlRmFjdG9yKCkpOwor CisgICAgLy8gTWFrZSBzdXJlIHdlIGRvbid0IHJlc2V0IHRvIGluaXRpYWwgc2NhbGUgaWYgdGhl IHZpZXdwb3J0IHNpemUgY2hhbmdlcy4KKyAgICB3ZWJWaWV3SW1wbC0+cmVzaXplKFdlYlNpemUo dmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQgKyAxMDApKTsKKyAgICBFWFBFQ1RfRVEodXNl clBpbmNoUGFnZVNjYWxlRmFjdG9yLCB3ZWJWaWV3SW1wbC0+cGFnZVNjYWxlRmFjdG9yKCkpOwor fQogI2VuZGlmCiAKICNpZiBFTkFCTEUoR0VTVFVSRV9FVkVOVFMpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvZml4ZWRfbGF5b3V0Lmh0bWwgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvZml4ZWRfbGF5b3V0Lmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u YTg5Y2VjYWU5MjhlNzVlMTVlZGRkZmFkMTFlMWQ5N2Q2ZGVkNjVjNwotLS0gL2Rldi9udWxsCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvZGF0YS9maXhlZF9sYXlvdXQuaHRtbApA QCAtMCwwICsxIEBACis8Ym9keT5PcmRpbmFyeSBub24tbW9iaWxlIHBhZ2U8L2JvZHk+Cg== 143427 2012-05-22 18:28:41 -0700 2012-05-22 18:59:15 -0700 Patch for landing bug-82949-20120522182840.patch text/plain 6243 abarth SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMTgwOTIpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4 IEBACisyMDEyLTA1LTIyICBBbGV4YW5kcmUgRWxpYXMgIDxhZWxpYXNAZ29vZ2xlLmNvbT4KKwor ICAgICAgICBbY2hyb21pdW1dIEFwcGx5IHZpZXdwb3J0IHRhZyBpbml0aWFsLXNjYWxlIG9ubHkg b25jZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI5 NDkKKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIEZpcnN0LCBj aGVjayB0aGF0IGlzUGFnZVNjYWxlRmFjdG9yU2V0IHJldHVybiBmYWxzZSBiZWZvcmUgc2V0dGlu ZworICAgICAgICBpbml0aWFsLXNjYWxlLiBXZSBuZWVkIHRvIGNhbGwgZGlzcGF0Y2hWaWV3cG9y dFByb3BlcnRpZXNEaWRDaGFuZ2UoKQorICAgICAgICB3aGVuIHRoZSB2aWV3cG9ydCB3aWR0aCBj aGFuZ2VzLCBzaW5jZSB0aGF0J3MgYW4gaW5wdXQgdG8gdGhlIHZpZXdwb3J0CisgICAgICAgIHRh ZyBjYWxjdWxhdGlvbi4gV2hlbiB0aGlzIGhhcHBlbnMsIHdlIHNob3VsZG4ndCBwb3AgYmFjayB0 byBpbml0aWFsCisgICAgICAgIHNjYWxlLgorCisgICAgICAgIFNlY29uZCwgY2hlY2sgdGhhdCBp c05ld05hdmlnYXRpb24gaXMgdHJ1ZSB3aGVuIGRlY2lkaW5nIHRvIGNsZWFyCisgICAgICAgIGlz UGFnZVNjYWxlRmFjdG9ySXNTZXQgaW4gZGlkQ29tbWl0TG9hZC4gV2Ugb25seSB3YW50IHRvIGNs ZWFyIGl0IG9uCisgICAgICAgIHRoZSB2ZXJ5IGZpcnN0IGNvbW1pdCwgb3RoZXJ3aXNlIHdlJ2xs IHBvcCBiYWNrIHRvIGluaXRpYWwgc2NhbGUgaWYKKyAgICAgICAgdGhlIHVzZXIgem9vbXMgaW4g YmVmb3JlIHRoZSBsb2FkIGlzIGNvbXBsZXRlLgorCisgICAgICAgIE5ldyB0ZXN0IFdlYkZyYW1l VGVzdDo6Rml4ZWRMYXlvdXRJbml0aWFsaXplQXRNaW5pbXVtUGFnZVNjYWxlLgorCisgICAgICAg ICogc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGll bnRJbXBsOjpkaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5nZSk6CisgICAgICAgICog c3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRpZENv bW1pdExvYWQpOgorCiAyMDEyLTA1LTIyICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gRG9uJ3QgZm9yY2UgdGhlIHZpc2libGVMYXllclJl Y3QgdG8gYmUgZW1wdHkgZm9yIGFuaW1hdGluZyBsYXllcnMgd2hvc2UgZnJvbnQgZmFjZSBpcyBu b3QgdmlzaWJsZQpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50 SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21l Q2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDExODA5MikKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NjUsMTQgKzY2 NSwxNCBAQCB2b2lkIENocm9tZUNsaWVudEltcGw6OmRpc3BhdGNoVmlld3BvcnRQCiAgICAgaW50 IGxheW91dEhlaWdodCA9IGNvbXB1dGVkLmxheW91dFNpemUuaGVpZ2h0KCk7CiAgICAgbV93ZWJW aWV3LT5zZXRGaXhlZExheW91dFNpemUoSW50U2l6ZShsYXlvdXRXaWR0aCwgbGF5b3V0SGVpZ2h0 KSk7CiAKLSAgICAvLyBGSVhNRTogSW52ZXN0aWdhdGUgdGhlIGltcGFjdCB0aGlzIGhhcyBvbiBs YXlvdXQvcmVuZGVyaW5nIGlmIGFueS4KLSAgICAvLyBUaGlzIGV4cG9zZXMgdGhlIGNvcnJlY3Qg ZGV2aWNlIHNjYWxlIHRvIGphdmFzY3JpcHQgYW5kIG1lZGlhIHF1ZXJpZXMuCisgICAgYm9vbCBu ZWVkSW5pdGlhbGl6ZVBhZ2VTY2FsZSA9ICFtX3dlYlZpZXctPmlzUGFnZVNjYWxlRmFjdG9yU2V0 KCk7CiAgICAgaWYgKHVzZURlZmF1bHREZXZpY2VTY2FsZUZhY3RvciAmJiBzZXR0aW5ncy0+ZGVm YXVsdERldmljZVNjYWxlRmFjdG9yKCkpCiAgICAgICAgIG1fd2ViVmlldy0+c2V0RGV2aWNlU2Nh bGVGYWN0b3Ioc2V0dGluZ3MtPmRlZmF1bHREZXZpY2VTY2FsZUZhY3RvcigpKTsKICAgICBlbHNl CiAgICAgICAgIG1fd2ViVmlldy0+c2V0RGV2aWNlU2NhbGVGYWN0b3IoY29tcHV0ZWQuZGV2aWNl UGl4ZWxSYXRpbyk7CiAgICAgbV93ZWJWaWV3LT5zZXRQYWdlU2NhbGVGYWN0b3JMaW1pdHMoY29t cHV0ZWQubWluaW11bVNjYWxlLCBjb21wdXRlZC5tYXhpbXVtU2NhbGUpOwotICAgIG1fd2ViVmll dy0+c2V0UGFnZVNjYWxlRmFjdG9yUHJlc2VydmluZ1Njcm9sbE9mZnNldChjb21wdXRlZC5pbml0 aWFsU2NhbGUgKiBjb21wdXRlZC5kZXZpY2VQaXhlbFJhdGlvKTsKKyAgICBpZiAobmVlZEluaXRp YWxpemVQYWdlU2NhbGUpCisgICAgICAgIG1fd2ViVmlldy0+c2V0UGFnZVNjYWxlRmFjdG9yUHJl c2VydmluZ1Njcm9sbE9mZnNldChjb21wdXRlZC5pbml0aWFsU2NhbGUgKiBjb21wdXRlZC5kZXZp Y2VQaXhlbFJhdGlvKTsKICNlbmRpZgogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lvbiAxMTgwOTIpCisrKyBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxMDIsNyAr MzEwMiw3IEBAIHZvaWQgV2ViVmlld0ltcGw6OmRpZENvbW1pdExvYWQoYm9vbCogaXMKICAgICBt X25ld05hdmlnYXRpb25Mb2FkZXIgPSAwOwogI2VuZGlmCiAgICAgbV9vYnNlcnZlZE5ld05hdmln YXRpb24gPSBmYWxzZTsKLSAgICBpZiAoIWlzTmF2aWdhdGlvbldpdGhpblBhZ2UpCisgICAgaWYg KCppc05ld05hdmlnYXRpb24gJiYgIWlzTmF2aWdhdGlvbldpdGhpblBhZ2UpCiAgICAgICAgIG1f cGFnZVNjYWxlRmFjdG9ySXNTZXQgPSBmYWxzZTsKIAogICAgIG1fZ2VzdHVyZUFuaW1hdGlvbi5j bGVhcigpOwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3Qu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVU ZXN0LmNwcAkocmV2aXNpb24gMTE4MDkyKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0 cy9XZWJGcmFtZVRlc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw2ICszNCw3IEBACiAKICNp bmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lVGVzdEhlbHBlcnMuaCIKKyNpbmNsdWRl ICJGcmFtZVZpZXcuaCIKICNpbmNsdWRlICJSZXNvdXJjZUVycm9yLmgiCiAjaW5jbHVkZSAiV2Vi RG9jdW1lbnQuaCIKICNpbmNsdWRlICJXZWJGaW5kT3B0aW9ucy5oIgpAQCAtNDYsNiArNDcsNyBA QAogI2luY2x1ZGUgIldlYlNlY3VyaXR5UG9saWN5LmgiCiAjaW5jbHVkZSAiV2ViU2V0dGluZ3Mu aCIKICNpbmNsdWRlICJXZWJWaWV3Q2xpZW50LmgiCisjaW5jbHVkZSAiV2ViRnJhbWVJbXBsLmgi CiAjaW5jbHVkZSAiV2ViVmlld0ltcGwuaCIKICNpbmNsdWRlICJ2OC5oIgogI2luY2x1ZGUgPGd0 ZXN0L2d0ZXN0Lmg+CkBAIC0yNDMsNiArMjQ1LDQzIEBAIFRFU1RfRihXZWJGcmFtZVRlc3QsIERl dmljZVNjYWxlRmFjdG9yVXMKICAgICAvLyBGb3JjZSB0aGUgbGF5b3V0IHRvIGhhcHBlbiBiZWZv cmUgbGVhdmluZyB0aGUgdGVzdC4KICAgICB3ZWJWaWV3LT5tYWluRnJhbWUoKS0+Y29udGVudEFz VGV4dCgxMDI0KS51dGY4KCk7CiB9CisKK1RFU1RfRihXZWJGcmFtZVRlc3QsIEZpeGVkTGF5b3V0 SW5pdGlhbGl6ZUF0TWluaW11bVBhZ2VTY2FsZSkKK3sKKyAgICByZWdpc3Rlck1vY2tlZEh0dHBV UkxMb2FkKCJmaXhlZF9sYXlvdXQuaHRtbCIpOworCisgICAgRml4ZWRMYXlvdXRUZXN0V2ViVmll d0NsaWVudCBjbGllbnQ7CisgICAgY2xpZW50Lm1fc2NyZWVuSW5mby5ob3Jpem9udGFsRFBJID0g MTYwOworICAgIGludCB2aWV3cG9ydFdpZHRoID0gNjQwOworICAgIGludCB2aWV3cG9ydEhlaWdo dCA9IDQ4MDsKKyAgICBjbGllbnQubV93aW5kb3dSZWN0ID0gV2ViUmVjdCgwLCAwLCB2aWV3cG9y dFdpZHRoLCB2aWV3cG9ydEhlaWdodCk7CisKKyAgICAvLyBNYWtlIHN1cmUgd2UgaW5pdGlhbGl6 ZSB0byBtaW5pbXVtIHNjYWxlLCBldmVuIGlmIHRoZSB3aW5kb3cgc2l6ZQorICAgIC8vIG9ubHkg YmVjb21lcyBhdmFpbGFibGUgYWZ0ZXIgdGhlIGxvYWQgYmVnaW5zLgorICAgIFdlYlZpZXdJbXBs KiB3ZWJWaWV3SW1wbCA9IHN0YXRpY19jYXN0PFdlYlZpZXdJbXBsKj4oRnJhbWVUZXN0SGVscGVy czo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJMICsgImZpeGVkX2xheW91dC5odG1sIiwg dHJ1ZSwgMCwgJmNsaWVudCkpOworICAgIHdlYlZpZXdJbXBsLT5lbmFibGVGaXhlZExheW91dE1v ZGUodHJ1ZSk7CisgICAgd2ViVmlld0ltcGwtPnNldHRpbmdzKCktPnNldFZpZXdwb3J0RW5hYmxl ZCh0cnVlKTsKKyAgICB3ZWJWaWV3SW1wbC0+cmVzaXplKFdlYlNpemUodmlld3BvcnRXaWR0aCwg dmlld3BvcnRIZWlnaHQpKTsKKworICAgIGludCBkZWZhdWx0Rml4ZWRMYXlvdXRXaWR0aCA9IDk4 MDsKKyAgICBmbG9hdCBtaW5pbXVtUGFnZVNjYWxlRmFjdG9yID0gdmlld3BvcnRXaWR0aCAvIChm bG9hdCkgZGVmYXVsdEZpeGVkTGF5b3V0V2lkdGg7CisgICAgRVhQRUNUX0VRKG1pbmltdW1QYWdl U2NhbGVGYWN0b3IsIHdlYlZpZXdJbXBsLT5wYWdlU2NhbGVGYWN0b3IoKSk7CisKKyAgICAvLyBB c3N1bWUgdGhlIHVzZXIgaGFzIHBpbmNoIHpvb21lZCB0byBwYWdlIHNjYWxlIGZhY3RvciAyLgor ICAgIGZsb2F0IHVzZXJQaW5jaFBhZ2VTY2FsZUZhY3RvciA9IDI7CisgICAgd2ViVmlld0ltcGwt PnNldFBhZ2VTY2FsZUZhY3RvclByZXNlcnZpbmdTY3JvbGxPZmZzZXQodXNlclBpbmNoUGFnZVNj YWxlRmFjdG9yKTsKKyAgICB3ZWJWaWV3SW1wbC0+bWFpbkZyYW1lSW1wbCgpLT5mcmFtZVZpZXco KS0+bGF5b3V0KCk7CisKKyAgICAvLyBNYWtlIHN1cmUgd2UgZG9uJ3QgcmVzZXQgdG8gaW5pdGlh bCBzY2FsZSBpZiB0aGUgcGFnZSBjb250aW51ZXMgdG8gbG9hZC4KKyAgICBib29sIGlzTmV3TmF2 aWdhdGlvbjsKKyAgICB3ZWJWaWV3SW1wbC0+ZGlkQ29tbWl0TG9hZCgmaXNOZXdOYXZpZ2F0aW9u LCBmYWxzZSk7CisgICAgd2ViVmlld0ltcGwtPmRpZENoYW5nZUNvbnRlbnRzU2l6ZSgpOworICAg IEVYUEVDVF9FUSh1c2VyUGluY2hQYWdlU2NhbGVGYWN0b3IsIHdlYlZpZXdJbXBsLT5wYWdlU2Nh bGVGYWN0b3IoKSk7CisKKyAgICAvLyBNYWtlIHN1cmUgd2UgZG9uJ3QgcmVzZXQgdG8gaW5pdGlh bCBzY2FsZSBpZiB0aGUgdmlld3BvcnQgc2l6ZSBjaGFuZ2VzLgorICAgIHdlYlZpZXdJbXBsLT5y ZXNpemUoV2ViU2l6ZSh2aWV3cG9ydFdpZHRoLCB2aWV3cG9ydEhlaWdodCArIDEwMCkpOworICAg IEVYUEVDVF9FUSh1c2VyUGluY2hQYWdlU2NhbGVGYWN0b3IsIHdlYlZpZXdJbXBsLT5wYWdlU2Nh bGVGYWN0b3IoKSk7Cit9CiAjZW5kaWYKIAogI2lmIEVOQUJMRShHRVNUVVJFX0VWRU5UUykKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvZGF0YS9maXhlZF9sYXlvdXQuaHRtbAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvZml4ZWRfbGF5 b3V0Lmh0bWwJKHJldmlzaW9uIDApCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2Rh dGEvZml4ZWRfbGF5b3V0Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEgQEAKKzxib2R5Pk9y ZGluYXJ5IG5vbi1tb2JpbGUgcGFnZTwvYm9keT4K 143433 2012-05-22 18:59:28 -0700 2012-05-22 22:02:31 -0700 Patch for landing bug-82949-20120522185927.patch text/plain 6219 abarth SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMTgwOTIpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4 IEBACisyMDEyLTA1LTIyICBBbGV4YW5kcmUgRWxpYXMgIDxhZWxpYXNAZ29vZ2xlLmNvbT4KKwor ICAgICAgICBbY2hyb21pdW1dIEFwcGx5IHZpZXdwb3J0IHRhZyBpbml0aWFsLXNjYWxlIG9ubHkg b25jZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI5 NDkKKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIEZpcnN0LCBj aGVjayB0aGF0IGlzUGFnZVNjYWxlRmFjdG9yU2V0IHJldHVybiBmYWxzZSBiZWZvcmUgc2V0dGlu ZworICAgICAgICBpbml0aWFsLXNjYWxlLiBXZSBuZWVkIHRvIGNhbGwgZGlzcGF0Y2hWaWV3cG9y dFByb3BlcnRpZXNEaWRDaGFuZ2UoKQorICAgICAgICB3aGVuIHRoZSB2aWV3cG9ydCB3aWR0aCBj aGFuZ2VzLCBzaW5jZSB0aGF0J3MgYW4gaW5wdXQgdG8gdGhlIHZpZXdwb3J0CisgICAgICAgIHRh ZyBjYWxjdWxhdGlvbi4gV2hlbiB0aGlzIGhhcHBlbnMsIHdlIHNob3VsZG4ndCBwb3AgYmFjayB0 byBpbml0aWFsCisgICAgICAgIHNjYWxlLgorCisgICAgICAgIFNlY29uZCwgY2hlY2sgdGhhdCBp c05ld05hdmlnYXRpb24gaXMgdHJ1ZSB3aGVuIGRlY2lkaW5nIHRvIGNsZWFyCisgICAgICAgIGlz UGFnZVNjYWxlRmFjdG9ySXNTZXQgaW4gZGlkQ29tbWl0TG9hZC4gV2Ugb25seSB3YW50IHRvIGNs ZWFyIGl0IG9uCisgICAgICAgIHRoZSB2ZXJ5IGZpcnN0IGNvbW1pdCwgb3RoZXJ3aXNlIHdlJ2xs IHBvcCBiYWNrIHRvIGluaXRpYWwgc2NhbGUgaWYKKyAgICAgICAgdGhlIHVzZXIgem9vbXMgaW4g YmVmb3JlIHRoZSBsb2FkIGlzIGNvbXBsZXRlLgorCisgICAgICAgIE5ldyB0ZXN0IFdlYkZyYW1l VGVzdDo6Rml4ZWRMYXlvdXRJbml0aWFsaXplQXRNaW5pbXVtUGFnZVNjYWxlLgorCisgICAgICAg ICogc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGll bnRJbXBsOjpkaXNwYXRjaFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5nZSk6CisgICAgICAgICog c3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRpZENv bW1pdExvYWQpOgorCiAyMDEyLTA1LTIyICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gRG9uJ3QgZm9yY2UgdGhlIHZpc2libGVMYXllclJl Y3QgdG8gYmUgZW1wdHkgZm9yIGFuaW1hdGluZyBsYXllcnMgd2hvc2UgZnJvbnQgZmFjZSBpcyBu b3QgdmlzaWJsZQpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50 SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21l Q2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDExODA5MikKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NjUsMTQgKzY2 NSwxNCBAQCB2b2lkIENocm9tZUNsaWVudEltcGw6OmRpc3BhdGNoVmlld3BvcnRQCiAgICAgaW50 IGxheW91dEhlaWdodCA9IGNvbXB1dGVkLmxheW91dFNpemUuaGVpZ2h0KCk7CiAgICAgbV93ZWJW aWV3LT5zZXRGaXhlZExheW91dFNpemUoSW50U2l6ZShsYXlvdXRXaWR0aCwgbGF5b3V0SGVpZ2h0 KSk7CiAKLSAgICAvLyBGSVhNRTogSW52ZXN0aWdhdGUgdGhlIGltcGFjdCB0aGlzIGhhcyBvbiBs YXlvdXQvcmVuZGVyaW5nIGlmIGFueS4KLSAgICAvLyBUaGlzIGV4cG9zZXMgdGhlIGNvcnJlY3Qg ZGV2aWNlIHNjYWxlIHRvIGphdmFzY3JpcHQgYW5kIG1lZGlhIHF1ZXJpZXMuCisgICAgYm9vbCBu ZWVkSW5pdGlhbGl6ZVBhZ2VTY2FsZSA9ICFtX3dlYlZpZXctPmlzUGFnZVNjYWxlRmFjdG9yU2V0 KCk7CiAgICAgaWYgKHVzZURlZmF1bHREZXZpY2VTY2FsZUZhY3RvciAmJiBzZXR0aW5ncy0+ZGVm YXVsdERldmljZVNjYWxlRmFjdG9yKCkpCiAgICAgICAgIG1fd2ViVmlldy0+c2V0RGV2aWNlU2Nh bGVGYWN0b3Ioc2V0dGluZ3MtPmRlZmF1bHREZXZpY2VTY2FsZUZhY3RvcigpKTsKICAgICBlbHNl CiAgICAgICAgIG1fd2ViVmlldy0+c2V0RGV2aWNlU2NhbGVGYWN0b3IoY29tcHV0ZWQuZGV2aWNl UGl4ZWxSYXRpbyk7CiAgICAgbV93ZWJWaWV3LT5zZXRQYWdlU2NhbGVGYWN0b3JMaW1pdHMoY29t cHV0ZWQubWluaW11bVNjYWxlLCBjb21wdXRlZC5tYXhpbXVtU2NhbGUpOwotICAgIG1fd2ViVmll dy0+c2V0UGFnZVNjYWxlRmFjdG9yUHJlc2VydmluZ1Njcm9sbE9mZnNldChjb21wdXRlZC5pbml0 aWFsU2NhbGUgKiBjb21wdXRlZC5kZXZpY2VQaXhlbFJhdGlvKTsKKyAgICBpZiAobmVlZEluaXRp YWxpemVQYWdlU2NhbGUpCisgICAgICAgIG1fd2ViVmlldy0+c2V0UGFnZVNjYWxlRmFjdG9yUHJl c2VydmluZ1Njcm9sbE9mZnNldChjb21wdXRlZC5pbml0aWFsU2NhbGUgKiBjb21wdXRlZC5kZXZp Y2VQaXhlbFJhdGlvKTsKICNlbmRpZgogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lvbiAxMTgwOTIpCisrKyBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxMDIsNyAr MzEwMiw3IEBAIHZvaWQgV2ViVmlld0ltcGw6OmRpZENvbW1pdExvYWQoYm9vbCogaXMKICAgICBt X25ld05hdmlnYXRpb25Mb2FkZXIgPSAwOwogI2VuZGlmCiAgICAgbV9vYnNlcnZlZE5ld05hdmln YXRpb24gPSBmYWxzZTsKLSAgICBpZiAoIWlzTmF2aWdhdGlvbldpdGhpblBhZ2UpCisgICAgaWYg KCppc05ld05hdmlnYXRpb24gJiYgIWlzTmF2aWdhdGlvbldpdGhpblBhZ2UpCiAgICAgICAgIG1f cGFnZVNjYWxlRmFjdG9ySXNTZXQgPSBmYWxzZTsKIAogICAgIG1fZ2VzdHVyZUFuaW1hdGlvbi5j bGVhcigpOwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3Qu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVU ZXN0LmNwcAkocmV2aXNpb24gMTE4MDkyKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0 cy9XZWJGcmFtZVRlc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCwxMSArMzQsMTMgQEAKIAog I2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVUZXN0SGVscGVycy5oIgorI2luY2x1 ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIlJlc291cmNlRXJyb3IuaCIKICNpbmNsdWRlICJX ZWJEb2N1bWVudC5oIgogI2luY2x1ZGUgIldlYkZpbmRPcHRpb25zLmgiCiAjaW5jbHVkZSAiV2Vi Rm9ybUVsZW1lbnQuaCIKICNpbmNsdWRlICJXZWJGcmFtZUNsaWVudC5oIgorI2luY2x1ZGUgIldl YkZyYW1lSW1wbC5oIgogI2luY2x1ZGUgIldlYlJhbmdlLmgiCiAjaW5jbHVkZSAiV2ViU2NyaXB0 U291cmNlLmgiCiAjaW5jbHVkZSAiV2ViU2VhcmNoYWJsZUZvcm1EYXRhLmgiCkBAIC0yNDMsNiAr MjQ1LDQzIEBAIFRFU1RfRihXZWJGcmFtZVRlc3QsIERldmljZVNjYWxlRmFjdG9yVXMKICAgICAv LyBGb3JjZSB0aGUgbGF5b3V0IHRvIGhhcHBlbiBiZWZvcmUgbGVhdmluZyB0aGUgdGVzdC4KICAg ICB3ZWJWaWV3LT5tYWluRnJhbWUoKS0+Y29udGVudEFzVGV4dCgxMDI0KS51dGY4KCk7CiB9CisK K1RFU1RfRihXZWJGcmFtZVRlc3QsIEZpeGVkTGF5b3V0SW5pdGlhbGl6ZUF0TWluaW11bVBhZ2VT Y2FsZSkKK3sKKyAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKCJmaXhlZF9sYXlvdXQuaHRt bCIpOworCisgICAgRml4ZWRMYXlvdXRUZXN0V2ViVmlld0NsaWVudCBjbGllbnQ7CisgICAgY2xp ZW50Lm1fc2NyZWVuSW5mby5ob3Jpem9udGFsRFBJID0gMTYwOworICAgIGludCB2aWV3cG9ydFdp ZHRoID0gNjQwOworICAgIGludCB2aWV3cG9ydEhlaWdodCA9IDQ4MDsKKyAgICBjbGllbnQubV93 aW5kb3dSZWN0ID0gV2ViUmVjdCgwLCAwLCB2aWV3cG9ydFdpZHRoLCB2aWV3cG9ydEhlaWdodCk7 CisKKyAgICAvLyBNYWtlIHN1cmUgd2UgaW5pdGlhbGl6ZSB0byBtaW5pbXVtIHNjYWxlLCBldmVu IGlmIHRoZSB3aW5kb3cgc2l6ZQorICAgIC8vIG9ubHkgYmVjb21lcyBhdmFpbGFibGUgYWZ0ZXIg dGhlIGxvYWQgYmVnaW5zLgorICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3SW1wbCA9IHN0YXRpY19j YXN0PFdlYlZpZXdJbXBsKj4oRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQo bV9iYXNlVVJMICsgImZpeGVkX2xheW91dC5odG1sIiwgdHJ1ZSwgMCwgJmNsaWVudCkpOworICAg IHdlYlZpZXdJbXBsLT5lbmFibGVGaXhlZExheW91dE1vZGUodHJ1ZSk7CisgICAgd2ViVmlld0lt cGwtPnNldHRpbmdzKCktPnNldFZpZXdwb3J0RW5hYmxlZCh0cnVlKTsKKyAgICB3ZWJWaWV3SW1w bC0+cmVzaXplKFdlYlNpemUodmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQpKTsKKworICAg IGludCBkZWZhdWx0Rml4ZWRMYXlvdXRXaWR0aCA9IDk4MDsKKyAgICBmbG9hdCBtaW5pbXVtUGFn ZVNjYWxlRmFjdG9yID0gdmlld3BvcnRXaWR0aCAvIChmbG9hdCkgZGVmYXVsdEZpeGVkTGF5b3V0 V2lkdGg7CisgICAgRVhQRUNUX0VRKG1pbmltdW1QYWdlU2NhbGVGYWN0b3IsIHdlYlZpZXdJbXBs LT5wYWdlU2NhbGVGYWN0b3IoKSk7CisKKyAgICAvLyBBc3N1bWUgdGhlIHVzZXIgaGFzIHBpbmNo IHpvb21lZCB0byBwYWdlIHNjYWxlIGZhY3RvciAyLgorICAgIGZsb2F0IHVzZXJQaW5jaFBhZ2VT Y2FsZUZhY3RvciA9IDI7CisgICAgd2ViVmlld0ltcGwtPnNldFBhZ2VTY2FsZUZhY3RvclByZXNl cnZpbmdTY3JvbGxPZmZzZXQodXNlclBpbmNoUGFnZVNjYWxlRmFjdG9yKTsKKyAgICB3ZWJWaWV3 SW1wbC0+bWFpbkZyYW1lSW1wbCgpLT5mcmFtZVZpZXcoKS0+bGF5b3V0KCk7CisKKyAgICAvLyBN YWtlIHN1cmUgd2UgZG9uJ3QgcmVzZXQgdG8gaW5pdGlhbCBzY2FsZSBpZiB0aGUgcGFnZSBjb250 aW51ZXMgdG8gbG9hZC4KKyAgICBib29sIGlzTmV3TmF2aWdhdGlvbjsKKyAgICB3ZWJWaWV3SW1w bC0+ZGlkQ29tbWl0TG9hZCgmaXNOZXdOYXZpZ2F0aW9uLCBmYWxzZSk7CisgICAgd2ViVmlld0lt cGwtPmRpZENoYW5nZUNvbnRlbnRzU2l6ZSgpOworICAgIEVYUEVDVF9FUSh1c2VyUGluY2hQYWdl U2NhbGVGYWN0b3IsIHdlYlZpZXdJbXBsLT5wYWdlU2NhbGVGYWN0b3IoKSk7CisKKyAgICAvLyBN YWtlIHN1cmUgd2UgZG9uJ3QgcmVzZXQgdG8gaW5pdGlhbCBzY2FsZSBpZiB0aGUgdmlld3BvcnQg c2l6ZSBjaGFuZ2VzLgorICAgIHdlYlZpZXdJbXBsLT5yZXNpemUoV2ViU2l6ZSh2aWV3cG9ydFdp ZHRoLCB2aWV3cG9ydEhlaWdodCArIDEwMCkpOworICAgIEVYUEVDVF9FUSh1c2VyUGluY2hQYWdl U2NhbGVGYWN0b3IsIHdlYlZpZXdJbXBsLT5wYWdlU2NhbGVGYWN0b3IoKSk7Cit9CiAjZW5kaWYK IAogI2lmIEVOQUJMRShHRVNUVVJFX0VWRU5UUykKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvZGF0YS9maXhlZF9sYXlvdXQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvZml4ZWRfbGF5b3V0Lmh0bWwJKHJldmlzaW9uIDApCisr KyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvZml4ZWRfbGF5b3V0Lmh0bWwJKHJl dmlzaW9uIDApCkBAIC0wLDAgKzEgQEAKKzxib2R5Pk9yZGluYXJ5IG5vbi1tb2JpbGUgcGFnZTwv Ym9keT4K