71250 2011-10-31 15:57:04 -0700 Factor code to resize the plug-in backing store out into a separate function 2011-10-31 16:07:23 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 493569 0 andersca 2011-10-31 15:57:04 -0700 Factor code to resize the plug-in backing store out into a separate function 493573 1 113099 andersca 2011-10-31 16:00:08 -0700 Created attachment 113099 Patch 493581 2 113099 aroben 2011-10-31 16:04:07 -0700 Comment on attachment 113099 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113099&action=review > Source/WebKit2/WebProcess/Plugins/PluginProxy.h:113 > + float contentsScaleFactor(); This should be a const member function. 493586 3 andersca 2011-10-31 16:07:23 -0700 Committed r98897: <http://trac.webkit.org/changeset/98897> 113099 2011-10-31 16:00:08 -0700 2011-10-31 16:04:07 -0700 Patch bug-71250-20111031155955.patch text/plain 9392 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogOTg4OTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA0NmIxZGYyNmQxZWNmNDQz Mjk0NWNmNWExYzg3YmZjYzM3NDRkMGM5Li5kOWY2OTBmNDZiZDExMTVmZjhmM2IzYjZkZGI4ODdi ZjJjMWM1YWRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTAtMzEgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBGYWN0b3IgY29kZSB0 byByZXNpemUgdGhlIHBsdWctaW4gYmFja2luZyBzdG9yZSBvdXQgaW50byBhIHNlcGFyYXRlIGZ1 bmN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 MTI1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBhIFBsdWdpblByb3h5Ojpjb250ZW50c1NjYWxlRmFjdG9yIGhlbHBlciBmdW5jdGlvbiB0byBn ZXQgcmlkIG9mIGEgYnVuY2ggb2YgUExBVEZPUk0oTUFDKSAjaWZkZWZzLAorICAgICAgICBhbmQg bW92ZSB0aGUgY29kZSB0byB1cGRhdGUgdGhlIGJhY2tpbmcgc3RvcmUgb3V0IGludG8gYSBzZXBh cmF0ZSBmdW5jdGlvbi4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb3h5Ojppbml0aWFsaXplKToKKyAgICAg ICAgKFdlYktpdDo6UGx1Z2luUHJveHk6OnBhaW50KToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2lu UHJveHk6Omdlb21ldHJ5RGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJveHk6 OmNvbnRlbnRzU2NhbGVGYWN0b3IpOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm94eTo6dXBk YXRlQmFja2luZ1N0b3JlKToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJveHk6OnVwZGF0ZSk6 CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5Lmg6CisKIDIwMTEtMTAt MzEgIEplZmYgTWlsbGVyICA8amVmZm1AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBtb3JlIEFQ SXMgdG8gV0tVc2VyQ29udGVudFVSTFBhdHRlcm4uaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5jcHAKaW5kZXggZDZkZGFlNzViYWZkOGQ0M2Fh NGVkMzczNmIzZDJkZmUwYWMzNjVhMi4uOTU5ZmExMjkzMzRhZTAzOTU0YzM5NGU3MThmODNjMjMx Y2Q4MGEzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpblByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luUHJveHkuY3BwCkBAIC0xMDIsNyArMTAyLDcgQEAgYm9vbCBQbHVnaW5Qcm94eTo6aW5pdGlh bGl6ZShjb25zdCBQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogICAgIGNyZWF0aW9uUGFyYW1ldGVy cy5pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkID0gY29udHJvbGxlcigpLT5pc0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKCk7CiAjZW5kaWYKICNpZiBQTEFURk9STShNQUMpCi0g ICAgY3JlYXRpb25QYXJhbWV0ZXJzLmNvbnRlbnRzU2NhbGVGYWN0b3IgPSBjb250cm9sbGVyKCkt PmNvbnRlbnRzU2NhbGVGYWN0b3IoKTsKKyAgICBjcmVhdGlvblBhcmFtZXRlcnMuY29udGVudHNT Y2FsZUZhY3RvciA9IGNvbnRlbnRzU2NhbGVGYWN0b3IoKTsKICNlbmRpZgogCiAgICAgYm9vbCBy ZXN1bHQgPSBmYWxzZTsKQEAgLTEzNSwyMSArMTM1LDE1IEBAIHZvaWQgUGx1Z2luUHJveHk6OnBh aW50KEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0 eVJlCiAgICAgaWYgKCFuZWVkc0JhY2tpbmdTdG9yZSgpIHx8ICFtX2JhY2tpbmdTdG9yZSkKICAg ICAgICAgcmV0dXJuOwogCi0jaWYgUExBVEZPUk0oTUFDKQotICAgIGZsb2F0IGNvbnRlbnRzU2Nh bGVGYWN0b3IgPSBjb250cm9sbGVyKCktPmNvbnRlbnRzU2NhbGVGYWN0b3IoKTsKLSNlbHNlCi0g ICAgZmxvYXQgY29udGVudHNTY2FsZUZhY3RvciA9IDE7Ci0jZW5kaWYKLQogICAgIGlmICghbV9w bHVnaW5CYWNraW5nU3RvcmVDb250YWluc1ZhbGlkRGF0YSkgewogICAgICAgICBtX2Nvbm5lY3Rp b24tPmNvbm5lY3Rpb24oKS0+c2VuZFN5bmMoTWVzc2FnZXM6OlBsdWdpbkNvbnRyb2xsZXJQcm94 eTo6UGFpbnRFbnRpcmVQbHVnaW4oKSwgTWVzc2FnZXM6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6 UGFpbnRFbnRpcmVQbHVnaW46OlJlcGx5KCksIG1fcGx1Z2luSW5zdGFuY2VJRCk7CiAgICAgCiAg ICAgICAgIC8vIEJsaXQgdGhlIHBsdWctaW4gYmFja2luZyBzdG9yZSBpbnRvIG91ciBvd24gYmFj a2luZyBzdG9yZS4KICAgICAgICAgT3duUHRyPFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dD4gZ3Jh cGhpY3NDb250ZXh0ID0gbV9iYWNraW5nU3RvcmUtPmNyZWF0ZUdyYXBoaWNzQ29udGV4dCgpOwot ICAgICAgICBncmFwaGljc0NvbnRleHQtPmFwcGx5RGV2aWNlU2NhbGVGYWN0b3IoY29udGVudHNT Y2FsZUZhY3Rvcik7CisgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+YXBwbHlEZXZpY2VTY2FsZUZh Y3Rvcihjb250ZW50c1NjYWxlRmFjdG9yKCkpOwogICAgICAgICBncmFwaGljc0NvbnRleHQtPnNl dENvbXBvc2l0ZU9wZXJhdGlvbihDb21wb3NpdGVDb3B5KTsKIAotICAgICAgICBtX3BsdWdpbkJh Y2tpbmdTdG9yZS0+cGFpbnQoKmdyYXBoaWNzQ29udGV4dCwgY29udGVudHNTY2FsZUZhY3Rvciwg SW50UG9pbnQoKSwgSW50UmVjdCgwLCAwLCBtX2ZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMu d2lkdGgoKSwgbV9mcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLmhlaWdodCgpKSk7CisgICAg ICAgIG1fcGx1Z2luQmFja2luZ1N0b3JlLT5wYWludCgqZ3JhcGhpY3NDb250ZXh0LCBjb250ZW50 c1NjYWxlRmFjdG9yKCksIEludFBvaW50KCksIEludFJlY3QoMCwgMCwgbV9mcmFtZVJlY3RJbldp bmRvd0Nvb3JkaW5hdGVzLndpZHRoKCksIG1fZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRlcy5o ZWlnaHQoKSkpOwogCiAgICAgICAgIG1fcGx1Z2luQmFja2luZ1N0b3JlQ29udGFpbnNWYWxpZERh dGEgPSB0cnVlOwogICAgIH0KQEAgLTE1Nyw3ICsxNTEsNyBAQCB2b2lkIFBsdWdpblByb3h5Ojpw YWludChHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwgY29uc3QgSW50UmVjdCYgZGly dHlSZQogICAgIEludFJlY3QgZGlydHlSZWN0SW5QbHVnaW5Db29yZGluYXRlcyA9IGRpcnR5UmVj dDsKICAgICBkaXJ0eVJlY3RJblBsdWdpbkNvb3JkaW5hdGVzLm1vdmUoLW1fZnJhbWVSZWN0SW5X aW5kb3dDb29yZGluYXRlcy54KCksIC1tX2ZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMueSgp KTsKIAotICAgIG1fYmFja2luZ1N0b3JlLT5wYWludCgqZ3JhcGhpY3NDb250ZXh0LCBjb250ZW50 c1NjYWxlRmFjdG9yLCBkaXJ0eVJlY3QubG9jYXRpb24oKSwgZGlydHlSZWN0SW5QbHVnaW5Db29y ZGluYXRlcyk7CisgICAgbV9iYWNraW5nU3RvcmUtPnBhaW50KCpncmFwaGljc0NvbnRleHQsIGNv bnRlbnRzU2NhbGVGYWN0b3IoKSwgZGlydHlSZWN0LmxvY2F0aW9uKCksIGRpcnR5UmVjdEluUGx1 Z2luQ29vcmRpbmF0ZXMpOwogCiAgICAgaWYgKG1fd2FpdGluZ0ZvclBhaW50SW5SZXNwb25zZVRv VXBkYXRlKSB7CiAgICAgICAgIG1fd2FpdGluZ0ZvclBhaW50SW5SZXNwb25zZVRvVXBkYXRlID0g ZmFsc2U7CkBAIC0xODYsMzggKzE4MCwxNyBAQCB2b2lkIFBsdWdpblByb3h5OjpnZW9tZXRyeURp ZENoYW5nZSgpCiB7CiAgICAgQVNTRVJUKG1faXNTdGFydGVkKTsKIAotI2lmIFBMQVRGT1JNKE1B QykKLSAgICBmbG9hdCBjb250ZW50c1NjYWxlRmFjdG9yID0gY29udHJvbGxlcigpLT5jb250ZW50 c1NjYWxlRmFjdG9yKCk7Ci0jZWxzZQotICAgIGZsb2F0IGNvbnRlbnRzU2NhbGVGYWN0b3IgPSAx OwotI2VuZGlmCi0KICAgICBpZiAobV9mcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLmlzRW1w dHkoKSB8fCAhbmVlZHNCYWNraW5nU3RvcmUoKSkgewogICAgICAgICBTaGFyZWFibGVCaXRtYXA6 OkhhbmRsZSBwbHVnaW5CYWNraW5nU3RvcmVIYW5kbGU7Ci0gICAgICAgIG1fY29ubmVjdGlvbi0+ Y29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpQbHVnaW5Db250cm9sbGVyUHJveHk6Okdlb21l dHJ5RGlkQ2hhbmdlKG1fZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRlcywgbV9jbGlwUmVjdElu V2luZG93Q29vcmRpbmF0ZXMsIGNvbnRlbnRzU2NhbGVGYWN0b3IsIHBsdWdpbkJhY2tpbmdTdG9y ZUhhbmRsZSksIG1fcGx1Z2luSW5zdGFuY2VJRCwgQ29yZUlQQzo6RGlzcGF0Y2hNZXNzYWdlRXZl bldoZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsKKyAgICAgICAgbV9jb25uZWN0aW9uLT5jb25uZWN0 aW9uKCktPnNlbmQoTWVzc2FnZXM6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6R2VvbWV0cnlEaWRD aGFuZ2UobV9mcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLCBtX2NsaXBSZWN0SW5XaW5kb3dD b29yZGluYXRlcywgY29udGVudHNTY2FsZUZhY3RvcigpLCBwbHVnaW5CYWNraW5nU3RvcmVIYW5k bGUpLCBtX3BsdWdpbkluc3RhbmNlSUQsIENvcmVJUEM6OkRpc3BhdGNoTWVzc2FnZUV2ZW5XaGVu V2FpdGluZ0ZvclN5bmNSZXBseSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBib29s IGRpZFVwZGF0ZUJhY2tpbmdTdG9yZSA9IGZhbHNlOwotICAgIEludFNpemUgYmFja2luZ1N0b3Jl U2l6ZSA9IG1fZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRlcy5zaXplKCk7Ci0gICAgYmFja2lu Z1N0b3JlU2l6ZS5zY2FsZShjb250ZW50c1NjYWxlRmFjdG9yKTsKLQotICAgIGlmICghbV9iYWNr aW5nU3RvcmUpIHsKLSAgICAgICAgbV9iYWNraW5nU3RvcmUgPSBTaGFyZWFibGVCaXRtYXA6OmNy ZWF0ZShiYWNraW5nU3RvcmVTaXplLCBTaGFyZWFibGVCaXRtYXA6OlN1cHBvcnRzQWxwaGEpOwot ICAgICAgICBkaWRVcGRhdGVCYWNraW5nU3RvcmUgPSB0cnVlOwotICAgIH0gZWxzZSBpZiAoYmFj a2luZ1N0b3JlU2l6ZSAhPSBtX2JhY2tpbmdTdG9yZS0+c2l6ZSgpKSB7Ci0gICAgICAgIC8vIFRo ZSBiYWNraW5nIHN0b3JlIGFscmVhZHkgZXhpc3RzLCBqdXN0IHJlc2l6ZSBpdC4KLSAgICAgICAg aWYgKCFtX2JhY2tpbmdTdG9yZS0+cmVzaXplKGJhY2tpbmdTdG9yZVNpemUpKQotICAgICAgICAg ICAgcmV0dXJuOwotCi0gICAgICAgIGRpZFVwZGF0ZUJhY2tpbmdTdG9yZSA9IHRydWU7Ci0gICAg fQotCiAgICAgU2hhcmVhYmxlQml0bWFwOjpIYW5kbGUgcGx1Z2luQmFja2luZ1N0b3JlSGFuZGxl OwogCi0gICAgaWYgKGRpZFVwZGF0ZUJhY2tpbmdTdG9yZSkgeworICAgIGlmICh1cGRhdGVCYWNr aW5nU3RvcmUoKSkgewogICAgICAgICAvLyBDcmVhdGUgYSBuZXcgcGx1Zy1pbiBiYWNraW5nIHN0 b3JlLgotICAgICAgICBtX3BsdWdpbkJhY2tpbmdTdG9yZSA9IFNoYXJlYWJsZUJpdG1hcDo6Y3Jl YXRlU2hhcmVhYmxlKGJhY2tpbmdTdG9yZVNpemUsIFNoYXJlYWJsZUJpdG1hcDo6U3VwcG9ydHNB bHBoYSk7CisgICAgICAgIG1fcGx1Z2luQmFja2luZ1N0b3JlID0gU2hhcmVhYmxlQml0bWFwOjpj cmVhdGVTaGFyZWFibGUobV9iYWNraW5nU3RvcmUtPnNpemUoKSwgU2hhcmVhYmxlQml0bWFwOjpT dXBwb3J0c0FscGhhKTsKICAgICAgICAgaWYgKCFtX3BsdWdpbkJhY2tpbmdTdG9yZSkKICAgICAg ICAgICAgIHJldHVybjsKIApAQCAtMjMwLDcgKzIwMyw3IEBAIHZvaWQgUGx1Z2luUHJveHk6Omdl b21ldHJ5RGlkQ2hhbmdlKCkKICAgICAgICAgbV9wbHVnaW5CYWNraW5nU3RvcmVDb250YWluc1Zh bGlkRGF0YSA9IGZhbHNlOwogICAgIH0KIAotICAgIG1fY29ubmVjdGlvbi0+Y29ubmVjdGlvbigp LT5zZW5kKE1lc3NhZ2VzOjpQbHVnaW5Db250cm9sbGVyUHJveHk6Okdlb21ldHJ5RGlkQ2hhbmdl KG1fZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRlcywgbV9mcmFtZVJlY3RJbldpbmRvd0Nvb3Jk aW5hdGVzLCBjb250ZW50c1NjYWxlRmFjdG9yLCBwbHVnaW5CYWNraW5nU3RvcmVIYW5kbGUpLCBt X3BsdWdpbkluc3RhbmNlSUQsIENvcmVJUEM6OkRpc3BhdGNoTWVzc2FnZUV2ZW5XaGVuV2FpdGlu Z0ZvclN5bmNSZXBseSk7CisgICAgbV9jb25uZWN0aW9uLT5jb25uZWN0aW9uKCktPnNlbmQoTWVz c2FnZXM6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6R2VvbWV0cnlEaWRDaGFuZ2UobV9mcmFtZVJl Y3RJbldpbmRvd0Nvb3JkaW5hdGVzLCBtX2ZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMsIGNv bnRlbnRzU2NhbGVGYWN0b3IoKSwgcGx1Z2luQmFja2luZ1N0b3JlSGFuZGxlKSwgbV9wbHVnaW5J bnN0YW5jZUlELCBDb3JlSVBDOjpEaXNwYXRjaE1lc3NhZ2VFdmVuV2hlbldhaXRpbmdGb3JTeW5j UmVwbHkpOwogfQogCiB2b2lkIFBsdWdpblByb3h5OjpkZXByZWNhdGVkR2VvbWV0cnlEaWRDaGFu Z2UoY29uc3QgSW50UmVjdCYgZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRlcywgY29uc3QgSW50 UmVjdCYgY2xpcFJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKQpAQCAtNDcxLDYgKzQ0NCwzMyBAQCB2 b2lkIFBsdWdpblByb3h5OjpnZXRBdXRoZW50aWNhdGlvbkluZm8oY29uc3QgUHJvdGVjdGlvblNw YWNlJiBwcm90ZWN0aW9uU3BhY2UsCiAgICAgcmV0dXJuVmFsdWUgPSBjb250cm9sbGVyKCktPmdl dEF1dGhlbnRpY2F0aW9uSW5mbyhwcm90ZWN0aW9uU3BhY2UsIHVzZXJuYW1lLCBwYXNzd29yZCk7 CiB9CiAKK2Zsb2F0IFBsdWdpblByb3h5Ojpjb250ZW50c1NjYWxlRmFjdG9yKCkKK3sKKyNpZiBQ TEFURk9STShNQUMpCisgICAgcmV0dXJuIGNvbnRyb2xsZXIoKS0+Y29udGVudHNTY2FsZUZhY3Rv cigpOworI2Vsc2UKKyAgICByZXR1cm4gMTsKKyNlbmRpZgorfQorCitib29sIFBsdWdpblByb3h5 Ojp1cGRhdGVCYWNraW5nU3RvcmUoKQoreworICAgIEludFNpemUgYmFja2luZ1N0b3JlU2l6ZSA9 IG1fZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRlcy5zaXplKCk7CisgICAgYmFja2luZ1N0b3Jl U2l6ZS5zY2FsZShjb250ZW50c1NjYWxlRmFjdG9yKCkpOworICAgIAorICAgIGlmICghbV9iYWNr aW5nU3RvcmUpIHsKKyAgICAgICAgbV9iYWNraW5nU3RvcmUgPSBTaGFyZWFibGVCaXRtYXA6OmNy ZWF0ZShiYWNraW5nU3RvcmVTaXplLCBTaGFyZWFibGVCaXRtYXA6OlN1cHBvcnRzQWxwaGEpOwor ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICBpZiAoYmFja2luZ1N0b3JlU2l6ZSAh PSBtX2JhY2tpbmdTdG9yZS0+c2l6ZSgpKSB7CisgICAgICAgIC8vIFRoZSBiYWNraW5nIHN0b3Jl IGFscmVhZHkgZXhpc3RzLCBqdXN0IHJlc2l6ZSBpdC4KKyAgICAgICAgcmV0dXJuIG1fYmFja2lu Z1N0b3JlLT5yZXNpemUoYmFja2luZ1N0b3JlU2l6ZSk7CisgICAgfQorCisgICAgcmV0dXJuIGZh bHNlOworfQorCiB1aW50NjRfdCBQbHVnaW5Qcm94eTo6d2luZG93TlBPYmplY3RJRCgpCiB7CiAg ICAgTlBPYmplY3QqIHdpbmRvd1NjcmlwdE5QT2JqZWN0ID0gY29udHJvbGxlcigpLT53aW5kb3dT Y3JpcHROUE9iamVjdCgpOwpAQCAtNTQzLDE3ICs1NDMsMTEgQEAgdm9pZCBQbHVnaW5Qcm94eTo6 dXBkYXRlKGNvbnN0IEludFJlY3QmIHBhaW50ZWRSZWN0KQogICAgIHBhaW50ZWRSZWN0UGx1Z2lu Q29vcmRpbmF0ZXMubW92ZSgtbV9mcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLngoKSwgLW1f ZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRlcy55KCkpOwogCiAgICAgaWYgKG1fYmFja2luZ1N0 b3JlKSB7Ci0jaWYgUExBVEZPUk0oTUFDKQotICAgICAgICBmbG9hdCBjb250ZW50c1NjYWxlRmFj dG9yID0gY29udHJvbGxlcigpLT5jb250ZW50c1NjYWxlRmFjdG9yKCk7Ci0jZWxzZQotICAgICAg ICBmbG9hdCBjb250ZW50c1NjYWxlRmFjdG9yID0gMTsKLSNlbmRpZgotCiAgICAgICAgIC8vIEJs aXQgdGhlIHBsdWctaW4gYmFja2luZyBzdG9yZSBpbnRvIG91ciBvd24gYmFja2luZyBzdG9yZS4K ICAgICAgICAgT3duUHRyPEdyYXBoaWNzQ29udGV4dD4gZ3JhcGhpY3NDb250ZXh0ID0gbV9iYWNr aW5nU3RvcmUtPmNyZWF0ZUdyYXBoaWNzQ29udGV4dCgpOwotICAgICAgICBncmFwaGljc0NvbnRl eHQtPmFwcGx5RGV2aWNlU2NhbGVGYWN0b3IoY29udGVudHNTY2FsZUZhY3Rvcik7CisgICAgICAg IGdyYXBoaWNzQ29udGV4dC0+YXBwbHlEZXZpY2VTY2FsZUZhY3Rvcihjb250ZW50c1NjYWxlRmFj dG9yKCkpOwogICAgICAgICBncmFwaGljc0NvbnRleHQtPnNldENvbXBvc2l0ZU9wZXJhdGlvbihD b21wb3NpdGVDb3B5KTsKLSAgICAgICAgbV9wbHVnaW5CYWNraW5nU3RvcmUtPnBhaW50KCpncmFw aGljc0NvbnRleHQsIGNvbnRlbnRzU2NhbGVGYWN0b3IsIHBhaW50ZWRSZWN0UGx1Z2luQ29vcmRp bmF0ZXMubG9jYXRpb24oKSwgCisgICAgICAgIG1fcGx1Z2luQmFja2luZ1N0b3JlLT5wYWludCgq Z3JhcGhpY3NDb250ZXh0LCBjb250ZW50c1NjYWxlRmFjdG9yKCksIHBhaW50ZWRSZWN0UGx1Z2lu Q29vcmRpbmF0ZXMubG9jYXRpb24oKSwgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwYWludGVkUmVjdFBsdWdpbkNvb3JkaW5hdGVzKTsKICAgICB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5oIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmgKaW5kZXggMTU4NDA1Njc0 ZjJhYjFlN2Q4NjA3OTFhMmEzOGViZmFjMzU0OWFmNi4uNDA1YmJjZWRiNzlmODc3NjkwNzg2NTk4 M2FhMWI5ZjU1NDA2NTQ5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpblByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL1BsdWdpblByb3h5LmgKQEAgLTExMCw3ICsxMTAsOSBAQCBwcml2YXRlOgogICAgIHZpcnR1 YWwgV2ViQ29yZTo6U2Nyb2xsYmFyKiBob3Jpem9udGFsU2Nyb2xsYmFyKCk7CiAgICAgdmlydHVh bCBXZWJDb3JlOjpTY3JvbGxiYXIqIHZlcnRpY2FsU2Nyb2xsYmFyKCk7CiAKKyAgICBmbG9hdCBj b250ZW50c1NjYWxlRmFjdG9yKCk7CiAgICAgYm9vbCBuZWVkc0JhY2tpbmdTdG9yZSgpIGNvbnN0 OworICAgIGJvb2wgdXBkYXRlQmFja2luZ1N0b3JlKCk7CiAgICAgdWludDY0X3Qgd2luZG93TlBP YmplY3RJRCgpOwogCiAgICAgdm9pZCBnZW9tZXRyeURpZENoYW5nZSgpOwo=