84559 2012-04-22 20:32:52 -0700 [Blackberry] remove m_isRequestedByPlugin in ResourceRequest 2012-05-08 07:01:58 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 logingx webkit-unassigned gmak tonikitoo webkit.review.bot oldest_to_newest 607429 0 logingx 2012-04-22 20:32:52 -0700 As AP and Antonio suggestions, m_isRequestedByPlugin should not be in ResourceRequest which is a network level abstraction and it does not fix any issues any more. So clean up all related code for m_isRequestedByPlugin. 607431 1 138288 logingx 2012-04-22 20:46:31 -0700 Created attachment 138288 Patch 607653 2 tonikitoo 2012-04-23 07:15:11 -0700 +gen. As I remember, it was added to avoid popping up a window when start scrolling a page off of a Flash Ad (for example, cnn.com full edition, right side of the webpage). However it did not completely cover all cases, and popups are still opened in many real world web sites ever with this hack. As I said, it does fixes some cases, but not all.. 608316 3 logingx 2012-04-23 19:39:15 -0700 (In reply to comment #2) > +gen. > > As I remember, it was added to avoid popping up a window when start scrolling a page off of a Flash Ad (for example, cnn.com full edition, right side of the webpage). However it did not completely cover all cases, and popups are still opened in many real world web sites ever with this hack. > > As I said, it does fixes some cases, but not all.. I was searching our code, only dispatchDecidePolicyForNewWindowAction is using "isRequestedByPlugin", do we have other cases? I removed the code in dispatchDecidePolicyForNewWindowAction, because isRequestedByPlugin seems to be always false without my that fixing(https://bugs.webkit.org/show_bug.cgi?id=83447), and the code run well long time without hitting those code I removed. 608521 4 logingx 2012-04-24 03:57:35 -0700 (In reply to comment #3) > (In reply to comment #2) > > +gen. > > > > As I remember, it was added to avoid popping up a window when start scrolling a page off of a Flash Ad (for example, cnn.com full edition, right side of the webpage). However it did not completely cover all cases, and popups are still opened in many real world web sites ever with this hack. > > > > As I said, it does fixes some cases, but not all.. > > I was searching our code, only dispatchDecidePolicyForNewWindowAction is using "isRequestedByPlugin", do we have other cases? > I removed the code in dispatchDecidePolicyForNewWindowAction, because isRequestedByPlugin seems to be always false without my that fixing(https://bugs.webkit.org/show_bug.cgi?id=83447), and the code run well long time without hitting those code I removed. Gen & Antonio, I guess the first policyChecker is useless, because there is not an early return. So the second policyChecker is working actually. let me summarize the options I have: 1. remove them, just like my patch 2. just remove "request.isRequestedByPlugin()" 3. #2 + early return; 609615 5 logingx 2012-04-25 03:44:49 -0700 (In reply to comment #4) > (In reply to comment #3) > > (In reply to comment #2) > > > +gen. > > > > > > As I remember, it was added to avoid popping up a window when start scrolling a page off of a Flash Ad (for example, cnn.com full edition, right side of the webpage). However it did not completely cover all cases, and popups are still opened in many real world web sites ever with this hack. > > > > > > As I said, it does fixes some cases, but not all.. > > > > I was searching our code, only dispatchDecidePolicyForNewWindowAction is using "isRequestedByPlugin", do we have other cases? > > I removed the code in dispatchDecidePolicyForNewWindowAction, because isRequestedByPlugin seems to be always false without my that fixing(https://bugs.webkit.org/show_bug.cgi?id=83447), and the code run well long time without hitting those code I removed. > > Gen & Antonio, > I guess the first policyChecker is useless, because there is not an early return. So the second policyChecker is working actually. let me summarize the options I have: > 1. remove them, just like my patch > 2. just remove "request.isRequestedByPlugin()" > 3. #2 + early return; Gen & Antonio, It seems that it is working well for option#3 by my testing(cnn.com). If you guys agree with me, I could post a new patch with my option#3, or do you have a better solution? Thanks 609651 6 tonikitoo 2012-04-25 04:54:25 -0700 please post a patch :) 618407 7 140690 logingx 2012-05-08 01:29:32 -0700 Created attachment 140690 Patch 618412 8 logingx 2012-05-08 01:35:21 -0700 (In reply to comment #7) > Created an attachment (id=140690) [details] > Patch With the latest refactor for zoom/scroll from Gen, it works well. I guess Gen's refactor make plugin happy by removing m_isRequestedByPlugin. 618429 9 140690 gyuyoung.kim 2012-05-08 02:12:12 -0700 Comment on attachment 140690 Patch Attachment 140690 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/12650304 618442 10 logingx 2012-05-08 02:39:44 -0700 (In reply to comment #9) > (From update of attachment 140690 [details]) > Attachment 140690 [details] did not pass efl-ews (efl): > Output: http://queues.webkit.org/results/12650304 false alarm? I did not touch any make files and elf code. 618480 11 tonikitoo 2012-05-08 06:54:44 -0700 (In reply to comment #8) > (In reply to comment #7) > > Created an attachment (id=140690) [details] [details] > > Patch > > With the latest refactor for zoom/scroll from Gen, it works well. I guess Gen's refactor make plugin happy by removing m_isRequestedByPlugin. not sure how it is related, in fact. 618493 12 140690 webkit.review.bot 2012-05-08 07:01:50 -0700 Comment on attachment 140690 Patch Clearing flags on attachment: 140690 Committed r116418: <http://trac.webkit.org/changeset/116418> 618494 13 webkit.review.bot 2012-05-08 07:01:58 -0700 All reviewed patches have been landed. Closing bug. 138288 2012-04-22 20:46:31 -0700 2012-04-23 21:15:15 -0700 Patch bug-84559-20120423114628.patch text/plain 6908 logingx U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0ODY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGIwNmZkZDIxMWJjZThl ZDk5MmI2ODVhZDUxZGY2M2Y2YzY0MTZkMS4uMzBhNjUxOWViYTk3MWIwMTk3ZWFiMjA1MjAxODUy ODE1Y2IzOTE3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA0LTIyICBDaHJp cyBHdWFuICA8Y2hyaXMuZ3VhbkB0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAgW0JsYWNr YmVycnldIFJlbW92ZSBtX2lzUmVxdWVzdGVkQnlQbHVnaW4gaW4gUmVzb3VyY2VSZXF1ZXN0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDU1OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlc291cmNlUmVx dWVzdCBpcyBhIG5ldHdvcmsgbGV2ZWwgYWJzdHJhY3Rpb24sIGFuZCBpdCBzaG91bGQgbm90IGtu b3cKKyAgICAgICAgYW55dGhpbmcgYWJvdXQgd2ViIGNvbmNlcHRzIHN1Y2ggYXMgcGx1Zy1pbnMs IGFuZCBCbGFja2JlcnJ5IGRvZXMgbm90CisgICAgICAgIG5lZWQgbV9pc1JlcXVlc3RlZEJ5UGx1 Z2luIGFueSBsb25nZXIsIFNvIGNsZWFuIHVwIGFsbCByZWxhdGVkIGNvZGUuCisgICAgICAgIAor ICAgICAgICBObyBuZXcgdGVzdHMsIGJlY2F1c2Ugbm8gYmVoYXZpb3IgY2hhbmdlZC4KKworICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3QuaDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6UmVzb3VyY2VSZXF1ZXN0KToKKyAgICAg ICAgKFJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChDcm9zc1RocmVhZFJlc291cmNlUmVxdWVz dERhdGEpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJl cXVlc3RCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6 ZG9QbGF0Zm9ybUNvcHlEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6 ZG9QbGF0Zm9ybUFkb3B0KToKKwogMjAxMi0wNC0yMiAgTWFydGluIFJvYmluc29uICA8bXJvYmlu c29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0NhaXJvXSBJbXBsZW1lbnQgQ29tcG9zaXRlRGlm ZmVyZW5jZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggYzcyZWRhMjUxOWVhMGJj YzM5ZTQyMDVhODBhZTg1MmRhYmVhZjRmMi4uMmEwZjEwMDdjMzgzYjY3YTRkNTAxOWZmNDdjNmYz M2MxYWE2MDZhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTItMDQtMjIgIENocmlzIEd1YW4gIDxjaHJpcy5ndWFuQHRvcmNobW9iaWxlLmNvbS5j bj4KKworICAgICAgICBbQmxhY2tiZXJyeV0gcmVtb3ZlIG1faXNSZXF1ZXN0ZWRCeVBsdWdpbiBp biBSZXNvdXJjZVJlcXVlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg0NTU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpkaXNwYXRj aERlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbik6CisKIDIwMTItMDQtMjEgIEJlbmphbWlu IEMgTWV5ZXIgIDxibWV5ZXJAcmltLmNvbT4KIAogICAgICAgICBEb24ndCBoYXJkIGNvZGUgdGhl IHBsdWdpbnMgdGhhdCBibGFja2JlcnJ5IHN1cHBvcnRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdC5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdC5o CmluZGV4IGZlOWRlNjY0MzcwNDY3ZjdjMWEyNWIwZjRkM2E1YjIxZGIyNjlhMzcuLjU5MDU1MWI5 NGQxNDI1MjFiYjhmMjJkZmQyOTg2MDVkMzM3NDIxMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3QuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0 LmgKQEAgLTU1LDcgKzU1LDYgQEAgcHVibGljOgogICAgICAgICA6IFJlc291cmNlUmVxdWVzdEJh c2UoS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIFVzZVByb3RvY29sQ2FjaGVQb2xpY3kpCiAg ICAgICAgICwgbV9pc1hNTEhUVFBSZXF1ZXN0KGZhbHNlKQogICAgICAgICAsIG1fbXVzdEhhbmRs ZUludGVybmFsbHkoZmFsc2UpCi0gICAgICAgICwgbV9pc1JlcXVlc3RlZEJ5UGx1Z2luKGZhbHNl KQogICAgICAgICAsIG1fZm9yY2VEb3dubG9hZChmYWxzZSkKICAgICAgICAgLCBtX3RhcmdldFR5 cGUoVGFyZ2V0SXNVbnNwZWNpZmllZCkKICAgICB7CkBAIC02NSw3ICs2NCw2IEBAIHB1YmxpYzoK ICAgICAgICAgOiBSZXNvdXJjZVJlcXVlc3RCYXNlKHVybCwgVXNlUHJvdG9jb2xDYWNoZVBvbGlj eSkKICAgICAgICAgLCBtX2lzWE1MSFRUUFJlcXVlc3QoZmFsc2UpCiAgICAgICAgICwgbV9tdXN0 SGFuZGxlSW50ZXJuYWxseShmYWxzZSkKLSAgICAgICAgLCBtX2lzUmVxdWVzdGVkQnlQbHVnaW4o ZmFsc2UpCiAgICAgICAgICwgbV9mb3JjZURvd25sb2FkKGZhbHNlKQogICAgICAgICAsIG1fdGFy Z2V0VHlwZShUYXJnZXRJc1Vuc3BlY2lmaWVkKQogICAgIHsKQEAgLTc1LDcgKzczLDYgQEAgcHVi bGljOgogICAgICAgICA6IFJlc291cmNlUmVxdWVzdEJhc2UodXJsLCBwb2xpY3kpCiAgICAgICAg ICwgbV9pc1hNTEhUVFBSZXF1ZXN0KGZhbHNlKQogICAgICAgICAsIG1fbXVzdEhhbmRsZUludGVy bmFsbHkoZmFsc2UpCi0gICAgICAgICwgbV9pc1JlcXVlc3RlZEJ5UGx1Z2luKGZhbHNlKQogICAg ICAgICAsIG1fZm9yY2VEb3dubG9hZChmYWxzZSkKICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFy Z2V0SXNVbnNwZWNpZmllZCkKICAgICB7CkBAIC04Niw3ICs4Myw2IEBAIHB1YmxpYzoKICAgICAg ICAgOiBSZXNvdXJjZVJlcXVlc3RCYXNlKEtVUkwoKSwgVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkK ICAgICAgICAgLCBtX2lzWE1MSFRUUFJlcXVlc3QoZmFsc2UpCiAgICAgICAgICwgbV9tdXN0SGFu ZGxlSW50ZXJuYWxseShmYWxzZSkKLSAgICAgICAgLCBtX2lzUmVxdWVzdGVkQnlQbHVnaW4oZmFs c2UpCiAgICAgICAgICwgbV9mb3JjZURvd25sb2FkKGZhbHNlKQogICAgICAgICAsIG1fdGFyZ2V0 VHlwZShUYXJnZXRJc1Vuc3BlY2lmaWVkKQogICAgIHsKQEAgLTEwNyw5ICsxMDMsNiBAQCBwdWJs aWM6CiAgICAgdm9pZCBzZXRJc1hNTEhUVFBSZXF1ZXN0KGJvb2wgaXNYTUxIVFRQUmVxdWVzdCkg eyBtX2lzWE1MSFRUUFJlcXVlc3QgPSBpc1hNTEhUVFBSZXF1ZXN0OyB9CiAgICAgYm9vbCBpc1hN TEhUVFBSZXF1ZXN0KCkgY29uc3QgeyByZXR1cm4gbV9pc1hNTEhUVFBSZXF1ZXN0OyB9CiAKLSAg ICB2b2lkIHNldElzUmVxdWVzdGVkQnlQbHVnaW4oYm9vbCBpc1JlcXVlc3RlZEJ5UGx1Z2luKSB7 IG1faXNSZXF1ZXN0ZWRCeVBsdWdpbiA9IGlzUmVxdWVzdGVkQnlQbHVnaW47IH0KLSAgICBib29s IGlzUmVxdWVzdGVkQnlQbHVnaW4oKSBjb25zdCB7IHJldHVybiBtX2lzUmVxdWVzdGVkQnlQbHVn aW47IH0KLQogICAgIC8vIE1hcmtzIHJlcXVlc3RzIHdoaWNoIG11c3QgYmUgaGFuZGxlZCBieSB3 ZWJraXQgZXZlbiBpZiBMaW5rc0hhbmRsZWRFeHRlcm5hbGx5IGlzIHNldC4KICAgICB2b2lkIHNl dE11c3RIYW5kbGVJbnRlcm5hbGx5KGJvb2wgbXVzdEhhbmRsZUludGVybmFsbHkpIHsgbV9tdXN0 SGFuZGxlSW50ZXJuYWxseSA9IG11c3RIYW5kbGVJbnRlcm5hbGx5OyB9CiAgICAgYm9vbCBtdXN0 SGFuZGxlSW50ZXJuYWxseSgpIGNvbnN0IHsgcmV0dXJuIG1fbXVzdEhhbmRsZUludGVybmFsbHk7 IH0KQEAgLTEzNSw3ICsxMjgsNiBAQCBwcml2YXRlOgogICAgIFN0cmluZyBtX292ZXJyaWRlQ29u dGVudFR5cGU7CiAgICAgYm9vbCBtX2lzWE1MSFRUUFJlcXVlc3Q7CiAgICAgYm9vbCBtX211c3RI YW5kbGVJbnRlcm5hbGx5OwotICAgIGJvb2wgbV9pc1JlcXVlc3RlZEJ5UGx1Z2luOwogICAgIGJv b2wgbV9mb3JjZURvd25sb2FkOwogICAgIFRhcmdldFR5cGUgbV90YXJnZXRUeXBlOwogCkBAIC0x NTEsNyArMTQzLDYgQEAgc3RydWN0IENyb3NzVGhyZWFkUmVzb3VyY2VSZXF1ZXN0RGF0YSA6IHB1 YmxpYyBDcm9zc1RocmVhZFJlc291cmNlUmVxdWVzdERhdGFCYXMKICAgICBTdHJpbmcgbV9hbmNo b3JUZXh0OwogICAgIGJvb2wgbV9pc1hNTEhUVFBSZXF1ZXN0OwogICAgIGJvb2wgbV9tdXN0SGFu ZGxlSW50ZXJuYWxseTsKLSAgICBib29sIG1faXNSZXF1ZXN0ZWRCeVBsdWdpbjsKICAgICBib29s IG1fZm9yY2VEb3dubG9hZDsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3RCbGFja0JlcnJ5LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3RC bGFja0JlcnJ5LmNwcAppbmRleCA5YTM1MGMxY2ViMGI4YjRlMTAxMTQ1MThmNTRmMjBiMTE3ODVk NzQ0Li5kZTI4YTFhOWFhYmQ5MjkwODIxMTFhMjkwZWFkMDQ2ZDFiZTE4NzRjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1 ZXN0QmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9i bGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdEJsYWNrQmVycnkuY3BwCkBAIC0yMzUsNyArMjM1LDYg QEAgUGFzc093blB0cjxDcm9zc1RocmVhZFJlc291cmNlUmVxdWVzdERhdGE+IFJlc291cmNlUmVx dWVzdDo6ZG9QbGF0Zm9ybUNvcHlEYXRhKFAKICAgICBkYXRhLT5tX2FuY2hvclRleHQgPSBtX2Fu Y2hvclRleHQ7CiAgICAgZGF0YS0+bV9pc1hNTEhUVFBSZXF1ZXN0ID0gbV9pc1hNTEhUVFBSZXF1 ZXN0OwogICAgIGRhdGEtPm1fbXVzdEhhbmRsZUludGVybmFsbHkgPSBtX211c3RIYW5kbGVJbnRl cm5hbGx5OwotICAgIGRhdGEtPm1faXNSZXF1ZXN0ZWRCeVBsdWdpbiA9IG1faXNSZXF1ZXN0ZWRC eVBsdWdpbjsKICAgICByZXR1cm4gZGF0YTsKIH0KIApAQCAtMjQ1LDcgKzI0NCw2IEBAIHZvaWQg UmVzb3VyY2VSZXF1ZXN0Ojpkb1BsYXRmb3JtQWRvcHQoUGFzc093blB0cjxDcm9zc1RocmVhZFJl c291cmNlUmVxdWVzdERhdGE+CiAgICAgbV9hbmNob3JUZXh0ID0gZGF0YS0+bV9hbmNob3JUZXh0 OwogICAgIG1faXNYTUxIVFRQUmVxdWVzdCA9IGRhdGEtPm1faXNYTUxIVFRQUmVxdWVzdDsKICAg ICBtX211c3RIYW5kbGVJbnRlcm5hbGx5ID0gZGF0YS0+bV9tdXN0SGFuZGxlSW50ZXJuYWxseTsK LSAgICBtX2lzUmVxdWVzdGVkQnlQbHVnaW4gPSBkYXRhLT5tX2lzUmVxdWVzdGVkQnlQbHVnaW47 CiAgICAgbV9mb3JjZURvd25sb2FkID0gZGF0YS0+bV9mb3JjZURvd25sb2FkOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRCbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3Jl U3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwCmluZGV4IDdmNDE0Yzc1MTI2 YTVkZDZlZDE1MDMwYmRjMTUyMjMxNTRjMDU1ZmQuLjg1MWVkMWY0YmI1ZGViNDE5NzdiMjIyYjA5 ZjZhNDlhOWU4ZTc5ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVy cnkuY3BwCkBAIC0yNzksOSArMjc5LDYgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVy cnk6OmRvUGVuZGluZ0ZyYWdtZW50U2Nyb2xsKCkKIAogdm9pZCBGcmFtZUxvYWRlckNsaWVudEJs YWNrQmVycnk6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKEZyYW1lUG9s aWN5RnVuY3Rpb24gZnVuY3Rpb24sIGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mLCBjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QsIFBhc3NSZWZQdHI8Rm9ybVN0YXRlPiwgY29uc3QgU3RyaW5n JiBmcmFtZU5hbWUpCiB7Ci0gICAgaWYgKHJlcXVlc3QuaXNSZXF1ZXN0ZWRCeVBsdWdpbigpICYm IFNjcmlwdENvbnRyb2xsZXI6OnByb2Nlc3NpbmdVc2VyR2VzdHVyZSgpICYmICFtX3dlYlBhZ2VQ cml2YXRlLT5tX3BsdWdpbk1heU9wZW5OZXdUYWIpCi0gICAgICAgIChtX2ZyYW1lLT5sb2FkZXIo KS0+cG9saWN5Q2hlY2tlcigpLT4qZnVuY3Rpb24pKFBvbGljeUlnbm9yZSk7Ci0KICAgICAvLyBB IG5ldyB3aW5kb3cgY2FuIG5ldmVyIGJlIGEgZnJhZ21lbnQgc2Nyb2xsLgogICAgIFBvbGljeUFj dGlvbiBkZWNpc2lvbiA9IGRlY2lkZVBvbGljeUZvckV4dGVybmFsTG9hZChyZXF1ZXN0LCBmYWxz ZSk7CiAgICAgKG1fZnJhbWUtPmxvYWRlcigpLT5wb2xpY3lDaGVja2VyKCktPipmdW5jdGlvbiko ZGVjaXNpb24pOwo= 140690 2012-05-08 01:29:32 -0700 2012-05-08 07:01:50 -0700 Patch bug-84559-20120508162930.patch text/plain 7329 logingx U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2NDAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZlOWI5YTk3NTcyZDZh ZDU2YmQ0MzlkNWI2ZjJjZDU3MDlmYWYxMC4uZmVhMGNkMTNhOGRmNDcxYjljNTI4OWM4Zjk3NmZm NzYyMWNhN2M2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA1LTA4ICBDaHJp cyBHdWFuICA8Y2hyaXMuZ3VhbkB0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAgW0JsYWNr YmVycnldIHJlbW92ZSBtX2lzUmVxdWVzdGVkQnlQbHVnaW4gaW4gUmVzb3VyY2VSZXF1ZXN0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDU1OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlc291cmNlUmVx dWVzdCBpcyBhIG5ldHdvcmsgbGV2ZWwgYWJzdHJhY3Rpb24sIGFuZCBpdCBzaG91bGQKKyAgICAg ICAgbm90IGtub3cgYW55dGhpbmcgYWJvdXQgd2ViIGNvbmNlcHRzIHN1Y2ggYXMgcGx1Zy1pbnMs IGFuZCBCbGFja2JlcnJ5CisgICAgICAgIGRvZXMgbm90IG5lZWQgbV9pc1JlcXVlc3RlZEJ5UGx1 Z2luIGFueSBsb25nZXIsIFNvIGNsZWFuIHVwIGFsbCByZWxhdGVkCisgICAgICAgIGNvZGUuCisK KyAgICAgICAgVGVzdGVkIG9uIGEgd2Vic2l0ZSBvZiBodHRwOi8vZWRpdGlvbi5jbm4uY29tLCBh IG5ldyB3aW5kb3cgc2hvdWxkIGJlCisgICAgICAgIG9wZW5lZCBvbmx5IHdoZW4gdXNlciBoYXMg YSBzaW5nZSB0YXAgZ2VzdHVyZSBvbiBhIHBsdWdpbiBlbGVtZW50LgorCisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdC5oOgorICAgICAgICAoV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpSZXNvdXJjZVJlcXVlc3QpOgorICAgICAgICAoUmVzb3Vy Y2VSZXF1ZXN0KToKKyAgICAgICAgKENyb3NzVGhyZWFkUmVzb3VyY2VSZXF1ZXN0RGF0YSk6Cisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdEJsYWNr QmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Ojpkb1BsYXRmb3Jt Q29weURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Ojpkb1BsYXRmb3Jt QWRvcHQpOgorCiAyMDEyLTA1LTA1ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1ha2UgSmF2YVNjcmlwdFNvdXJjZUZyYW1l IHVzZSBicmVha3BvaW50IG1hbmFnZXIncyBicmVha3BvaW50cyBzdG9yZS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQ2hhbmdlTG9nCmluZGV4IDhlMzlmODY5ZmNlNjdmZTJjYTQ2OTFmMmIwZWJmZDQ4YjY3 YjE1YzguLjc0ODBjMWY4MTUyYmQ3MmUzOGY2OWRiNDYwYjgyYmMwN2RhZWMzN2MgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA1LTA4ICBDaHJp cyBHdWFuICA8Y2hyaXMuZ3VhbkB0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAgW0JsYWNr YmVycnldIHJlbW92ZSBtX2lzUmVxdWVzdGVkQnlQbHVnaW4gaW4gUmVzb3VyY2VSZXF1ZXN0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDU1OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6ZGlzcGF0Y2hEZWNpZGVQb2xpY3lGb3JOZXdX aW5kb3dBY3Rpb24pOgorCiAyMDEyLTA1LTA4ICBKb25hdGhhbiBEb25nICA8am9uYXRoYW4uZG9u Z0B0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEF1dG9maWxsTWFu YWdlciBpbXBsZW1lbnRhdGlvbiB1cHN0cmVhbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdC5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdC5oCmluZGV4 IDI5YmIyNWMxYTRhNWYwMTQyY2I4OGRlZjYwMDU1M2JjNmExOWNkNzkuLjk2NGMzNWM3NGE2NzE2 ZTI2NGJhZjExOGM3Nzc3ZGE1ZWFmMmI5NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3QuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0LmgKQEAg LTU1LDcgKzU1LDYgQEAgcHVibGljOgogICAgICAgICA6IFJlc291cmNlUmVxdWVzdEJhc2UoS1VS TChQYXJzZWRVUkxTdHJpbmcsIHVybCksIFVzZVByb3RvY29sQ2FjaGVQb2xpY3kpCiAgICAgICAg ICwgbV9pc1hNTEhUVFBSZXF1ZXN0KGZhbHNlKQogICAgICAgICAsIG1fbXVzdEhhbmRsZUludGVy bmFsbHkoZmFsc2UpCi0gICAgICAgICwgbV9pc1JlcXVlc3RlZEJ5UGx1Z2luKGZhbHNlKQogICAg ICAgICAsIG1fZm9yY2VEb3dubG9hZChmYWxzZSkKICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFy Z2V0SXNVbnNwZWNpZmllZCkKICAgICB7CkBAIC02NSw3ICs2NCw2IEBAIHB1YmxpYzoKICAgICAg ICAgOiBSZXNvdXJjZVJlcXVlc3RCYXNlKHVybCwgVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKICAg ICAgICAgLCBtX2lzWE1MSFRUUFJlcXVlc3QoZmFsc2UpCiAgICAgICAgICwgbV9tdXN0SGFuZGxl SW50ZXJuYWxseShmYWxzZSkKLSAgICAgICAgLCBtX2lzUmVxdWVzdGVkQnlQbHVnaW4oZmFsc2Up CiAgICAgICAgICwgbV9mb3JjZURvd25sb2FkKGZhbHNlKQogICAgICAgICAsIG1fdGFyZ2V0VHlw ZShUYXJnZXRJc1Vuc3BlY2lmaWVkKQogICAgIHsKQEAgLTc1LDcgKzczLDYgQEAgcHVibGljOgog ICAgICAgICA6IFJlc291cmNlUmVxdWVzdEJhc2UodXJsLCBwb2xpY3kpCiAgICAgICAgICwgbV9p c1hNTEhUVFBSZXF1ZXN0KGZhbHNlKQogICAgICAgICAsIG1fbXVzdEhhbmRsZUludGVybmFsbHko ZmFsc2UpCi0gICAgICAgICwgbV9pc1JlcXVlc3RlZEJ5UGx1Z2luKGZhbHNlKQogICAgICAgICAs IG1fZm9yY2VEb3dubG9hZChmYWxzZSkKICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNV bnNwZWNpZmllZCkKICAgICB7CkBAIC04Niw3ICs4Myw2IEBAIHB1YmxpYzoKICAgICAgICAgOiBS ZXNvdXJjZVJlcXVlc3RCYXNlKEtVUkwoKSwgVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKICAgICAg ICAgLCBtX2lzWE1MSFRUUFJlcXVlc3QoZmFsc2UpCiAgICAgICAgICwgbV9tdXN0SGFuZGxlSW50 ZXJuYWxseShmYWxzZSkKLSAgICAgICAgLCBtX2lzUmVxdWVzdGVkQnlQbHVnaW4oZmFsc2UpCiAg ICAgICAgICwgbV9mb3JjZURvd25sb2FkKGZhbHNlKQogICAgICAgICAsIG1fdGFyZ2V0VHlwZShU YXJnZXRJc1Vuc3BlY2lmaWVkKQogICAgIHsKQEAgLTEwNyw5ICsxMDMsNiBAQCBwdWJsaWM6CiAg ICAgdm9pZCBzZXRJc1hNTEhUVFBSZXF1ZXN0KGJvb2wgaXNYTUxIVFRQUmVxdWVzdCkgeyBtX2lz WE1MSFRUUFJlcXVlc3QgPSBpc1hNTEhUVFBSZXF1ZXN0OyB9CiAgICAgYm9vbCBpc1hNTEhUVFBS ZXF1ZXN0KCkgY29uc3QgeyByZXR1cm4gbV9pc1hNTEhUVFBSZXF1ZXN0OyB9CiAKLSAgICB2b2lk IHNldElzUmVxdWVzdGVkQnlQbHVnaW4oYm9vbCBpc1JlcXVlc3RlZEJ5UGx1Z2luKSB7IG1faXNS ZXF1ZXN0ZWRCeVBsdWdpbiA9IGlzUmVxdWVzdGVkQnlQbHVnaW47IH0KLSAgICBib29sIGlzUmVx dWVzdGVkQnlQbHVnaW4oKSBjb25zdCB7IHJldHVybiBtX2lzUmVxdWVzdGVkQnlQbHVnaW47IH0K LQogICAgIC8vIE1hcmtzIHJlcXVlc3RzIHdoaWNoIG11c3QgYmUgaGFuZGxlZCBieSB3ZWJraXQg ZXZlbiBpZiBMaW5rc0hhbmRsZWRFeHRlcm5hbGx5IGlzIHNldC4KICAgICB2b2lkIHNldE11c3RI YW5kbGVJbnRlcm5hbGx5KGJvb2wgbXVzdEhhbmRsZUludGVybmFsbHkpIHsgbV9tdXN0SGFuZGxl SW50ZXJuYWxseSA9IG11c3RIYW5kbGVJbnRlcm5hbGx5OyB9CiAgICAgYm9vbCBtdXN0SGFuZGxl SW50ZXJuYWxseSgpIGNvbnN0IHsgcmV0dXJuIG1fbXVzdEhhbmRsZUludGVybmFsbHk7IH0KQEAg LTEzOCw3ICsxMzEsNiBAQCBwcml2YXRlOgogICAgIFN0cmluZyBtX3N1Z2dlc3RlZFNhdmVOYW1l OwogICAgIGJvb2wgbV9pc1hNTEhUVFBSZXF1ZXN0OwogICAgIGJvb2wgbV9tdXN0SGFuZGxlSW50 ZXJuYWxseTsKLSAgICBib29sIG1faXNSZXF1ZXN0ZWRCeVBsdWdpbjsKICAgICBib29sIG1fZm9y Y2VEb3dubG9hZDsKICAgICBUYXJnZXRUeXBlIG1fdGFyZ2V0VHlwZTsKIApAQCAtMTU2LDcgKzE0 OCw2IEBAIHN0cnVjdCBDcm9zc1RocmVhZFJlc291cmNlUmVxdWVzdERhdGEgOiBwdWJsaWMgQ3Jv c3NUaHJlYWRSZXNvdXJjZVJlcXVlc3REYXRhQmFzCiAgICAgU3RyaW5nIG1fc3VnZ2VzdGVkU2F2 ZU5hbWU7CiAgICAgYm9vbCBtX2lzWE1MSFRUUFJlcXVlc3Q7CiAgICAgYm9vbCBtX211c3RIYW5k bGVJbnRlcm5hbGx5OwotICAgIGJvb2wgbV9pc1JlcXVlc3RlZEJ5UGx1Z2luOwogICAgIGJvb2wg bV9mb3JjZURvd25sb2FkOwogICAgIFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0VHlwZSBtX3Rhcmdl dFR5cGU7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9i bGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdEJsYWNrQmVycnkuY3Bw CmluZGV4IDk0ODUzNDY0NzNkYTI3Nzk1NzE1YTY5MjFmM2MwYjQ1YjIwODcyOGUuLjU4NDRmM2Ri ODIxZWRiNzJkNmMwODA0YTI3NzUxNmRlMzU5YmM0MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3RCbGFja0JlcnJ5 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVz b3VyY2VSZXF1ZXN0QmxhY2tCZXJyeS5jcHAKQEAgLTIzOCw3ICsyMzgsNiBAQCBQYXNzT3duUHRy PENyb3NzVGhyZWFkUmVzb3VyY2VSZXF1ZXN0RGF0YT4gUmVzb3VyY2VSZXF1ZXN0Ojpkb1BsYXRm b3JtQ29weURhdGEoUAogICAgIGRhdGEtPm1fc3VnZ2VzdGVkU2F2ZU5hbWUgPSBtX3N1Z2dlc3Rl ZFNhdmVOYW1lOwogICAgIGRhdGEtPm1faXNYTUxIVFRQUmVxdWVzdCA9IG1faXNYTUxIVFRQUmVx dWVzdDsKICAgICBkYXRhLT5tX211c3RIYW5kbGVJbnRlcm5hbGx5ID0gbV9tdXN0SGFuZGxlSW50 ZXJuYWxseTsKLSAgICBkYXRhLT5tX2lzUmVxdWVzdGVkQnlQbHVnaW4gPSBtX2lzUmVxdWVzdGVk QnlQbHVnaW47CiAgICAgZGF0YS0+bV9mb3JjZURvd25sb2FkID0gbV9mb3JjZURvd25sb2FkOwog ICAgIGRhdGEtPm1fdGFyZ2V0VHlwZSA9IG1fdGFyZ2V0VHlwZTsKICAgICByZXR1cm4gZGF0YTsK QEAgLTI1Miw3ICsyNTEsNiBAQCB2b2lkIFJlc291cmNlUmVxdWVzdDo6ZG9QbGF0Zm9ybUFkb3B0 KFBhc3NPd25QdHI8Q3Jvc3NUaHJlYWRSZXNvdXJjZVJlcXVlc3REYXRhPgogICAgIG1fc3VnZ2Vz dGVkU2F2ZU5hbWUgPSBkYXRhLT5tX3N1Z2dlc3RlZFNhdmVOYW1lOwogICAgIG1faXNYTUxIVFRQ UmVxdWVzdCA9IGRhdGEtPm1faXNYTUxIVFRQUmVxdWVzdDsKICAgICBtX211c3RIYW5kbGVJbnRl cm5hbGx5ID0gZGF0YS0+bV9tdXN0SGFuZGxlSW50ZXJuYWxseTsKLSAgICBtX2lzUmVxdWVzdGVk QnlQbHVnaW4gPSBkYXRhLT5tX2lzUmVxdWVzdGVkQnlQbHVnaW47CiAgICAgbV9mb3JjZURvd25s b2FkID0gZGF0YS0+bV9mb3JjZURvd25sb2FkOwogICAgIG1fdGFyZ2V0VHlwZSA9IGRhdGEtPm1f dGFyZ2V0VHlwZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5j cHAKaW5kZXggYjJkZTc2ZTM5MjhmZjJjNzM1YmVhYzQ2ZDIwYTNjMjllZTA3ZDQ4OC4uNTA4YTA5 YmZkZmEyNDJmNGY3MTM4NDE4ZDVjYTQwOTMzNmIxYmJmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJy eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1l TG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKQEAgLTI3Niw4ICsyNzYsMTAgQEAgdm9pZCBGcmFt ZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmRvUGVuZGluZ0ZyYWdtZW50U2Nyb2xsKCkKIAogdm9p ZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmV3 V2luZG93QWN0aW9uKEZyYW1lUG9saWN5RnVuY3Rpb24gZnVuY3Rpb24sIGNvbnN0IE5hdmlnYXRp b25BY3Rpb24mLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFBhc3NSZWZQdHI8Rm9y bVN0YXRlPiwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUpCiB7Ci0gICAgaWYgKHJlcXVlc3QuaXNS ZXF1ZXN0ZWRCeVBsdWdpbigpICYmIFNjcmlwdENvbnRyb2xsZXI6OnByb2Nlc3NpbmdVc2VyR2Vz dHVyZSgpICYmICFtX3dlYlBhZ2VQcml2YXRlLT5tX3BsdWdpbk1heU9wZW5OZXdUYWIpCisgICAg aWYgKFNjcmlwdENvbnRyb2xsZXI6OnByb2Nlc3NpbmdVc2VyR2VzdHVyZSgpICYmICFtX3dlYlBh Z2VQcml2YXRlLT5tX3BsdWdpbk1heU9wZW5OZXdUYWIpIHsKICAgICAgICAgKG1fZnJhbWUtPmxv YWRlcigpLT5wb2xpY3lDaGVja2VyKCktPipmdW5jdGlvbikoUG9saWN5SWdub3JlKTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KIAogICAgIC8vIEEgbmV3IHdpbmRvdyBjYW4gbmV2ZXIgYmUgYSBm cmFnbWVudCBzY3JvbGwuCiAgICAgUG9saWN5QWN0aW9uIGRlY2lzaW9uID0gZGVjaWRlUG9saWN5 Rm9yRXh0ZXJuYWxMb2FkKHJlcXVlc3QsIGZhbHNlKTsK