61260 2011-05-22 22:45:49 -0700 [Chromium] Call setToolTipText() in WebPopupMenuImpl mouse move handler to show tool tip in select popup window. 2011-06-06 16:30:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 honten inferno commit-queue dglazkov eric fishd honten inferno tkent oldest_to_newest 407762 0 honten 2011-05-22 22:45:49 -0700 [Chromium]Call setToolTipText() in WebPopupMenuImpl mouse move handler to show tool tip in select popup window. 407765 1 94369 honten 2011-05-22 22:52:05 -0700 Created attachment 94369 Patch 407766 2 94369 honten 2011-05-22 22:53:59 -0700 Comment on attachment 94369 Patch Please review. 408479 3 94369 tkent 2011-05-23 16:58:08 -0700 Comment on attachment 94369 Patch Does this patch work with all Chromium platforms? I'm afraid for Mac. 408485 4 honten 2011-05-23 17:03:42 -0700 Ah, you are right, I have to look into more Mac... But I don't think the patch harms Mac code like crash. But how about Win and Linux? Is the direction is right? Especially I'm a bit afraid of static_cast<PopupContainer*>(), but it looks Ok after I analyzed statically with code search. Thanks, (In reply to comment #3) > (From update of attachment 94369 [details]) > Does this patch work with all Chromium platforms? I'm afraid for Mac. 408498 5 tkent 2011-05-23 17:22:07 -0700 (In reply to comment #4) > Ah, you are right, I have to look into more Mac... But I don't think the patch harms Mac code like crash. > > But how about Win and Linux? Is the direction is right? Especially I'm a bit afraid of static_cast<PopupContainer*>(), but it looks Ok after I analyzed statically with code search. The patch would be a right direction if we ignored Mac. However we should have a solution for Mac, and the solution might be applied to all platforms. So I don't accept this patch at this moment. 408499 6 honten 2011-05-23 17:23:21 -0700 Sure, I try to fix also on Mac. My Mac is really slow though... (In reply to comment #5) > (In reply to comment #4) > > Ah, you are right, I have to look into more Mac... But I don't think the patch harms Mac code like crash. > > > > But how about Win and Linux? Is the direction is right? Especially I'm a bit afraid of static_cast<PopupContainer*>(), but it looks Ok after I analyzed statically with code search. > > The patch would be a right direction if we ignored Mac. However we should have a solution for Mac, and the solution might be applied to all platforms. So I don't accept this patch at this moment. 408702 7 honten 2011-05-24 00:44:36 -0700 Right now, I'm looking into Mac side source code. And I noticed very interesting thing. The change for Mac is completely independent from Linux and Win change. As you know, Mac uses PopupMenuHelper::ShowPopupMenu() to show popup window, and we can pass the whole tool tip text at once right before the window pops up. Right now, I'm writing the code and I will be able to upload tomorrow. Thanks, (In reply to comment #6) > Sure, I try to fix also on Mac. > > My Mac is really slow though... > > (In reply to comment #5) > > (In reply to comment #4) > > > Ah, you are right, I have to look into more Mac... But I don't think the patch harms Mac code like crash. > > > > > > But how about Win and Linux? Is the direction is right? Especially I'm a bit afraid of static_cast<PopupContainer*>(), but it looks Ok after I analyzed statically with code search. > > > > The patch would be a right direction if we ignored Mac. However we should have a solution for Mac, and the solution might be applied to all platforms. So I don't accept this patch at this moment. 409384 8 94730 honten 2011-05-24 19:44:44 -0700 Created attachment 94730 Patch 409386 9 94730 honten 2011-05-24 19:45:31 -0700 Comment on attachment 94730 Patch Please review. It includes Mac change. 411194 10 honten 2011-05-26 23:23:49 -0700 Could you review? As you know, 411195 11 honten 2011-05-26 23:24:29 -0700 Eric or Kent-san, Could you review my patch? I already got LGTM in Mac part. Thanks, 411415 12 eric 2011-05-27 07:14:07 -0700 I'm not very useful for chromium WebKit reviews. WebCore does have manual tests. You could add a manual test which allowed us to test across all webcore implementations that we do RTL tooltips correctly, etc. 411521 13 94730 fishd 2011-05-27 10:28:13 -0700 Comment on attachment 94730 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=94730&action=review > Source/WebKit/chromium/public/WebWidgetClient.h:86 > + virtual void setToolTipText(const WebString&, WebTextDirection hint) { } be sure to cleanup the chromium side so that the methods are declared in the proper order in render_view.{h,cc}. 411541 14 honten 2011-05-27 10:52:18 -0700 Thank you for your review, fishd. Here is the chromium side patch, http://codereview.chromium.org/6974007/ If you have time, could you review it too? Also we need to commit this patch at the same time with chromium and webkit. How I can commit them at the same time? BTW, I cannot find you e-mail address, fishd@chromium.org in Chromium CL. Do you have another e-mail? Thanks, (In reply to comment #13) > (From update of attachment 94730 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=94730&action=review > > > Source/WebKit/chromium/public/WebWidgetClient.h:86 > > + virtual void setToolTipText(const WebString&, WebTextDirection hint) { } > > be sure to cleanup the chromium side so that the methods are declared in the > proper order in render_view.{h,cc}. 411570 15 fishd 2011-05-27 11:24:00 -0700 (In reply to comment #14) > Thank you for your review, fishd. > > Here is the chromium side patch, > http://codereview.chromium.org/6974007/ > If you have time, could you review it too? > > Also we need to commit this patch at the same time with chromium and webkit. > How I can commit them at the same time? It is really necessary in this case? It looks like render_view.cc should still compile and work properly if only this WebKit change lands. If I'm wrong, then what we sometimes do is add a #define to a WebKit API header. Then, we land a Chromium patch that is conditional on that #define to implement either the old API or the new API. So land that Chromium patch first. Then land the WebKit patch. Then land a Chromium patch to clean out the conditional code. Then go back and land another WebKit patch to remove the #define. Lot's of back-n-forth, but it is fairly easy once you get used to it. Not sure it is necessary in this case though. > BTW, I cannot find you e-mail address, fishd@chromium.org in Chromium CL. > Do you have another e-mail? Use darin@chromium.org. Sorry for the confusion. I only use the fishd alias on WebKit to avoid confusion with Darin Adler. Bugzilla has a habit of only showing usernames, dropping the @domain part :-P 411585 16 honten 2011-05-27 11:33:38 -0700 I couldn't build correctly at the last time because of virtual derivation. But I'll check it again. Once it looks Ok, I'll add manual-test and then ask again. Thanks, (In reply to comment #15) > (In reply to comment #14) > > Thank you for your review, fishd. > > > > Here is the chromium side patch, > > http://codereview.chromium.org/6974007/ > > If you have time, could you review it too? > > > > Also we need to commit this patch at the same time with chromium and webkit. > > How I can commit them at the same time? > > It is really necessary in this case? It looks like render_view.cc should still compile and work properly if only this WebKit change lands. If I'm wrong, then what we sometimes do is add a #define to a WebKit API header. Then, we land a Chromium patch that is conditional on that #define to implement either the old API or the new API. So land that Chromium patch first. Then land the WebKit patch. Then land a Chromium patch to clean out the conditional code. Then go back and land another WebKit patch to remove the #define. Lot's of back-n-forth, but it is fairly easy once you get used to it. Not sure it is necessary in this case though. > > > > BTW, I cannot find you e-mail address, fishd@chromium.org in Chromium CL. > > Do you have another e-mail? > > Use darin@chromium.org. Sorry for the confusion. I only use the fishd alias on WebKit to avoid confusion with Darin Adler. Bugzilla has a habit of only showing usernames, dropping the @domain part :-P 411771 17 95245 honten 2011-05-27 19:24:14 -0700 Created attachment 95245 Patch 411776 18 95245 honten 2011-05-27 19:25:31 -0700 Comment on attachment 95245 Patch Added manual test. Also I made sure we don't have to land the patch at once btw Chromium and WebKit. So please land this patch. 412735 19 honten 2011-05-31 10:32:32 -0700 Darin, Could you review again? As I wrote here, I just added manual test. Thanks, (In reply to comment #18) > (From update of attachment 95245 [details]) > Added manual test. > > Also I made sure we don't have to land the patch at once btw Chromium and WebKit. > > So please land this patch. 413442 20 honten 2011-06-01 09:42:09 -0700 Can anybody review my patch? The main c++ part review is already done. Just I want to make sure manual test is Ok or not. Thanks, (In reply to comment #19) > Darin, > > Could you review again? > > As I wrote here, I just added manual test. > > Thanks, > > (In reply to comment #18) > > (From update of attachment 95245 [details] [details]) > > Added manual test. > > > > Also I made sure we don't have to land the patch at once btw Chromium and WebKit. > > > > So please land this patch. 414197 21 honten 2011-06-02 09:40:54 -0700 Does anybody review my patch? Chromium side review is done, but I cannot commit without this patch landing. (In reply to comment #20) > Can anybody review my patch? > > The main c++ part review is already done. > > Just I want to make sure manual test is Ok or not. > > Thanks, > > (In reply to comment #19) > > Darin, > > > > Could you review again? > > > > As I wrote here, I just added manual test. > > > > Thanks, > > > > (In reply to comment #18) > > > (From update of attachment 95245 [details] [details] [details]) > > > Added manual test. > > > > > > Also I made sure we don't have to land the patch at once btw Chromium and WebKit. > > > > > > So please land this patch. 414600 22 honten 2011-06-02 19:06:46 -0700 Eric, Could you land my patch? As you see, I just added manual test here as you suggested me. So I believe you can review it. Thanks, (In reply to comment #21) > Does anybody review my patch? > > Chromium side review is done, but I cannot commit without this patch landing. > > (In reply to comment #20) > > Can anybody review my patch? > > > > The main c++ part review is already done. > > > > Just I want to make sure manual test is Ok or not. > > > > Thanks, > > > > (In reply to comment #19) > > > Darin, > > > > > > Could you review again? > > > > > > As I wrote here, I just added manual test. > > > > > > Thanks, > > > > > > (In reply to comment #18) > > > > (From update of attachment 95245 [details] [details] [details] [details]) > > > > Added manual test. > > > > > > > > Also I made sure we don't have to land the patch at once btw Chromium and WebKit. > > > > > > > > So please land this patch. 414885 23 95245 eric 2011-06-03 07:40:34 -0700 Comment on attachment 95245 Patch rs=me based on fishd's previous r+. 414933 24 95245 commit-queue 2011-06-03 09:00:38 -0700 Comment on attachment 95245 Patch Clearing flags on attachment: 95245 Committed r88021: <http://trac.webkit.org/changeset/88021> 414934 25 commit-queue 2011-06-03 09:00:44 -0700 All reviewed patches have been landed. Closing bug. 414948 26 commit-queue 2011-06-03 09:23:16 -0700 The commit-queue encountered the following flaky tests while processing attachment 95245: http/tests/websocket/tests/frame-length-longer-than-buffer.html bug 61837 (author: abarth@webkit.org) The commit-queue is continuing to process your patch. 416105 27 96149 inferno 2011-06-06 16:29:23 -0700 Created attachment 96149 Ignore this. 416107 28 inferno 2011-06-06 16:30:31 -0700 Sorry wrong bug. 94369 2011-05-22 22:52:05 -0700 2011-05-24 19:44:39 -0700 Patch bug-61260-20110522225205.patch text/plain 6847 honten U3VidmVyc2lvbiBSZXZpc2lvbjogODcwMjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzNWViNmI5OTQyMWIwNTg3 ZjY4MDczZWMzNzllYmIyNTU5NzcyNGE2Li40OGI2OWNhMzJiYzdmNjg4ODAwOWYxMjVmNWJmNzNj NThkZjgyOThjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDUtMjIgIE5hb2tp IFRha2FubyAgPHRha2Fuby5uYW9raUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXUNhbGwgc2V0VG9vbFRpcFRleHQo KSBpbiBXZWJQb3B1cE1lbnVJbXBsIG1vdXNlIG1vdmUgaGFuZGxlciB0byBzaG93IHRvb2wgdGlw IGluIHNlbGVjdCBwb3B1cCB3aW5kb3cuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02MTI2MAorICAgICAgICBodHRwOi8vY29kZS5nb29nbGUuY29tL3Av Y2hyb21pdW0vaXNzdWVzL2RldGFpbD9pZD0xMjcyMQorCisgICAgICAgIE5vIG5ldyB0ZXN0LCBi ZWNhdXNlIFdlYktpdCBkb2Vzbid0IGhhdmUgcG9wdXAgd2luZG93IHRlc3QuIFdlIGNhbiBtYW51 YWxseSB0ZXN0LCBwbGVhc2UgcmVmZXIgdG8gaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9t aXVtL2lzc3Vlcy9kZXRhaWw/aWQ9MTI3MjEKKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVt L1BvcHVwTWVudUNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwQ29udGFpbmVy OjpnZXRTZWxlY3RlZEl0ZW1Ub29sVGlwKTogR2V0IHNlbGVjdGVkIGl0ZW0gdG9vbHRpcCBzdHJp bmcgYWNjb3JkaW5nIHRvIGhvdmVyaW5nIG1vdXNlIHBvc2l0aW9uLgorICAgICAgICAqIHBsYXRm b3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmg6IEFkZCBnZXRTZWxlY3RlZEl0ZW1Ub29s VGlwKCkgZGVjbGFyYXRpb24uCisKIDIwMTEtMDUtMjEgIEplcmVteSBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0u Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0u Y3BwCmluZGV4IDk2NWNjZDU4YjFkNTY1ZmRlY2I5MWY3YjI0OWVlZTA3NWU0NDY2NzguLmU3Njdk ZmFlMWM4YmJjN2IzNWY4MmQ4NDA5NmVhOTJmYzg3YmFmMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKQEAgLTYw Niw2ICs2MDYsMTMgQEAgY29uc3QgV1RGOjpWZWN0b3I8UG9wdXBJdGVtKj4mIFBvcHVwQ29udGFp bmVyOjogcG9wdXBEYXRhKCkgY29uc3QKICAgICByZXR1cm4gbV9saXN0Qm94LT5pdGVtcygpOwog fQogCitTdHJpbmcgUG9wdXBDb250YWluZXI6OmdldFNlbGVjdGVkSXRlbVRvb2xUaXAoKQorewor ICAgIC8vIFdlIGNhbm5vdCB1c2UgbV9wb3B1cENsaWVudC0+c2VsZWN0ZWRJbmRleCgpIHRvIGNo b29zZSB0b29sdGlwIG1lc3NhZ2UsCisgICAgLy8gYmVjYXVzZSB0aGUgc2VsZWN0ZWRJbmRleCgp IG1pZ2h0IHJldHVybiBmaW5hbCBzZWxlY3RlZCBpbmRleCwgbm90IGhvdmVyaW5nIHNlbGVjdGlv bi4KKyAgICByZXR1cm4gbGlzdEJveCgpLT5tX3BvcHVwQ2xpZW50LT5pdGVtVG9vbFRpcChsaXN0 Qm94KCktPm1fc2VsZWN0ZWRJbmRleCk7Cit9CisKIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KIC8v IFBvcHVwTGlzdEJveCBpbXBsZW1lbnRhdGlvbgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaAppbmRleCAzNDM2NjUwMDFkOTdh MzJlMWU2YWU2ZDRiMzk1MGE4YzAzY2E0MjlkLi42YWNlNjM0NTEwYzdmOWVmNGQ5MGE1MmU3ODhl MjQ2ZmU1NmE2YWYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1 bS9Qb3B1cE1lbnVDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL1BvcHVwTWVudUNocm9taXVtLmgKQEAgLTE2Nyw2ICsxNjcsOSBAQCBwdWJsaWM6CiAKICAg ICBQb3B1cFR5cGUgcG9wdXBUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9wb3B1cFR5cGU7IH0KIAor ICAgIC8vIFdoaWxlIGhvdmVyaW5nIHBvcHVwIG1lbnUgd2luZG93LCB3ZSB3YW50IHRvIHNob3cg dG9vbCB0aXAgbWVzc2FnZS4KKyAgICBTdHJpbmcgZ2V0U2VsZWN0ZWRJdGVtVG9vbFRpcCgpOwor CiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBXVEY6OlJlZkNvdW50ZWQ8UG9wdXBDb250YWlu ZXI+OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGEzMjRlZmIxYTJjZmE1YTRiYjkw OGM0YjY3ZDc4YzVjOGU2MmIwNGIuLjRiNzcwMzg5ZDc2M2RlMWNkNmM3MjdkNmY5ZmY3ODk2ZDZj OWFhYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEt MDUtMjIgIE5hb2tpIFRha2FubyAgPHRha2Fuby5uYW9raUBnbWFpbC5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXUNhbGwgc2V0 VG9vbFRpcFRleHQoKSBpbiBXZWJQb3B1cE1lbnVJbXBsIG1vdXNlIG1vdmUgaGFuZGxlciB0byBz aG93IHRvb2wgdGlwIGluIHNlbGVjdCBwb3B1cCB3aW5kb3cuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTI2MAorICAgICAgICBodHRwOi8vY29kZS5n b29nbGUuY29tL3AvY2hyb21pdW0vaXNzdWVzL2RldGFpbD9pZD0xMjcyMQorCisgICAgICAgICog cHVibGljL1dlYlZpZXdDbGllbnQuaDogUmVtb3ZlIHNldFRvb2xUaXBUZXh0KCkgZnVuY3Rpb24u CisgICAgICAgICogcHVibGljL1dlYldpZGdldENsaWVudC5oOiBEZWNsYXJlIHNldFRvb2xUaXBU ZXh0KCkgZnVuY3Rpb24uCisgICAgICAgIChXZWJLaXQ6OldlYldpZGdldENsaWVudDo6c2V0VG9v bFRpcFRleHQpOgorICAgICAgICAqIHNyYy9XZWJQb3B1cE1lbnVJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUG9wdXBNZW51SW1wbDo6TW91c2VNb3ZlKTogQ2FsbCBzZXRUb29sVGlwVGV4 dCgpIHRvIHNldCB0b29sIHRpcCBzdHJpbmcgd2hlbiBtb3VzZSBpcyBtb3ZlZCBvbiBzZWxlY3Qg cG9wdXAgd2luZG93LgorCiAyMDExLTA1LTIxICBKb2NoZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXdDbGllbnQuaCBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXdDbGllbnQuaAppbmRleCBmM2JlM2NhNTc4 YTIyOWY4YjQzYmNhNDc0YWZkYWNlZjQ2ZTE0ZTEzLi44OTk4NmIyZjc4OWQzZjQxZTc2NmUwZGY4 ZWIxNGJkMGExNGUwMWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJWaWV3Q2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Vmlld0NsaWVudC5oCkBAIC0yMjcsOSArMjI3LDYgQEAgcHVibGljOgogICAgIC8vIENhbGxlZCB3 aGVuIGtleWJvYXJkIGZvY3VzIHN3aXRjaGVzIHRvIGFuIGFuY2hvciB3aXRoIHRoZSBnaXZlbiBV UkwuCiAgICAgdmlydHVhbCB2b2lkIHNldEtleWJvYXJkRm9jdXNVUkwoY29uc3QgV2ViVVJMJikg eyB9CiAKLSAgICAvLyBDYWxsZWQgd2hlbiBhIHRvb2x0aXAgc2hvdWxkIGJlIHNob3duIGF0IHRo ZSBjdXJyZW50IGN1cnNvciBwb3NpdGlvbi4KLSAgICB2aXJ0dWFsIHZvaWQgc2V0VG9vbFRpcFRl eHQoY29uc3QgV2ViU3RyaW5nJiwgV2ViVGV4dERpcmVjdGlvbiBoaW50KSB7IH0KLQogICAgIC8v IFNob3dzIGEgY29udGV4dCBtZW51IHdpdGggY29tbWFuZHMgcmVsZXZhbnQgdG8gYSBzcGVjaWZp YyBlbGVtZW50IG9uCiAgICAgLy8gdGhlIGdpdmVuIGZyYW1lLiBBZGRpdGlvbmFsIGNvbnRleHQg ZGF0YSBpcyBzdXBwbGllZC4KICAgICB2aXJ0dWFsIHZvaWQgc2hvd0NvbnRleHRNZW51KFdlYkZy YW1lKiwgY29uc3QgV2ViQ29udGV4dE1lbnVEYXRhJikgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJXaWRnZXRDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYldpZGdldENsaWVudC5oCmluZGV4IDg1ZTQwMTVhNzFlN2U3YmE5 ZWNkNjIwNzg3MDM5YmQ2ZTgzNjRiMzMuLjYwYjRhYmY5NjFlNjRlNWFjODE5MDM1MzhlMWRmMGI1 YTUyMmVhMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYldp ZGdldENsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYldpZGdl dENsaWVudC5oCkBAIC0zOCw2ICszOCw3IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFz cyBXZWJTdHJpbmc7CiBjbGFzcyBXZWJXaWRnZXQ7CiBzdHJ1Y3QgV2ViQ3Vyc29ySW5mbzsKIApA QCAtODEsNiArODIsOSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBXZWJSZWN0IHdpbmRvd1JlY3Qo KSB7IHJldHVybiBXZWJSZWN0KCk7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2V0V2luZG93UmVjdChj b25zdCBXZWJSZWN0JikgeyB9CiAKKyAgICAvLyBDYWxsZWQgd2hlbiBhIHRvb2x0aXAgc2hvdWxk IGJlIHNob3duIGF0IHRoZSBjdXJyZW50IGN1cnNvciBwb3NpdGlvbi4KKyAgICB2aXJ0dWFsIHZv aWQgc2V0VG9vbFRpcFRleHQoY29uc3QgV2ViU3RyaW5nJiwgV2ViVGV4dERpcmVjdGlvbiBoaW50 KSB7IH0KKwogICAgIC8vIENhbGxlZCB0byBnZXQgdGhlIHBvc2l0aW9uIG9mIHRoZSByZXNpemVy IHJlY3QgaW4gd2luZG93IGNvb3JkaW5hdGVzLgogICAgIHZpcnR1YWwgV2ViUmVjdCB3aW5kb3dS ZXNpemVyUmVjdCgpIHsgcmV0dXJuIFdlYlJlY3QoKTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQb3B1cE1lbnVJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuY3BwCmluZGV4IDBmMzE4OTJmZDg3NDk1ZTU2 NTA1N2VjOWZjMWRhYjMxMGM3OGI0Y2IuLmE5NmJhYzBlZTBlZmU2MDRlZGU1MjUyNmYxMjkzOTBi NTZhMDgzZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVw TWVudUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVu dUltcGwuY3BwCkBAIC00MCwxMiArNDAsMTQgQEAKICNpbmNsdWRlICJQbGF0Zm9ybUtleWJvYXJk RXZlbnQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybU1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJQbGF0 Zm9ybVdoZWVsRXZlbnQuaCIKKyNpbmNsdWRlICJQb3B1cE1lbnVDaHJvbWl1bS5oIgogI2luY2x1 ZGUgIlNraWFVdGlscy5oIgogCiAjaW5jbHVkZSAiV2ViSW5wdXRFdmVudC5oIgogI2luY2x1ZGUg IldlYklucHV0RXZlbnRDb252ZXJzaW9uLmgiCiAjaW5jbHVkZSAiV2ViUmFuZ2UuaCIKICNpbmNs dWRlICJXZWJSZWN0LmgiCisjaW5jbHVkZSAiV2ViVmlld0NsaWVudC5oIgogI2luY2x1ZGUgIldl YldpZGdldENsaWVudC5oIgogCiAjaW5jbHVkZSA8c2tpYS9leHQvcGxhdGZvcm1fY2FudmFzLmg+ CkBAIC05NSw2ICs5NywxMCBAQCB2b2lkIFdlYlBvcHVwTWVudUltcGw6Ok1vdXNlTW92ZShjb25z dCBXZWJNb3VzZUV2ZW50JiBldmVudCkKICAgICBpZiAoZXZlbnQueCAhPSBtX2xhc3RNb3VzZVBv c2l0aW9uLnggfHwgZXZlbnQueSAhPSBtX2xhc3RNb3VzZVBvc2l0aW9uLnkpIHsKICAgICAgICAg bV9sYXN0TW91c2VQb3NpdGlvbiA9IFdlYlBvaW50KGV2ZW50LngsIGV2ZW50LnkpOwogICAgICAg ICBtX3dpZGdldC0+aGFuZGxlTW91c2VNb3ZlRXZlbnQoUGxhdGZvcm1Nb3VzZUV2ZW50QnVpbGRl cihtX3dpZGdldCwgZXZlbnQpKTsKKworICAgICAgICAvLyBXZSBjYW5ub3QgY2FsbCBzZXRUb29s VGlwVGV4dCgpIGluIFBvcHVwQ29udGFpbmVyLCBiZWNhdXNlIFBvcHVwQ29udGFpbmVyIGlzIGlu IFdlYkNvcmUsIGFuZCB3ZSBjYW5ub3QgcmVmZXIgdG8gV2ViS2l0IGZyb20gV2ViY29yZS4KKyAg ICAgICAgV2ViQ29yZTo6UG9wdXBDb250YWluZXIqIGNvbnRhaW5lciA9IHN0YXRpY19jYXN0PFdl YkNvcmU6OlBvcHVwQ29udGFpbmVyKj4obV93aWRnZXQpOworICAgICAgICBjbGllbnQoKS0+c2V0 VG9vbFRpcFRleHQoY29udGFpbmVyLT5nZXRTZWxlY3RlZEl0ZW1Ub29sVGlwKCksIGNvbnRhaW5l ci0+bWVudVN0eWxlKCkudGV4dERpcmVjdGlvbigpID09IFdlYkNvcmU6OlJUTCA/IFdlYlRleHRE aXJlY3Rpb25SaWdodFRvTGVmdCA6IFdlYlRleHREaXJlY3Rpb25MZWZ0VG9SaWdodCk7CiAgICAg fQogfQogCg== 94730 2011-05-24 19:44:44 -0700 2011-05-27 19:24:03 -0700 Patch bug-61260-20110524194443.patch text/plain 8203 honten U3VidmVyc2lvbiBSZXZpc2lvbjogODcxNzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxYjNhZjEyNDM2YzVhOWVj ZDliNTI2ZDQ2NWZiODIyNTQzNmM2YmIzLi41ZjU2ZTliZGQ1YTc0N2MyM2VkNDUxZDk1YmY4YTMw YTQ0N2QxYjRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDUtMjQgIE5hb2tp IFRha2FubyAgPHRha2Fuby5uYW9raUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXUNhbGwgc2V0VG9vbFRpcFRleHQo KSBpbiBXZWJQb3B1cE1lbnVJbXBsIG1vdXNlIG1vdmUgaGFuZGxlciB0byBzaG93IHRvb2wgdGlw IGluIHNlbGVjdCBwb3B1cCB3aW5kb3cuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02MTI2MAorICAgICAgICBodHRwOi8vY29kZS5nb29nbGUuY29tL3Av Y2hyb21pdW0vaXNzdWVzL2RldGFpbD9pZD0xMjcyMQorCisgICAgICAgIE5vIG5ldyB0ZXN0LCBi ZWNhdXNlIFdlYktpdCBkb2Vzbid0IGhhdmUgcG9wdXAgd2luZG93IHRlc3QuIFdlIGNhbiBtYW51 YWxseSB0ZXN0LCBwbGVhc2UgcmVmZXIgdG8gaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9t aXVtL2lzc3Vlcy9kZXRhaWw/aWQ9MTI3MjEKKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVt L1BvcHVwTWVudUNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwQ29udGFpbmVy OjpnZXRTZWxlY3RlZEl0ZW1Ub29sVGlwKTogR2V0IHNlbGVjdGVkIGl0ZW0gdG9vbHRpcCBzdHJp bmcgYWNjb3JkaW5nIHRvIGhvdmVyaW5nIG1vdXNlIHBvc2l0aW9uLgorICAgICAgICAqIHBsYXRm b3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmg6IEFkZCBnZXRTZWxlY3RlZEl0ZW1Ub29s VGlwKCkgZGVjbGFyYXRpb24uCisKIDIwMTEtMDUtMjQgIEFkYW0gS2xlaW4gIDxhZGFta0BjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjg3MTQ1LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21p dW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21p dW0uY3BwCmluZGV4IDVkZDdhZjhmNGMxYjE4NDNjNDE2NjIyYTM0N2YwMDMzYjVmNDZkOTguLjA5 MTllNDBhMzRlM2U0ZTFhZDA3MzY0ZGZmNjMzMzcwYzY5OWY1MDQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKQEAg LTYxNiw2ICs2MTYsMTMgQEAgY29uc3QgV1RGOjpWZWN0b3I8UG9wdXBJdGVtKj4mIFBvcHVwQ29u dGFpbmVyOjogcG9wdXBEYXRhKCkgY29uc3QKICAgICByZXR1cm4gbV9saXN0Qm94LT5pdGVtcygp OwogfQogCitTdHJpbmcgUG9wdXBDb250YWluZXI6OmdldFNlbGVjdGVkSXRlbVRvb2xUaXAoKQor eworICAgIC8vIFdlIGNhbm5vdCB1c2UgbV9wb3B1cENsaWVudC0+c2VsZWN0ZWRJbmRleCgpIHRv IGNob29zZSB0b29sdGlwIG1lc3NhZ2UsCisgICAgLy8gYmVjYXVzZSB0aGUgc2VsZWN0ZWRJbmRl eCgpIG1pZ2h0IHJldHVybiBmaW5hbCBzZWxlY3RlZCBpbmRleCwgbm90IGhvdmVyaW5nIHNlbGVj dGlvbi4KKyAgICByZXR1cm4gbGlzdEJveCgpLT5tX3BvcHVwQ2xpZW50LT5pdGVtVG9vbFRpcChs aXN0Qm94KCktPm1fc2VsZWN0ZWRJbmRleCk7Cit9CisKIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8K IC8vIFBvcHVwTGlzdEJveCBpbXBsZW1lbnRhdGlvbgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaAppbmRleCAzNDM2NjUwMDFk OTdhMzJlMWU2YWU2ZDRiMzk1MGE4YzAzY2E0MjlkLi42YWNlNjM0NTEwYzdmOWVmNGQ5MGE1MmU3 ODhlMjQ2ZmU1NmE2YWYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1BvcHVwTWVudUNocm9taXVtLmgKQEAgLTE2Nyw2ICsxNjcsOSBAQCBwdWJsaWM6CiAK ICAgICBQb3B1cFR5cGUgcG9wdXBUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9wb3B1cFR5cGU7IH0K IAorICAgIC8vIFdoaWxlIGhvdmVyaW5nIHBvcHVwIG1lbnUgd2luZG93LCB3ZSB3YW50IHRvIHNo b3cgdG9vbCB0aXAgbWVzc2FnZS4KKyAgICBTdHJpbmcgZ2V0U2VsZWN0ZWRJdGVtVG9vbFRpcCgp OworCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBXVEY6OlJlZkNvdW50ZWQ8UG9wdXBDb250 YWluZXI+OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDEwZjhhNDQzN2E2YTY1Mzg2 YTAzNWJlOGJmZTBmNjYyNDVmZmZlMTguLjdhZjc1YzQwZjNiMmM4ZjZiMDNhMDFiMTA5YWYxN2E3 ZTg0ODQ2MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIw MTEtMDUtMjQgIE5hb2tpIFRha2FubyAgPHRha2Fuby5uYW9raUBnbWFpbC5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXUNhbGwg c2V0VG9vbFRpcFRleHQoKSBpbiBXZWJQb3B1cE1lbnVJbXBsIG1vdXNlIG1vdmUgaGFuZGxlciB0 byBzaG93IHRvb2wgdGlwIGluIHNlbGVjdCBwb3B1cCB3aW5kb3cuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTI2MAorICAgICAgICBodHRwOi8vY29k ZS5nb29nbGUuY29tL3AvY2hyb21pdW0vaXNzdWVzL2RldGFpbD9pZD0xMjcyMQorCisgICAgICAg ICogcHVibGljL1dlYk1lbnVJdGVtSW5mby5oOiBBZGQgdG9vbFRpcC4KKyAgICAgICAgKiBwdWJs aWMvV2ViVmlld0NsaWVudC5oOiBSZW1vdmUgc2V0VG9vbFRpcFRleHQoKS4KKyAgICAgICAgKiBw dWJsaWMvV2ViV2lkZ2V0Q2xpZW50Lmg6IEFkZCBzZXRUb29UaXBUZXh0KCkuCisgICAgICAgIChX ZWJLaXQ6OldlYldpZGdldENsaWVudDo6c2V0VG9vbFRpcFRleHQpOgorICAgICAgICAqIHNyYy9F eHRlcm5hbFBvcHVwTWVudS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkV4dGVybmFsUG9wdXBNZW51 OjpnZXRQb3B1cE1lbnVJbmZvKTogQWRkIHBvcHVwSXRlbS50b29sVGlwIHNldC4KKyAgICAgICAg KiBzcmMvV2ViUG9wdXBNZW51SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBvcHVwTWVu dUltcGw6Ok1vdXNlTW92ZSk6IENhbGwgc2V0VG9vbFRpcFRleHQoKS4KKwogMjAxMS0wNS0yNCAg QWxvayBQcml5YWRhcnNoaSAgPGFsb2twQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBKYW1lcyBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYk1lbnVJdGVtSW5mby5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViTWVudUl0ZW1JbmZvLmgKaW5kZXggNzQyYjRlZmUwMmMwZWVjYmM4ZjA3YmJlNjIxNjg3ZjEx ZmJkMTFkZi4uOWQ3Y2ZkNDMwYzM3MzdlMWVlOTdmOWU5MGUyZTI5M2I3YWFlNjdlMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVudUl0ZW1JbmZvLmgKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVudUl0ZW1JbmZvLmgKQEAgLTU3 LDYgKzU3LDcgQEAgc3RydWN0IFdlYk1lbnVJdGVtSW5mbyB7CiAgICAgfQogCiAgICAgV2ViU3Ry aW5nIGxhYmVsOworICAgIFdlYlN0cmluZyB0b29sVGlwOwogICAgIFR5cGUgdHlwZTsKICAgICB1 bnNpZ25lZCBhY3Rpb247CiAgICAgV2ViVGV4dERpcmVjdGlvbiB0ZXh0RGlyZWN0aW9uOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCmluZGV4IGYzYmUz Y2E1NzhhMjI5ZjhiNDNiY2E0NzRhZmRhY2VmNDZlMTRlMTMuLjg5OTg2YjJmNzg5ZDNmNDFlNzY2 ZTBkZjhlYjE0YmQwYTE0ZTAxYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYlZpZXdDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJWaWV3Q2xpZW50LmgKQEAgLTIyNyw5ICsyMjcsNiBAQCBwdWJsaWM6CiAgICAgLy8gQ2Fs bGVkIHdoZW4ga2V5Ym9hcmQgZm9jdXMgc3dpdGNoZXMgdG8gYW4gYW5jaG9yIHdpdGggdGhlIGdp dmVuIFVSTC4KICAgICB2aXJ0dWFsIHZvaWQgc2V0S2V5Ym9hcmRGb2N1c1VSTChjb25zdCBXZWJV UkwmKSB7IH0KIAotICAgIC8vIENhbGxlZCB3aGVuIGEgdG9vbHRpcCBzaG91bGQgYmUgc2hvd24g YXQgdGhlIGN1cnJlbnQgY3Vyc29yIHBvc2l0aW9uLgotICAgIHZpcnR1YWwgdm9pZCBzZXRUb29s VGlwVGV4dChjb25zdCBXZWJTdHJpbmcmLCBXZWJUZXh0RGlyZWN0aW9uIGhpbnQpIHsgfQotCiAg ICAgLy8gU2hvd3MgYSBjb250ZXh0IG1lbnUgd2l0aCBjb21tYW5kcyByZWxldmFudCB0byBhIHNw ZWNpZmljIGVsZW1lbnQgb24KICAgICAvLyB0aGUgZ2l2ZW4gZnJhbWUuIEFkZGl0aW9uYWwgY29u dGV4dCBkYXRhIGlzIHN1cHBsaWVkLgogICAgIHZpcnR1YWwgdm9pZCBzaG93Q29udGV4dE1lbnUo V2ViRnJhbWUqLCBjb25zdCBXZWJDb250ZXh0TWVudURhdGEmKSB7IH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYldpZGdldENsaWVudC5oIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0Q2xpZW50LmgKaW5kZXggODVlNDAxNWE3MWU3 ZTdiYTllY2Q2MjA3ODcwMzliZDZlODM2NGIzMy4uNjBiNGFiZjk2MWU2NGU1YWM4MTkwMzUzOGUx ZGYwYjVhNTIyZWEwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViV2lkZ2V0Q2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi V2lkZ2V0Q2xpZW50LmgKQEAgLTM4LDYgKzM4LDcgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAK K2NsYXNzIFdlYlN0cmluZzsKIGNsYXNzIFdlYldpZGdldDsKIHN0cnVjdCBXZWJDdXJzb3JJbmZv OwogCkBAIC04MSw2ICs4Miw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFdlYlJlY3Qgd2luZG93 UmVjdCgpIHsgcmV0dXJuIFdlYlJlY3QoKTsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRXaW5kb3dS ZWN0KGNvbnN0IFdlYlJlY3QmKSB7IH0KIAorICAgIC8vIENhbGxlZCB3aGVuIGEgdG9vbHRpcCBz aG91bGQgYmUgc2hvd24gYXQgdGhlIGN1cnJlbnQgY3Vyc29yIHBvc2l0aW9uLgorICAgIHZpcnR1 YWwgdm9pZCBzZXRUb29sVGlwVGV4dChjb25zdCBXZWJTdHJpbmcmLCBXZWJUZXh0RGlyZWN0aW9u IGhpbnQpIHsgfQorCiAgICAgLy8gQ2FsbGVkIHRvIGdldCB0aGUgcG9zaXRpb24gb2YgdGhlIHJl c2l6ZXIgcmVjdCBpbiB3aW5kb3cgY29vcmRpbmF0ZXMuCiAgICAgdmlydHVhbCBXZWJSZWN0IHdp bmRvd1Jlc2l6ZXJSZWN0KCkgeyByZXR1cm4gV2ViUmVjdCgpOyB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0V4dGVybmFsUG9wdXBNZW51LmNwcCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL0V4dGVybmFsUG9wdXBNZW51LmNwcAppbmRleCA1ODA4MDAzZDQ2 Y2Q4MjhkZTY0YWViMDVhMWYwZGI3ZjA3ZGYzMzU2Li44NjUxZDM1MGU2YTYzNTg0MGRjNDNjNDRj NzQ5OTM5ZjVhMGVhYzlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9F eHRlcm5hbFBvcHVwTWVudS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRXh0 ZXJuYWxQb3B1cE1lbnUuY3BwCkBAIC0xMzMsNiArMTMzLDcgQEAgdm9pZCBFeHRlcm5hbFBvcHVw TWVudTo6Z2V0UG9wdXBNZW51SW5mbyhXZWJQb3B1cE1lbnVJbmZvKiBpbmZvKQogICAgIGZvciAo aW50IGkgPSAwOyBpIDwgaXRlbUNvdW50OyArK2kpIHsKICAgICAgICAgV2ViTWVudUl0ZW1JbmZv JiBwb3B1cEl0ZW0gPSBpdGVtc1tpXTsKICAgICAgICAgcG9wdXBJdGVtLmxhYmVsID0gbV9wb3B1 cE1lbnVDbGllbnQtPml0ZW1UZXh0KGkpOworICAgICAgICBwb3B1cEl0ZW0udG9vbFRpcCA9IG1f cG9wdXBNZW51Q2xpZW50LT5pdGVtVG9vbFRpcChpKTsKICAgICAgICAgaWYgKG1fcG9wdXBNZW51 Q2xpZW50LT5pdGVtSXNTZXBhcmF0b3IoaSkpCiAgICAgICAgICAgICBwb3B1cEl0ZW0udHlwZSA9 IFdlYk1lbnVJdGVtSW5mbzo6U2VwYXJhdG9yOwogICAgICAgICBlbHNlIGlmIChtX3BvcHVwTWVu dUNsaWVudC0+aXRlbUlzTGFiZWwoaSkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJQb3B1cE1lbnVJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlBvcHVwTWVudUltcGwuY3BwCmluZGV4IDBmMzE4OTJmZDg3NDk1ZTU2NTA1N2VjOWZjMWRh YjMxMGM3OGI0Y2IuLmE5NmJhYzBlZTBlZmU2MDRlZGU1MjUyNmYxMjkzOTBiNTZhMDgzZWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuY3BwCkBA IC00MCwxMiArNDAsMTQgQEAKICNpbmNsdWRlICJQbGF0Zm9ybUtleWJvYXJkRXZlbnQuaCIKICNp bmNsdWRlICJQbGF0Zm9ybU1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZl bnQuaCIKKyNpbmNsdWRlICJQb3B1cE1lbnVDaHJvbWl1bS5oIgogI2luY2x1ZGUgIlNraWFVdGls cy5oIgogCiAjaW5jbHVkZSAiV2ViSW5wdXRFdmVudC5oIgogI2luY2x1ZGUgIldlYklucHV0RXZl bnRDb252ZXJzaW9uLmgiCiAjaW5jbHVkZSAiV2ViUmFuZ2UuaCIKICNpbmNsdWRlICJXZWJSZWN0 LmgiCisjaW5jbHVkZSAiV2ViVmlld0NsaWVudC5oIgogI2luY2x1ZGUgIldlYldpZGdldENsaWVu dC5oIgogCiAjaW5jbHVkZSA8c2tpYS9leHQvcGxhdGZvcm1fY2FudmFzLmg+CkBAIC05NSw2ICs5 NywxMCBAQCB2b2lkIFdlYlBvcHVwTWVudUltcGw6Ok1vdXNlTW92ZShjb25zdCBXZWJNb3VzZUV2 ZW50JiBldmVudCkKICAgICBpZiAoZXZlbnQueCAhPSBtX2xhc3RNb3VzZVBvc2l0aW9uLnggfHwg ZXZlbnQueSAhPSBtX2xhc3RNb3VzZVBvc2l0aW9uLnkpIHsKICAgICAgICAgbV9sYXN0TW91c2VQ b3NpdGlvbiA9IFdlYlBvaW50KGV2ZW50LngsIGV2ZW50LnkpOwogICAgICAgICBtX3dpZGdldC0+ aGFuZGxlTW91c2VNb3ZlRXZlbnQoUGxhdGZvcm1Nb3VzZUV2ZW50QnVpbGRlcihtX3dpZGdldCwg ZXZlbnQpKTsKKworICAgICAgICAvLyBXZSBjYW5ub3QgY2FsbCBzZXRUb29sVGlwVGV4dCgpIGlu IFBvcHVwQ29udGFpbmVyLCBiZWNhdXNlIFBvcHVwQ29udGFpbmVyIGlzIGluIFdlYkNvcmUsIGFu ZCB3ZSBjYW5ub3QgcmVmZXIgdG8gV2ViS2l0IGZyb20gV2ViY29yZS4KKyAgICAgICAgV2ViQ29y ZTo6UG9wdXBDb250YWluZXIqIGNvbnRhaW5lciA9IHN0YXRpY19jYXN0PFdlYkNvcmU6OlBvcHVw Q29udGFpbmVyKj4obV93aWRnZXQpOworICAgICAgICBjbGllbnQoKS0+c2V0VG9vbFRpcFRleHQo Y29udGFpbmVyLT5nZXRTZWxlY3RlZEl0ZW1Ub29sVGlwKCksIGNvbnRhaW5lci0+bWVudVN0eWxl KCkudGV4dERpcmVjdGlvbigpID09IFdlYkNvcmU6OlJUTCA/IFdlYlRleHREaXJlY3Rpb25SaWdo dFRvTGVmdCA6IFdlYlRleHREaXJlY3Rpb25MZWZ0VG9SaWdodCk7CiAgICAgfQogfQogCg== 95245 2011-05-27 19:24:14 -0700 2011-06-06 16:29:16 -0700 Patch bug-61260-20110527192412.patch text/plain 9193 honten U3VidmVyc2lvbiBSZXZpc2lvbjogODc0NDkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiNDUzMGFjNjcxODdkOTdm NzZmODAwMTdkNWU4YWE5ZGQ0YTAzZTBlLi5iNzk2NjVhZDg1NTUyZjk4MmFjZGMxODE0YzE4NDIz YzI0OGVhZDdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDUtMjcgIE5hb2tp IFRha2FubyAgPHRha2Fuby5uYW9raUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBDYWxsIHNldFRvb2xUaXBUZXh0 KCkgaW4gV2ViUG9wdXBNZW51SW1wbCBtb3VzZSBtb3ZlIGhhbmRsZXIgdG8gc2hvdyB0b29sIHRp cCBpbiBzZWxlY3QgcG9wdXAgd2luZG93LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjEyNjAKKyAgICAgICAgaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9w L2Nocm9taXVtL2lzc3Vlcy9kZXRhaWw/aWQ9MTI3MjEKKworICAgICAgICBNYW51YWwgdGVzdDog c2VsZWN0LXBvcHVwLXRvb2x0aXAtdGVzdC5odG1sCisKKyAgICAgICAgKiBtYW51YWwtdGVzdHMv c2VsZWN0LXBvcHVwLXRvb2x0aXAtdGVzdC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9y bS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQb3B1 cENvbnRhaW5lcjo6Z2V0U2VsZWN0ZWRJdGVtVG9vbFRpcCk6IEdldCBzZWxlY3RlZCBpdGVtIHRv b2x0aXAgc3RyaW5nIGFjY29yZGluZyB0byBob3ZlcmluZyBtb3VzZSBwb3NpdGlvbi4KKyAgICAg ICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oOiBBZGQgZ2V0U2VsZWN0 ZWRJdGVtVG9vbFRpcCgpIGRlY2xhcmF0aW9uLgorCiAyMDExLTA1LTI2ICBTaGVyaWZmIEJvdCAg PHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByODc0NDQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9tYW51YWwtdGVzdHMv c2VsZWN0LXBvcHVwLXRvb2x0aXAtdGVzdC5odG1sIGIvU291cmNlL1dlYkNvcmUvbWFudWFsLXRl c3RzL3NlbGVjdC1wb3B1cC10b29sdGlwLXRlc3QuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hZmJhNDY5M2Ez NGE4NGQ1ZjA0MTRlZjkzNWJmZDNjOTg3OWZlYzI5Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNl L1dlYkNvcmUvbWFudWFsLXRlc3RzL3NlbGVjdC1wb3B1cC10b29sdGlwLXRlc3QuaHRtbApAQCAt MCwwICsxLDE5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+Cis8aDM+IFRlc3Qg dG9vbCB0aXAgaXMgY29ycmVjdGx5IHNob3duIHdoZW4gcG9wdXAgc2VsZWN0IGlzIGRpc3BsYXll ZC48L2gzPgorPG9sPgorPGxpPkNsaWNrIHRoZSBmb2xsb3dpbmcgc2VsZWN0IHRhZy48L2xpPgor PGxpPiBNb3ZlIG1vdXNlIGN1cnNvciBvbiAib3B0aW9uIDEiIGFuZCBzdG9wIG1vdmluZy48L2xp PgorPGxpPiBBZnRlciBzZWNvbmRzLCBtYWtlIHN1cmUgeW91IGNhbiBzZWUgdG9vbCB0aXAgdGV4 dCAiVGhpcyBpcyB0aGUgZmlyc3Qgb3B0aW9uIi48L2xpPgorPGxpPiBNb3ZlIG1vdXNlIGN1cnNv ciBvbiAib3B0aW9uIDIiIGFuZCBzdG9wIG1vdmluZy48L2xpPgorPGxpPiBNYWtlIHN1cmUgeW91 IGNhbiBzZWUgdG9vbCB0aXAgdGV4dCAiVGhpcyBpcyB0aGUgc2Vjb25kIG9wdGlvbiIuPC9saT4K Kzwvb2w+CisKKzxzZWxlY3Qgc2l6ZT0xPgorPG9wdGlvbiB0aXRsZT0iVGhpcyBpcyB0aGUgZmly c3Qgb3B0aW9uIj5vcHRpb24gMTwvb3B0aW9uPgorPG9wdGlvbiB0aXRsZT0iVGhpcyBpcyB0aGUg c2Vjb25kIG9wdGlvbiI+b3B0aW9uIDI8L29wdGlvbj4KKzxvcHRpb24gdGl0bGU9IlRoaXMgaXMg dGhlIHRoaXJkIG9wdGlvbiI+b3B0aW9uIDM8L29wdGlvbj4KKzwvc2VsZWN0PgorPC9ib2R5Pgor PC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9w dXBNZW51Q2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9w dXBNZW51Q2hyb21pdW0uY3BwCmluZGV4IDVkZDdhZjhmNGMxYjE4NDNjNDE2NjIyYTM0N2YwMDMz YjVmNDZkOTguLjA5MTllNDBhMzRlM2U0ZTFhZDA3MzY0ZGZmNjMzMzcwYzY5OWY1MDQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVt LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJv bWl1bS5jcHAKQEAgLTYxNiw2ICs2MTYsMTMgQEAgY29uc3QgV1RGOjpWZWN0b3I8UG9wdXBJdGVt Kj4mIFBvcHVwQ29udGFpbmVyOjogcG9wdXBEYXRhKCkgY29uc3QKICAgICByZXR1cm4gbV9saXN0 Qm94LT5pdGVtcygpOwogfQogCitTdHJpbmcgUG9wdXBDb250YWluZXI6OmdldFNlbGVjdGVkSXRl bVRvb2xUaXAoKQoreworICAgIC8vIFdlIGNhbm5vdCB1c2UgbV9wb3B1cENsaWVudC0+c2VsZWN0 ZWRJbmRleCgpIHRvIGNob29zZSB0b29sdGlwIG1lc3NhZ2UsCisgICAgLy8gYmVjYXVzZSB0aGUg c2VsZWN0ZWRJbmRleCgpIG1pZ2h0IHJldHVybiBmaW5hbCBzZWxlY3RlZCBpbmRleCwgbm90IGhv dmVyaW5nIHNlbGVjdGlvbi4KKyAgICByZXR1cm4gbGlzdEJveCgpLT5tX3BvcHVwQ2xpZW50LT5p dGVtVG9vbFRpcChsaXN0Qm94KCktPm1fc2VsZWN0ZWRJbmRleCk7Cit9CisKIC8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8KIC8vIFBvcHVwTGlzdEJveCBpbXBsZW1lbnRhdGlvbgogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaAppbmRl eCAzNDM2NjUwMDFkOTdhMzJlMWU2YWU2ZDRiMzk1MGE4YzAzY2E0MjlkLi42YWNlNjM0NTEwYzdm OWVmNGQ5MGE1MmU3ODhlMjQ2ZmU1NmE2YWYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmgKQEAgLTE2Nyw2ICsxNjcsOSBA QCBwdWJsaWM6CiAKICAgICBQb3B1cFR5cGUgcG9wdXBUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9w b3B1cFR5cGU7IH0KIAorICAgIC8vIFdoaWxlIGhvdmVyaW5nIHBvcHVwIG1lbnUgd2luZG93LCB3 ZSB3YW50IHRvIHNob3cgdG9vbCB0aXAgbWVzc2FnZS4KKyAgICBTdHJpbmcgZ2V0U2VsZWN0ZWRJ dGVtVG9vbFRpcCgpOworCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBXVEY6OlJlZkNvdW50 ZWQ8UG9wdXBDb250YWluZXI+OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDI3MTY1 YmFhMDQ2ODlkNWU2ZGRjZjAzM2JiYmYwYjcyZWExZGRmZGIuLjJjOTg1NzRmMzRkN2I5YjBhYTNj MDA5M2U4YzM0YTUwNTU4ZWIwMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjAgQEAKKzIwMTEtMDUtMjcgIE5hb2tpIFRha2FubyAgPHRha2Fuby5uYW9raUBnbWFpbC5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0No cm9taXVtXSBDYWxsIHNldFRvb2xUaXBUZXh0KCkgaW4gV2ViUG9wdXBNZW51SW1wbCBtb3VzZSBt b3ZlIGhhbmRsZXIgdG8gc2hvdyB0b29sIHRpcCBpbiBzZWxlY3QgcG9wdXAgd2luZG93LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjEyNjAKKyAgICAg ICAgaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9kZXRhaWw/aWQ9MTI3 MjEKKworICAgICAgICAqIHB1YmxpYy9XZWJNZW51SXRlbUluZm8uaDogQWRkIHRvb2xUaXAuCisg ICAgICAgICogcHVibGljL1dlYlZpZXdDbGllbnQuaDogUmVtb3ZlIHNldFRvb2xUaXBUZXh0KCku CisgICAgICAgICogcHVibGljL1dlYldpZGdldENsaWVudC5oOiBBZGQgc2V0VG9vVGlwVGV4dCgp LgorICAgICAgICAoV2ViS2l0OjpXZWJXaWRnZXRDbGllbnQ6OnNldFRvb2xUaXBUZXh0KToKKyAg ICAgICAgKiBzcmMvRXh0ZXJuYWxQb3B1cE1lbnUuY3BwOgorICAgICAgICAoV2ViS2l0OjpFeHRl cm5hbFBvcHVwTWVudTo6Z2V0UG9wdXBNZW51SW5mbyk6IEFkZCBwb3B1cEl0ZW0udG9vbFRpcCBz ZXQuCisgICAgICAgICogc3JjL1dlYlBvcHVwTWVudUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQb3B1cE1lbnVJbXBsOjpNb3VzZU1vdmUpOiBDYWxsIHNldFRvb2xUaXBUZXh0KCkuCisK IDIwMTEtMDUtMjYgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4NzQ0NC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1lbnVJdGVtSW5mby5oIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVudUl0ZW1JbmZvLmgKaW5kZXggNzQyYjRlZmUwMmMw ZWVjYmM4ZjA3YmJlNjIxNjg3ZjExZmJkMTFkZi4uOWQ3Y2ZkNDMwYzM3MzdlMWVlOTdmOWU5MGUy ZTI5M2I3YWFlNjdlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViTWVudUl0ZW1JbmZvLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi TWVudUl0ZW1JbmZvLmgKQEAgLTU3LDYgKzU3LDcgQEAgc3RydWN0IFdlYk1lbnVJdGVtSW5mbyB7 CiAgICAgfQogCiAgICAgV2ViU3RyaW5nIGxhYmVsOworICAgIFdlYlN0cmluZyB0b29sVGlwOwog ICAgIFR5cGUgdHlwZTsKICAgICB1bnNpZ25lZCBhY3Rpb247CiAgICAgV2ViVGV4dERpcmVjdGlv biB0ZXh0RGlyZWN0aW9uOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViVmlld0NsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmll d0NsaWVudC5oCmluZGV4IGYzYmUzY2E1NzhhMjI5ZjhiNDNiY2E0NzRhZmRhY2VmNDZlMTRlMTMu Ljg5OTg2YjJmNzg5ZDNmNDFlNzY2ZTBkZjhlYjE0YmQwYTE0ZTAxYWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXdDbGllbnQuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgKQEAgLTIyNyw5ICsyMjcsNiBA QCBwdWJsaWM6CiAgICAgLy8gQ2FsbGVkIHdoZW4ga2V5Ym9hcmQgZm9jdXMgc3dpdGNoZXMgdG8g YW4gYW5jaG9yIHdpdGggdGhlIGdpdmVuIFVSTC4KICAgICB2aXJ0dWFsIHZvaWQgc2V0S2V5Ym9h cmRGb2N1c1VSTChjb25zdCBXZWJVUkwmKSB7IH0KIAotICAgIC8vIENhbGxlZCB3aGVuIGEgdG9v bHRpcCBzaG91bGQgYmUgc2hvd24gYXQgdGhlIGN1cnJlbnQgY3Vyc29yIHBvc2l0aW9uLgotICAg IHZpcnR1YWwgdm9pZCBzZXRUb29sVGlwVGV4dChjb25zdCBXZWJTdHJpbmcmLCBXZWJUZXh0RGly ZWN0aW9uIGhpbnQpIHsgfQotCiAgICAgLy8gU2hvd3MgYSBjb250ZXh0IG1lbnUgd2l0aCBjb21t YW5kcyByZWxldmFudCB0byBhIHNwZWNpZmljIGVsZW1lbnQgb24KICAgICAvLyB0aGUgZ2l2ZW4g ZnJhbWUuIEFkZGl0aW9uYWwgY29udGV4dCBkYXRhIGlzIHN1cHBsaWVkLgogICAgIHZpcnR1YWwg dm9pZCBzaG93Q29udGV4dE1lbnUoV2ViRnJhbWUqLCBjb25zdCBXZWJDb250ZXh0TWVudURhdGEm KSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYldpZGdl dENsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0Q2xpZW50 LmgKaW5kZXggODVlNDAxNWE3MWU3ZTdiYTllY2Q2MjA3ODcwMzliZDZlODM2NGIzMy4uNjBiNGFi Zjk2MWU2NGU1YWM4MTkwMzUzOGUxZGYwYjVhNTIyZWEwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0Q2xpZW50LmgKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0Q2xpZW50LmgKQEAgLTM4LDYgKzM4LDcgQEAKIAog bmFtZXNwYWNlIFdlYktpdCB7CiAKK2NsYXNzIFdlYlN0cmluZzsKIGNsYXNzIFdlYldpZGdldDsK IHN0cnVjdCBXZWJDdXJzb3JJbmZvOwogCkBAIC04MSw2ICs4Miw5IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIFdlYlJlY3Qgd2luZG93UmVjdCgpIHsgcmV0dXJuIFdlYlJlY3QoKTsgfQogICAgIHZp cnR1YWwgdm9pZCBzZXRXaW5kb3dSZWN0KGNvbnN0IFdlYlJlY3QmKSB7IH0KIAorICAgIC8vIENh bGxlZCB3aGVuIGEgdG9vbHRpcCBzaG91bGQgYmUgc2hvd24gYXQgdGhlIGN1cnJlbnQgY3Vyc29y IHBvc2l0aW9uLgorICAgIHZpcnR1YWwgdm9pZCBzZXRUb29sVGlwVGV4dChjb25zdCBXZWJTdHJp bmcmLCBXZWJUZXh0RGlyZWN0aW9uIGhpbnQpIHsgfQorCiAgICAgLy8gQ2FsbGVkIHRvIGdldCB0 aGUgcG9zaXRpb24gb2YgdGhlIHJlc2l6ZXIgcmVjdCBpbiB3aW5kb3cgY29vcmRpbmF0ZXMuCiAg ICAgdmlydHVhbCBXZWJSZWN0IHdpbmRvd1Jlc2l6ZXJSZWN0KCkgeyByZXR1cm4gV2ViUmVjdCgp OyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0V4dGVybmFsUG9w dXBNZW51LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0V4dGVybmFsUG9wdXBNZW51 LmNwcAppbmRleCA1ODA4MDAzZDQ2Y2Q4MjhkZTY0YWViMDVhMWYwZGI3ZjA3ZGYzMzU2Li44NjUx ZDM1MGU2YTYzNTg0MGRjNDNjNDRjNzQ5OTM5ZjVhMGVhYzlkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9FeHRlcm5hbFBvcHVwTWVudS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvRXh0ZXJuYWxQb3B1cE1lbnUuY3BwCkBAIC0xMzMsNiArMTMzLDcg QEAgdm9pZCBFeHRlcm5hbFBvcHVwTWVudTo6Z2V0UG9wdXBNZW51SW5mbyhXZWJQb3B1cE1lbnVJ bmZvKiBpbmZvKQogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgaXRlbUNvdW50OyArK2kpIHsKICAg ICAgICAgV2ViTWVudUl0ZW1JbmZvJiBwb3B1cEl0ZW0gPSBpdGVtc1tpXTsKICAgICAgICAgcG9w dXBJdGVtLmxhYmVsID0gbV9wb3B1cE1lbnVDbGllbnQtPml0ZW1UZXh0KGkpOworICAgICAgICBw b3B1cEl0ZW0udG9vbFRpcCA9IG1fcG9wdXBNZW51Q2xpZW50LT5pdGVtVG9vbFRpcChpKTsKICAg ICAgICAgaWYgKG1fcG9wdXBNZW51Q2xpZW50LT5pdGVtSXNTZXBhcmF0b3IoaSkpCiAgICAgICAg ICAgICBwb3B1cEl0ZW0udHlwZSA9IFdlYk1lbnVJdGVtSW5mbzo6U2VwYXJhdG9yOwogICAgICAg ICBlbHNlIGlmIChtX3BvcHVwTWVudUNsaWVudC0+aXRlbUlzTGFiZWwoaSkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQb3B1cE1lbnVJbXBsLmNwcCBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuY3BwCmluZGV4IDk2MWNlMjQ1 ZTNiM2I0ZTA0ODhiYjU3NzlkM2NiMjBlZjI3NmM1NGEuLjVjYmY1ZmYwNjBmYTM0MjNkNGNkNDg4 MmQ1ZGIxN2Y5OTNjMTc3N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlBvcHVwTWVudUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlBvcHVwTWVudUltcGwuY3BwCkBAIC00MCwxMiArNDAsMTQgQEAKICNpbmNsdWRlICJQbGF0Zm9y bUtleWJvYXJkRXZlbnQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybU1vdXNlRXZlbnQuaCIKICNpbmNs dWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIKKyNpbmNsdWRlICJQb3B1cE1lbnVDaHJvbWl1bS5o IgogI2luY2x1ZGUgIlNraWFVdGlscy5oIgogCiAjaW5jbHVkZSAiV2ViSW5wdXRFdmVudC5oIgog I2luY2x1ZGUgIldlYklucHV0RXZlbnRDb252ZXJzaW9uLmgiCiAjaW5jbHVkZSAiV2ViUmFuZ2Uu aCIKICNpbmNsdWRlICJXZWJSZWN0LmgiCisjaW5jbHVkZSAiV2ViVmlld0NsaWVudC5oIgogI2lu Y2x1ZGUgIldlYldpZGdldENsaWVudC5oIgogCiAjaW5jbHVkZSA8c2tpYS9leHQvcGxhdGZvcm1f Y2FudmFzLmg+CkBAIC05NSw2ICs5NywxMCBAQCB2b2lkIFdlYlBvcHVwTWVudUltcGw6Ok1vdXNl TW92ZShjb25zdCBXZWJNb3VzZUV2ZW50JiBldmVudCkKICAgICBpZiAoZXZlbnQueCAhPSBtX2xh c3RNb3VzZVBvc2l0aW9uLnggfHwgZXZlbnQueSAhPSBtX2xhc3RNb3VzZVBvc2l0aW9uLnkpIHsK ICAgICAgICAgbV9sYXN0TW91c2VQb3NpdGlvbiA9IFdlYlBvaW50KGV2ZW50LngsIGV2ZW50Lnkp OwogICAgICAgICBtX3dpZGdldC0+aGFuZGxlTW91c2VNb3ZlRXZlbnQoUGxhdGZvcm1Nb3VzZUV2 ZW50QnVpbGRlcihtX3dpZGdldCwgZXZlbnQpKTsKKworICAgICAgICAvLyBXZSBjYW5ub3QgY2Fs bCBzZXRUb29sVGlwVGV4dCgpIGluIFBvcHVwQ29udGFpbmVyLCBiZWNhdXNlIFBvcHVwQ29udGFp bmVyIGlzIGluIFdlYkNvcmUsIGFuZCB3ZSBjYW5ub3QgcmVmZXIgdG8gV2ViS2l0IGZyb20gV2Vi Y29yZS4KKyAgICAgICAgV2ViQ29yZTo6UG9wdXBDb250YWluZXIqIGNvbnRhaW5lciA9IHN0YXRp Y19jYXN0PFdlYkNvcmU6OlBvcHVwQ29udGFpbmVyKj4obV93aWRnZXQpOworICAgICAgICBjbGll bnQoKS0+c2V0VG9vbFRpcFRleHQoY29udGFpbmVyLT5nZXRTZWxlY3RlZEl0ZW1Ub29sVGlwKCks IGNvbnRhaW5lci0+bWVudVN0eWxlKCkudGV4dERpcmVjdGlvbigpID09IFdlYkNvcmU6OlJUTCA/ IFdlYlRleHREaXJlY3Rpb25SaWdodFRvTGVmdCA6IFdlYlRleHREaXJlY3Rpb25MZWZ0VG9SaWdo dCk7CiAgICAgfQogfQogCg== 96149 2011-06-06 16:29:23 -0700 2011-06-06 16:30:51 -0700 Ignore this. bug-61260-20110606162922.patch text/plain 1340 inferno SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MTk3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDYtMDYgIEFiaGlzaGVr IEFyeWEgIDxpbmZlcm5vQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBQcm90ZWN0IHJlZiB0byBwYXJlbnQgbm9kZSBiZWNhdXNl IHRoZSBuZXdseSBhZGRlZAorICAgICAgICBjaGlsZCBjYW4gcmVtb3ZlIHVzIHdoZW4gaW5zZXJ0 ZWQgaW50byBkb2N1bWVudAorICAgICAgICBpbiBDb250YWluZXJOb2RlOjpwYXJzZXJBZGRDaGls ZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMTYw CisKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MQ29uc3RydWN0aW9uU2l0ZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MQ29uc3RydWN0aW9uU2l0ZTo6YXR0YWNoKToKKwogMjAxMS0wNi0w NiAgTGV2aSBXZWludHJhdWIgIDxsZXZpd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1M Q29uc3RydWN0aW9uU2l0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9w YXJzZXIvSFRNTENvbnN0cnVjdGlvblNpdGUuY3BwCShyZXZpc2lvbiA4ODEzOCkKKysrIFNvdXJj ZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxDb25zdHJ1Y3Rpb25TaXRlLmNwcAkod29ya2luZyBj b3B5KQpAQCAtODQsNiArODQsNyBAQCBib29sIGNhdXNlc0Zvc3RlclBhcmVudGluZyhjb25zdCBR dWFsaWZpCiB0ZW1wbGF0ZTx0eXBlbmFtZSBDaGlsZFR5cGU+CiBQYXNzUmVmUHRyPENoaWxkVHlw ZT4gSFRNTENvbnN0cnVjdGlvblNpdGU6OmF0dGFjaChDb250YWluZXJOb2RlKiBwYXJlbnQsIFBh c3NSZWZQdHI8Q2hpbGRUeXBlPiBwcnBDaGlsZCkKIHsKKyAgICBSZWZQdHI8Q29udGFpbmVyTm9k ZT4gcHJvdGVjdCA9IHBhcmVudDsKICAgICBSZWZQdHI8Q2hpbGRUeXBlPiBjaGlsZCA9IHBycENo aWxkOwogCiAgICAgLy8gRklYTUU6IEl0J3MgY29uZnVzaW5nIHRoYXQgSFRNTENvbnN0cnVjdGlv blNpdGU6OmF0dGFjaCBkb2VzIHRoZSBtYWdpYwo=