62095 2011-06-04 13:28:35 -0700 Disable WebProcess side display throttling when in a user scroll 2011-06-04 19:12:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sam sam oldest_to_newest 415526 0 sam 2011-06-04 13:28:35 -0700 Disable WebProcess side display throttling when in a user scroll 415527 1 96032 sam 2011-06-04 13:30:34 -0700 Created attachment 96032 Patch 415528 2 sam 2011-06-04 13:30:56 -0700 <rdar://problem/9517175> 415532 3 96032 darin 2011-06-04 13:56:51 -0700 Comment on attachment 96032 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=96032&action=review > Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp:778 > + m_page->drawingArea()->enableDisplayThrottling(); What if this rubber-banding is ending after some other scrolling has begun? Can that happen? Does starting a new scroll terminate rubber-banding already in effect? If not, then I’m not sure it’s correct to unconditionally enable. Should this be a count instead of a single flag? A count would be more risky, though, because if it got off by one you could be left in the wrong state permanently. > Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp:792 > + m_page->drawingArea()->enableDisplayThrottling(); Same question as for rubber banding. Could we have started some other kind of scroll before the animated scroll completed? > Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h:122 > + // Whether we should throttle displays to a set update rate on the WebProcess > + // side. Awkward line break. I suggest merging this comment into one line. > Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h:123 > + bool m_throttleDisplay; For boolean data members we try to avoid verb phrases. I suggest either m_shouldThrottleDisplay or m_isThrottlingDisplay. > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:1072 > +#if PLATFORM(MAC) Why put this inside an #if? I’d think we’d want this on any platform where enableDisableDisplayThrottling has an effect. 415571 4 sam 2011-06-04 19:08:59 -0700 Committed r88127: <http://trac.webkit.org/changeset/88127> 415572 5 sam 2011-06-04 19:12:24 -0700 (In reply to comment #3) > (From update of attachment 96032 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=96032&action=review > > > Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp:778 > > + m_page->drawingArea()->enableDisplayThrottling(); > > What if this rubber-banding is ending after some other scrolling has begun? Can that happen? Does starting a new scroll terminate rubber-banding already in effect? If not, then I’m not sure it’s correct to unconditionally enable. Should this be a count instead of a single flag? A count would be more risky, though, because if it got off by one you could be left in the wrong state permanently. > > > Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp:792 > > + m_page->drawingArea()->enableDisplayThrottling(); > > Same question as for rubber banding. Could we have started some other kind of scroll before the animated scroll completed? In very rare cases, I believe we can get out of order calls to enable/disable, but the affect is marginal, and will be rectified by a subsequent scroll. > > > Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h:122 > > + // Whether we should throttle displays to a set update rate on the WebProcess > > + // side. > > Awkward line break. I suggest merging this comment into one line. Fixed. > > > Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h:123 > > + bool m_throttleDisplay; > > For boolean data members we try to avoid verb phrases. I suggest either m_shouldThrottleDisplay or m_isThrottlingDisplay. Fixed. > > > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:1072 > > +#if PLATFORM(MAC) > > Why put this inside an #if? I’d think we’d want this on any platform where enableDisableDisplayThrottling has an effect. This only works, for platforms that support momentum scrolling and thus have scroll phases, and right now that is just the mac. 96032 2011-06-04 13:30:34 -0700 2011-06-04 13:56:50 -0700 Patch bug-62095-20110604133032.patch text/plain 7229 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MTIyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDYtMDQgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBEaXNhYmxlIFdlYlByb2Nlc3Mgc2lkZSBkaXNwbGF5IHRocm90dGxpbmcg d2hlbiBpbiBhIHVzZXIgc2Nyb2xsCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85NTE3MTc1Pgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIwOTUKKwor ICAgICAgICBBZGQgdGhlIGFiaWxpdHkgdG8gZGlzYWJsZSBXZWJQcm9jZXNzIHNpZGUgZGlzcGxh eSB0aHJvdHRsaW5nIHRoYXQKKyAgICAgICAgdGFrZXMgcGxhY2UgaW4gRHJhd2luZ0FyZWFJbXBs OjpkaXNwbGF5VGltZXJGaXJlZC4gRGlzYWJsZSB0aGUgdGhyb3R0bGluZworICAgICAgICB3aGVu IGluIGEgdXNlciBvciBhbmltYXRlZCBzY3JvbGwuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNo cm9tZUNsaWVudDo6ZGlkU3RhcnRSdWJiZXJCYW5kRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0 OjpXZWJDaHJvbWVDbGllbnQ6OmRpZENvbXBsZXRlUnViYmVyQmFuZEZvckZyYW1lKToKKyAgICAg ICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50OjpkaWRTdGFydEFuaW1hdGVkU2Nyb2xsKToKKyAg ICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50OjpkaWRDb21wbGV0ZUFuaW1hdGVkU2Nyb2xs KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaDoKKyAgICAgICAg KFdlYktpdDo6RHJhd2luZ0FyZWE6OmVuYWJsZURpc3BsYXlUaHJvdHRsaW5nKToKKyAgICAgICAg KFdlYktpdDo6RHJhd2luZ0FyZWE6OmRpc2FibGVEaXNwbGF5VGhyb3R0bGluZyk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHA6CisgICAgICAgIChXZWJL aXQ6OkRyYXdpbmdBcmVhSW1wbDo6RHJhd2luZ0FyZWFJbXBsKToKKyAgICAgICAgKFdlYktpdDo6 RHJhd2luZ0FyZWFJbXBsOjplbmFibGVEaXNwbGF5VGhyb3R0bGluZyk6CisgICAgICAgIChXZWJL aXQ6OkRyYXdpbmdBcmVhSW1wbDo6ZGlzYWJsZURpc3BsYXlUaHJvdHRsaW5nKToKKyAgICAgICAg KFdlYktpdDo6RHJhd2luZ0FyZWFJbXBsOjpkaXNwbGF5VGltZXJGaXJlZCk6CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5oOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6d2hlZWxF dmVudCk6CisKIDIwMTEtMDYtMDQgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGll bnQuY3BwCShyZXZpc2lvbiA4ODEyMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzcwLDEw ICs3NzAsMTMgQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6OmRpc3BhdGNoVmlld3BvcnREYQogCiB2 b2lkIFdlYkNocm9tZUNsaWVudDo6ZGlkU3RhcnRSdWJiZXJCYW5kRm9yRnJhbWUoRnJhbWUqLCBj b25zdCBJbnRTaXplJikgY29uc3QKIHsKKyAgICBtX3BhZ2UtPmRyYXdpbmdBcmVhKCktPmRpc2Fi bGVEaXNwbGF5VGhyb3R0bGluZygpOwogfQogCiB2b2lkIFdlYkNocm9tZUNsaWVudDo6ZGlkQ29t cGxldGVSdWJiZXJCYW5kRm9yRnJhbWUoRnJhbWUqIGZyYW1lLCBjb25zdCBJbnRTaXplJiBpbml0 aWFsT3ZlcmhhbmcpIGNvbnN0CiB7CisgICAgbV9wYWdlLT5kcmF3aW5nQXJlYSgpLT5lbmFibGVE aXNwbGF5VGhyb3R0bGluZygpOworCiAgICAgaWYgKGZyYW1lICE9IGZyYW1lLT5wYWdlKCktPm1h aW5GcmFtZSgpKQogICAgICAgICByZXR1cm47CiAgICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OkRpZENvbXBsZXRlUnViYmVyQmFuZEZvck1haW5GcmFtZShpbml0aWFsT3Zl cmhhbmcpKTsKQEAgLTc4MSwxMCArNzg0LDEyIEBAIHZvaWQgV2ViQ2hyb21lQ2xpZW50OjpkaWRD b21wbGV0ZVJ1YmJlckIKIAogdm9pZCBXZWJDaHJvbWVDbGllbnQ6OmRpZFN0YXJ0QW5pbWF0ZWRT Y3JvbGwoKSBjb25zdAogeworICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+ZGlzYWJsZURpc3Bs YXlUaHJvdHRsaW5nKCk7CiB9CiAKIHZvaWQgV2ViQ2hyb21lQ2xpZW50OjpkaWRDb21wbGV0ZUFu aW1hdGVkU2Nyb2xsKCkgY29uc3QKIHsKKyAgICBtX3BhZ2UtPmRyYXdpbmdBcmVhKCktPmVuYWJs ZURpc3BsYXlUaHJvdHRsaW5nKCk7CiB9CiAgICAgCiB2b2lkIFdlYkNocm9tZUNsaWVudDo6bm90 aWZ5U2Nyb2xsZXJUaHVtYklzVmlzaWJsZUluUmVjdChjb25zdCBJbnRSZWN0JiBzY3JvbGxlclRo dW1iKQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVh LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdp bmdBcmVhLmgJKHJldmlzaW9uIDg4MTIwKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL0RyYXdpbmdBcmVhLmgJKHdvcmtpbmcgY29weSkKQEAgLTYzLDYgKzYzLDggQEAgcHVi bGljOgogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGwoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgc2Ny b2xsUmVjdCwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2Nyb2xsT2Zmc2V0KSA9IDA7CiAKICAg ICAvLyBGSVhNRTogVGhlc2Ugc2hvdWxkIGJlIHB1cmUgdmlydHVhbC4KKyAgICB2aXJ0dWFsIHZv aWQgZW5hYmxlRGlzcGxheVRocm90dGxpbmcoKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgZGlzYWJs ZURpc3BsYXlUaHJvdHRsaW5nKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHBhZ2VCYWNrZ3JvdW5k VHJhbnNwYXJlbmN5Q2hhbmdlZCgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBmb3JjZVJlcGFpbnQo KSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2V0TGF5ZXJUcmVlU3RhdGVJc0Zyb3plbihib29sKSB7 IH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUlt cGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9E cmF3aW5nQXJlYUltcGwuY3BwCShyZXZpc2lvbiA4ODEyMCkKKysrIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02 NCw2ICs2NCw3IEBAIERyYXdpbmdBcmVhSW1wbDo6RHJhd2luZ0FyZWFJbXBsKFdlYlBhZ2UKICAg ICAsIG1fd2FudHNUb0V4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShmYWxzZSkKICAgICAs IG1faXNQYWludGluZ1N1c3BlbmRlZCghcGFyYW1ldGVycy5pc1Zpc2libGUpCiAgICAgLCBtX2Fs d2F5c1VzZUNvbXBvc2l0aW5nKGZhbHNlKQorICAgICwgbV90aHJvdHRsZURpc3BsYXkodHJ1ZSkK ICAgICAsIG1fbGFzdERpc3BsYXlUaW1lKDApCiAgICAgLCBtX2Rpc3BsYXlUaW1lcihXZWJQcm9j ZXNzOjpzaGFyZWQoKS5ydW5Mb29wKCksIHRoaXMsICZEcmF3aW5nQXJlYUltcGw6OmRpc3BsYXlU aW1lckZpcmVkKQogICAgICwgbV9leGl0Q29tcG9zaXRpbmdUaW1lcihXZWJQcm9jZXNzOjpzaGFy ZWQoKS5ydW5Mb29wKCksIHRoaXMsICZEcmF3aW5nQXJlYUltcGw6OmV4aXRBY2NlbGVyYXRlZENv bXBvc2l0aW5nTW9kZSkKQEAgLTE5Miw2ICsxOTMsMTYgQEAgdm9pZCBEcmF3aW5nQXJlYUltcGw6 OmZvcmNlUmVwYWludCgpCiAgICAgZGlzcGxheSgpOwogfQogCit2b2lkIERyYXdpbmdBcmVhSW1w bDo6ZW5hYmxlRGlzcGxheVRocm90dGxpbmcoKQoreworICAgIG1fdGhyb3R0bGVEaXNwbGF5ID0g dHJ1ZTsKK30KKwordm9pZCBEcmF3aW5nQXJlYUltcGw6OmRpc2FibGVEaXNwbGF5VGhyb3R0bGlu ZygpCit7CisgICAgbV90aHJvdHRsZURpc3BsYXkgPSBmYWxzZTsKK30KKwogdm9pZCBEcmF3aW5n QXJlYUltcGw6OmRpZEluc3RhbGxQYWdlT3ZlcmxheSgpCiB7CiAgICAgaWYgKG1fbGF5ZXJUcmVl SG9zdCkKQEAgLTUxNCwxMiArNTI1LDE0IEBAIHZvaWQgRHJhd2luZ0FyZWFJbXBsOjpkaXNwbGF5 VGltZXJGaXJlZCgKICAgICBzdGF0aWMgY29uc3QgZG91YmxlIG1pbmltdW1GcmFtZUludGVydmFs ID0gMS4wIC8gNjAuMDsKICNlbmRpZgogCi0gICAgZG91YmxlIHRpbWVTaW5jZUxhc3REaXNwbGF5 ID0gY3VycmVudFRpbWUoKSAtIG1fbGFzdERpc3BsYXlUaW1lOwotICAgIGRvdWJsZSB0aW1lVW50 aWxOZXh0RGlzcGxheSA9IG1pbmltdW1GcmFtZUludGVydmFsIC0gdGltZVNpbmNlTGFzdERpc3Bs YXk7CisgICAgaWYgKG1fdGhyb3R0bGVEaXNwbGF5KSB7CisgICAgICAgIGRvdWJsZSB0aW1lU2lu Y2VMYXN0RGlzcGxheSA9IGN1cnJlbnRUaW1lKCkgLSBtX2xhc3REaXNwbGF5VGltZTsKKyAgICAg ICAgZG91YmxlIHRpbWVVbnRpbE5leHREaXNwbGF5ID0gbWluaW11bUZyYW1lSW50ZXJ2YWwgLSB0 aW1lU2luY2VMYXN0RGlzcGxheTsKIAotICAgIGlmICh0aW1lVW50aWxOZXh0RGlzcGxheSA+IDAp IHsKLSAgICAgICAgbV9kaXNwbGF5VGltZXIuc3RhcnRPbmVTaG90KHRpbWVVbnRpbE5leHREaXNw bGF5KTsKLSAgICAgICAgcmV0dXJuOworICAgICAgICBpZiAodGltZVVudGlsTmV4dERpc3BsYXkg PiAwKSB7CisgICAgICAgICAgICBtX2Rpc3BsYXlUaW1lci5zdGFydE9uZVNob3QodGltZVVudGls TmV4dERpc3BsYXkpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAgICAgfQogCiAg ICAgZGlzcGxheSgpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Ry YXdpbmdBcmVhSW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuaAkocmV2aXNpb24gODgxMjApCisrKyBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmgJKHdvcmtpbmcgY29weSkK QEAgLTUxLDYgKzUxLDkgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgc2V0TGF5ZXJUcmVl U3RhdGVJc0Zyb3plbihib29sKTsKICAgICB2aXJ0dWFsIHZvaWQgZm9yY2VSZXBhaW50KCk7CiAK KyAgICB2aXJ0dWFsIHZvaWQgZW5hYmxlRGlzcGxheVRocm90dGxpbmcoKTsKKyAgICB2aXJ0dWFs IHZvaWQgZGlzYWJsZURpc3BsYXlUaHJvdHRsaW5nKCk7CisKICAgICB2aXJ0dWFsIHZvaWQgZGlk SW5zdGFsbFBhZ2VPdmVybGF5KCk7CiAgICAgdmlydHVhbCB2b2lkIGRpZFVuaW5zdGFsbFBhZ2VP dmVybGF5KCk7CiAgICAgdmlydHVhbCB2b2lkIHNldFBhZ2VPdmVybGF5TmVlZHNEaXNwbGF5KGNv bnN0IFdlYkNvcmU6OkludFJlY3QmKTsKQEAgLTExNSw2ICsxMTgsMTAgQEAgcHJpdmF0ZToKICAg ICBib29sIG1faXNQYWludGluZ1N1c3BlbmRlZDsKICAgICBib29sIG1fYWx3YXlzVXNlQ29tcG9z aXRpbmc7CiAKKyAgICAvLyBXaGV0aGVyIHdlIHNob3VsZCB0aHJvdHRsZSBkaXNwbGF5cyB0byBh IHNldCB1cGRhdGUgcmF0ZSBvbiB0aGUgV2ViUHJvY2VzcworICAgIC8vIHNpZGUuCisgICAgYm9v bCBtX3Rocm90dGxlRGlzcGxheTsKKwogICAgIGRvdWJsZSBtX2xhc3REaXNwbGF5VGltZTsKIAog ICAgIFJ1bkxvb3A6OlRpbWVyPERyYXdpbmdBcmVhSW1wbD4gbV9kaXNwbGF5VGltZXI7CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZp c2lvbiA4ODEyMCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA2OSw2ICsxMDY5LDEzIEBAIHZvaWQgV2ViUGFnZTo6 d2hlZWxFdmVudChjb25zdCBXZWJXaGVlbEUKIHsKICAgICBDdXJyZW50RXZlbnQgY3VycmVudEV2 ZW50KHdoZWVsRXZlbnQpOwogCisjaWYgUExBVEZPUk0oTUFDKQorICAgIGlmICh3aGVlbEV2ZW50 Lm1vbWVudHVtUGhhc2UoKSA9PSBXZWJXaGVlbEV2ZW50OjpQaGFzZUJlZ2FuIHx8IHdoZWVsRXZl bnQucGhhc2UoKSA9PSBXZWJXaGVlbEV2ZW50OjpQaGFzZUJlZ2FuKQorICAgICAgICBtX2RyYXdp bmdBcmVhLT5kaXNhYmxlRGlzcGxheVRocm90dGxpbmcoKTsKKyAgICBlbHNlIGlmICh3aGVlbEV2 ZW50Lm1vbWVudHVtUGhhc2UoKSA9PSBXZWJXaGVlbEV2ZW50OjpQaGFzZUVuZGVkIHx8IHdoZWVs RXZlbnQucGhhc2UoKSA9PSBXZWJXaGVlbEV2ZW50OjpQaGFzZUVuZGVkKQorICAgICAgICBtX2Ry YXdpbmdBcmVhLT5lbmFibGVEaXNwbGF5VGhyb3R0bGluZygpOworI2VuZGlmCisKICAgICBib29s IGhhbmRsZWQgPSBoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQsIG1fcGFnZS5nZXQoKSk7CiAg ICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRSZWNlaXZlRXZlbnQoc3RhdGljX2Nh c3Q8dWludDMyX3Q+KHdoZWVsRXZlbnQudHlwZSgpKSwgaGFuZGxlZCkpOwogfQo=