144700 2015-05-06 11:56:55 -0700 Media Controls: Scrubber should not follow actual video time, causes scrubber to be jumpy 2015-05-07 15:33:34 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 roger_fong webkit-unassigned dino jer.noble roger_fong oldest_to_newest 1092259 0 roger_fong 2015-05-06 11:56:55 -0700 We should a) draw the scrubber based on the input range position b) also, update the time and draw the timeline on timelinemousemove, not wrappermousemove. rdar://problem/19997548 1092260 1 252502 roger_fong 2015-05-06 12:01:17 -0700 Created attachment 252502 patch 1092277 2 252502 dino 2015-05-06 12:27:30 -0700 Comment on attachment 252502 patch I guess we have to do the same for iOS. 1092282 3 252502 jer.noble 2015-05-06 12:30:11 -0700 Comment on attachment 252502 patch This doesn't solve the underlying problem. You are still querying the <video> element's currentTime when interacting with the timeline slider. 1092285 4 252502 jer.noble 2015-05-06 12:32:11 -0700 Comment on attachment 252502 patch View in context: https://bugs.webkit.org/attachment.cgi?id=252502&action=review > Source/WebCore/Modules/mediacontrols/mediaControlsApple.js:885 > + this.updateTime(); updateTime() sets timeline.value based on video.currentTime. That's the underlying problem. 1092519 5 252572 roger_fong 2015-05-06 23:10:54 -0700 Created attachment 252572 patch 1092614 6 252572 darin 2015-05-07 09:33:16 -0700 Comment on attachment 252572 patch View in context: https://bugs.webkit.org/attachment.cgi?id=252572&action=review > Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm:369 > - CGContextSetFontAntialiasingStyle(cgContext, kCGFontAntialiasingStyleUnfilteredCustomDilation); > + CGContextSetFontAntialiasingStyle(cgContext, kCGFontAntialiasingStyleCustomDilation); Surely this was included in the patch by accident? 1092626 7 roger_fong 2015-05-07 10:05:09 -0700 > Surely this was included in the patch by accident? whoops yup 1092627 8 252597 roger_fong 2015-05-07 10:05:46 -0700 Created attachment 252597 patch 1092636 9 252597 jer.noble 2015-05-07 10:36:56 -0700 Comment on attachment 252597 patch View in context: https://bugs.webkit.org/attachment.cgi?id=252597&action=review > Source/WebCore/Modules/mediacontrols/mediaControlsApple.js:888 > handleTimelineMouseMove: function(event) > { > + this.updateControlsWhileScrubbing(); > + Shouldn't this be handled in handleTimelineInput()? (And in handleTimelineChange())? Doing it this way means that the controls won't update when the timeline is changed through Accessibility. > Source/WebCore/Modules/mediacontrols/mediaControlsApple.js:1408 > + > + if (this.isWaitingForBuffer) > + return; Why is this necessary? Surely we're not getting "timechange" events when we're in the "waiting" state. 1092679 10 252603 roger_fong 2015-05-07 11:57:31 -0700 Created attachment 252603 patch 1092683 11 roger_fong 2015-05-07 12:01:23 -0700 (In reply to comment #10) > Created attachment 252603 [details] > patch I think handleTimelineInput is sufficient since we get an input and change event at the same timeline position when ending the scrub. 1092686 12 roger_fong 2015-05-07 12:03:14 -0700 I should probably do an iOS fix in this patch as well 1092800 13 roger_fong 2015-05-07 15:33:34 -0700 http://trac.webkit.org/changeset/183953 252502 2015-05-06 12:01:17 -0700 2015-05-06 23:10:54 -0700 patch patch.patch text/plain 2361 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4Mzg3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA1LTA2ICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgTWVkaWEgQ29udHJvbHM6IFNj cnViYmVyIHNob3VsZCBub3QgZm9sbG93IGFjdHVhbCB2aWRlbyB0aW1lLCBjYXVzZXMgc2NydWJi ZXIgdG8gYmUganVtcHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDQ3MDAuCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xOTk5NzU0OD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvbWVk aWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanM6CisgICAgICAgIChDb250cm9sbGVyLnBy b3RvdHlwZS5oYW5kbGVXcmFwcGVyTW91c2VNb3ZlKToKKyAgICAgICAgKENvbnRyb2xsZXIucHJv dG90eXBlLmhhbmRsZVRpbWVsaW5lTW91c2VNb3ZlKToKKyAgICAgICAgVXBkYXRlIHRpbWUgYW5k IHRpbWVsaW5lIGluIHRoZSB0aW1lbGluZSdzIG1vdXNlbW92ZSBoYW5kbGVyLCBub3QgdGhlIHdy YXBwZXIncy4KKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLmRyYXdUaW1lbGluZUJhY2tn cm91bmQpOgorICAgICAgICBEcmF3IHNjcnViYmVyIHBvc2l0aW9uIHVzaW5nIGlucHV0IHJhbmdl IHBvc2l0aW9uIGluc3RlYWQuCisKIDIwMTUtMDUtMDYgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2Jp bnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtGcmVlVHlwZV0gVmVydGljYWwgQ0pLIGdseXBo cyBzaG91bGQgbm90IGJlIHJlbmRlcmVkIHdpdGggc3ludGhldGljIG9ibGlxdWUKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlh Q29udHJvbHNBcHBsZS5qcwkocmV2aXNpb24gMTgzODgwKQorKysgU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5qcwkod29ya2luZyBjb3B5KQpA QCAtNzYyLDkgKzc2Miw2IEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICBpZiAo dGhpcy5jb250cm9sc0FyZUhpZGRlbigpKQogICAgICAgICAgICAgdGhpcy5zaG93Q29udHJvbHMo KTsKICAgICAgICAgdGhpcy5yZXNldEhpZGVDb250cm9sc1RpbWVyKCk7Ci0gICAgICAgIAotICAg ICAgICBpZiAodGhpcy5zY3J1YmJpbmcpCi0gICAgICAgICAgICB0aGlzLnVwZGF0ZVRpbWUoKTsK IAogICAgICAgICBpZiAoIXRoaXMuaXNEcmFnZ2luZykKICAgICAgICAgICAgIHJldHVybjsKQEAg LTg4NCw2ICs4ODEsMTEgQEAgQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAKICAgICBoYW5kbGVU aW1lbGluZU1vdXNlTW92ZTogZnVuY3Rpb24oZXZlbnQpCiAgICAgeworICAgICAgICBpZiAodGhp cy5zY3J1YmJpbmcpIHsKKyAgICAgICAgICAgIHRoaXMudXBkYXRlVGltZSgpOworICAgICAgICAg ICAgdGhpcy5kcmF3VGltZWxpbmVCYWNrZ3JvdW5kKCk7CisgICAgICAgIH0KKwogICAgICAgICBp ZiAodGhpcy5jb250cm9scy50aHVtYm5haWwuY2xhc3NMaXN0LmNvbnRhaW5zKHRoaXMuQ2xhc3NO YW1lcy5oaWRkZW4pKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0xMTU3LDggKzExNTksOCBA QCBDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgCiAgICAgICAgIGlmICghd2lkdGgg fHwgIWhlaWdodCkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgCi0gICAgICAgIHZhciBw bGF5ZWQgPSB0aGlzLnZpZGVvLmN1cnJlbnRUaW1lIC8gdGhpcy52aWRlby5kdXJhdGlvbjsKKwor ICAgICAgICB2YXIgcGxheWVkID0gdGhpcy5jb250cm9scy50aW1lbGluZS52YWx1ZSAvIHRoaXMu Y29udHJvbHMudGltZWxpbmUubWF4OwogICAgICAgICB2YXIgYnVmZmVyZWQgPSAwOwogICAgICAg ICBmb3IgKHZhciBpID0gMCwgZW5kID0gdGhpcy52aWRlby5idWZmZXJlZC5sZW5ndGg7IGkgPCBl bmQ7ICsraSkKICAgICAgICAgICAgIGJ1ZmZlcmVkID0gTWF0aC5tYXgodGhpcy52aWRlby5idWZm ZXJlZC5lbmQoaSksIGJ1ZmZlcmVkKTsK 252572 2015-05-06 23:10:54 -0700 2015-05-07 10:05:46 -0700 patch patch.patch text/plain 5328 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MzkxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE1LTA1LTA2ICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgTWVkaWEgQ29udHJvbHM6IFNj cnViYmVyIHNob3VsZCBiZSBpbmRlcGVuZGVudCBvZiBhY3R1YWwgdmlkZW8gdGltZSwgY2F1c2Vz IHNjcnViYmVyIHRvIGJlIGp1bXB5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ0NzAwLgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTk5OTc1NDg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1 bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmpzOgorICAgICAgICBLZWVwIHRy YWNrIG9mIHdoZW4gdGhlIHZpZGVvIGlzIGJ1ZmZlcmluZy4KKyAgICAgICAgKENvbnRyb2xsZXIp OgorICAgICAgICAoQ29udHJvbGxlci5wcm90b3R5cGUuaGFuZGxlV2FpdGluZyk6CisgICAgICAg IChDb250cm9sbGVyLnByb3RvdHlwZS5oYW5kbGVQbGF5KToKKworICAgICAgICBVcGRhdGUgdGlt ZSBhbmQgdGltZWxpbmUgaW4gdGhlIHRpbWVsaW5lJ3MgbW91c2Vtb3ZlIGhhbmRsZXIsIG5vdCB0 aGUgd3JhcHBlcidzLgorICAgICAgICAoQ29udHJvbGxlci5wcm90b3R5cGUuaGFuZGxlV3JhcHBl ck1vdXNlTW92ZSk6CisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS5oYW5kbGVUaW1lbGlu ZU1vdXNlTW92ZSk6CisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS5kcmF3VGltZWxpbmVC YWNrZ3JvdW5kKTogCisKKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLnVwZGF0ZUNvbnRy b2xzV2hpbGVTY3J1YmJpbmcpOiAKKyAgICAgICAgICAgIFVwZGF0ZXMgdGltZSBhbmQgc2NydWJi ZXIgdG8gcmVmbGVjdCB0aW1lbGluZSB1c2VyIGlucHV0LgorICAgICAgICAoQ29udHJvbGxlci5w cm90b3R5cGUudXBkYXRlVGltZSk6IAorICAgICAgICAgICAgRG9uJ3QgdXBkYXRlIHRoZSB0aW1l IHdoaWxlIGJ1ZmZlcmluZywgdGhlIHRpbWUgcmVhZGluZyB3aWxsIG5vdCBiZSBmaW5hbC4KKwog MjAxNS0wNS0wNiAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAg W2lPU11bV0syXSBQYXVzZS9yZXN1bWUgZGF0YWJhc2UgdGhyZWFkIHdoZW4gVUlQcm9jZXNzIGVu dGVycy9sZWF2ZXMgdGhlIGJhY2tncm91bmQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5qcwkocmV2 aXNpb24gMTgzODgwKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21l ZGlhQ29udHJvbHNBcHBsZS5qcwkod29ya2luZyBjb3B5KQpAQCAtMTcsNiArMTcsNyBAQCBmdW5j dGlvbiBDb250cm9sbGVyKHJvb3QsIHZpZGVvLCBob3N0KQogICAgIHRoaXMuY3VycmVudFRhcmdl dElzV2lyZWxlc3MgPSBmYWxzZTsKICAgICB0aGlzLndpcmVsZXNzUGxheWJhY2tEaXNhYmxlZCA9 IGZhbHNlOwogICAgIHRoaXMuaXNWb2x1bWVTbGlkZXJBY3RpdmUgPSBmYWxzZTsKKyAgICB0aGlz LmlzV2FpdGluZ0ZvckJ1ZmZlciA9IGZhbHNlOwogCiAgICAgdGhpcy5hZGRWaWRlb0xpc3RlbmVy cygpOwogICAgIHRoaXMuY3JlYXRlQmFzZSgpOwpAQCAtNjQ2LDYgKzY0Nyw3IEBAIENvbnRyb2xs ZXIucHJvdG90eXBlID0gewogICAgIGhhbmRsZVdhaXRpbmc6IGZ1bmN0aW9uKGV2ZW50KQogICAg IHsKICAgICAgICAgdGhpcy51cGRhdGVTdGF0dXNEaXNwbGF5KCk7CisgICAgICAgIHRoaXMuaXNX YWl0aW5nRm9yQnVmZmVyID0gdHJ1ZTsKICAgICB9LAogCiAgICAgaGFuZGxlUmVhZHlTdGF0ZUNo YW5nZTogZnVuY3Rpb24oZXZlbnQpCkBAIC02NzYsNiArNjc4LDcgQEAgQ29udHJvbGxlci5wcm90 b3R5cGUgPSB7CiAgICAgaGFuZGxlUGxheTogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAg ICB0aGlzLnNldFBsYXlpbmcodHJ1ZSk7CisgICAgICAgIHRoaXMuaXNXYWl0aW5nRm9yQnVmZmVy ID0gZmFsc2U7CiAgICAgfSwKIAogICAgIGhhbmRsZVBhdXNlOiBmdW5jdGlvbihldmVudCkKQEAg LTc2Miw5ICs3NjUsNiBAQCBDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRo aXMuY29udHJvbHNBcmVIaWRkZW4oKSkKICAgICAgICAgICAgIHRoaXMuc2hvd0NvbnRyb2xzKCk7 CiAgICAgICAgIHRoaXMucmVzZXRIaWRlQ29udHJvbHNUaW1lcigpOwotICAgICAgICAKLSAgICAg ICAgaWYgKHRoaXMuc2NydWJiaW5nKQotICAgICAgICAgICAgdGhpcy51cGRhdGVUaW1lKCk7CiAK ICAgICAgICAgaWYgKCF0aGlzLmlzRHJhZ2dpbmcpCiAgICAgICAgICAgICByZXR1cm47CkBAIC04 ODQsNiArODg0LDggQEAgQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAKICAgICBoYW5kbGVUaW1l bGluZU1vdXNlTW92ZTogZnVuY3Rpb24oZXZlbnQpCiAgICAgeworICAgICAgICB0aGlzLnVwZGF0 ZUNvbnRyb2xzV2hpbGVTY3J1YmJpbmcoKTsKKwogICAgICAgICBpZiAodGhpcy5jb250cm9scy50 aHVtYm5haWwuY2xhc3NMaXN0LmNvbnRhaW5zKHRoaXMuQ2xhc3NOYW1lcy5oaWRkZW4pKQogICAg ICAgICAgICAgcmV0dXJuOwogCkBAIC0xMTU3LDggKzExNTksOCBAQCBDb250cm9sbGVyLnByb3Rv dHlwZSA9IHsKICAgICAgICAgCiAgICAgICAgIGlmICghd2lkdGggfHwgIWhlaWdodCkKICAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgCi0gICAgICAgIHZhciBwbGF5ZWQgPSB0aGlzLnZpZGVv LmN1cnJlbnRUaW1lIC8gdGhpcy52aWRlby5kdXJhdGlvbjsKKworICAgICAgICB2YXIgcGxheWVk ID0gdGhpcy5jb250cm9scy50aW1lbGluZS52YWx1ZSAvIHRoaXMuY29udHJvbHMudGltZWxpbmUu bWF4OwogICAgICAgICB2YXIgYnVmZmVyZWQgPSAwOwogICAgICAgICBmb3IgKHZhciBpID0gMCwg ZW5kID0gdGhpcy52aWRlby5idWZmZXJlZC5sZW5ndGg7IGkgPCBlbmQ7ICsraSkKICAgICAgICAg ICAgIGJ1ZmZlcmVkID0gTWF0aC5tYXgodGhpcy52aWRlby5idWZmZXJlZC5lbmQoaSksIGJ1ZmZl cmVkKTsKQEAgLTE0MDEsNiArMTQwMyw5IEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAg IHsKICAgICAgICAgaWYgKCFmb3JjZVVwZGF0ZSAmJiB0aGlzLmNvbnRyb2xzQXJlSGlkZGVuKCkp CiAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIAorICAgICAgICBpZiAodGhpcy5pc1dhaXRp bmdGb3JCdWZmZXIpCisgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdmFyIGN1cnJlbnRU aW1lID0gdGhpcy52aWRlby5jdXJyZW50VGltZTsKICAgICAgICAgdmFyIHRpbWVSZW1haW5pbmcg PSBjdXJyZW50VGltZSAtIHRoaXMudmlkZW8uZHVyYXRpb247CkBAIC0xNDA4LDYgKzE0MTMsMTgg QEAgQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuY29udHJvbHMudGltZWxp bmUudmFsdWUgPSB0aGlzLnZpZGVvLmN1cnJlbnRUaW1lOwogICAgICAgICB0aGlzLmNvbnRyb2xz LnJlbWFpbmluZ1RpbWUuaW5uZXJUZXh0ID0gdGhpcy5mb3JtYXRUaW1lKHRpbWVSZW1haW5pbmcp OwogICAgIH0sCisgICAgCisgICAgdXBkYXRlQ29udHJvbHNXaGlsZVNjcnViYmluZzogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLnNjcnViYmluZykKKyAgICAgICAgICAgIHJl dHVybjsKKworICAgICAgICB2YXIgY3VycmVudFRpbWUgPSAodGhpcy5jb250cm9scy50aW1lbGlu ZS52YWx1ZSAvIHRoaXMuY29udHJvbHMudGltZWxpbmUubWF4KSAqIHRoaXMudmlkZW8uZHVyYXRp b247CisgICAgICAgIHZhciB0aW1lUmVtYWluaW5nID0gY3VycmVudFRpbWUgLSB0aGlzLnZpZGVv LmR1cmF0aW9uOworICAgICAgICB0aGlzLmNvbnRyb2xzLmN1cnJlbnRUaW1lLmlubmVyVGV4dCA9 IHRoaXMuZm9ybWF0VGltZShjdXJyZW50VGltZSk7CisgICAgICAgIHRoaXMuY29udHJvbHMucmVt YWluaW5nVGltZS5pbm5lclRleHQgPSB0aGlzLmZvcm1hdFRpbWUodGltZVJlbWFpbmluZyk7Cisg ICAgICAgIHRoaXMuZHJhd1RpbWVsaW5lQmFja2dyb3VuZCgpOworICAgIH0sCiAKICAgICB1cGRh dGVSZWFkeVN0YXRlOiBmdW5jdGlvbigpCiAgICAgewpJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhc2NhZGVDb2NvYS5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FzY2FkZUNvY29hLm1t CShyZXZpc2lvbiAxODM3ODApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9Gb250Q2FzY2FkZUNvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNjYsNyArMzY2LDcg QEAgdm9pZCBGb250Q2FzY2FkZTo6ZHJhd0dseXBocyhHcmFwaGljc0NvbgogICAgIGlmIChhbnRp YWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQoKSAmJiAhQ0dDb250ZXh0R2V0U2hvdWxkU21vb3Ro Rm9udHMoY2dDb250ZXh0KSAmJiBtYXRjaEFudGlhbGlhc2VkQW5kU21vb3RoZWRGb250cykgewog ICAgICAgICByZXNldEFudGlhbGlhc2luZ1N0eWxlID0gdHJ1ZTsKICAgICAgICAgb2xkQW50aWFs aWFzaW5nU3R5bGUgPSBDR0NvbnRleHRHZXRGb250QW50aWFsaWFzaW5nU3R5bGUoY2dDb250ZXh0 KTsKLSAgICAgICAgQ0dDb250ZXh0U2V0Rm9udEFudGlhbGlhc2luZ1N0eWxlKGNnQ29udGV4dCwg a0NHRm9udEFudGlhbGlhc2luZ1N0eWxlVW5maWx0ZXJlZEN1c3RvbURpbGF0aW9uKTsKKyAgICAg ICAgQ0dDb250ZXh0U2V0Rm9udEFudGlhbGlhc2luZ1N0eWxlKGNnQ29udGV4dCwga0NHRm9udEFu dGlhbGlhc2luZ1N0eWxlQ3VzdG9tRGlsYXRpb24pOwogICAgICAgICBDR0NvbnRleHRTZXRGb250 RGlsYXRpb24oY2dDb250ZXh0LCBkaWxhdGlvblNpemVGb3JUZXh0Q29sb3IoY29udGV4dC0+Zmls bENvbG9yKCkpKTsKICAgICB9CiAjZW5kaWYK 252597 2015-05-07 10:05:46 -0700 2015-05-07 11:57:31 -0700 patch patch.patch text/plain 4421 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MzkxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE1LTA1LTA2ICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgTWVkaWEgQ29udHJvbHM6IFNj cnViYmVyIHNob3VsZCBiZSBpbmRlcGVuZGVudCBvZiBhY3R1YWwgdmlkZW8gdGltZSwgY2F1c2Vz IHNjcnViYmVyIHRvIGJlIGp1bXB5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ0NzAwLgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTk5OTc1NDg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1 bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmpzOgorICAgICAgICBLZWVwIHRy YWNrIG9mIHdoZW4gdGhlIHZpZGVvIGlzIGJ1ZmZlcmluZy4KKyAgICAgICAgKENvbnRyb2xsZXIp OgorICAgICAgICAoQ29udHJvbGxlci5wcm90b3R5cGUuaGFuZGxlV2FpdGluZyk6CisgICAgICAg IChDb250cm9sbGVyLnByb3RvdHlwZS5oYW5kbGVQbGF5KToKKworICAgICAgICBVcGRhdGUgdGlt ZSBhbmQgdGltZWxpbmUgaW4gdGhlIHRpbWVsaW5lJ3MgbW91c2Vtb3ZlIGhhbmRsZXIsIG5vdCB0 aGUgd3JhcHBlcidzLgorICAgICAgICAoQ29udHJvbGxlci5wcm90b3R5cGUuaGFuZGxlV3JhcHBl ck1vdXNlTW92ZSk6CisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS5oYW5kbGVUaW1lbGlu ZU1vdXNlTW92ZSk6CisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS5kcmF3VGltZWxpbmVC YWNrZ3JvdW5kKTogCisKKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLnVwZGF0ZUNvbnRy b2xzV2hpbGVTY3J1YmJpbmcpOiAKKyAgICAgICAgICAgIFVwZGF0ZXMgdGltZSBhbmQgc2NydWJi ZXIgdG8gcmVmbGVjdCB0aW1lbGluZSB1c2VyIGlucHV0LgorICAgICAgICAoQ29udHJvbGxlci5w cm90b3R5cGUudXBkYXRlVGltZSk6IAorICAgICAgICAgICAgRG9uJ3QgdXBkYXRlIHRoZSB0aW1l IHdoaWxlIGJ1ZmZlcmluZywgdGhlIHRpbWUgcmVhZGluZyB3aWxsIG5vdCBiZSBmaW5hbC4KKwog MjAxNS0wNS0wNiAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAg W2lPU11bV0syXSBQYXVzZS9yZXN1bWUgZGF0YWJhc2UgdGhyZWFkIHdoZW4gVUlQcm9jZXNzIGVu dGVycy9sZWF2ZXMgdGhlIGJhY2tncm91bmQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5qcwkocmV2 aXNpb24gMTgzODgwKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21l ZGlhQ29udHJvbHNBcHBsZS5qcwkod29ya2luZyBjb3B5KQpAQCAtMTcsNiArMTcsNyBAQCBmdW5j dGlvbiBDb250cm9sbGVyKHJvb3QsIHZpZGVvLCBob3N0KQogICAgIHRoaXMuY3VycmVudFRhcmdl dElzV2lyZWxlc3MgPSBmYWxzZTsKICAgICB0aGlzLndpcmVsZXNzUGxheWJhY2tEaXNhYmxlZCA9 IGZhbHNlOwogICAgIHRoaXMuaXNWb2x1bWVTbGlkZXJBY3RpdmUgPSBmYWxzZTsKKyAgICB0aGlz LmlzV2FpdGluZ0ZvckJ1ZmZlciA9IGZhbHNlOwogCiAgICAgdGhpcy5hZGRWaWRlb0xpc3RlbmVy cygpOwogICAgIHRoaXMuY3JlYXRlQmFzZSgpOwpAQCAtNjQ2LDYgKzY0Nyw3IEBAIENvbnRyb2xs ZXIucHJvdG90eXBlID0gewogICAgIGhhbmRsZVdhaXRpbmc6IGZ1bmN0aW9uKGV2ZW50KQogICAg IHsKICAgICAgICAgdGhpcy51cGRhdGVTdGF0dXNEaXNwbGF5KCk7CisgICAgICAgIHRoaXMuaXNX YWl0aW5nRm9yQnVmZmVyID0gdHJ1ZTsKICAgICB9LAogCiAgICAgaGFuZGxlUmVhZHlTdGF0ZUNo YW5nZTogZnVuY3Rpb24oZXZlbnQpCkBAIC02NzYsNiArNjc4LDcgQEAgQ29udHJvbGxlci5wcm90 b3R5cGUgPSB7CiAgICAgaGFuZGxlUGxheTogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAg ICB0aGlzLnNldFBsYXlpbmcodHJ1ZSk7CisgICAgICAgIHRoaXMuaXNXYWl0aW5nRm9yQnVmZmVy ID0gZmFsc2U7CiAgICAgfSwKIAogICAgIGhhbmRsZVBhdXNlOiBmdW5jdGlvbihldmVudCkKQEAg LTc2Miw5ICs3NjUsNiBAQCBDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRo aXMuY29udHJvbHNBcmVIaWRkZW4oKSkKICAgICAgICAgICAgIHRoaXMuc2hvd0NvbnRyb2xzKCk7 CiAgICAgICAgIHRoaXMucmVzZXRIaWRlQ29udHJvbHNUaW1lcigpOwotICAgICAgICAKLSAgICAg ICAgaWYgKHRoaXMuc2NydWJiaW5nKQotICAgICAgICAgICAgdGhpcy51cGRhdGVUaW1lKCk7CiAK ICAgICAgICAgaWYgKCF0aGlzLmlzRHJhZ2dpbmcpCiAgICAgICAgICAgICByZXR1cm47CkBAIC04 ODQsNiArODg0LDggQEAgQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAKICAgICBoYW5kbGVUaW1l bGluZU1vdXNlTW92ZTogZnVuY3Rpb24oZXZlbnQpCiAgICAgeworICAgICAgICB0aGlzLnVwZGF0 ZUNvbnRyb2xzV2hpbGVTY3J1YmJpbmcoKTsKKwogICAgICAgICBpZiAodGhpcy5jb250cm9scy50 aHVtYm5haWwuY2xhc3NMaXN0LmNvbnRhaW5zKHRoaXMuQ2xhc3NOYW1lcy5oaWRkZW4pKQogICAg ICAgICAgICAgcmV0dXJuOwogCkBAIC0xMTU3LDggKzExNTksOCBAQCBDb250cm9sbGVyLnByb3Rv dHlwZSA9IHsKICAgICAgICAgCiAgICAgICAgIGlmICghd2lkdGggfHwgIWhlaWdodCkKICAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgCi0gICAgICAgIHZhciBwbGF5ZWQgPSB0aGlzLnZpZGVv LmN1cnJlbnRUaW1lIC8gdGhpcy52aWRlby5kdXJhdGlvbjsKKworICAgICAgICB2YXIgcGxheWVk ID0gdGhpcy5jb250cm9scy50aW1lbGluZS52YWx1ZSAvIHRoaXMuY29udHJvbHMudGltZWxpbmUu bWF4OwogICAgICAgICB2YXIgYnVmZmVyZWQgPSAwOwogICAgICAgICBmb3IgKHZhciBpID0gMCwg ZW5kID0gdGhpcy52aWRlby5idWZmZXJlZC5sZW5ndGg7IGkgPCBlbmQ7ICsraSkKICAgICAgICAg ICAgIGJ1ZmZlcmVkID0gTWF0aC5tYXgodGhpcy52aWRlby5idWZmZXJlZC5lbmQoaSksIGJ1ZmZl cmVkKTsKQEAgLTE0MDEsNiArMTQwMyw5IEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAg IHsKICAgICAgICAgaWYgKCFmb3JjZVVwZGF0ZSAmJiB0aGlzLmNvbnRyb2xzQXJlSGlkZGVuKCkp CiAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIAorICAgICAgICBpZiAodGhpcy5pc1dhaXRp bmdGb3JCdWZmZXIpCisgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdmFyIGN1cnJlbnRU aW1lID0gdGhpcy52aWRlby5jdXJyZW50VGltZTsKICAgICAgICAgdmFyIHRpbWVSZW1haW5pbmcg PSBjdXJyZW50VGltZSAtIHRoaXMudmlkZW8uZHVyYXRpb247CkBAIC0xNDA4LDYgKzE0MTMsMTgg QEAgQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuY29udHJvbHMudGltZWxp bmUudmFsdWUgPSB0aGlzLnZpZGVvLmN1cnJlbnRUaW1lOwogICAgICAgICB0aGlzLmNvbnRyb2xz LnJlbWFpbmluZ1RpbWUuaW5uZXJUZXh0ID0gdGhpcy5mb3JtYXRUaW1lKHRpbWVSZW1haW5pbmcp OwogICAgIH0sCisgICAgCisgICAgdXBkYXRlQ29udHJvbHNXaGlsZVNjcnViYmluZzogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLnNjcnViYmluZykKKyAgICAgICAgICAgIHJl dHVybjsKKworICAgICAgICB2YXIgY3VycmVudFRpbWUgPSAodGhpcy5jb250cm9scy50aW1lbGlu ZS52YWx1ZSAvIHRoaXMuY29udHJvbHMudGltZWxpbmUubWF4KSAqIHRoaXMudmlkZW8uZHVyYXRp b247CisgICAgICAgIHZhciB0aW1lUmVtYWluaW5nID0gY3VycmVudFRpbWUgLSB0aGlzLnZpZGVv LmR1cmF0aW9uOworICAgICAgICB0aGlzLmNvbnRyb2xzLmN1cnJlbnRUaW1lLmlubmVyVGV4dCA9 IHRoaXMuZm9ybWF0VGltZShjdXJyZW50VGltZSk7CisgICAgICAgIHRoaXMuY29udHJvbHMucmVt YWluaW5nVGltZS5pbm5lclRleHQgPSB0aGlzLmZvcm1hdFRpbWUodGltZVJlbWFpbmluZyk7Cisg ICAgICAgIHRoaXMuZHJhd1RpbWVsaW5lQmFja2dyb3VuZCgpOworICAgIH0sCiAKICAgICB1cGRh dGVSZWFkeVN0YXRlOiBmdW5jdGlvbigpCiAgICAgewo= 252603 2015-05-07 11:57:31 -0700 2015-05-07 12:08:22 -0700 patch patch.patch text/plain 2992 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MzkzOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA1LTA2ICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgTWVkaWEgQ29udHJvbHM6IFNj cnViYmVyIHNob3VsZCBiZSBpbmRlcGVuZGVudCBvZiBhY3R1YWwgdmlkZW8gdGltZSwgY2F1c2Vz IHNjcnViYmVyIHRvIGJlIGp1bXB5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ0NzAwLgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTk5OTc1NDg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRl IHRpbWUgYW5kIHRpbWVsaW5lIGR1cmluZyB0aGUgdGltZWxpbmUgaW5wdXQgZXZlbnQgaW5zdGVh ZCBvZiB0aGUgd3JhcHBlcidzIG1vdXNlbW92ZS4KKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90 eXBlLmhhbmRsZVdyYXBwZXJNb3VzZU1vdmUpOgorICAgICAgICAoQ29udHJvbGxlci5wcm90b3R5 cGUuaGFuZGxlVGltZWxpbmVNb3VzZU1vdmUpOgorICAgICAgICAoQ29udHJvbGxlci5wcm90b3R5 cGUuZHJhd1RpbWVsaW5lQmFja2dyb3VuZCk6IAorCisgICAgICAgIChDb250cm9sbGVyLnByb3Rv dHlwZS51cGRhdGVDb250cm9sc1doaWxlU2NydWJiaW5nKTogCisgICAgICAgIFVwZGF0ZXMgdGlt ZSBhbmQgc2NydWJiZXIgdG8gcmVmbGVjdCB0aW1lbGluZSB1c2VyIGlucHV0LgorCiAyMDE1LTA1 LTA3ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgVHJpZWQgdG8g Zml4IHRoZSBidWlsZC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9s cy9tZWRpYUNvbnRyb2xzQXBwbGUuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5qcwkocmV2aXNpb24gMTgzODgw KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNB cHBsZS5qcwkod29ya2luZyBjb3B5KQpAQCAtNzYyLDkgKzc2Miw2IEBAIENvbnRyb2xsZXIucHJv dG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5jb250cm9sc0FyZUhpZGRlbigpKQogICAgICAg ICAgICAgdGhpcy5zaG93Q29udHJvbHMoKTsKICAgICAgICAgdGhpcy5yZXNldEhpZGVDb250cm9s c1RpbWVyKCk7Ci0gICAgICAgIAotICAgICAgICBpZiAodGhpcy5zY3J1YmJpbmcpCi0gICAgICAg ICAgICB0aGlzLnVwZGF0ZVRpbWUoKTsKIAogICAgICAgICBpZiAoIXRoaXMuaXNEcmFnZ2luZykK ICAgICAgICAgICAgIHJldHVybjsKQEAgLTg1NSw2ICs4NTIsNyBAQCBDb250cm9sbGVyLnByb3Rv dHlwZSA9IHsKICAgICBoYW5kbGVUaW1lbGluZUlucHV0OiBmdW5jdGlvbihldmVudCkKICAgICB7 CiAgICAgICAgIHRoaXMudmlkZW8uZmFzdFNlZWsodGhpcy5jb250cm9scy50aW1lbGluZS52YWx1 ZSk7CisgICAgICAgIHRoaXMudXBkYXRlQ29udHJvbHNXaGlsZVNjcnViYmluZygpOwogICAgIH0s CiAKICAgICBoYW5kbGVUaW1lbGluZUNoYW5nZTogZnVuY3Rpb24oZXZlbnQpCkBAIC0xMTU3LDgg KzExNTUsOCBAQCBDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgCiAgICAgICAgIGlm ICghd2lkdGggfHwgIWhlaWdodCkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgCi0gICAg ICAgIHZhciBwbGF5ZWQgPSB0aGlzLnZpZGVvLmN1cnJlbnRUaW1lIC8gdGhpcy52aWRlby5kdXJh dGlvbjsKKworICAgICAgICB2YXIgcGxheWVkID0gdGhpcy5jb250cm9scy50aW1lbGluZS52YWx1 ZSAvIHRoaXMuY29udHJvbHMudGltZWxpbmUubWF4OwogICAgICAgICB2YXIgYnVmZmVyZWQgPSAw OwogICAgICAgICBmb3IgKHZhciBpID0gMCwgZW5kID0gdGhpcy52aWRlby5idWZmZXJlZC5sZW5n dGg7IGkgPCBlbmQ7ICsraSkKICAgICAgICAgICAgIGJ1ZmZlcmVkID0gTWF0aC5tYXgodGhpcy52 aWRlby5idWZmZXJlZC5lbmQoaSksIGJ1ZmZlcmVkKTsKQEAgLTE0MDgsNiArMTQwNiwxOCBAQCBD b250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5jb250cm9scy50aW1lbGluZS52 YWx1ZSA9IHRoaXMudmlkZW8uY3VycmVudFRpbWU7CiAgICAgICAgIHRoaXMuY29udHJvbHMucmVt YWluaW5nVGltZS5pbm5lclRleHQgPSB0aGlzLmZvcm1hdFRpbWUodGltZVJlbWFpbmluZyk7CiAg ICAgfSwKKyAgICAKKyAgICB1cGRhdGVDb250cm9sc1doaWxlU2NydWJiaW5nOiBmdW5jdGlvbigp CisgICAgeworICAgICAgICBpZiAoIXRoaXMuc2NydWJiaW5nKQorICAgICAgICAgICAgcmV0dXJu OworCisgICAgICAgIHZhciBjdXJyZW50VGltZSA9ICh0aGlzLmNvbnRyb2xzLnRpbWVsaW5lLnZh bHVlIC8gdGhpcy5jb250cm9scy50aW1lbGluZS5tYXgpICogdGhpcy52aWRlby5kdXJhdGlvbjsK KyAgICAgICAgdmFyIHRpbWVSZW1haW5pbmcgPSBjdXJyZW50VGltZSAtIHRoaXMudmlkZW8uZHVy YXRpb247CisgICAgICAgIHRoaXMuY29udHJvbHMuY3VycmVudFRpbWUuaW5uZXJUZXh0ID0gdGhp cy5mb3JtYXRUaW1lKGN1cnJlbnRUaW1lKTsKKyAgICAgICAgdGhpcy5jb250cm9scy5yZW1haW5p bmdUaW1lLmlubmVyVGV4dCA9IHRoaXMuZm9ybWF0VGltZSh0aW1lUmVtYWluaW5nKTsKKyAgICAg ICAgdGhpcy5kcmF3VGltZWxpbmVCYWNrZ3JvdW5kKCk7CisgICAgfSwKIAogICAgIHVwZGF0ZVJl YWR5U3RhdGU6IGZ1bmN0aW9uKCkKICAgICB7Cg==