134740 2014-07-08 13:08:30 -0700 [iOS] caption size is sometimes incorrect in fullscreen 2014-07-09 10:19:10 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson calvaris cdumez commit-queue esprehn+autocc glenn gyuyoung.kim jer.noble kondapallykalyan philipj sergio oldest_to_newest 1021169 0 eric.carlson 2014-07-08 13:08:30 -0700 The font sized used for captions sometimes does not change immediately when entering full screen. 1021178 1 234589 eric.carlson 2014-07-08 13:34:20 -0700 Created attachment 234589 Proposed patch. 1021186 2 234589 jer.noble 2014-07-08 13:53:58 -0700 Comment on attachment 234589 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=234589&action=review r=me > Source/WebCore/ChangeLog:8 > + Reviewed by NOBODY (OOPS!). > + > + * Modules/mediacontrols/MediaControlsHost.cpp: Nit: no description of the problem and how this patch fixes it? 1021383 3 eric.carlson 2014-07-09 10:18:21 -0700 (In reply to comment #2) > (From update of attachment 234589 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=234589&action=review > > r=me > > > Source/WebCore/ChangeLog:8 > > + Reviewed by NOBODY (OOPS!). > > + > > + * Modules/mediacontrols/MediaControlsHost.cpp: > > Nit: no description of the problem and how this patch fixes it? Fixed. 1021384 4 eric.carlson 2014-07-09 10:18:58 -0700 Committed r170920: http://trac.webkit.org/changeset/170920 234589 2014-07-08 13:34:20 -0700 2014-07-09 10:19:10 -0700 Proposed patch. patch_2.txt text/plain 13799 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MDg5MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBACisyMDE0LTA3LTA4ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIGNhcHRpb24g c2l6ZSBpcyBzb21ldGltZXMgaW5jb3JyZWN0IGluIGZ1bGxzY3JlZW4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDc0MAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xz L01lZGlhQ29udHJvbHNIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNI b3N0OjplbnRlcmVkRnVsbHNjcmVlbik6IE5vdGlmeSB0ZXh0IHRyYWNrIGNvbnRhaW5lci4KKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0OjpleGl0ZWRGdWxsc2NyZWVuKTogRGl0 dG8uCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0Lmg6 CisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmlkbDoK KworICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanM6 CisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS5oYW5kbGVGdWxsc2NyZWVuQ2hhbmdlKTog Tm90aWZ5IGhvc3Qgb2YgZnVsbHNjcmVlbiBjaGFuZ2UuCisKKyAgICAgICAgKiBodG1sL0hUTUxN ZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6cmVx dWlyZXNUZXh0VHJhY2tSZXByZXNlbnRhdGlvbik6IE9ubHkgcmV0dXJuIHRydWUgd2hlbiBpbgor ICAgICAgICAgICAgZnVsbHNjcmVlbi4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1l bnQ6OnNldFZpZGVvRnVsbHNjcmVlbkxheWVyKTogQ2FsbCB1cGRhdGVUZXh0VHJhY2tEaXNwbGF5 LgorCisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6TWVk aWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudCk6IEluaXRpYWxpemUKKyAgICAgICAg ICAgIG1fdXBkYXRlVGV4dFRyYWNrUmVwcmVzZW50YXRpb25TdHlsZSB0byBmYWxzZS4KKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQ6OnVwZGF0 ZURpc3BsYXkpOiBNb3ZlIGxvZ2ljIGZvciBjcmVhdGluZworICAgICAgICAgICAgVGV4dFRyYWNr UmVwcmVzZW50YXRpb24gdG8gdXBkYXRlVGV4dFRyYWNrUmVwcmVzZW50YXRpb24uCisgICAgICAg IChXZWJDb3JlOjpNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50Ojp1cGRhdGVB Y3RpdmVDdWVzRm9udFNpemUpOiBOZXcsIHNwbGl0IG91dCBvZiB1cGRhdGVUaW1lckZpcmVkLgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6 dXBkYXRlVGltZXJGaXJlZCk6IE1vdmUgY29kZSB0byBmb3JjZSBpbW1lZGlhdGUKKyAgICAgICAg ICAgIGZvbnQgc2l6ZSBjaGFuZ2UgdG8gdXBkYXRlQWN0aXZlQ3Vlc0ZvbnRTaXplLgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6dXBkYXRl VGV4dFRyYWNrUmVwcmVzZW50YXRpb24pOiBOZXcsIHVwZGF0ZQorICAgICAgICAgICAgdGV4dCB0 cmFjayByZXByZXNlbnRhdGlvbiwgY3JlYXRpbmcgZmlyc3QgaWYgbmVjZXNzYXJ5LgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6Y2xlYXJU ZXh0VHJhY2tSZXByZXNlbnRhdGlvbik6IEFkZCBhbiBlYXJseQorICAgICAgICAgICAgcmV0dXJu IGlmIHdlIGRvbid0IGhhdmUgYSB0ZXh0IHRyYWNrIHJlcHJlc2VudGF0aW9uLgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6dXBkYXRlU3R5 bGVGb3JUZXh0VHJhY2tSZXByZXNlbnRhdGlvbik6IEVhcmx5CisgICAgICAgICAgICByZXR1cm4g aWYgdGhlcmUgaXMgbm90aGluZyB0byBiZSBkb25lLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFD b250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6ZW50ZXJlZEZ1bGxzY3JlZW4pOiBGb3Jj ZSBhIGNhcHRpb24gdXBkYXRlCisgICAgICAgICAgICBpZiB0aGVyZSBhcmUgdmlzaWJsZSBjYXB0 aW9ucy4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFRleHRUcmFja0NvbnRhaW5lckVs ZW1lbnQ6OnVwZGF0ZVNpemVzKTogU2V0IG1fdXBkYXRlVGV4dFRyYWNrUmVwcmVzZW50YXRpb25T dHlsZQorICAgICAgICAgICAgdG8gdHJ1ZS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJv bFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQ6OnRleHRUcmFja1JlcHJlc2VudGF0aW9uQm91bmRz Q2hhbmdlZCk6ICBGb3JjZSBhIAorICAgICAgICAgICAgY2FwdGlvbiB1cGRhdGUgaWYgdGhlcmUg YXJlIHZpc2libGUgY2FwdGlvbnMuCisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9s RWxlbWVudHMuaDoKKwogMjAxNC0wNy0wOCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lh QGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IEdPYmplY3QgRE9NIGJpbmRp bmdzIEFQSSBicmVha3MgdGVzdCBhZnRlciByMTcwNzAwLgpJbmRleDogU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3Qu Y3BwCShyZXZpc2lvbiAxNzA4NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29u dHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAsNiArMTUw LDE4IEBAIHZvaWQgTWVkaWFDb250cm9sc0hvc3Q6OnVwZGF0ZVRleHRUcmFja0MKICAgICAgICAg bV90ZXh0VHJhY2tDb250YWluZXItPnVwZGF0ZURpc3BsYXkoKTsKIH0KIAordm9pZCBNZWRpYUNv bnRyb2xzSG9zdDo6ZW50ZXJlZEZ1bGxzY3JlZW4oKQoreworICAgIGlmIChtX3RleHRUcmFja0Nv bnRhaW5lcikKKyAgICAgICAgbV90ZXh0VHJhY2tDb250YWluZXItPmVudGVyZWRGdWxsc2NyZWVu KCk7Cit9CisKK3ZvaWQgTWVkaWFDb250cm9sc0hvc3Q6OmV4aXRlZEZ1bGxzY3JlZW4oKQorewor ICAgIGlmIChtX3RleHRUcmFja0NvbnRhaW5lcikKKyAgICAgICAgbV90ZXh0VHJhY2tDb250YWlu ZXItPmV4aXRlZEZ1bGxzY3JlZW4oKTsKK30KKwogdm9pZCBNZWRpYUNvbnRyb2xzSG9zdDo6dXBk YXRlQ2FwdGlvbkRpc3BsYXlTaXplcygpCiB7CiAgICAgaWYgKG1fdGV4dFRyYWNrQ29udGFpbmVy KQpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJv bHNIb3N0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRy b2xzL01lZGlhQ29udHJvbHNIb3N0LmgJKHJldmlzaW9uIDE3MDg0NCkKKysrIFNvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5oCSh3b3JraW5nIGNv cHkpCkBAIC02NCw2ICs2NCw4IEBAIHB1YmxpYzoKICAgICBib29sIHVzZXJHZXN0dXJlUmVxdWly ZWQoKSBjb25zdDsKIAogICAgIHZvaWQgdXBkYXRlQ2FwdGlvbkRpc3BsYXlTaXplcygpOworICAg IHZvaWQgZW50ZXJlZEZ1bGxzY3JlZW4oKTsKKyAgICB2b2lkIGV4aXRlZEZ1bGxzY3JlZW4oKTsK IAogICAgIFN0cmluZyBleHRlcm5hbERldmljZURpc3BsYXlOYW1lKCkgY29uc3Q7CiAgICAgU3Ry aW5nIGV4dGVybmFsRGV2aWNlVHlwZSgpIGNvbnN0OwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmlkbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaWRs CShyZXZpc2lvbiAxNzA4NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJv bHMvTWVkaWFDb250cm9sc0hvc3QuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC00MSw3ICs0MSw2IEBA IGVudW0gRGV2aWNlVHlwZSB7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIERPTVN0cmluZyBjYXB0 aW9uRGlzcGxheU1vZGU7CiAgICAgdm9pZCBzZXRTZWxlY3RlZFRleHRUcmFjayhUZXh0VHJhY2sg dHJhY2spOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBIVE1MRWxlbWVudCB0ZXh0VHJhY2tDb250 YWluZXI7Ci0gICAgdm9pZCB1cGRhdGVUZXh0VHJhY2tDb250YWluZXIoKTsKICAgICByZWFkb25s eSBhdHRyaWJ1dGUgYm9vbGVhbiBtZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lOwogICAgIHJlYWRv bmx5IGF0dHJpYnV0ZSBib29sZWFuIHN1cHBvcnRzRnVsbHNjcmVlbjsKICAgICByZWFkb25seSBh dHRyaWJ1dGUgYm9vbGVhbiB1c2VyR2VzdHVyZVJlcXVpcmVkOwpAQCAtNTAsNCArNDksOCBAQCBl bnVtIERldmljZVR5cGUgewogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBEZXZpY2VUeXBlIGV4dGVy bmFsRGV2aWNlVHlwZTsKIAogICAgIGF0dHJpYnV0ZSBib29sZWFuIGNvbnRyb2xzRGVwZW5kT25Q YWdlU2NhbGVGYWN0b3I7CisgICAgCisgICAgdm9pZCB1cGRhdGVUZXh0VHJhY2tDb250YWluZXIo KTsKKyAgICB2b2lkIGVudGVyZWRGdWxsc2NyZWVuKCk7CisgICAgdm9pZCBleGl0ZWRGdWxsc2Ny ZWVuKCk7CiB9OwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21l ZGlhQ29udHJvbHNBcHBsZS5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmpzCShyZXZpc2lvbiAxNzA4NDQpCisr KyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxl LmpzCSh3b3JraW5nIGNvcHkpCkBAIC02MjQsOSArNjI0LDExIEBAIENvbnRyb2xsZXIucHJvdG90 eXBlID0gewogICAgICAgICBpZiAodGhpcy5pc0Z1bGxTY3JlZW4oKSkgewogICAgICAgICAgICAg dGhpcy5jb250cm9scy5mdWxsc2NyZWVuQnV0dG9uLmNsYXNzTGlzdC5hZGQodGhpcy5DbGFzc05h bWVzLmV4aXQpOwogICAgICAgICAgICAgdGhpcy5jb250cm9scy5mdWxsc2NyZWVuQnV0dG9uLnNl dEF0dHJpYnV0ZSgnYXJpYS1sYWJlbCcsIHRoaXMuVUlTdHJpbmcoJ0V4aXQgRnVsbCBTY3JlZW4n KSk7CisgICAgICAgICAgICB0aGlzLmhvc3QuZW50ZXJlZEZ1bGxzY3JlZW4oKTsKICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMuY29udHJvbHMuZnVsbHNjcmVlbkJ1dHRvbi5jbGFz c0xpc3QucmVtb3ZlKHRoaXMuQ2xhc3NOYW1lcy5leGl0KTsKICAgICAgICAgICAgIHRoaXMuY29u dHJvbHMuZnVsbHNjcmVlbkJ1dHRvbi5zZXRBdHRyaWJ1dGUoJ2FyaWEtbGFiZWwnLCB0aGlzLlVJ U3RyaW5nKCdEaXNwbGF5IEZ1bGwgU2NyZWVuJykpOworICAgICAgICAgICAgdGhpcy5ob3N0LmV4 aXRlZEZ1bGxzY3JlZW4oKTsKICAgICAgICAgfQogICAgIH0sCiAKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24gMTcwODQ0KQorKysgU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDc3 Myw3ICs0NzczLDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp2aXNpYmlsaXR5U3RhdGVDaAog I2lmIEVOQUJMRShWSURFT19UUkFDSykKIGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6cmVxdWlyZXNU ZXh0VHJhY2tSZXByZXNlbnRhdGlvbigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fcGxheWVyID8g bV9wbGF5ZXItPnJlcXVpcmVzVGV4dFRyYWNrUmVwcmVzZW50YXRpb24oKSA6IDA7CisgICAgcmV0 dXJuIG1faXNGdWxsc2NyZWVuICYmIG1fcGxheWVyID8gbV9wbGF5ZXItPnJlcXVpcmVzVGV4dFRy YWNrUmVwcmVzZW50YXRpb24oKSA6IGZhbHNlOwogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OnNldFRleHRUcmFja1JlcHJlc2VudGF0aW9uKFRleHRUcmFja1JlcHJlc2VudGF0aW9uKiByZXBy ZXNlbnRhdGlvbikKQEAgLTQ5NjEsNiArNDk2MSwxMCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OnNldFZpZGVvRnVsbHNjcmVlCiAgICAgCiAgICAgbV9wbGF5ZXItPnNldFZpZGVvRnVsbHNjcmVl bkxheWVyKHBsYXRmb3JtTGF5ZXIpOwogICAgIHNldE5lZWRzU3R5bGVSZWNhbGMoU3ludGhldGlj U3R5bGVDaGFuZ2UpOworI2lmIEVOQUJMRShWSURFT19UUkFDSykKKyAgICBpZiAoUnVudGltZUVu YWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS53ZWJraXRWaWRlb1RyYWNrRW5hYmxlZCgp KQorICAgICAgICB1cGRhdGVUZXh0VHJhY2tEaXNwbGF5KCk7CisjZW5kaWYKIH0KICAgICAKIHZv aWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0VmlkZW9GdWxsc2NyZWVuRnJhbWUoRmxvYXRSZWN0IGZy YW1lKQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVu dHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29u dHJvbEVsZW1lbnRzLmNwcAkocmV2aXNpb24gMTcwODQ0KQorKysgU291cmNlL1dlYkNvcmUvaHRt bC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjI4 LDYgKzEyMjgsNyBAQCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50OjpNCiAg ICAgLCBtX3VwZGF0ZVRpbWVyKHRoaXMsICZNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJF bGVtZW50Ojp1cGRhdGVUaW1lckZpcmVkKQogICAgICwgbV9mb250U2l6ZSgwKQogICAgICwgbV9m b250U2l6ZUlzSW1wb3J0YW50KGZhbHNlKQorICAgICwgbV91cGRhdGVUZXh0VHJhY2tSZXByZXNl bnRhdGlvblN0eWxlKGZhbHNlKQogewogICAgIHNldFBzZXVkbyhzaGFkb3dQc2V1ZG9JZCgpKTsK IH0KQEAgLTEzNTMsMjggKzEzNTQsMTggQEAgdm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250 YWluZXJFbGVtZQogICAgIC8vIDExLiBSZXR1cm4gb3V0cHV0LgogICAgIGlmIChoYXNDaGlsZE5v ZGVzKCkpIHsKICAgICAgICAgc2hvdygpOwotICAgICAgICBpZiAobWVkaWFFbGVtZW50LT5yZXF1 aXJlc1RleHRUcmFja1JlcHJlc2VudGF0aW9uKCkpIHsKLSAgICAgICAgICAgIGlmICghbV90ZXh0 VHJhY2tSZXByZXNlbnRhdGlvbikKLSAgICAgICAgICAgICAgICBtX3RleHRUcmFja1JlcHJlc2Vu dGF0aW9uID0gVGV4dFRyYWNrUmVwcmVzZW50YXRpb246OmNyZWF0ZSh0aGlzKTsKLSAgICAgICAg ICAgIG1lZGlhRWxlbWVudC0+c2V0VGV4dFRyYWNrUmVwcmVzZW50YXRpb24obV90ZXh0VHJhY2tS ZXByZXNlbnRhdGlvbi5nZXQoKSk7Ci0KLSAgICAgICAgICAgIG1fdGV4dFRyYWNrUmVwcmVzZW50 YXRpb24tPnVwZGF0ZSgpOwotICAgICAgICAgICAgdXBkYXRlU3R5bGVGb3JUZXh0VHJhY2tSZXBy ZXNlbnRhdGlvbigpOwotICAgICAgICB9CisgICAgICAgIHVwZGF0ZVRleHRUcmFja1JlcHJlc2Vu dGF0aW9uKCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgaGlkZSgpOwogICAgICAgICBjbGVhclRl eHRUcmFja1JlcHJlc2VudGF0aW9uKCk7CiAgICAgfQogfQogCi12b2lkIE1lZGlhQ29udHJvbFRl eHRUcmFja0NvbnRhaW5lckVsZW1lbnQ6OnVwZGF0ZVRpbWVyRmlyZWQoVGltZXI8TWVkaWFDb250 cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudD4mKQordm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJh Y2tDb250YWluZXJFbGVtZW50Ojp1cGRhdGVBY3RpdmVDdWVzRm9udFNpemUoKQogewogICAgIGlm ICghZG9jdW1lbnQoKS5wYWdlKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX3RleHRU cmFja1JlcHJlc2VudGF0aW9uKQotICAgICAgICB1cGRhdGVTdHlsZUZvclRleHRUcmFja1JlcHJl c2VudGF0aW9uKCk7Ci0KICAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSBwYXJl bnRNZWRpYUVsZW1lbnQodGhpcyk7CiAgICAgaWYgKCFtZWRpYUVsZW1lbnQpCiAgICAgICAgIHJl dHVybjsKQEAgLTEzOTEsMzYgKzEzODIsNzkgQEAgdm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tD b250YWluZXJFbGVtZQogCiAgICAgICAgIHRvVlRUQ3VlKGN1ZSktPnNldEZvbnRTaXplKG1fZm9u dFNpemUsIG1fdmlkZW9EaXNwbGF5U2l6ZS5zaXplKCksIG1fZm9udFNpemVJc0ltcG9ydGFudCk7 CiAgICAgfQorCit9CisKK3ZvaWQgTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVu dDo6dXBkYXRlVGltZXJGaXJlZChUaW1lcjxNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJF bGVtZW50PiYpCit7CisgICAgaWYgKCFkb2N1bWVudCgpLnBhZ2UoKSkKKyAgICAgICAgcmV0dXJu OworCisgICAgaWYgKG1fdGV4dFRyYWNrUmVwcmVzZW50YXRpb24pCisgICAgICAgIHVwZGF0ZVN0 eWxlRm9yVGV4dFRyYWNrUmVwcmVzZW50YXRpb24oKTsKKworICAgIHVwZGF0ZUFjdGl2ZUN1ZXNG b250U2l6ZSgpOwogICAgIHVwZGF0ZURpc3BsYXkoKTsKIH0KIAordm9pZCBNZWRpYUNvbnRyb2xU ZXh0VHJhY2tDb250YWluZXJFbGVtZW50Ojp1cGRhdGVUZXh0VHJhY2tSZXByZXNlbnRhdGlvbigp Cit7CisgICAgSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50ID0gcGFyZW50TWVkaWFFbGVt ZW50KHRoaXMpOworICAgIGlmICghbWVkaWFFbGVtZW50KQorICAgICAgICByZXR1cm47CisKKyAg ICBpZiAoIW1lZGlhRWxlbWVudC0+cmVxdWlyZXNUZXh0VHJhY2tSZXByZXNlbnRhdGlvbigpKQor ICAgICAgICByZXR1cm47CisKKyAgICBpZiAoIW1fdGV4dFRyYWNrUmVwcmVzZW50YXRpb24pIHsK KyAgICAgICAgbV90ZXh0VHJhY2tSZXByZXNlbnRhdGlvbiA9IFRleHRUcmFja1JlcHJlc2VudGF0 aW9uOjpjcmVhdGUodGhpcyk7CisgICAgICAgIG1fdXBkYXRlVGV4dFRyYWNrUmVwcmVzZW50YXRp b25TdHlsZSA9IHRydWU7CisgICAgICAgIG1lZGlhRWxlbWVudC0+c2V0VGV4dFRyYWNrUmVwcmVz ZW50YXRpb24obV90ZXh0VHJhY2tSZXByZXNlbnRhdGlvbi5nZXQoKSk7CisgICAgfQorCisgICAg bV90ZXh0VHJhY2tSZXByZXNlbnRhdGlvbi0+dXBkYXRlKCk7CisgICAgdXBkYXRlU3R5bGVGb3JU ZXh0VHJhY2tSZXByZXNlbnRhdGlvbigpOworfQorCiB2b2lkIE1lZGlhQ29udHJvbFRleHRUcmFj a0NvbnRhaW5lckVsZW1lbnQ6OmNsZWFyVGV4dFRyYWNrUmVwcmVzZW50YXRpb24oKQogeworICAg IGlmICghbV90ZXh0VHJhY2tSZXByZXNlbnRhdGlvbikKKyAgICAgICAgcmV0dXJuOworCisgICAg bV90ZXh0VHJhY2tSZXByZXNlbnRhdGlvbiA9IG51bGxwdHI7CisgICAgbV91cGRhdGVUZXh0VHJh Y2tSZXByZXNlbnRhdGlvblN0eWxlID0gdHJ1ZTsKICAgICBpZiAoSFRNTE1lZGlhRWxlbWVudCog bWVkaWFFbGVtZW50ID0gcGFyZW50TWVkaWFFbGVtZW50KHRoaXMpKQogICAgICAgICBtZWRpYUVs ZW1lbnQtPnNldFRleHRUcmFja1JlcHJlc2VudGF0aW9uKG51bGxwdHIpOwotICAgIG1fdGV4dFRy YWNrUmVwcmVzZW50YXRpb24gPSBudWxscHRyOwogICAgIHVwZGF0ZVN0eWxlRm9yVGV4dFRyYWNr UmVwcmVzZW50YXRpb24oKTsKKyAgICB1cGRhdGVBY3RpdmVDdWVzRm9udFNpemUoKTsKIH0KIAog dm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50Ojp1cGRhdGVTdHlsZUZv clRleHRUcmFja1JlcHJlc2VudGF0aW9uKCkKIHsKKyAgICBpZiAoIW1fdXBkYXRlVGV4dFRyYWNr UmVwcmVzZW50YXRpb25TdHlsZSkKKyAgICAgICAgcmV0dXJuOworICAgIG1fdXBkYXRlVGV4dFRy YWNrUmVwcmVzZW50YXRpb25TdHlsZSA9IGZhbHNlOworCiAgICAgaWYgKG1fdGV4dFRyYWNrUmVw cmVzZW50YXRpb24pIHsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0 eVdpZHRoLCBtX3ZpZGVvRGlzcGxheVNpemUuc2l6ZSgpLndpZHRoKCksIENTU1ByaW1pdGl2ZVZh bHVlOjpDU1NfUFgpOwogICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5 SGVpZ2h0LCBtX3ZpZGVvRGlzcGxheVNpemUuc2l6ZSgpLmhlaWdodCgpLCBDU1NQcmltaXRpdmVW YWx1ZTo6Q1NTX1BYKTsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0 eVBvc2l0aW9uLCBDU1NWYWx1ZUFic29sdXRlKTsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9w ZXJ0eShDU1NQcm9wZXJ0eUxlZnQsIDAsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgpOwogICAg ICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5VG9wLCAwLCBDU1NQcmltaXRp dmVWYWx1ZTo6Q1NTX1BYKTsKLSAgICB9IGVsc2UgewotICAgICAgICByZW1vdmVJbmxpbmVTdHls ZVByb3BlcnR5KENTU1Byb3BlcnR5UG9zaXRpb24pOwotICAgICAgICByZW1vdmVJbmxpbmVTdHls ZVByb3BlcnR5KENTU1Byb3BlcnR5V2lkdGgpOwotICAgICAgICByZW1vdmVJbmxpbmVTdHlsZVBy b3BlcnR5KENTU1Byb3BlcnR5SGVpZ2h0KTsKLSAgICAgICAgcmVtb3ZlSW5saW5lU3R5bGVQcm9w ZXJ0eShDU1NQcm9wZXJ0eUxlZnQpOwotICAgICAgICByZW1vdmVJbmxpbmVTdHlsZVByb3BlcnR5 KENTU1Byb3BlcnR5VG9wKTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KKworICAgIHJlbW92ZUlu bGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlQb3NpdGlvbik7CisgICAgcmVtb3ZlSW5saW5l U3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVdpZHRoKTsKKyAgICByZW1vdmVJbmxpbmVTdHlsZVBy b3BlcnR5KENTU1Byb3BlcnR5SGVpZ2h0KTsKKyAgICByZW1vdmVJbmxpbmVTdHlsZVByb3BlcnR5 KENTU1Byb3BlcnR5TGVmdCk7CisgICAgcmVtb3ZlSW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9w ZXJ0eVRvcCk7CiB9CiAKIHZvaWQgTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVu dDo6ZW50ZXJlZEZ1bGxzY3JlZW4oKQogeworICAgIGlmIChoYXNDaGlsZE5vZGVzKCkpCisgICAg ICAgIHVwZGF0ZVRleHRUcmFja1JlcHJlc2VudGF0aW9uKCk7CiAgICAgdXBkYXRlU2l6ZXModHJ1 ZSk7CiB9CiAKQEAgLTE0NDIsNyArMTQ3Niw2IEBAIHZvaWQgTWVkaWFDb250cm9sVGV4dFRyYWNr Q29udGFpbmVyRWxlbWUKICAgICBtZWRpYUVsZW1lbnQtPnN5bmNUZXh0VHJhY2tCb3VuZHMoKTsK IAogICAgIEludFJlY3QgdmlkZW9Cb3g7Ci0KICAgICBpZiAobV90ZXh0VHJhY2tSZXByZXNlbnRh dGlvbikKICAgICAgICAgdmlkZW9Cb3ggPSBtX3RleHRUcmFja1JlcHJlc2VudGF0aW9uLT5ib3Vu ZHMoKTsKICAgICBlbHNlIHsKQEAgLTE0NTMsNyArMTQ4Niw5IEBAIHZvaWQgTWVkaWFDb250cm9s VGV4dFRyYWNrQ29udGFpbmVyRWxlbWUKIAogICAgIGlmICghZm9yY2VVcGRhdGUgJiYgbV92aWRl b0Rpc3BsYXlTaXplID09IHZpZGVvQm94KQogICAgICAgICByZXR1cm47CisKICAgICBtX3ZpZGVv RGlzcGxheVNpemUgPSB2aWRlb0JveDsKKyAgICBtX3VwZGF0ZVRleHRUcmFja1JlcHJlc2VudGF0 aW9uU3R5bGUgPSB0cnVlOwogCiAgICAgLy8gRklYTUUgKDEyMTE3MCk6IFRoaXMgZnVuY3Rpb24g aXMgY2FsbGVkIGR1cmluZyBsYXlvdXQsIGFuZCBzaG91bGQgbGF5IG91dCB0aGUgdGV4dCB0cmFj a3MgaW1tZWRpYXRlbHkuCiAgICAgbV91cGRhdGVUaW1lci5zdGFydE9uZVNob3QoMCk7CkBAIC0x NDk2LDYgKzE1MzEsOCBAQCBQYXNzUmVmUHRyPEltYWdlPiBNZWRpYUNvbnRyb2xUZXh0VHJhY2tD CiAKIHZvaWQgTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6dGV4dFRyYWNr UmVwcmVzZW50YXRpb25Cb3VuZHNDaGFuZ2VkKGNvbnN0IEludFJlY3QmKQogeworICAgIGlmICho YXNDaGlsZE5vZGVzKCkpCisgICAgICAgIHVwZGF0ZVRleHRUcmFja1JlcHJlc2VudGF0aW9uKCk7 CiAgICAgdXBkYXRlU2l6ZXMoKTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9zaGFk b3cvTWVkaWFDb250cm9sRWxlbWVudHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9o dG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oCShyZXZpc2lvbiAxNzA4NDQpCisrKyBT b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oCSh3b3JraW5n IGNvcHkpCkBAIC00NzgsNiArNDc4LDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIHZvaWQg dXBkYXRlVGltZXJGaXJlZChUaW1lcjxNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVt ZW50PiYpOworICAgIHZvaWQgdXBkYXRlQWN0aXZlQ3Vlc0ZvbnRTaXplKCk7CiAKICAgICBleHBs aWNpdCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50KERvY3VtZW50Jik7CiAg ICAgdmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIHNoYWRvd1BzZXVkb0lkKCkgY29uc3Qgb3Zl cnJpZGU7CkBAIC00ODYsNiArNDg3LDcgQEAgcHJpdmF0ZToKIAogICAgIHZpcnR1YWwgUGFzc1Jl ZlB0cjxJbWFnZT4gY3JlYXRlVGV4dFRyYWNrUmVwcmVzZW50YXRpb25JbWFnZSgpIG92ZXJyaWRl OwogICAgIHZpcnR1YWwgdm9pZCB0ZXh0VHJhY2tSZXByZXNlbnRhdGlvbkJvdW5kc0NoYW5nZWQo Y29uc3QgSW50UmVjdCYpIG92ZXJyaWRlOworICAgIHZvaWQgdXBkYXRlVGV4dFRyYWNrUmVwcmVz ZW50YXRpb24oKTsKICAgICB2b2lkIGNsZWFyVGV4dFRyYWNrUmVwcmVzZW50YXRpb24oKTsKICAg ICB2b2lkIHVwZGF0ZVN0eWxlRm9yVGV4dFRyYWNrUmVwcmVzZW50YXRpb24oKTsKICAgICBPd25Q dHI8VGV4dFRyYWNrUmVwcmVzZW50YXRpb24+IG1fdGV4dFRyYWNrUmVwcmVzZW50YXRpb247CkBA IC00OTQsNiArNDk2LDcgQEAgcHJpdmF0ZToKICAgICBJbnRSZWN0IG1fdmlkZW9EaXNwbGF5U2l6 ZTsKICAgICBpbnQgbV9mb250U2l6ZTsKICAgICBib29sIG1fZm9udFNpemVJc0ltcG9ydGFudDsK KyAgICBib29sIG1fdXBkYXRlVGV4dFRyYWNrUmVwcmVzZW50YXRpb25TdHlsZTsKIH07CiAKICNl bmRpZgo=