31831 2009-11-24 06:57:19 -0800 [Android] The select elements do not reflect the actual choice the user makes. 2009-11-25 08:51:12 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 andreip webkit-unassigned android-webkit-unforking benm oldest_to_newest 166062 0 andreip 2009-11-24 06:57:19 -0800 <select multiple="multiple"> elements always show the first of the available choices instead of the first item that was actually selected by the user. 166442 1 43846 andreip 2009-11-25 07:47:07 -0800 Created attachment 43846 Handle the drawing of ListBoxes in Android code. Also fix exisiting style issues. 166453 2 43846 dglazkov 2009-11-25 08:01:50 -0800 Comment on attachment 43846 Handle the drawing of ListBoxes in Android code. Also fix exisiting style issues. Thanks for cleaning up the old code! r=me, except: > bool RenderThemeAndroid::paintTextArea(RenderObject* obj, const RenderObject::PaintInfo& info, const IntRect& rect) > { > - if (obj->isMenuList()) > - return paintCombo(obj, info, rect); > + if (obj->isListBox()) { > + paintCombo(obj, info, rect); Can this be just an early return? 166468 3 benm 2009-11-25 08:31:09 -0800 (In reply to comment #2) > (From update of attachment 43846 [details]) > Thanks for cleaning up the old code! > > r=me, except: > > > bool RenderThemeAndroid::paintTextArea(RenderObject* obj, const RenderObject::PaintInfo& info, const IntRect& rect) > > { > > - if (obj->isMenuList()) > > - return paintCombo(obj, info, rect); > > + if (obj->isListBox()) { > > + paintCombo(obj, info, rect); > > Can this be just an early return? I can make this change on landing. 166477 4 benm 2009-11-25 08:51:12 -0800 Landed as r51386. 43846 2009-11-25 07:47:07 -0800 2009-11-25 08:01:50 -0800 Handle the drawing of ListBoxes in Android code. Also fix exisiting style issues. 31831.patch text/plain 9350 andreip SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTM4MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMDktMTEtMjUgIEFuZHJlaSBQb3Blc2N1ICA8YW5kcmVpcEBnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoZSBzZWxlY3QgZWxlbWVudHMgZG8gbm90IHJlZmxlY3QgdGhlIGFjdHVhbCBjaG9pY2UgdGhl IHVzZXIgbWFrZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zMTgzMQorCisgICAgICAgIEhhbmRsZSB0aGUgZHJhd2luZyBvZiB0aGUgbGlzdGJveGVz IGluIEFuZHJvaWQgY29kZS4KKworICAgICAgICBObyBuZXcgZmVhdHVyZXMsIGp1c3QgZml4aW5n IGFuIEFuZHJvaWQgcHJvYmxlbS4gRXhpc3RpbmcgbGF5b3V0IHRlc3RzIGFyZSBzdWZmaWNpZW50 LgorCisgICAgICAgICogcGxhdGZvcm0vYW5kcm9pZC9SZW5kZXJUaGVtZUFuZHJvaWQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6dGhlbWUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVB bmRyb2lkOjpwbGF0Zm9ybUFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcik6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJUaGVtZUFuZHJvaWQ6OnBsYXRmb3JtQWN0aXZlTGlzdEJveFNlbGVj dGlvbkJhY2tncm91bmRDb2xvcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUFuZHJv aWQ6OnBsYXRmb3JtSW5hY3RpdmVMaXN0Qm94U2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQW5kcm9pZDo6cGxhdGZvcm1BY3RpdmVMaXN0Qm94 U2VsZWN0aW9uRm9yZWdyb3VuZENvbG9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l QW5kcm9pZDo6cGxhdGZvcm1JbmFjdGl2ZUxpc3RCb3hTZWxlY3Rpb25Gb3JlZ3JvdW5kQ29sb3Ip OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVBbmRyb2lkOjphZGp1c3RCdXR0b25TdHls ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUFuZHJvaWQ6OnBhaW50VGV4dEFyZWEp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVBbmRyb2lkOjphZGp1c3RMaXN0Ym94U3R5 bGUpOgorICAgICAgICAqIHBsYXRmb3JtL2FuZHJvaWQvUmVuZGVyVGhlbWVBbmRyb2lkLmg6CisK IDIwMDktMTEtMjUgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xs YWJvcmEuY28udWs+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWGFuIExvcGV6LgpJbmRleDogV2Vi Q29yZS9wbGF0Zm9ybS9hbmRyb2lkL1JlbmRlclRoZW1lQW5kcm9pZC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1JlbmRlclRoZW1lQW5kcm9pZC5jcHAJKHJldmlz aW9uIDUxMzgwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1JlbmRlclRoZW1lQW5kcm9p ZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IDIw MDYsIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKyAqIENvcHlyaWdodCAyMDA5LCBU aGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CiAgKgogICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKQEAgLTEzLDcgKzEzLDcgQEAKICAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkg VEhFIENPUFlSSUdIVCBIT0xERVJTIGBgQVMgSVMnJyBBTkQgQU5ZCiAgKiBFWFBSRVNTIE9SIElN UExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQogICog SU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQ QVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwg QVBQTEUgQ09NUFVURVIsIElOQy4gT1IKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBO TyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUIE9XTkVSIE9SCiAgKiBDT05UUklCVVRPUlMgQkUg TElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKICAq IEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1Qg TElNSVRFRCBUTywKICAqIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklD RVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgpAQCAtMjksNiArMjksMTAgQEAKICNpbmNsdWRlICJD b2xvci5oIgogI2luY2x1ZGUgIkVsZW1lbnQuaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQu aCIKKyNpbmNsdWRlICJIVE1MTmFtZXMuaCIKKyNpbmNsdWRlICJIVE1MT3B0aW9uRWxlbWVudC5o IgorI2luY2x1ZGUgIkhUTUxTZWxlY3RFbGVtZW50LmgiCisjaW5jbHVkZSAiTm9kZS5oIgogI2lu Y2x1ZGUgIlBsYXRmb3JtR3JhcGhpY3NDb250ZXh0LmgiCiAjaW5jbHVkZSAiUmVuZGVyU2tpbkFu ZHJvaWQuaCIKICNpbmNsdWRlICJSZW5kZXJTa2luQnV0dG9uLmgiCkBAIC00MSwxNiArNDUsMTYg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogLy8gQWRkIGEgY29uc3RhbnQgYW1vdW50IG9mIHBhZGRp bmcgdG8gdGhlIHRleHRzaXplIHRvIGdldCB0aGUgZmluYWwgaGVpZ2h0CiAvLyBvZiBidXR0b25z LCBzbyB0aGF0IG91ciBidXR0b24gaW1hZ2VzIGFyZSBsYXJnZSBlbm91Z2ggdG8gcHJvcGVybHkg Zml0CiAvLyB0aGUgdGV4dC4KLWNvbnN0IGludCBCVVRUT05fUEFERElORyA9IDE4OworY29uc3Qg aW50IGJ1dHRvblBhZGRpbmcgPSAxODsKIAogLy8gQWRkIHBhZGRpbmcgdG8gdGhlIGZvbnRTaXpl IG9mIExpc3RCb3hlcyB0byBnZXQgdGhlaXIgbWF4aW11bSBzaXplcy4KIC8vIExpc3Rib3hlcyBv ZnRlbiBoYXZlIGEgc3BlY2lmaWVkIHNpemUuICBTaW5jZSB3ZSBjaGFuZ2UgdGhlbSBpbnRvCiAv LyBkcm9wZG93bnMsIHdlIHdhbnQgYSBtdWNoIHNtYWxsZXIgaGVpZ2h0LCB3aGljaCBlbmNvbXBh c3NlcyB0aGUgdGV4dC4KLWNvbnN0IGludCBMSVNUQk9YX1BBRERJTkcgPSA1OworY29uc3QgaW50 IGxpc3Rib3hQYWRkaW5nID0gNTsKIAogLy8gVGhpcyBpcyB0aGUgY29sb3Igb2Ygc2VsZWN0aW9u IGluIGEgdGV4dGZpZWxkLiAgSXQgd2FzIG9idGFpbmVkIGJ5IGNoZWNraW5nCiAvLyB0aGUgY29s b3Igb2Ygc2VsZWN0aW9uIGluIFRleHRWaWV3cyBpbiB0aGUgc3lzdGVtLgotY29uc3QgUkdCQTMy IFNFTEVDVElPTl9DT0xPUiA9IG1ha2VSR0IoMjU1LCAxNDYsIDApOworY29uc3QgUkdCQTMyIHNl bGVjdGlvbkNvbG9yID0gbWFrZVJHQigyNTUsIDE0NiwgMCk7CiAKIHN0YXRpYyBTa0NhbnZhcyog Z2V0Q2FudmFzRnJvbUluZm8oY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8mIGluZm8pCiB7 CkBAIC01OSw3ICs2Myw3IEBAIHN0YXRpYyBTa0NhbnZhcyogZ2V0Q2FudmFzRnJvbUluZm8oY29u c3QKIAogUmVuZGVyVGhlbWUqIHRoZW1lKCkKIHsKLSAgICBzdGF0aWMgUmVuZGVyVGhlbWVBbmRy b2lkIGFuZHJvaWRUaGVtZTsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFJlbmRlclRoZW1lQW5k cm9pZCwgYW5kcm9pZFRoZW1lLCAoKSk7CiAgICAgcmV0dXJuICZhbmRyb2lkVGhlbWU7CiB9CiAK QEAgLTk3LDcgKzEwMSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVBbmRyb2lkOjpzdGF0ZUNoYW5nZWQo UmUKIAogQ29sb3IgUmVuZGVyVGhlbWVBbmRyb2lkOjpwbGF0Zm9ybUFjdGl2ZVNlbGVjdGlvbkJh Y2tncm91bmRDb2xvcigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIENvbG9yKFNFTEVDVElPTl9DT0xP Uik7CisgICAgcmV0dXJuIENvbG9yKHNlbGVjdGlvbkNvbG9yKTsKIH0KIAogQ29sb3IgUmVuZGVy VGhlbWVBbmRyb2lkOjpwbGF0Zm9ybUluYWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKCkg Y29uc3QKQEAgLTEyMCw2ICsxMjQsMjYgQEAgQ29sb3IgUmVuZGVyVGhlbWVBbmRyb2lkOjpwbGF0 Zm9ybVRleHRTZQogICAgIHJldHVybiBDb2xvcihDb2xvcjo6dHJhbnNwYXJlbnQpOwogfQogCitD b2xvciBSZW5kZXJUaGVtZUFuZHJvaWQ6OnBsYXRmb3JtQWN0aXZlTGlzdEJveFNlbGVjdGlvbkJh Y2tncm91bmRDb2xvcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIENvbG9yKENvbG9yOjp0cmFuc3Bh cmVudCk7Cit9CisKK0NvbG9yIFJlbmRlclRoZW1lQW5kcm9pZDo6cGxhdGZvcm1JbmFjdGl2ZUxp c3RCb3hTZWxlY3Rpb25CYWNrZ3JvdW5kQ29sb3IoKSBjb25zdAoreworICAgIHJldHVybiBDb2xv cihDb2xvcjo6dHJhbnNwYXJlbnQpOworfQorCitDb2xvciBSZW5kZXJUaGVtZUFuZHJvaWQ6OnBs YXRmb3JtQWN0aXZlTGlzdEJveFNlbGVjdGlvbkZvcmVncm91bmRDb2xvcigpIGNvbnN0Cit7Cisg ICAgcmV0dXJuIENvbG9yKENvbG9yOjp0cmFuc3BhcmVudCk7Cit9CisKK0NvbG9yIFJlbmRlclRo ZW1lQW5kcm9pZDo6cGxhdGZvcm1JbmFjdGl2ZUxpc3RCb3hTZWxlY3Rpb25Gb3JlZ3JvdW5kQ29s b3IoKSBjb25zdAoreworICAgIHJldHVybiBDb2xvcihDb2xvcjo6dHJhbnNwYXJlbnQpOworfQor CiBpbnQgUmVuZGVyVGhlbWVBbmRyb2lkOjpiYXNlbGluZVBvc2l0aW9uKGNvbnN0IFJlbmRlck9i amVjdCogb2JqKSBjb25zdAogewogICAgIC8vIEZyb20gdGhlIGRlc2NyaXB0aW9uIG9mIHRoaXMg ZnVuY3Rpb24gaW4gUmVuZGVyVGhlbWUuaDoKQEAgLTE3Nyw3ICsyMDEsNyBAQCB2b2lkIFJlbmRl clRoZW1lQW5kcm9pZDo6YWRqdXN0QnV0dG9uU3R5CiAgICAgY29uc3QgaW50IHBhZGRpbmcgPSA4 OwogICAgIHN0eWxlLT5zZXRQYWRkaW5nTGVmdChMZW5ndGgocGFkZGluZywgRml4ZWQpKTsKICAg ICBzdHlsZS0+c2V0UGFkZGluZ1JpZ2h0KExlbmd0aChwYWRkaW5nLCBGaXhlZCkpOwotICAgIHN0 eWxlLT5zZXRNaW5IZWlnaHQoTGVuZ3RoKHN0eWxlLT5mb250U2l6ZSgpICsgQlVUVE9OX1BBRERJ TkcsIEZpeGVkKSk7CisgICAgc3R5bGUtPnNldE1pbkhlaWdodChMZW5ndGgoc3R5bGUtPmZvbnRT aXplKCkgKyBidXR0b25QYWRkaW5nLCBGaXhlZCkpOwogfQogCiBib29sIFJlbmRlclRoZW1lQW5k cm9pZDo6cGFpbnRDaGVja2JveChSZW5kZXJPYmplY3QqIG9iaiwgY29uc3QgUmVuZGVyT2JqZWN0 OjpQYWludEluZm8mIGluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCkBAIC0yMzYsOCArMjYwLDU0 IEBAIHZvaWQgUmVuZGVyVGhlbWVBbmRyb2lkOjphZGp1c3RUZXh0QXJlYVMKIAogYm9vbCBSZW5k ZXJUaGVtZUFuZHJvaWQ6OnBhaW50VGV4dEFyZWEoUmVuZGVyT2JqZWN0KiBvYmosIGNvbnN0IFJl bmRlck9iamVjdDo6UGFpbnRJbmZvJiBpbmZvLCBjb25zdCBJbnRSZWN0JiByZWN0KQogewotICAg IGlmIChvYmotPmlzTWVudUxpc3QoKSkKLSAgICAgICAgcmV0dXJuIHBhaW50Q29tYm8ob2JqLCBp bmZvLCByZWN0KTsKKyAgICBpZiAob2JqLT5pc0xpc3RCb3goKSkgeworICAgICAgICBwYWludENv bWJvKG9iaiwgaW5mbywgcmVjdCk7CisgICAgICAgIFJlbmRlclN0eWxlKiBzdHlsZSA9IG9iai0+ c3R5bGUoKTsKKyAgICAgICAgaWYgKHN0eWxlKQorICAgICAgICAgICAgc3R5bGUtPnNldENvbG9y KENvbG9yOjp0cmFuc3BhcmVudCk7CisgICAgICAgIE5vZGUqIG5vZGUgPSBvYmotPm5vZGUoKTsK KyAgICAgICAgaWYgKCFub2RlIHx8ICFub2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6c2VsZWN0 VGFnKSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworCisgICAgICAgIEhUTUxTZWxlY3RFbGVt ZW50KiBzZWxlY3QgPSBzdGF0aWNfY2FzdDxIVE1MU2VsZWN0RWxlbWVudCo+KG5vZGUpOworICAg ICAgICAvLyBUaGUgZmlyc3QgaXRlbSBtYXkgYmUgdmlzaWJsZS4gIE1ha2Ugc3VyZSBpdCBkb2Vz IG5vdCBkcmF3LgorICAgICAgICAvLyBJZiBpdCBoYXMgYSBzdHlsZSwgaXQgb3ZlcnJpZGVzIHRo ZSBSZW5kZXJMaXN0Qm94J3Mgc3R5bGUsIHNvIHdlCisgICAgICAgIC8vIG5lZWQgdG8gbWFrZSBz dXJlIGJvdGggYXJlIHNldCB0byB0cmFuc3BhcmVudC4KKyAgICAgICAgbm9kZSA9IHNlbGVjdC0+ aXRlbSgwKTsKKyAgICAgICAgaWYgKG5vZGUpIHsKKyAgICAgICAgICAgIFJlbmRlck9iamVjdCog cmVuZGVyZXIgPSBub2RlLT5yZW5kZXJlcigpOworICAgICAgICAgICAgaWYgKHJlbmRlcmVyKSB7 CisgICAgICAgICAgICAgICAgUmVuZGVyU3R5bGUqIHJlbmRlclN0eWxlID0gcmVuZGVyZXItPnN0 eWxlKCk7CisgICAgICAgICAgICAgICAgaWYgKHJlbmRlclN0eWxlKQorICAgICAgICAgICAgICAg ICAgICByZW5kZXJTdHlsZS0+c2V0Q29sb3IoQ29sb3I6OnRyYW5zcGFyZW50KTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgfQorICAgICAgICAvLyBGaW5kIHRoZSBmaXJzdCBzZWxlY3RlZCBvcHRp b24sIGFuZCBkcmF3IGl0cyB0ZXh0LgorICAgICAgICAvLyBGSVhNRTogSW4gYSBsYXRlciBjaGFu Z2UsIGlmIHRoZXJlIGlzIG1vcmUgdGhhbiBvbmUgaXRlbSBzZWxlY3RlZCwKKyAgICAgICAgLy8g ZHJhdyBhIHN0cmluZyB0aGF0IHNheXMgIlggaXRlbXMiIGxpa2UgaVBob25lIFNhZmFyaSBkb2Vz CisgICAgICAgIGludCBpbmRleCA9IHNlbGVjdC0+c2VsZWN0ZWRJbmRleCgpOworICAgICAgICBu b2RlID0gc2VsZWN0LT5pdGVtKGluZGV4KTsKKyAgICAgICAgaWYgKCFub2RlIHx8ICFub2RlLT5o YXNUYWdOYW1lKEhUTUxOYW1lczo6b3B0aW9uVGFnKSkKKyAgICAgICAgICAgIHJldHVybiB0cnVl OworCisgICAgICAgIEhUTUxPcHRpb25FbGVtZW50KiBvcHRpb24gPSBzdGF0aWNfY2FzdDxIVE1M T3B0aW9uRWxlbWVudCo+KG5vZGUpOworICAgICAgICBTdHJpbmcgbGFiZWwgPSBvcHRpb24tPnRl eHRJbmRlbnRlZFRvUmVzcGVjdEdyb3VwTGFiZWwoKTsKKyAgICAgICAgU2tSZWN0IHIocmVjdCk7 CisKKyAgICAgICAgU2tQYWludCBwYWludDsKKyAgICAgICAgcGFpbnQuc2V0QW50aUFsaWFzKHRy dWUpOworICAgICAgICBwYWludC5zZXRUZXh0RW5jb2RpbmcoU2tQYWludDo6a1VURjE2X1RleHRF bmNvZGluZyk7CisgICAgICAgIC8vIFZhbHVlcyBmb3IgdGV4dCBzaXplIGFuZCBwb3NpdGlvbmlu ZyBkZXRlcm1pbmVkIGJ5IHRyaWFsIGFuZCBlcnJvcgorICAgICAgICBwYWludC5zZXRUZXh0U2l6 ZShyLmhlaWdodCgpIC0gU2tJbnRUb1NjYWxhcig2KSk7CisKKyAgICAgICAgU2tDYW52YXMqIGNh bnZhcyA9IGdldENhbnZhc0Zyb21JbmZvKGluZm8pOworICAgICAgICBpbnQgc2F2ZUNvdW50ID0g Y2FudmFzLT5zYXZlKCk7CisgICAgICAgIHIuZlJpZ2h0IC09IFNrSW50VG9TY2FsYXIoUmVuZGVy U2tpbkNvbWJvOjpleHRyYVdpZHRoKCkpOworICAgICAgICBjYW52YXMtPmNsaXBSZWN0KHIpOwor ICAgICAgICBjYW52YXMtPmRyYXdUZXh0KGxhYmVsLmNoYXJhY3RlcnMoKSwgbGFiZWwubGVuZ3Ro KCkgPDwgMSwKKyAgICAgICAgICAgICAgICAgci5mTGVmdCArIFNrSW50VG9TY2FsYXIoNSksIHIu ZkJvdHRvbSAtIFNrSW50VG9TY2FsYXIoNSksIHBhaW50KTsKKyAgICAgICAgY2FudmFzLT5yZXN0 b3JlVG9Db3VudChzYXZlQ291bnQpOworICAgIH0KICAgICByZXR1cm4gdHJ1ZTsgICAgCiB9CiAK QEAgLTI1NCw3ICszMjQsOSBAQCBib29sIFJlbmRlclRoZW1lQW5kcm9pZDo6cGFpbnRTZWFyY2hG aWVsCiB2b2lkIFJlbmRlclRoZW1lQW5kcm9pZDo6YWRqdXN0TGlzdGJveFN0eWxlKENTU1N0eWxl U2VsZWN0b3IqLCBSZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQqKSBjb25zdAogewogICAgIHN0 eWxlLT5zZXRQYWRkaW5nUmlnaHQoTGVuZ3RoKFJlbmRlclNraW5Db21ibzo6ZXh0cmFXaWR0aCgp LCBGaXhlZCkpOwotICAgIHN0eWxlLT5zZXRNYXhIZWlnaHQoTGVuZ3RoKHN0eWxlLT5mb250U2l6 ZSgpICsgTElTVEJPWF9QQURESU5HLCBGaXhlZCkpOworICAgIHN0eWxlLT5zZXRNYXhIZWlnaHQo TGVuZ3RoKHN0eWxlLT5mb250U2l6ZSgpICsgbGlzdGJveFBhZGRpbmcsIEZpeGVkKSk7CisgICAg Ly8gTWFrZSB3ZWJraXQgZHJhdyBpbnZpc2libGUsIHNpbmNlIGl0IHdpbGwgc2ltcGx5IGRyYXcg dGhlIGZpcnN0IGVsZW1lbnQKKyAgICBzdHlsZS0+c2V0Q29sb3IoQ29sb3I6OnRyYW5zcGFyZW50 KTsKICAgICBhZGRJbnRyaW5zaWNNYXJnaW5zKHN0eWxlKTsKIH0KIApJbmRleDogV2ViQ29yZS9w bGF0Zm9ybS9hbmRyb2lkL1JlbmRlclRoZW1lQW5kcm9pZC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGxhdGZvcm0vYW5kcm9pZC9SZW5kZXJUaGVtZUFuZHJvaWQuaAkocmV2aXNpb24gNTEzODAp CisrKyBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvUmVuZGVyVGhlbWVBbmRyb2lkLmgJKHdvcmtp bmcgY29weSkKQEAgLTYzLDcgKzYzLDEyIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIENvbG9yIHBs YXRmb3JtQWN0aXZlU2VsZWN0aW9uRm9yZWdyb3VuZENvbG9yKCkgY29uc3Q7CiAgICAgdmlydHVh bCBDb2xvciBwbGF0Zm9ybUluYWN0aXZlU2VsZWN0aW9uRm9yZWdyb3VuZENvbG9yKCkgY29uc3Q7 CiAgICAgdmlydHVhbCBDb2xvciBwbGF0Zm9ybVRleHRTZWFyY2hIaWdobGlnaHRDb2xvcigpIGNv bnN0OwotICAgIAorCisgICAgdmlydHVhbCBDb2xvciBwbGF0Zm9ybUFjdGl2ZUxpc3RCb3hTZWxl Y3Rpb25CYWNrZ3JvdW5kQ29sb3IoKSBjb25zdDsKKyAgICB2aXJ0dWFsIENvbG9yIHBsYXRmb3Jt SW5hY3RpdmVMaXN0Qm94U2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKCkgY29uc3Q7CisgICAgdmly dHVhbCBDb2xvciBwbGF0Zm9ybUFjdGl2ZUxpc3RCb3hTZWxlY3Rpb25Gb3JlZ3JvdW5kQ29sb3Io KSBjb25zdDsKKyAgICB2aXJ0dWFsIENvbG9yIHBsYXRmb3JtSW5hY3RpdmVMaXN0Qm94U2VsZWN0 aW9uRm9yZWdyb3VuZENvbG9yKCkgY29uc3Q7CisKICAgICB2aXJ0dWFsIHZvaWQgc3lzdGVtRm9u dChpbnQsIFdlYkNvcmU6OkZvbnREZXNjcmlwdGlvbiYpIGNvbnN0IHt9CiAKICAgICB2aXJ0dWFs IGludCBtaW5pbXVtTWVudUxpc3RTaXplKFJlbmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsg fQo=