133129 2014-05-20 12:54:18 -0700 [Mac] Allow popup menus to override default appearance 2014-05-20 14:08:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dino dino oldest_to_newest 1010593 0 dino 2014-05-20 12:54:18 -0700 [Mac] Allow popup menus to override default appearance 1010594 1 dino 2014-05-20 12:54:50 -0700 <rdar://problem/16881605> 1010596 2 231786 dino 2014-05-20 13:05:52 -0700 Created attachment 231786 Patch 1010597 3 dino 2014-05-20 13:06:18 -0700 This patch will not compile until WKSI is updated. 1010602 4 231786 thorton 2014-05-20 13:09:51 -0700 Comment on attachment 231786 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231786&action=review > Source/WebCore/platform/PopupMenuStyle.h:46 > - PopupMenuStyle(const Color& foreground, const Color& background, const Font& font, bool visible, bool isDisplayNone, Length textIndent, TextDirection textDirection, bool hasTextDirectionOverride, BackgroundColorType backgroundColorType = DefaultBackgroundColor, PopupMenuType menuType = SelectPopup, PopupMenuSize menuSize = PopupMenuSizeNormal) > + PopupMenuStyle(const Color& foreground, const Color& background, const Font& font, bool visible, bool isDisplayNone, bool hasDefaultAppearance, Length textIndent, TextDirection textDirection, bool hasTextDirectionOverride, BackgroundColorType backgroundColorType = DefaultBackgroundColor, PopupMenuType menuType = SelectPopup, PopupMenuSize menuSize = PopupMenuSizeNormal) yikes. this could really use some cleaning up. 1010632 5 dino 2014-05-20 14:08:06 -0700 Committed r169134: <http://trac.webkit.org/changeset/169134> 231786 2014-05-20 13:05:52 -0700 2014-05-20 13:09:50 -0700 Patch bug-133129-20140521060529.patch text/plain 14507 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4OTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODJiNTJjMDZiNGJhOTI3 NjBkZjU3MzExZTVkZGMzODMxY2QzMjA1Zi4uZjFhODk5NDc2NTIwYWZkNDVmODliNDE4MjhiZDJh NGQ0OGEwMDZiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE0LTA1LTIwICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBBbGxvdyBwb3B1cCBt ZW51cyB0byBvdmVycmlkZSBkZWZhdWx0IGFwcGVhcmFuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzEyOQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYktpdFN5c3RlbUludGVyZmFjZSdzIFdLUG9w dXBNZW51IGhhcyBhIGZsYWcgdG8gaGlkZQorICAgICAgICB0aGUgYXJyb3dzIGF0IHRoZSBlbmQg b2YgYSBwb3B1cC1tZW51IChlLmcuIDxzZWxlY3Q+KS4KKyAgICAgICAgRXhwb3NlIHRoYXQgdmlh IGFkZGluZyBhIGhhc0RlZmF1bHRBcHBlYXJhbmNlIGZsYWcgdG8KKyAgICAgICAgUG9wdXBNZW51 U3R5bGUsIHdoaWNoIHRoZW4gcGFzc2VzIGl0IG9uIHRvIFdLU0kuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9Qb3B1cE1lbnVTdHlsZS5oOgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBNZW51U3R5bGU6 OlBvcHVwTWVudVN0eWxlKTogTmV3IGZsYWcgaW4gY29uc3RydWN0b3IuCisgICAgICAgIChXZWJD b3JlOjpQb3B1cE1lbnVTdHlsZTo6aGFzRGVmYXVsdEFwcGVhcmFuY2UpOiBOZXcgZmxhZy4KKyAg ICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5oOiB3a1BvcHVwTWVu dSBzaWduYXR1cmUgaGFzIGNoYW5nZWQgdG8gYWNjZXB0CisgICAgICAgIHRoZSBuZXcgZmxhZy4K KyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5tbTogRGl0dG8u CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcDoKKyAgICAgICAgKFJlbmRl ck1lbnVMaXN0OjppdGVtU3R5bGUpOiBQYXNzIGluIHRydWUgYXMgZGVmYXVsdCBhcHBlYXJhbmNl IHdoZW4gY3JlYXRpbmcKKyAgICAgICAgdGhlIFBvcHVwTWVudVN0eWxlLiBXZSBkb24ndCBuZWVk IGl0LgorICAgICAgICAoUmVuZGVyTWVudUxpc3Q6Om1lbnVTdHlsZSk6IEluIHRoaXMgY2FzZSB3 ZSBwYXNzIGluIHRoZSBuZWdhdGVkIHZhbHVlIG9mCisgICAgICAgIHN0eWxlKCkuaGFzQXBwZWFy YW5jZSgpLCB3aGljaCBpbmRpY2F0ZXMgaWYgd2UgYXJlIG92ZXJyaWRpbmcgdGhlIGJ1aWx0LWlu IGRyYXdpbmcuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclNlYXJjaEZpZWxkLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclNlYXJjaEZpZWxkOjptZW51U3R5bGUpOiBVc2UgdHJ1ZSBh cyB0aGUgZGVmYXVsdCB2YWx1ZS4KKwogMjAxNC0wNS0xNCAgRGVhbiBKYWNrc29uICA8ZGlub0Bh cHBsZS5jb20+CiAKICAgICAgICAgW01hY10gU2VhcmNoIGZpZWxkcyBzaG91bGQgbm90IHVzZSBj ZW50ZXJlZCBsb29rCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggODJjMzhlNjU4MzQ4ZWExYjk4ZmZjMDc2 ZDBhOWI2YTI0YmUwMDkyNS4uNzIwMTNiYjU5YzRlZmEwZTcwOWNlM2ZmYjIzYmFiNTk4MTNiZGEw MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA1LTIwICBEZWFuIEph Y2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBBbGxvdyBwb3B1cCBtZW51 cyB0byBvdmVycmlkZSBkZWZhdWx0IGFwcGVhcmFuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzEyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxhY2UgdGhlIGNhbGwgdG8gd2tQb3B1cE1lbnVX aXRoU2l6ZSB3aXRoIHdrUG9wdXBNZW51LCBub3cKKyAgICAgICAgd2l0aCBleHRyYSBwYXJhbWV0 ZXJzIHRvIGluZGljYXRlIHRoZSBjb250cm9sIHNpemUgYW5kIHdoZXRoZXIKKyAgICAgICAgb3Ig bm90IHRvIGRyYXcgdGhlIGFycm93cyBhdCB0aGUgZW5kLgorCisgICAgICAgICogV2ViQ29yZVN1 cHBvcnQvUG9wdXBNZW51TWFjLm1tOgorICAgICAgICAoUG9wdXBNZW51TWFjOjpzaG93KToKKwog MjAxNC0wNS0xNiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZW1vdmUgInJlZ2lvbi1iYXNlZCBjb2x1bW5zIiBwcmVmcwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDYx NjFjMjM5NGM0NDFjNjQ2YTVhNGU0MTgyMDRiMGUxODFjYTg0NTkuLjQyY2Q0YmE2NmE4MWUyMWY1 OWFjMmM4ZjVjNzliMTQ0OGU0ZTdmNmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAx NC0wNS0yMCAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10g QWxsb3cgcG9wdXAgbWVudXMgdG8gb3ZlcnJpZGUgZGVmYXVsdCBhcHBlYXJhbmNlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMxMjkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYW4gZXh0cmEgImhp ZGVBcnJvd3MiIGZsYWcgdG8gUGxhdGZvcm1Qb3B1cE1lbnVEYXRhCisgICAgICAgIGFuZCByZXBs YWNlIHRoZSBjYWxsIHRvIFdLUG9wdXBNZW51V2l0aFNpemUgd2l0aCBXS1BvcHVwTWVudS4KKwor ICAgICAgICAqIFNoYXJlZC9QbGF0Zm9ybVBvcHVwTWVudURhdGEuY3BwOiBFbmNvZGUgYW5kIGRl Y29kZSB0aGUgbmV3IGRhdGEgdmFsdWUuCisgICAgICAgIChXZWJLaXQ6OlBsYXRmb3JtUG9wdXBN ZW51RGF0YTo6ZW5jb2RlKToKKyAgICAgICAgKFdlYktpdDo6UGxhdGZvcm1Qb3B1cE1lbnVEYXRh OjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9QbGF0Zm9ybVBvcHVwTWVudURhdGEuaDogQWRk IGhpZGVBcnJvd3MgYm9vbGVhbi4KKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBvcHVwTWVu dVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQb3B1cE1lbnVQcm94eU1hYzo6c2hv d1BvcHVwTWVudSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2Vi UG9wdXBNZW51TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQb3B1cE1lbnU6OnNldFVwUGxh dGZvcm1EYXRhKTogVGhlIGhpZGVBcnJvd3MgZmxhZyBpcworICAgICAgICB0cnVlIGlmIHdlIGRv bid0IGhhdmUgdGhlIGRlZmF1bHQgYXBwZWFyYW5jZS4KKwogMjAxNC0wNS0xNiAgT2xpdmVyIEh1 bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFNlcGFyYXRlIGVuYWJsaW5nIHNhbmRi b3ggZXh0ZW5zaW9ucyBmcm9tIHRoZSBXRUJfUFJPQ0VTU19TQU5EQk9YIGZsYWcKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1BvcHVwTWVudVN0eWxlLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Qb3B1cE1lbnVTdHlsZS5oCmluZGV4IGM3YWFhYzUyYmJmOTg1MzFlNGYz NmQxYzhmYmIwMzk4N2IxOTY2MTYuLjk0YjhhNzIyNmYyZDExOTIzOTYwMGI2N2MzNDAxZTQ2OWZh MjkyZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1BvcHVwTWVudVN0eWxl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUG9wdXBNZW51U3R5bGUuaApAQCAtNDMs MTIgKzQzLDEzIEBAIHB1YmxpYzoKICAgICAgICAgUG9wdXBNZW51U2l6ZU1pbmkKICAgICB9Owog Ci0gICAgUG9wdXBNZW51U3R5bGUoY29uc3QgQ29sb3ImIGZvcmVncm91bmQsIGNvbnN0IENvbG9y JiBiYWNrZ3JvdW5kLCBjb25zdCBGb250JiBmb250LCBib29sIHZpc2libGUsIGJvb2wgaXNEaXNw bGF5Tm9uZSwgTGVuZ3RoIHRleHRJbmRlbnQsIFRleHREaXJlY3Rpb24gdGV4dERpcmVjdGlvbiwg Ym9vbCBoYXNUZXh0RGlyZWN0aW9uT3ZlcnJpZGUsIEJhY2tncm91bmRDb2xvclR5cGUgYmFja2dy b3VuZENvbG9yVHlwZSA9IERlZmF1bHRCYWNrZ3JvdW5kQ29sb3IsIFBvcHVwTWVudVR5cGUgbWVu dVR5cGUgPSBTZWxlY3RQb3B1cCwgUG9wdXBNZW51U2l6ZSBtZW51U2l6ZSA9IFBvcHVwTWVudVNp emVOb3JtYWwpCisgICAgUG9wdXBNZW51U3R5bGUoY29uc3QgQ29sb3ImIGZvcmVncm91bmQsIGNv bnN0IENvbG9yJiBiYWNrZ3JvdW5kLCBjb25zdCBGb250JiBmb250LCBib29sIHZpc2libGUsIGJv b2wgaXNEaXNwbGF5Tm9uZSwgYm9vbCBoYXNEZWZhdWx0QXBwZWFyYW5jZSwgTGVuZ3RoIHRleHRJ bmRlbnQsIFRleHREaXJlY3Rpb24gdGV4dERpcmVjdGlvbiwgYm9vbCBoYXNUZXh0RGlyZWN0aW9u T3ZlcnJpZGUsIEJhY2tncm91bmRDb2xvclR5cGUgYmFja2dyb3VuZENvbG9yVHlwZSA9IERlZmF1 bHRCYWNrZ3JvdW5kQ29sb3IsIFBvcHVwTWVudVR5cGUgbWVudVR5cGUgPSBTZWxlY3RQb3B1cCwg UG9wdXBNZW51U2l6ZSBtZW51U2l6ZSA9IFBvcHVwTWVudVNpemVOb3JtYWwpCiAgICAgICAgIDog bV9mb3JlZ3JvdW5kQ29sb3IoZm9yZWdyb3VuZCkKICAgICAgICAgLCBtX2JhY2tncm91bmRDb2xv cihiYWNrZ3JvdW5kKQogICAgICAgICAsIG1fZm9udChmb250KQogICAgICAgICAsIG1fdmlzaWJs ZSh2aXNpYmxlKQogICAgICAgICAsIG1faXNEaXNwbGF5Tm9uZShpc0Rpc3BsYXlOb25lKQorICAg ICAgICAsIG1faGFzRGVmYXVsdEFwcGVhcmFuY2UoaGFzRGVmYXVsdEFwcGVhcmFuY2UpCiAgICAg ICAgICwgbV90ZXh0SW5kZW50KHRleHRJbmRlbnQpCiAgICAgICAgICwgbV90ZXh0RGlyZWN0aW9u KHRleHREaXJlY3Rpb24pCiAgICAgICAgICwgbV9oYXNUZXh0RGlyZWN0aW9uT3ZlcnJpZGUoaGFz VGV4dERpcmVjdGlvbk92ZXJyaWRlKQpAQCAtNjMsNiArNjQsNyBAQCBwdWJsaWM6CiAgICAgY29u c3QgRm9udCYgZm9udCgpIGNvbnN0IHsgcmV0dXJuIG1fZm9udDsgfQogICAgIGJvb2wgaXNWaXNp YmxlKCkgY29uc3QgeyByZXR1cm4gbV92aXNpYmxlOyB9CiAgICAgYm9vbCBpc0Rpc3BsYXlOb25l KCkgY29uc3QgeyByZXR1cm4gbV9pc0Rpc3BsYXlOb25lOyB9CisgICAgYm9vbCBoYXNEZWZhdWx0 QXBwZWFyYW5jZSgpIGNvbnN0IHsgcmV0dXJuIG1faGFzRGVmYXVsdEFwcGVhcmFuY2U7IH0KICAg ICBMZW5ndGggdGV4dEluZGVudCgpIGNvbnN0IHsgcmV0dXJuIG1fdGV4dEluZGVudDsgfQogICAg IFRleHREaXJlY3Rpb24gdGV4dERpcmVjdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fdGV4dERpcmVj dGlvbjsgfQogICAgIGJvb2wgaGFzVGV4dERpcmVjdGlvbk92ZXJyaWRlKCkgY29uc3QgeyByZXR1 cm4gbV9oYXNUZXh0RGlyZWN0aW9uT3ZlcnJpZGU7IH0KQEAgLTc2LDYgKzc4LDcgQEAgcHJpdmF0 ZToKICAgICBGb250IG1fZm9udDsKICAgICBib29sIG1fdmlzaWJsZTsKICAgICBib29sIG1faXNE aXNwbGF5Tm9uZTsKKyAgICBib29sIG1faGFzRGVmYXVsdEFwcGVhcmFuY2U7CiAgICAgTGVuZ3Ro IG1fdGV4dEluZGVudDsKICAgICBUZXh0RGlyZWN0aW9uIG1fdGV4dERpcmVjdGlvbjsKICAgICBi b29sIG1faGFzVGV4dERpcmVjdGlvbk92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmgKaW5kZXggNDhiMWYyNWRiYzNh MzRmNjVjZjVmMzFhZDJlZTkzNzAzODZjNzdjZC4uMmMxM2QxYjRmOWFmZGQ0MDRiYWJjMjE2MTdl YTYxOGJjYjM5OWQ1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dl YkNvcmVTeXN0ZW1JbnRlcmZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv V2ViQ29yZVN5c3RlbUludGVyZmFjZS5oCkBAIC0yMDIsOCArMjAyLDggQEAgZXh0ZXJuIE5TQ29u dHJvbCAqKCp3a0NyZWF0ZU1lZGlhVUlDb250cm9sKShpbnQpOwogZXh0ZXJuIHZvaWQgKCp3a1dp bmRvd1NldEFscGhhKShOU1dpbmRvdyAqLCBmbG9hdCk7CiBleHRlcm4gdm9pZCAoKndrV2luZG93 U2V0U2NhbGVkRnJhbWUpKE5TV2luZG93ICosIE5TUmVjdCwgTlNSZWN0KTsKIAotZXh0ZXJuIHZv aWQgKCp3a1BvcHVwTWVudSkoTlNNZW51KiwgTlNQb2ludCBsb2NhdGlvbiwgZmxvYXQgd2lkdGgs IE5TVmlldyosIGludCBzZWxlY3RlZEl0ZW0sIE5TRm9udCopOwogI2lmIGRlZmluZWQoX19PQkpD X18pCitleHRlcm4gdm9pZCAoKndrUG9wdXBNZW51KShOU01lbnUqLCBOU1BvaW50IGxvY2F0aW9u LCBmbG9hdCB3aWR0aCwgTlNWaWV3KiwgaW50IHNlbGVjdGVkSXRlbSwgTlNGb250KiwgTlNDb250 cm9sU2l6ZSBjb250cm9sU2l6ZSwgYm9vbCBoaWRlQXJyb3dzKTsKIGV4dGVybiB2b2lkICgqd2tQ b3B1cE1lbnVXaXRoU2l6ZSkoTlNNZW51KiwgTlNQb2ludCBsb2NhdGlvbiwgZmxvYXQgd2lkdGgs IE5TVmlldyosIGludCBzZWxlY3RlZEl0ZW0sIE5TRm9udCosIE5TQ29udHJvbFNpemUgY29udHJv bFNpemUpOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h Yy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj L1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UubW0KaW5kZXggYTg0MTcwMzUwODlmYjA3ODMxNDMzYjJk Mzk5NDRjYmVhNmEyODZhYi4uOTc0NjZmMWRhMTEwODVmY2RkYmY4ZDgyMWQxODM1NjNkNDZlMGZm NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1J bnRlcmZhY2UubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0 ZW1JbnRlcmZhY2UubW0KQEAgLTY4LDcgKzY4LDcgQEAgTlNEYXRlICooKndrR2V0TlNVUkxSZXNw b25zZUxhc3RNb2RpZmllZERhdGUpKE5TVVJMUmVzcG9uc2UgKnJlc3BvbnNlKTsKIEJPT0wgKCp3 a0dldE5TVVJMUmVzcG9uc2VNdXN0UmV2YWxpZGF0ZSkoTlNVUkxSZXNwb25zZSAqcmVzcG9uc2Up Owogdm9pZCAoKndrR2V0V2hlZWxFdmVudERlbHRhcykoTlNFdmVudCosIGZsb2F0KiBkZWx0YVgs IGZsb2F0KiBkZWx0YVksIEJPT0wqIGNvbnRpbnVvdXMpOwogVUludDggKCp3a0dldE5TRXZlbnRL ZXlDaGFyKShOU0V2ZW50ICopOwotdm9pZCAoKndrUG9wdXBNZW51KShOU01lbnUqLCBOU1BvaW50 IGxvY2F0aW9uLCBmbG9hdCB3aWR0aCwgTlNWaWV3KiwgaW50IHNlbGVjdGVkSXRlbSwgTlNGb250 Kik7Cit2b2lkICgqd2tQb3B1cE1lbnUpKE5TTWVudSosIE5TUG9pbnQgbG9jYXRpb24sIGZsb2F0 IHdpZHRoLCBOU1ZpZXcqLCBpbnQgc2VsZWN0ZWRJdGVtLCBOU0ZvbnQqLCBOU0NvbnRyb2xTaXpl IGNvbnRyb2xTaXplLCBib29sIGhpZGVBcnJvd3MpOwogdm9pZCAoKndrUG9wdXBNZW51V2l0aFNp emUpKE5TTWVudSosIE5TUG9pbnQgbG9jYXRpb24sIGZsb2F0IHdpZHRoLCBOU1ZpZXcqLCBpbnQg c2VsZWN0ZWRJdGVtLCBOU0ZvbnQqLCBOU0NvbnRyb2xTaXplIGNvbnRyb2xTaXplKTsKIHVuc2ln bmVkICgqd2tRVEluY2x1ZGVPbmx5TW9kZXJuTWVkaWFGaWxlVHlwZXMpKHZvaWQpOwogaW50ICgq d2tRVE1vdmllRGF0YVJhdGUpKFFUTW92aWUqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTWVudUxpc3QuY3BwCmluZGV4IDllZjcxMTNjMzZhYjg4YmVmYWU5NTNhNWI4ZjA2OWM5 YTk0N2ZkMzkuLjg2M2YxY2YyYmZjNjhlMTA0YWFmZTRhMWFhOWMwODczZTJiMTM2MWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcApAQCAtNTIyLDcgKzUy Miw3IEBAIFBvcHVwTWVudVN0eWxlIFJlbmRlck1lbnVMaXN0OjppdGVtU3R5bGUodW5zaWduZWQg bGlzdEluZGV4KSBjb25zdAogCiAgICAgUmVuZGVyU3R5bGUqIHN0eWxlID0gZWxlbWVudC0+cmVu ZGVyU3R5bGUoKSA/IGVsZW1lbnQtPnJlbmRlclN0eWxlKCkgOiBlbGVtZW50LT5jb21wdXRlZFN0 eWxlKCk7CiAgICAgcmV0dXJuIHN0eWxlID8gUG9wdXBNZW51U3R5bGUoc3R5bGUtPnZpc2l0ZWRE ZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKSwgaXRlbUJhY2tncm91bmRDb2xvciwgc3R5 bGUtPmZvbnQoKSwgc3R5bGUtPnZpc2liaWxpdHkoKSA9PSBWSVNJQkxFLAotICAgICAgICBzdHls ZS0+ZGlzcGxheSgpID09IE5PTkUsIHN0eWxlLT50ZXh0SW5kZW50KCksIHN0eWxlLT5kaXJlY3Rp b24oKSwgaXNPdmVycmlkZShzdHlsZS0+dW5pY29kZUJpZGkoKSksCisgICAgICAgIHN0eWxlLT5k aXNwbGF5KCkgPT0gTk9ORSwgdHJ1ZSwgc3R5bGUtPnRleHRJbmRlbnQoKSwgc3R5bGUtPmRpcmVj dGlvbigpLCBpc092ZXJyaWRlKHN0eWxlLT51bmljb2RlQmlkaSgpKSwKICAgICAgICAgaXRlbUhh c0N1c3RvbUJhY2tncm91bmRDb2xvciA/IFBvcHVwTWVudVN0eWxlOjpDdXN0b21CYWNrZ3JvdW5k Q29sb3IgOiBQb3B1cE1lbnVTdHlsZTo6RGVmYXVsdEJhY2tncm91bmRDb2xvcikgOiBtZW51U3R5 bGUoKTsKIH0KIApAQCAtNTYyLDcgKzU2Miw3IEBAIFBvcHVwTWVudVN0eWxlIFJlbmRlck1lbnVM aXN0OjptZW51U3R5bGUoKSBjb25zdAogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZVRvVXNl ID0gbV9pbm5lckJsb2NrID8gbV9pbm5lckJsb2NrLT5zdHlsZSgpIDogc3R5bGUoKTsKICAgICBJ bnRSZWN0IGFic0JvdW5kcyA9IGFic29sdXRlQm91bmRpbmdCb3hSZWN0SWdub3JpbmdUcmFuc2Zv cm1zKCk7CiAgICAgcmV0dXJuIFBvcHVwTWVudVN0eWxlKHN0eWxlVG9Vc2UudmlzaXRlZERlcGVu ZGVudENvbG9yKENTU1Byb3BlcnR5Q29sb3IpLCBzdHlsZVRvVXNlLnZpc2l0ZWREZXBlbmRlbnRD b2xvcihDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xvciksCi0gICAgICAgIHN0eWxlVG9Vc2UuZm9u dCgpLCBzdHlsZVRvVXNlLnZpc2liaWxpdHkoKSA9PSBWSVNJQkxFLCBzdHlsZVRvVXNlLmRpc3Bs YXkoKSA9PSBOT05FLCBzdHlsZVRvVXNlLnRleHRJbmRlbnQoKSwKKyAgICAgICAgc3R5bGVUb1Vz ZS5mb250KCksIHN0eWxlVG9Vc2UudmlzaWJpbGl0eSgpID09IFZJU0lCTEUsIHN0eWxlVG9Vc2Uu ZGlzcGxheSgpID09IE5PTkUsIHN0eWxlKCkuaGFzQXBwZWFyYW5jZSgpLCBzdHlsZVRvVXNlLnRl eHRJbmRlbnQoKSwKICAgICAgICAgc3R5bGUoKS5kaXJlY3Rpb24oKSwgaXNPdmVycmlkZShzdHls ZSgpLnVuaWNvZGVCaWRpKCkpLCBQb3B1cE1lbnVTdHlsZTo6RGVmYXVsdEJhY2tncm91bmRDb2xv ciwKICAgICAgICAgUG9wdXBNZW51U3R5bGU6OlNlbGVjdFBvcHVwLCB0aGVtZSgpLnBvcHVwTWVu dVNpemUoJnN0eWxlVG9Vc2UsIGFic0JvdW5kcykpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclNlYXJjaEZpZWxkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJTZWFyY2hGaWVsZC5jcHAKaW5kZXggNDU0MWI4YmQ2ZGJkYWZlNTE0Nzli MDZiNWZkYzQ2MmExMjAyYTJjMS4uMjNhYzVhMGYwOTg3MTM4OTVlMzljNDdhZDBiNDIwNTg0NjVj OGJiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNlYXJjaEZp ZWxkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2VhcmNoRmllbGQu Y3BwCkBAIC0yNjEsNyArMjYxLDcgQEAgUG9wdXBNZW51U3R5bGUgUmVuZGVyU2VhcmNoRmllbGQ6 Oml0ZW1TdHlsZSh1bnNpZ25lZCkgY29uc3QKIFBvcHVwTWVudVN0eWxlIFJlbmRlclNlYXJjaEZp ZWxkOjptZW51U3R5bGUoKSBjb25zdAogewogICAgIHJldHVybiBQb3B1cE1lbnVTdHlsZShzdHls ZSgpLnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKSwgc3R5bGUoKS52aXNp dGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpLCBzdHlsZSgpLmZv bnQoKSwgc3R5bGUoKS52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSwKLSAgICAgICAgc3R5bGUoKS5k aXNwbGF5KCkgPT0gTk9ORSwgc3R5bGUoKS50ZXh0SW5kZW50KCksIHN0eWxlKCkuZGlyZWN0aW9u KCksIGlzT3ZlcnJpZGUoc3R5bGUoKS51bmljb2RlQmlkaSgpKSwgUG9wdXBNZW51U3R5bGU6OkN1 c3RvbUJhY2tncm91bmRDb2xvcik7CisgICAgICAgIHN0eWxlKCkuZGlzcGxheSgpID09IE5PTkUs IHRydWUsIHN0eWxlKCkudGV4dEluZGVudCgpLCBzdHlsZSgpLmRpcmVjdGlvbigpLCBpc092ZXJy aWRlKHN0eWxlKCkudW5pY29kZUJpZGkoKSksIFBvcHVwTWVudVN0eWxlOjpDdXN0b21CYWNrZ3Jv dW5kQ29sb3IpOwogfQogCiBpbnQgUmVuZGVyU2VhcmNoRmllbGQ6OmNsaWVudEluc2V0TGVmdCgp IGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9Qb3B1 cE1lbnVNYWMubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9Qb3B1cE1lbnVN YWMubW0KaW5kZXggNTI5MDI5M2MzMjUzZGRlODU3ZTkxNmUyZWFhNjY2YzczMWRjNzRiZC4uOTIz ODgxMGU5ZDI4NWNlNDhmMWYzNjFkZjk5ZjdhYTI4ZDM4ZWM5ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvUG9wdXBNZW51TWFjLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1BvcHVwTWVudU1hYy5tbQpAQCAtMjA0LDcgKzIwNCw3 IEBAIHZvaWQgUG9wdXBNZW51TWFjOjpzaG93KGNvbnN0IEludFJlY3QmIHIsIEZyYW1lVmlldyog diwgaW50IGluZGV4KQogICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICB3a1BvcHVwTWVudVdp dGhTaXplKG1lbnUsIGxvY2F0aW9uLCByb3VuZGYoTlNXaWR0aChyKSksIGR1bW15Vmlldy5nZXQo KSwgaW5kZXgsIGZvbnQsIGNvbnRyb2xTaXplKTsKKyAgICB3a1BvcHVwTWVudShtZW51LCBsb2Nh dGlvbiwgcm91bmRmKE5TV2lkdGgocikpLCBkdW1teVZpZXcuZ2V0KCksIGluZGV4LCBmb250LCBj b250cm9sU2l6ZSwgIW1fY2xpZW50LT5tZW51U3R5bGUoKS5oYXNEZWZhdWx0QXBwZWFyYW5jZSgp KTsKIAogICAgIFttX3BvcHVwIGRpc21pc3NQb3BVcF07CiAgICAgW2R1bW15VmlldyByZW1vdmVG cm9tU3VwZXJ2aWV3XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbGF0Zm9y bVBvcHVwTWVudURhdGEuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsYXRmb3JtUG9wdXBN ZW51RGF0YS5jcHAKaW5kZXggNWVlYmZlMTNkYWJkY2U4ZTY1MjcyNzk0MjNmNGNhOTgxMTBkNGNj OC4uM2FkMDZhMzAwZmQ4MjhmZDcxMWYzMGI2M2IwYTVmNTA2ODBmYmMyZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvU2hhcmVkL1BsYXRmb3JtUG9wdXBNZW51RGF0YS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvU2hhcmVkL1BsYXRmb3JtUG9wdXBNZW51RGF0YS5jcHAKQEAgLTM5LDYgKzM5 LDcgQEAgdm9pZCBQbGF0Zm9ybVBvcHVwTWVudURhdGE6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5j b2RlciYgZW5jb2RlcikgY29uc3QKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBlbmNvZGVyIDw8 IGZvbnRJbmZvOwogICAgIGVuY29kZXIgPDwgc2hvdWxkUG9wT3ZlcjsKKyAgICBlbmNvZGVyIDw8 IGhpZGVBcnJvd3M7CiAgICAgZW5jb2Rlci5lbmNvZGVFbnVtKG1lbnVTaXplKTsKICNlbHNlCiAg ICAgVU5VU0VEX1BBUkFNKGVuY29kZXIpOwpAQCAtNTIsNiArNTMsOCBAQCBib29sIFBsYXRmb3Jt UG9wdXBNZW51RGF0YTo6ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBQbGF0 Zm9ybVBvcHVwTQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29k ZShkYXRhLnNob3VsZFBvcE92ZXIpKQogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShkYXRhLmhpZGVBcnJvd3MpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgaWYgKCFkZWNvZGVyLmRlY29kZUVudW0oZGF0YS5tZW51U2l6ZSkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKICNlbHNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGxhdGZv cm1Qb3B1cE1lbnVEYXRhLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGxhdGZvcm1Qb3B1cE1l bnVEYXRhLmgKaW5kZXggNDAwZWRjZDI2YmZlZTkxN2U2YzBhMjc1ZDFkYjcyMDNlZWJjNzA4OS4u MzFhOWQxYmExN2MwYzRiZmQ1OTQyYmQ5OTNiZThiMWI5OTQ2OTg2NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvU2hhcmVkL1BsYXRmb3JtUG9wdXBNZW51RGF0YS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9QbGF0Zm9ybVBvcHVwTWVudURhdGEuaApAQCAtNDcsNiArNDcsNyBAQCBz dHJ1Y3QgUGxhdGZvcm1Qb3B1cE1lbnVEYXRhIHsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBG b250SW5mbyBmb250SW5mbzsKICAgICBib29sIHNob3VsZFBvcE92ZXI7CisgICAgYm9vbCBoaWRl QXJyb3dzOwogICAgIFdlYkNvcmU6OlBvcHVwTWVudVN0eWxlOjpQb3B1cE1lbnVTaXplIG1lbnVT aXplOwogI2VuZGlmCiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9XZWJQb3B1cE1lbnVQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMv V2ViUG9wdXBNZW51UHJveHlNYWMubW0KaW5kZXggY2I0NWQ1YmM2ZTIxNjdkMGFlZWZmMmIwYmU1 MDJhOWE3NjgzYTRlNi4uNjM3ZmZmMzA1NDRiYzQ2ODJmZTkwYmQ2NjQ0Yzg5MmY5NWIxZGY4ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQb3B1cE1lbnVQcm94 eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBvcHVwTWVudVBy b3h5TWFjLm1tCkBAIC0xNDcsNyArMTQ3LDcgQEAgdm9pZCBXZWJQb3B1cE1lbnVQcm94eU1hYzo6 c2hvd1BvcHVwTWVudShjb25zdCBJbnRSZWN0JiByZWN0LCBUZXh0RGlyZWN0aW9uIHRleHQKICAg ICAgICAgYnJlYWs7CiAgICAgfQogCi0gICAgV0tQb3B1cE1lbnVXaXRoU2l6ZShtZW51LCBsb2Nh dGlvbiwgcm91bmRmKE5TV2lkdGgocmVjdCkpLCBkdW1teVZpZXcuZ2V0KCksIHNlbGVjdGVkSW5k ZXgsIGZvbnQsIGNvbnRyb2xTaXplKTsKKyAgICBXS1BvcHVwTWVudShtZW51LCBsb2NhdGlvbiwg cm91bmRmKE5TV2lkdGgocmVjdCkpLCBkdW1teVZpZXcuZ2V0KCksIHNlbGVjdGVkSW5kZXgsIGZv bnQsIGNvbnRyb2xTaXplLCBkYXRhLmhpZGVBcnJvd3MpOwogCiAgICAgW21fcG9wdXAgZGlzbWlz c1BvcFVwXTsKICAgICBbZHVtbXlWaWV3IHJlbW92ZUZyb21TdXBlcnZpZXddOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViUG9wdXBN ZW51TWFjLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMv V2ViUG9wdXBNZW51TWFjLm1tCmluZGV4IDgxNDFhYzI1ZGFjZWIzZjAwNGEzZmU4ZGUyM2NjYjYx MDY3YzE5Y2IuLmRmY2I1OGFmMGZmNzdlZWIzYTllOWZmODA1M2ZlMTE2N2JlZTliMmMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYlBv cHVwTWVudU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L21hYy9XZWJQb3B1cE1lbnVNYWMubW0KQEAgLTQ5LDYgKzQ5LDcgQEAgdm9pZCBXZWJQb3B1 cE1lbnU6OnNldFVwUGxhdGZvcm1EYXRhKGNvbnN0IEludFJlY3QmLCBQbGF0Zm9ybVBvcHVwTWVu dURhdGEmIGRhdGEKICAgICAKICAgICBkYXRhLmZvbnRJbmZvLmZvbnRBdHRyaWJ1dGVEaWN0aW9u YXJ5ID0gZm9udERlc2NyaXB0b3JBdHRyaWJ1dGVzOwogICAgIGRhdGEuc2hvdWxkUG9wT3ZlciA9 IG1fcG9wdXBDbGllbnQtPnNob3VsZFBvcE92ZXIoKTsKKyAgICBkYXRhLmhpZGVBcnJvd3MgPSAh bV9wb3B1cENsaWVudC0+bWVudVN0eWxlKCkuaGFzRGVmYXVsdEFwcGVhcmFuY2UoKTsKICAgICBk YXRhLm1lbnVTaXplID0gbV9wb3B1cENsaWVudC0+bWVudVN0eWxlKCkubWVudVNpemUoKTsKICNl bHNlCiAgICAgVU5VU0VEX1BBUkFNKGRhdGEpOwo=