54810 2011-02-19 11:26:10 -0800 Fix isLayoutTimerActive for ports that set a minimumLayoutDelay 2011-02-26 04:07:13 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tonyg tonyg abarth commit-queue eric oldest_to_newest 354199 0 tonyg 2011-02-19 11:26:10 -0800 Fix isLayoutTimerActive for ports that set a minimumLayoutDelay 354200 1 83081 tonyg 2011-02-19 11:31:10 -0800 Created attachment 83081 Patch 354211 2 83081 eric 2011-02-19 12:46:53 -0800 Comment on attachment 83081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83081&action=review > Source/WebCore/ChangeLog:8 > + No new tests because no new functionality. So we have no way to test that we're yielding between tokens? Do we have any way to detect first paint from JS? Certainly there is in FF, but I'm not sure there is in WebKit. > Source/WebCore/dom/Document.cpp:2160 > + return view() && view()->layoutPending() && minimumLayoutDelay() == m_extraLayoutDelay; Maybe the minimum = extra check needs itself to be a function. Given how strange that reads. 354736 3 83081 abarth 2011-02-21 12:34:24 -0800 Comment on attachment 83081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83081&action=review >> Source/WebCore/ChangeLog:8 >> + No new tests because no new functionality. > > So we have no way to test that we're yielding between tokens? Do we have any way to detect first paint from JS? Certainly there is in FF, but I'm not sure there is in WebKit. It's very difficult to test. It might be observable, but I can't think of how to observe it without races. >> Source/WebCore/dom/Document.cpp:2160 >> + return view() && view()->layoutPending() && minimumLayoutDelay() == m_extraLayoutDelay; > > Maybe the minimum = extra check needs itself to be a function. Given how strange that reads. Yeah, if I were reading this code in the future, it would be pretty mysterious. 357492 4 83081 eric 2011-02-24 15:50:03 -0800 Comment on attachment 83081 Patch cq- for functionization. 357495 5 83737 tonyg 2011-02-24 15:51:26 -0800 Created attachment 83737 Patch for landing 357497 6 tonyg 2011-02-24 15:52:09 -0800 I went with a bool "isPendingLayoutImmediate" to make this more clear. We can pull it out to a function if anything else needs it. But I'm not sure proliferation of this condition should be encouraged. 358446 7 83737 commit-queue 2011-02-26 03:20:27 -0800 Comment on attachment 83737 Patch for landing Clearing flags on attachment: 83737 Committed r79775: <http://trac.webkit.org/changeset/79775> 358447 8 commit-queue 2011-02-26 03:20:33 -0800 All reviewed patches have been landed. Closing bug. 358454 9 commit-queue 2011-02-26 04:07:13 -0800 The commit-queue encountered the following flaky tests while processing attachment 83737: http/tests/websocket/tests/multiple-connections.html bug 53825 (author: abarth@webkit.org) The commit-queue is continuing to process your patch. 83081 2011-02-19 11:31:10 -0800 2011-02-24 15:51:23 -0800 Patch bug-54810-20110219113109.patch text/plain 4232 tonyg U3VidmVyc2lvbiBSZXZpc2lvbjogNzkxMjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2ZDNmMTgwZmQ3M2EwY2M3 N2I0MDg1M2U4ZTkwYmI5MmYzYWYyMTA1Li40OThjY2U0MjQwN2VlYjdlMzkxNjZjODAwMTcxNTM5 YzE2Mzk0OTczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDItMTkgIFRvbnkg R2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggaXNMYXlvdXRUaW1lckFjdGl2ZSBmb3IgcG9y dHMgdGhhdCBzZXQgYSBtaW5pbXVtTGF5b3V0RGVsYXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0ODEwCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJl Y2F1c2Ugbm8gbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmlzTGF5b3V0VGltZXJBY3RpdmUpOiBNb3Zl ZCBmcm9tIEhUTUxQYXJzZXJTY2hlZHVsZXIgcGVyIEZJWE1FLiBDb21wYXJlCisgICAgICAgIG1p bmltdW1MYXlvdXREZWxheSgpIHRvIG1fZXh0cmFMYXlvdXREZWxheSBpbnN0ZWFkIG9mIDAuIFRo aXMgc3Bpcml0IG9mIHRoaXMgY29tcGFyaXNvbiB3YXMKKyAgICAgICAgYnJva2VuIGJ5IHI1Mjkx OS4gVGhlIGVmZmVjdCB3b3VsZCBiZSB0aGF0IHBvcnRzIHRoYXQgc2V0IGFuIGV4dHJhIGxheW91 dCBkZWxheSBjYW4ndCB5aWVsZAorICAgICAgICBiZXR3ZWVuIHRva2Vucy4gTm90ZTogY2FuJ3Qg YmUgY29uc3QgYmVjYXVzZSBtaW5pbXVtTGF5b3V0RGVsYXkgc2V0cyBhIG1lbWJlci4KKyAgICAg ICAgKiBkb20vRG9jdW1lbnQuaDoKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MUGFyc2VyU2No ZWR1bGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQYXJzZXJTY2hlZHVsZXI6OmNvbnRp bnVlTmV4dENodW5rVGltZXJGaXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MUGFyc2VyU2No ZWR1bGVyOjpjaGVja0ZvcllpZWxkQmVmb3JlU2NyaXB0KToKKwogMjAxMS0wMi0xOSAgQnJpYW4g UnluZXIgIDxicnluZXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0g QmFydGguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCBhN2JiODVhMWYyYWU3NGNmNGQzZTEy YWNhYWY2NTFlNGZlM2NiM2JmLi4wOGUwYzI0NTNlNWY5NjUxMWI3ZDhkYzk1NDQ2NDgwNThhNmY3 NDdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTIxNTQsNiArMjE1NCwxMSBAQCBib29s IERvY3VtZW50OjpzaG91bGRTY2hlZHVsZUxheW91dCgpCiAgICAgcmV0dXJuIChoYXZlU3R5bGVz aGVldHNMb2FkZWQoKSAmJiBib2R5KCkpCiAgICAgICAgIHx8IChkb2N1bWVudEVsZW1lbnQoKSAm JiAhZG9jdW1lbnRFbGVtZW50KCktPmhhc1RhZ05hbWUoaHRtbFRhZykpOwogfQorICAgIAorYm9v bCBEb2N1bWVudDo6aXNMYXlvdXRUaW1lckFjdGl2ZSgpCit7CisgICAgcmV0dXJuIHZpZXcoKSAm JiB2aWV3KCktPmxheW91dFBlbmRpbmcoKSAmJiBtaW5pbXVtTGF5b3V0RGVsYXkoKSA9PSBtX2V4 dHJhTGF5b3V0RGVsYXk7Cit9CiAKIGludCBEb2N1bWVudDo6bWluaW11bUxheW91dERlbGF5KCkK IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oIGIvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmgKaW5kZXggOTJlYzU3ODFkYTQ0OWJkNWU5NGY4ZDIyNTE4OTM3 OWFkMTVlZTBiYS4uNWM0YmQzNTdhOTY5ODM4OTdiYjc0OTJiMmZmZDE4YWZjOTU1ZWJhMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKKysrIGIvU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmgKQEAgLTY0NSw2ICs2NDUsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBz ZXRFeHRyYUxheW91dERlbGF5KGludCBkZWxheSkgeyBtX2V4dHJhTGF5b3V0RGVsYXkgPSBkZWxh eTsgfQogCiAgICAgYm9vbCBzaG91bGRTY2hlZHVsZUxheW91dCgpOworICAgIGJvb2wgaXNMYXlv dXRUaW1lckFjdGl2ZSgpOwogICAgIGludCBlbGFwc2VkVGltZSgpIGNvbnN0OwogICAgIAogICAg IHZvaWQgc2V0VGV4dENvbG9yKGNvbnN0IENvbG9yJiBjb2xvcikgeyBtX3RleHRDb2xvciA9IGNv bG9yOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUGFyc2Vy U2NoZWR1bGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJzZXJTY2hl ZHVsZXIuY3BwCmluZGV4IDc0ODljZGYzYmExZDEwNmNjYTBlOTQ2MDVhYzY1YTg0MDc1NWU0N2Iu LjYyYTU3ZGVlMjUzYjZhMDlhOWFiMTdkMjgxYjhlYjhmNzg5ZDI4ZDYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJzZXJTY2hlZHVsZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJzZXJTY2hlZHVsZXIuY3BwCkBAIC03NCwy MCArNzQsMTQgQEAgSFRNTFBhcnNlclNjaGVkdWxlcjo6fkhUTUxQYXJzZXJTY2hlZHVsZXIoKQog ICAgIG1fY29udGludWVOZXh0Q2h1bmtUaW1lci5zdG9wKCk7CiB9CiAKLS8vIEZJWE1FOiBUaGlz IGJlbG9uZ3Mgb24gRG9jdW1lbnQuCi1zdGF0aWMgYm9vbCBpc0xheW91dFRpbWVyQWN0aXZlKERv Y3VtZW50KiBkb2MpCi17Ci0gICAgQVNTRVJUKGRvYyk7Ci0gICAgLy8gRklYTUU6IFRoaXMgaXMg YnJva2VuIG9uIEFuZHJvaWQgYmVjYXVzZSBtaW5pbXVtTGF5b3V0RGVsYXkgaXMgbmV2ZXIgMC4K LSAgICByZXR1cm4gZG9jLT52aWV3KCkgJiYgZG9jLT52aWV3KCktPmxheW91dFBlbmRpbmcoKSAm JiAhZG9jLT5taW5pbXVtTGF5b3V0RGVsYXkoKTsKLX0KLQogdm9pZCBIVE1MUGFyc2VyU2NoZWR1 bGVyOjpjb250aW51ZU5leHRDaHVua1RpbWVyRmlyZWQoVGltZXI8SFRNTFBhcnNlclNjaGVkdWxl cj4qIHRpbWVyKQogewogICAgIEFTU0VSVF9VTlVTRUQodGltZXIsIHRpbWVyID09ICZtX2NvbnRp bnVlTmV4dENodW5rVGltZXIpOwogICAgIC8vIEZJWE1FOiBUaGUgdGltZXIgY2xhc3Mgc2hvdWxk IGhhbmRsZSB0aW1lciBwcmlvcml0aWVzIGluc3RlYWQgb2YgdGhpcyBjb2RlLgogICAgIC8vIElm IGEgbGF5b3V0IGlzIHNjaGVkdWxlZCwgd2FpdCBhZ2FpbiB0byBsZXQgdGhlIGxheW91dCB0aW1l ciBydW4gZmlyc3QuCi0gICAgaWYgKGlzTGF5b3V0VGltZXJBY3RpdmUobV9wYXJzZXItPmRvY3Vt ZW50KCkpKSB7CisgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gbV9wYXJzZXItPmRvY3VtZW50KCk7 CisgICAgQVNTRVJUKGRvY3VtZW50KTsKKyAgICBpZiAoZG9jdW1lbnQtPmlzTGF5b3V0VGltZXJB Y3RpdmUoKSkgewogICAgICAgICBtX2NvbnRpbnVlTmV4dENodW5rVGltZXIuc3RhcnRPbmVTaG90 KDApOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtOTksOCArOTMsOSBAQCB2b2lkIEhUTUxQ YXJzZXJTY2hlZHVsZXI6OmNoZWNrRm9yWWllbGRCZWZvcmVTY3JpcHQoUHVtcFNlc3Npb24mIHNl c3Npb24pCiAgICAgLy8gSWYgd2UndmUgbmV2ZXIgcGFpbnRlZCBiZWZvcmUgYW5kIGEgbGF5b3V0 IGlzIHBlbmRpbmcsIHlpZWxkIHByaW9yIHRvIHJ1bm5pbmcKICAgICAvLyBzY3JpcHRzIHRvIGdp dmUgdGhlIHBhZ2UgYSBjaGFuY2UgdG8gcGFpbnQgZWFybGllci4KICAgICBEb2N1bWVudCogZG9j dW1lbnQgPSBtX3BhcnNlci0+ZG9jdW1lbnQoKTsKKyAgICBBU1NFUlQoZG9jdW1lbnQpOwogICAg IGJvb2wgbmVlZHNGaXJzdFBhaW50ID0gZG9jdW1lbnQtPnZpZXcoKSAmJiAhZG9jdW1lbnQtPnZp ZXcoKS0+aGFzRXZlclBhaW50ZWQoKTsKLSAgICBpZiAobmVlZHNGaXJzdFBhaW50ICYmIGlzTGF5 b3V0VGltZXJBY3RpdmUoZG9jdW1lbnQpKQorICAgIGlmIChuZWVkc0ZpcnN0UGFpbnQgJiYgZG9j dW1lbnQtPmlzTGF5b3V0VGltZXJBY3RpdmUoKSkKICAgICAgICAgc2Vzc2lvbi5uZWVkc1lpZWxk ID0gdHJ1ZTsKIH0KIAo= 83737 2011-02-24 15:51:26 -0800 2011-02-26 03:20:27 -0800 Patch for landing bug-54810-20110224155125.patch text/plain 3648 tonyg U3VidmVyc2lvbiBSZXZpc2lvbjogNzk2MDIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkY2Y5ZjI0MTNjNzA3NDcw YTdiYWEwZDg1OWEyOWZjNjI2MTA4OGRkLi5kNGFhYmY3NTVkMTM4OTllMmJjZjYyYWRlNmQ3M2Jm YTVkOWMwNTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDItMTkgIFRvbnkg R2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBB ZGFtIEJhcnRoLgorCisgICAgICAgIEZpeCBpc0xheW91dFRpbWVyQWN0aXZlIGZvciBwb3J0cyB0 aGF0IHNldCBhIG1pbmltdW1MYXlvdXREZWxheQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ4MTAKKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVz ZSBubyBuZXcgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6aXNMYXlvdXRUaW1lckFjdGl2ZSk6IE1vdmVkIGZy b20gSFRNTFBhcnNlclNjaGVkdWxlciBwZXIgRklYTUUuIENvbXBhcmUKKyAgICAgICAgbWluaW11 bUxheW91dERlbGF5KCkgdG8gbV9leHRyYUxheW91dERlbGF5IGluc3RlYWQgb2YgMC4gVGhpcyBz cGlyaXQgb2YgdGhpcyBjb21wYXJpc29uIHdhcworICAgICAgICBicm9rZW4gYnkgcjUyOTE5LiBU aGUgZWZmZWN0IHdvdWxkIGJlIHRoYXQgcG9ydHMgdGhhdCBzZXQgYW4gZXh0cmEgbGF5b3V0IGRl bGF5IGNhbid0IHlpZWxkCisgICAgICAgIGJldHdlZW4gdG9rZW5zLiBOb3RlOiBjYW4ndCBiZSBj b25zdCBiZWNhdXNlIG1pbmltdW1MYXlvdXREZWxheSBzZXRzIGEgbWVtYmVyLgorICAgICAgICAq IGRvbS9Eb2N1bWVudC5oOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxQYXJzZXJTY2hlZHVs ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFBhcnNlclNjaGVkdWxlcjo6Y29udGludWVO ZXh0Q2h1bmtUaW1lckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQYXJzZXJTY2hlZHVs ZXI6OmNoZWNrRm9yWWllbGRCZWZvcmVTY3JpcHQpOgorCiAyMDExLTAyLTI0ICBEaW1pdHJpIEds YXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ2hyb21pdW0gTWFjIGJ1 aWxkIGZpeCBhZnRlciByNzk1OTEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j dW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCAzYzVhMmY3 MGYyNmMyYWE1NGY3NzUxZDA2OWEwNGNjMWU0ZTMwOTJlLi4yOGZlYTA1Mjg5MzE5Y2M2NDhlZGRm YTViOTdjMzI3YzNjNmYxZjIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTIxNDYsNiAr MjE0NiwxNCBAQCBib29sIERvY3VtZW50OjpzaG91bGRTY2hlZHVsZUxheW91dCgpCiAgICAgcmV0 dXJuIChoYXZlU3R5bGVzaGVldHNMb2FkZWQoKSAmJiBib2R5KCkpCiAgICAgICAgIHx8IChkb2N1 bWVudEVsZW1lbnQoKSAmJiAhZG9jdW1lbnRFbGVtZW50KCktPmhhc1RhZ05hbWUoaHRtbFRhZykp OwogfQorICAgIAorYm9vbCBEb2N1bWVudDo6aXNMYXlvdXRUaW1lckFjdGl2ZSgpCit7CisgICAg aWYgKCF2aWV3KCkgfHwgIXZpZXcoKS0+bGF5b3V0UGVuZGluZygpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgYm9vbCBpc1BlbmRpbmdMYXlvdXRJbW1lZGlhdGUgPSBtaW5pbXVtTGF5b3V0 RGVsYXkoKSA9PSBtX2V4dHJhTGF5b3V0RGVsYXk7CisgICAgcmV0dXJuIGlzUGVuZGluZ0xheW91 dEltbWVkaWF0ZTsKK30KIAogaW50IERvY3VtZW50OjptaW5pbXVtTGF5b3V0RGVsYXkoKQogewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmggYi9Tb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnQuaAppbmRleCA3Y2Y5NGI0MDFjMDk2NjUwZTRlMDM1ZGZkY2UxN2UyMTY0 NDZhMmU4Li45OGM5ZGM4NDE5NDM2N2QxYTM5Y2IwZTg4NDk2N2Q5N2MwZGIyMWM2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuaApAQCAtNjQ2LDYgKzY0Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEV4 dHJhTGF5b3V0RGVsYXkoaW50IGRlbGF5KSB7IG1fZXh0cmFMYXlvdXREZWxheSA9IGRlbGF5OyB9 CiAKICAgICBib29sIHNob3VsZFNjaGVkdWxlTGF5b3V0KCk7CisgICAgYm9vbCBpc0xheW91dFRp bWVyQWN0aXZlKCk7CiAgICAgaW50IGVsYXBzZWRUaW1lKCkgY29uc3Q7CiAgICAgCiAgICAgdm9p ZCBzZXRUZXh0Q29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKSB7IG1fdGV4dENvbG9yID0gY29sb3I7 IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJzZXJTY2hl ZHVsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFBhcnNlclNjaGVkdWxl ci5jcHAKaW5kZXggOTljMDkwNzY2ZWY2OTMyN2RjNjc4N2RlNzA5OTY0MGM3M2FlZGE4NS4uYzQ1 MjVjOGVjNzI3ZTc5NWM5OWM4NTkzYjI5NTU4YzZmZGRhYmY3NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFBhcnNlclNjaGVkdWxlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFBhcnNlclNjaGVkdWxlci5jcHAKQEAgLTc0LDE5ICs3 NCwxMiBAQCBIVE1MUGFyc2VyU2NoZWR1bGVyOjp+SFRNTFBhcnNlclNjaGVkdWxlcigpCiAgICAg bV9jb250aW51ZU5leHRDaHVua1RpbWVyLnN0b3AoKTsKIH0KIAotLy8gRklYTUU6IFRoaXMgYmVs b25ncyBvbiBEb2N1bWVudC4KLXN0YXRpYyBib29sIGlzTGF5b3V0VGltZXJBY3RpdmUoRG9jdW1l bnQqIGRvYykKLXsKLSAgICBBU1NFUlQoZG9jKTsKLSAgICByZXR1cm4gZG9jLT52aWV3KCkgJiYg ZG9jLT52aWV3KCktPmxheW91dFBlbmRpbmcoKSAmJiAhZG9jLT5taW5pbXVtTGF5b3V0RGVsYXko KTsKLX0KLQogdm9pZCBIVE1MUGFyc2VyU2NoZWR1bGVyOjpjb250aW51ZU5leHRDaHVua1RpbWVy RmlyZWQoVGltZXI8SFRNTFBhcnNlclNjaGVkdWxlcj4qIHRpbWVyKQogewogICAgIEFTU0VSVF9V TlVTRUQodGltZXIsIHRpbWVyID09ICZtX2NvbnRpbnVlTmV4dENodW5rVGltZXIpOwogICAgIC8v IEZJWE1FOiBUaGUgdGltZXIgY2xhc3Mgc2hvdWxkIGhhbmRsZSB0aW1lciBwcmlvcml0aWVzIGlu c3RlYWQgb2YgdGhpcyBjb2RlLgogICAgIC8vIElmIGEgbGF5b3V0IGlzIHNjaGVkdWxlZCwgd2Fp dCBhZ2FpbiB0byBsZXQgdGhlIGxheW91dCB0aW1lciBydW4gZmlyc3QuCi0gICAgaWYgKGlzTGF5 b3V0VGltZXJBY3RpdmUobV9wYXJzZXItPmRvY3VtZW50KCkpKSB7CisgICAgaWYgKG1fcGFyc2Vy LT5kb2N1bWVudCgpLT5pc0xheW91dFRpbWVyQWN0aXZlKCkpIHsKICAgICAgICAgbV9jb250aW51 ZU5leHRDaHVua1RpbWVyLnN0YXJ0T25lU2hvdCgwKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K