90884 2012-07-10 07:24:30 -0700 [BlackBerry] HTML5 <video> controls are scaled differently depending on the current WebPage scale 2012-07-31 09:22:28 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tonikitoo tonikitoo tonikitoo oldest_to_newest 665747 0 tonikitoo 2012-07-10 07:24:30 -0700 When FULLSCREEN_API is enabled, the way we fit the media element to content overscale the controls if the page is scaled. 683169 1 155561 tonikitoo 2012-07-31 09:12:16 -0700 Created attachment 155561 (committed r124214, r=rbuis patch 683175 2 155561 rwlbuis 2012-07-31 09:14:45 -0700 Comment on attachment 155561 (committed r124214, r=rbuis patch LGTM. 683188 3 tonikitoo 2012-07-31 09:21:50 -0700 http://trac.webkit.org/changeset/124214 155561 2012-07-31 09:12:16 -0700 2012-07-31 09:22:28 -0700 (committed r124214, r=rbuis patch 0001-Blackberry-FullScreen-HTML5-video-controls-are-scale.patch text/plain 10447 tonikitoo RnJvbSAzODA5ZWZhZjk1OWYxM2ExMjBjODEwODllNzY3ZTk5OWJiNTBlYjVlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog VHVlLCAzMSBKdWwgMjAxMiAxMjoxMDo1NSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtCbGFja2Jl cnJ5XVtGdWxsU2NyZWVuXSBIVE1MNSA8dmlkZW8+IGNvbnRyb2xzIGFyZSBzY2FsZWQKIGRpZmZl cmVudGx5IGRlcGVuZGluZyBvbiB0aGUgY3VycmVudCB3ZWJwYWdlIHNjYWxlCiBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA4ODQgUFIgIzE2MjgzOQoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuClBhdGNoIGJ5IEFudG9uaW8gR29tZXMgPGFnb21lc0ByaW0uY29t PgoKVGhlIHdheSB0aGUgQmxhY2tCZXJyeSBwb3J0IGltcGxlbWVudHMgdGhlIEZVTExTQ1JFRU5f QVBJIGZvciBtZWRpYQplbGVtZW50cyBtaWdodCByZXN1bHQgaW4gdGhlIGNvbnRyb2xzIGJlaW5n IG92ZXJzaXplZCwgcHJvcG9ydGlvbmFsbHkKdG8gdGhlIGN1cnJlbnQgcGFnZSBzY2FsZS4gVGhh dCBoYXBwZW5zIGJlY2F1c2UgdGhlIGZ1bGxzY3JlZW4gZWxlbWVudApnZXRzIHNpemVkIHRvIGJl IGFzIGJpZyBhcyB0aGUgdmlld3BvcnQgc2l6ZSwgYW5kIHRoZSB2aWV3cG9ydCBzaXplIG1pZ2h0 CmdldCBvdXRzdHJldGNoZWQgdG8gZml0IHRvIHRoZSBzY3JlZW4gZGltZW5zaW9ucy4KCkluIG9y ZGVyIHRvIGZpeCB0aGF0LCB0aGUgcGF0Y2ggc3RyaXBzIG91dCB0aGUgUGFnZSBzY2FsZSBmYWN0 b3IgZnJvbQp0aGUgbWVkaWEgY29udHJvbHMgbXVsdGlwbGllci4KClBhdGNoIGFsc28gY2hhbmdl cyBtYW55IGludGVnZXItYmFzZWQgY2FsY3VsYXRpb25zIHRvIGJlIGZsb2F0LWJhc2VkLCBpbgpv cmRlciB0byBnZXQgdGhlIG5lZWRlZCBwcmVjaXNpb24uCgpJbnRlcm5hbGx5IHJldmlld2VkIGJ5 IEphY2t5IEppYW5nLgoKKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJy eS5jcHA6CihXZWJDb3JlKToKKFdlYkNvcmU6OmRldGVybWluZUZ1bGxTY3JlZW5NdWx0aXBsaWVy KToKKFdlYkNvcmU6OlJlbmRlclRoZW1lQmxhY2tCZXJyeTo6YWRqdXN0U2xpZGVyVGh1bWJTaXpl KToKKFdlYkNvcmU6OlJlbmRlclRoZW1lQmxhY2tCZXJyeTo6YWRqdXN0TWVkaWFDb250cm9sU3R5 bGUpOgooV2ViQ29yZTo6UmVuZGVyVGhlbWVCbGFja0JlcnJ5OjphZGp1c3RTbGlkZXJUcmFja1N0 eWxlKToKKFdlYkNvcmU6OlJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYVNsaWRlclRy YWNrKToKKFdlYkNvcmU6OlJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYVNsaWRlclRo dW1iKToKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg ICAgICB8ICAgMzEgKysrKysrKysrKysKIC4uLi9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRo ZW1lQmxhY2tCZXJyeS5jcHAgIHwgICA1NSArKysrKysrKysrKystLS0tLS0tLQogMiBmaWxlcyBj aGFuZ2VkLCA2NSBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTUxNTRkMy4uYjhhZGExOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA3LTE3 ICBBbnRvbmlvIEdvbWVzICA8YWdvbWVzQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrYmVycnld W0Z1bGxTY3JlZW5dIEhUTUw1IDx2aWRlbz4gY29udHJvbHMgYXJlIHNjYWxlZCBkaWZmZXJlbnRs eSBkZXBlbmRpbmcgb24gdGhlIGN1cnJlbnQgd2VicGFnZSBzY2FsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA4ODQKKyAgICAgICAgUFIgIzE2Mjgz OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSB3 YXkgdGhlIEJsYWNrQmVycnkgcG9ydCBpbXBsZW1lbnRzIHRoZSBGVUxMU0NSRUVOX0FQSSBmb3Ig bWVkaWEKKyAgICAgICAgZWxlbWVudHMgbWlnaHQgcmVzdWx0IGluIHRoZSBjb250cm9scyBiZWlu ZyBvdmVyc2l6ZWQsIHByb3BvcnRpb25hbGx5CisgICAgICAgIHRvIHRoZSBjdXJyZW50IHBhZ2Ug c2NhbGUuIFRoYXQgaGFwcGVucyBiZWNhdXNlIHRoZSBmdWxsc2NyZWVuIGVsZW1lbnQKKyAgICAg ICAgZ2V0cyBzaXplZCB0byBiZSBhcyBiaWcgYXMgdGhlIHZpZXdwb3J0IHNpemUsIGFuZCB0aGUg dmlld3BvcnQgc2l6ZSBtaWdodAorICAgICAgICBnZXQgb3V0c3RyZXRjaGVkIHRvIGZpdCB0byB0 aGUgc2NyZWVuIGRpbWVuc2lvbnMuCisKKyAgICAgICAgSW4gb3JkZXIgdG8gZml4IHRoYXQsIHRo ZSBwYXRjaCBzdHJpcHMgb3V0IHRoZSBQYWdlIHNjYWxlIGZhY3RvciBmcm9tCisgICAgICAgIHRo ZSBtZWRpYSBjb250cm9scyBtdWx0aXBsaWVyLgorCisgICAgICAgIFBhdGNoIGFsc28gY2hhbmdl cyBtYW55IGludGVnZXItYmFzZWQgY2FsY3VsYXRpb25zIHRvIGJlIGZsb2F0LWJhc2VkLCBpbgor ICAgICAgICBvcmRlciB0byBnZXQgdGhlIG5lZWRlZCBwcmVjaXNpb24uCisKKyAgICAgICAgSW50 ZXJuYWxseSByZXZpZXdlZCBieSBKYWNreSBKaWFuZy4KKworICAgICAgICAqIHBsYXRmb3JtL2Js YWNrYmVycnkvUmVuZGVyVGhlbWVCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgor ICAgICAgICAoV2ViQ29yZTo6ZGV0ZXJtaW5lRnVsbFNjcmVlbk11bHRpcGxpZXIpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVCbGFja0JlcnJ5OjphZGp1c3RTbGlkZXJUaHVtYlNpemUp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVCbGFja0JlcnJ5OjphZGp1c3RNZWRpYUNv bnRyb2xTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVycnk6OmFk anVzdFNsaWRlclRyYWNrU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVCbGFj a0JlcnJ5OjpwYWludE1lZGlhU2xpZGVyVHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVCbGFja0JlcnJ5OjpwYWludE1lZGlhU2xpZGVyVGh1bWIpOgorCiAyMDEyLTA3LTI2ICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBzdXBw b3J0IGZvciBjb21wb3NpdGluZyB0aGUgY29udGVudHMgb2Ygb3ZlcmZsb3c6c2Nyb2xsIGFyZWFz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRo ZW1lQmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1Jl bmRlclRoZW1lQmxhY2tCZXJyeS5jcHAKaW5kZXggN2UyNTg4MS4uMzUxYTJiOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVy cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhl bWVCbGFja0JlcnJ5LmNwcApAQCAtMjQsMTAgKzI0LDEyIEBACiAjaW5jbHVkZSAiQ1NTVmFsdWVL ZXl3b3Jkcy5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiSFRNTE1lZGlhRWxlbWVu dC5oIgorI2luY2x1ZGUgIkhvc3RXaW5kb3cuaCIKICNpbmNsdWRlICJNZWRpYUNvbnRyb2xFbGVt ZW50cy5oIgogI2luY2x1ZGUgIk1lZGlhUGxheWVyUHJpdmF0ZUJsYWNrQmVycnkuaCIKICNpbmNs dWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUGFpbnRJbmZvLmgiCisjaW5jbHVkZSAiUmVuZGVyRnVs bFNjcmVlbi5oIgogI2luY2x1ZGUgIlJlbmRlclByb2dyZXNzLmgiCiAjaW5jbHVkZSAiUmVuZGVy U2xpZGVyLmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgpAQCAtMzksMTMgKzQxLDEzIEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIGNvbnN0IHVuc2lnbmVkIHNtYWxsUmFkaXVzID0gMTsKIGNvbnN0 IHVuc2lnbmVkIGxhcmdlUmFkaXVzID0gMzsKIGNvbnN0IHVuc2lnbmVkIGxpbmVXaWR0aCA9IDE7 Ci1jb25zdCBpbnQgbWFyZ2luU2l6ZSA9IDQ7Ci1jb25zdCBpbnQgbWVkaWFDb250cm9sc0hlaWdo dCA9IDMyOwotY29uc3QgaW50IG1lZGlhU2xpZGVyVGh1bWJXaWR0aCA9IDQwOwotY29uc3QgaW50 IG1lZGlhU2xpZGVyVGh1bWJIZWlnaHQgPSAxMzsKLWNvbnN0IGludCBtZWRpYVNsaWRlclRodW1i UmFkaXVzID0gNTsKLWNvbnN0IGludCBzbGlkZXJUaHVtYldpZHRoID0gMTU7Ci1jb25zdCBpbnQg c2xpZGVyVGh1bWJIZWlnaHQgPSAyNTsKK2NvbnN0IGZsb2F0IG1hcmdpblNpemUgPSA0OworY29u c3QgZmxvYXQgbWVkaWFDb250cm9sc0hlaWdodCA9IDMyOworY29uc3QgZmxvYXQgbWVkaWFTbGlk ZXJUaHVtYldpZHRoID0gNDA7Citjb25zdCBmbG9hdCBtZWRpYVNsaWRlclRodW1iSGVpZ2h0ID0g MTM7Citjb25zdCBmbG9hdCBtZWRpYVNsaWRlclRodW1iUmFkaXVzID0gNTsKK2NvbnN0IGZsb2F0 IHNsaWRlclRodW1iV2lkdGggPSAxNTsKK2NvbnN0IGZsb2F0IHNsaWRlclRodW1iSGVpZ2h0ID0g MjU7CiAKIC8vIENoZWNrYm94IGNoZWNrIHNjYWxlcnMKIGNvbnN0IGZsb2F0IGNoZWNrYm94TGVm dFggPSA3IC8gNDAuMDsKQEAgLTE1OCwxMyArMTYwLDIzIEBAIHN0YXRpYyBSZW5kZXJTbGlkZXIq IGRldGVybWluZVJlbmRlclNsaWRlcihSZW5kZXJPYmplY3QqIG9iamVjdCkKICAgICByZXR1cm4g dG9SZW5kZXJTbGlkZXIob2JqZWN0KTsKIH0KIAotc3RhdGljIGludCBkZXRlcm1pbmVGdWxsU2Ny ZWVuTXVsdGlwbGllcihFbGVtZW50KiBlbGVtZW50KQorc3RhdGljIGZsb2F0IGRldGVybWluZUZ1 bGxTY3JlZW5NdWx0aXBsaWVyKEVsZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAgaW50IGZ1bGxTY3Jl ZW5NdWx0aXBsaWVyID0gMTsKKyAgICBmbG9hdCBmdWxsU2NyZWVuTXVsdGlwbGllciA9IDEuMDsK ICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpICYmIEVOQUJMRShWSURFTykKICAgICBpZiAoZWxl bWVudCAmJiBlbGVtZW50LT5kb2N1bWVudCgpLT53ZWJraXRJc0Z1bGxTY3JlZW4oKSAmJiBlbGVt ZW50LT5kb2N1bWVudCgpLT53ZWJraXRDdXJyZW50RnVsbFNjcmVlbkVsZW1lbnQoKSA9PSB0b1Bh cmVudE1lZGlhRWxlbWVudChlbGVtZW50KSkgewogICAgICAgICBpZiAoZWxlbWVudC0+ZG9jdW1l bnQoKS0+cGFnZSgpLT5kZXZpY2VTY2FsZUZhY3RvcigpIDwgc2NhbGVGYWN0b3JUaHJlc2hvbGQp CiAgICAgICAgICAgICBmdWxsU2NyZWVuTXVsdGlwbGllciA9IGZ1bGxTY3JlZW5FbmxhcmdlbWVu dEZhY3RvcjsKKworICAgICAgICAvLyBUaGUgd2F5IHRoZSBCbGFja0JlcnJ5IHBvcnQgaW1wbGVt ZW50cyB0aGUgRlVMTFNDUkVFTl9BUEkgZm9yIG1lZGlhIGVsZW1lbnRzCisgICAgICAgIC8vIG1p Z2h0IHJlc3VsdCBpbiB0aGUgY29udHJvbHMgYmVpbmcgb3ZlcnNpemVkLCBwcm9wb3J0aW9uYWxs eSB0byB0aGUgY3VycmVudCBwYWdlCisgICAgICAgIC8vIHNjYWxlLiBUaGF0IGhhcHBlbnMgYmVj YXVzZSB0aGUgZnVsbHNjcmVlbiBlbGVtZW50IGdldHMgc2l6ZWQgdG8gYmUgYXMgYmlnIGFzIHRo ZQorICAgICAgICAvLyB2aWV3cG9ydCBzaXplLCBhbmQgdGhlIHZpZXdwb3J0IHNpemUgbWlnaHQg Z2V0IG91dHN0cmV0Y2hlZCB0byBmaXQgdG8gdGhlIHNjcmVlbiBkaW1lbnNpb25zLgorICAgICAg ICAvLyBUbyBmaXggdGhhdCwgbGV0cyBzdHJpcHMgb3V0IHRoZSBQYWdlIHNjYWxlIGZhY3RvciBm cm9tIHRoZSBtZWRpYSBjb250cm9scyBtdWx0aXBsaWVyLgorICAgICAgICBmbG9hdCBzY2FsZUZh Y3RvciA9IGVsZW1lbnQtPmRvY3VtZW50KCktPnZpZXcoKS0+aG9zdFdpbmRvdygpLT5wbGF0Zm9y bVBhZ2VDbGllbnQoKS0+Y3VycmVudFpvb21GYWN0b3IoKTsKKyAgICAgICAgc3RhdGljIFZpZXdw b3J0QXJndW1lbnRzIGRlZmF1bHRWaWV3cG9ydEFyZ3VtZW50czsKKyAgICAgICAgZmxvYXQgc2Nh bGVGYWN0b3JGdWRnZSA9IGVsZW1lbnQtPmRvY3VtZW50KCktPnBhZ2UoKS0+dmlld3BvcnRBcmd1 bWVudHMoKSAhPSBkZWZhdWx0Vmlld3BvcnRBcmd1bWVudHMgPyAuNSA6IC44NTsKKyAgICAgICAg ZnVsbFNjcmVlbk11bHRpcGxpZXIgLz0gc2NhbGVGYWN0b3IgKiBzY2FsZUZhY3RvckZ1ZGdlOwog ICAgIH0KICNlbmRpZgogICAgIHJldHVybiBmdWxsU2NyZWVuTXVsdGlwbGllcjsKQEAgLTYyOSw3 ICs2NDEsNyBAQCBib29sIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZW51TGlzdEJ1dHRv bihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGFpbgogCiB2b2lkIFJlbmRlclRoZW1lQmxh Y2tCZXJyeTo6YWRqdXN0U2xpZGVyVGh1bWJTaXplKFJlbmRlclN0eWxlKiBzdHlsZSwgRWxlbWVu dCogZWxlbWVudCkgY29uc3QKIHsKLSAgICBpbnQgZnVsbFNjcmVlbk11bHRpcGxpZXIgPSAxOwor ICAgIGZsb2F0IGZ1bGxTY3JlZW5NdWx0aXBsaWVyID0gMTsKICAgICBDb250cm9sUGFydCBwYXJ0 ID0gc3R5bGUtPmFwcGVhcmFuY2UoKTsKIAogICAgIGlmIChwYXJ0ID09IE1lZGlhU2xpZGVyVGh1 bWJQYXJ0IHx8IHBhcnQgPT0gTWVkaWFWb2x1bWVTbGlkZXJUaHVtYlBhcnQpIHsKQEAgLTc1MCwx NCArNzYyLDE1IEBAIGJvb2wgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludFNsaWRlclRodW1i KFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBQYWludEluCiAKIHZvaWQgUmVuZGVyVGhlbWVC bGFja0JlcnJ5OjphZGp1c3RNZWRpYUNvbnRyb2xTdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVy U3R5bGUqIHN0eWxlLCBFbGVtZW50KiBlbGVtZW50KSBjb25zdAogewotICAgIGludCBmdWxsU2Ny ZWVuTXVsdGlwbGllciA9IGRldGVybWluZUZ1bGxTY3JlZW5NdWx0aXBsaWVyKGVsZW1lbnQpOwor ICAgIGZsb2F0IGZ1bGxTY3JlZW5NdWx0aXBsaWVyID0gZGV0ZXJtaW5lRnVsbFNjcmVlbk11bHRp cGxpZXIoZWxlbWVudCk7CiAKICAgICAvLyBXZSB1c2UgbXVsdGlwbGVzIG9mIG1lZGlhQ29udHJv bHNIZWlnaHQgdG8gbWFrZSBhbGwgb2JqZWN0cyBzY2FsZSBldmVubHkKICAgICBMZW5ndGggY29u dHJvbHNIZWlnaHQobWVkaWFDb250cm9sc0hlaWdodCAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyLCBG aXhlZCk7CiAgICAgTGVuZ3RoIHRpbWVXaWR0aChtZWRpYUNvbnRyb2xzSGVpZ2h0ICogMyAvIDIg KiBmdWxsU2NyZWVuTXVsdGlwbGllciwgRml4ZWQpOwogICAgIExlbmd0aCB2b2x1bWVIZWlnaHQo bWVkaWFDb250cm9sc0hlaWdodCAqIDQgKiBmdWxsU2NyZWVuTXVsdGlwbGllciwgRml4ZWQpOwog ICAgIExlbmd0aCBwYWRkaW5nKG1lZGlhQ29udHJvbHNIZWlnaHQgLyA4ICogZnVsbFNjcmVlbk11 bHRpcGxpZXIsIEZpeGVkKTsKLSAgICBpbnQgZm9udFNpemUgPSBtZWRpYUNvbnRyb2xzSGVpZ2h0 IC8gMiAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyOworICAgIGZsb2F0IGZvbnRTaXplID0gbWVkaWFD b250cm9sc0hlaWdodCAvIDIgKiBmdWxsU2NyZWVuTXVsdGlwbGllcjsKKwogICAgIHN3aXRjaCAo c3R5bGUtPmFwcGVhcmFuY2UoKSkgewogICAgIGNhc2UgTWVkaWFQbGF5QnV0dG9uUGFydDoKICAg ICBjYXNlIE1lZGlhRW50ZXJGdWxsc2NyZWVuQnV0dG9uUGFydDoKQEAgLTc4NSw3ICs3OTgsNyBA QCB2b2lkIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6YWRqdXN0TWVkaWFDb250cm9sU3R5bGUoU3R5 bGVSZXNvbHZlciosIFJlbmRlclN0eWxlKgogCiB2b2lkIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6 YWRqdXN0U2xpZGVyVHJhY2tTdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqIHN0eWxl LCBFbGVtZW50KiBlbGVtZW50KSBjb25zdAogewotICAgIGludCBmdWxsU2NyZWVuTXVsdGlwbGll ciA9IGRldGVybWluZUZ1bGxTY3JlZW5NdWx0aXBsaWVyKGVsZW1lbnQpOworICAgIGZsb2F0IGZ1 bGxTY3JlZW5NdWx0aXBsaWVyID0gZGV0ZXJtaW5lRnVsbFNjcmVlbk11bHRpcGxpZXIoZWxlbWVu dCk7CiAKICAgICAvLyBXZSB1c2UgbXVsdGlwbGVzIG9mIG1lZGlhQ29udHJvbHNIZWlnaHQgdG8g bWFrZSBhbGwgb2JqZWN0cyBzY2FsZSBldmVubHkKICAgICBMZW5ndGggY29udHJvbHNIZWlnaHQo bWVkaWFDb250cm9sc0hlaWdodCAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyLCBGaXhlZCk7CkBAIC04 ODEsNyArODk0LDcgQEAgYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFTbGlk ZXJUcmFjayhSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGEKICAgICBpZiAoIW1lZGlhRWxl bWVudCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaW50IGZ1bGxTY3JlZW5NdWx0aXBs aWVyID0gZGV0ZXJtaW5lRnVsbFNjcmVlbk11bHRpcGxpZXIobWVkaWFFbGVtZW50KTsKKyAgICBm bG9hdCBmdWxsU2NyZWVuTXVsdGlwbGllciA9IGRldGVybWluZUZ1bGxTY3JlZW5NdWx0aXBsaWVy KG1lZGlhRWxlbWVudCk7CiAgICAgZmxvYXQgbG9hZGVkID0gMDsKICAgICAvLyBGSVhNRTogcmVw bGFjZSBsb2FkZWQgd2l0aCBjb21tZW50ZWQgb3V0IG9uZSB3aGVuIGJ1ZmZlciBidWcgaXMgZml4 ZWQgKHNlZSBjb21tZW50IGluCiAgICAgLy8gTWVkaWFQbGF5ZXJQcml2YXRlTU1yZW5kZXJlcjo6 cGVyY2VudExvYWRlZCkuCkBAIC04OTAsMTQgKzkwMywxNCBAQCBib29sIFJlbmRlclRoZW1lQmxh Y2tCZXJyeTo6cGFpbnRNZWRpYVNsaWRlclRyYWNrKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25z dCBQYQogICAgICAgICBsb2FkZWQgPSBzdGF0aWNfY2FzdDxNZWRpYVBsYXllclByaXZhdGUgKj4o bWVkaWFFbGVtZW50LT5wbGF5ZXIoKS0+aW1wbGVtZW50YXRpb24oKSktPnBlcmNlbnRMb2FkZWQo KTsKICAgICBmbG9hdCBwb3NpdGlvbiA9IG1lZGlhRWxlbWVudC0+ZHVyYXRpb24oKSA+IDAgPyAo bWVkaWFFbGVtZW50LT5jdXJyZW50VGltZSgpIC8gbWVkaWFFbGVtZW50LT5kdXJhdGlvbigpKSA6 IDA7CiAKLSAgICBpbnQgeCA9IHJlY3QueCgpICsgMiAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyIC0g ZnVsbFNjcmVlbk11bHRpcGxpZXIgLyAyOwotICAgIGludCB5ID0gcmVjdC55KCkgKyAxNCAqIGZ1 bGxTY3JlZW5NdWx0aXBsaWVyICsgZnVsbFNjcmVlbk11bHRpcGxpZXIgLyAyOwotICAgIGludCB3 ID0gcmVjdC53aWR0aCgpIC0gNCAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyICsgZnVsbFNjcmVlbk11 bHRpcGxpZXIgLyAyOwotICAgIGludCBoID0gMiAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyOworICAg IGludCB4ID0gY2VpbChyZWN0LngoKSArIDIgKiBmdWxsU2NyZWVuTXVsdGlwbGllciAtIGZ1bGxT Y3JlZW5NdWx0aXBsaWVyIC8gMik7CisgICAgaW50IHkgPSBjZWlsKHJlY3QueSgpICsgMTQgKiBm dWxsU2NyZWVuTXVsdGlwbGllciArIGZ1bGxTY3JlZW5NdWx0aXBsaWVyIC8gMik7CisgICAgaW50 IHcgPSBjZWlsKHJlY3Qud2lkdGgoKSAtIDQgKiBmdWxsU2NyZWVuTXVsdGlwbGllciArIGZ1bGxT Y3JlZW5NdWx0aXBsaWVyIC8gMik7CisgICAgaW50IGggPSBjZWlsKDIgKiBmdWxsU2NyZWVuTXVs dGlwbGllcik7CiAgICAgSW50UmVjdCByZWN0Mih4LCB5LCB3LCBoKTsKIAotICAgIGludCB3UGxh eWVkID0gKHcgKiBwb3NpdGlvbik7Ci0gICAgaW50IHdMb2FkZWQgPSAodyAtIG1lZGlhU2xpZGVy VGh1bWJXaWR0aCAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyKSAqIGxvYWRlZCArIG1lZGlhU2xpZGVy VGh1bWJXaWR0aCAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyOworICAgIGludCB3UGxheWVkID0gY2Vp bCh3ICogcG9zaXRpb24pOworICAgIGludCB3TG9hZGVkID0gY2VpbCgodyAtIG1lZGlhU2xpZGVy VGh1bWJXaWR0aCAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyKSAqIGxvYWRlZCArIG1lZGlhU2xpZGVy VGh1bWJXaWR0aCAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyKTsKIAogICAgIEludFJlY3QgcGxheWVk KHgsIHksIHdQbGF5ZWQsIGgpOwogICAgIEludFJlY3QgYnVmZmVyZWQoeCwgeSwgd0xvYWRlZCwg aCk7CkBAIC05MjksNyArOTQyLDcgQEAgYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50 TWVkaWFTbGlkZXJUaHVtYihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGEKICAgICBpZiAo IXNsaWRlcikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaW50IGZ1bGxTY3JlZW5NdWx0 aXBsaWVyID0gZGV0ZXJtaW5lRnVsbFNjcmVlbk11bHRpcGxpZXIodG9FbGVtZW50KHNsaWRlci0+ bm9kZSgpKSk7CisgICAgZmxvYXQgZnVsbFNjcmVlbk11bHRpcGxpZXIgPSBkZXRlcm1pbmVGdWxs U2NyZWVuTXVsdGlwbGllcih0b0VsZW1lbnQoc2xpZGVyLT5ub2RlKCkpKTsKIAogICAgIHBhaW50 SW5mby5jb250ZXh0LT5zYXZlKCk7CiAgICAgUGF0aCBtZWRpYVRodW1iUm91bmRlZFJlY3Rhbmds ZTsKLS0gCjEuNy41LjQKCg==