47797 2010-10-17 23:00:07 -0700 Clean up of iframe scrollbar mode code 2010-12-02 07:03:04 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 0 mikelawther webkit-unassigned abarth commit-queue eric hyatt manyoso ossy tonikitoo webkit.review.bot yael oldest_to_newest 295355 0 mikelawther 2010-10-17 23:00:07 -0700 Followup to comments in https://bugs.webkit.org/show_bug.cgi?id=29240#c19 "Some comments... seems like it would be cleaner to turn off scrollbars early and bail in the helper function rather than doing it at the very end. That way you're not flipping stuff on and off. In order to do that, though, you need to pull the setChildNeedsLayout/setNeedsLayout calls (which should never have been put in this code in the first place) out of the helper function and back into the main layout method. None of this is minus-worthy, though, so could be fixed in a followup." 296626 1 71244 mikelawther 2010-10-19 21:10:10 -0700 Created attachment 71244 Patch 296635 2 mikelawther 2010-10-19 21:50:44 -0700 Hi Hyatt - can you please take a look at this cleanup? 311156 3 74314 mikelawther 2010-11-18 16:20:02 -0800 Created attachment 74314 Patch 311158 4 mikelawther 2010-11-18 16:21:59 -0800 Made sure patch still applies to current tree. 315908 5 74314 hyatt 2010-12-01 15:45:09 -0800 Comment on attachment 74314 Patch r=me 316050 6 74314 commit-queue 2010-12-02 02:12:45 -0800 Comment on attachment 74314 Patch Clearing flags on attachment: 74314 Committed r73117: <http://trac.webkit.org/changeset/73117> 316051 7 commit-queue 2010-12-02 02:12:51 -0800 All reviewed patches have been landed. Closing bug. 316053 8 webkit.review.bot 2010-12-02 02:27:53 -0800 http://trac.webkit.org/changeset/73117 might have broken Qt Linux Release minimal 316066 9 ossy 2010-12-02 03:05:11 -0800 (In reply to comment #8) > http://trac.webkit.org/changeset/73117 might have broken Qt Linux Release minimal Buildfix landed in http://trac.webkit.org/changeset/73120 71244 2010-10-19 21:10:10 -0700 2010-11-18 16:19:56 -0800 Patch bug-47797-20101020151007.patch text/plain 5391 mikelawther ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTkwOTg4MGIwYmQ3ODg4MTIzMGRmYjIyNzZhM2Y2Y2U4NzI5MWZiMi4uZTM0MjRhZWE4OGE3MjU4 ZWExODgwNGJhZDJmOWZlYTIwMjNmY2YyYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0xMC0xOSAgTWlr ZSBMYXd0aGVyICA8bWlrZWxhd3RoZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENsZWFuIHVwIG9mIGlmcmFtZSBzY3JvbGxi YXIgbW9kZSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00Nzc5NworCisgICAgICAgIFB1bGwgc2V0Q2hpbGROZWVkc0xheW91dC9zZXROZWVkc0xh eW91dCBjYWxscyBvdXQgb2Ygc2Nyb2xsYmFyIG1vZGUKKyAgICAgICAgY2FsY3VsYXRpb24gbWV0 aG9kIGFuZCBwdXQgYmFjayBpbnRvIG1haW4gbGF5b3V0IGZ1bmN0aW9uLiAKKyAgICAgICAgRWFy bHkgZXhpdCBmcm9tIHRoZSBzY3JvbGxiYXIgY2FsYyB3aGVuIHNjcm9sbGJhcnMgYXJlIHR1cm5l ZCBvZmYuIAorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVWaWV3OjpjYWxjdWxhdGVTY3JvbGxiYXJNb2Rlc0ZvckxheW91dCk6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZVZpZXc6OmxheW91dCk6CisKIDIwMTAtMTAtMTkgIEV2YW4gTWFydGlu ICA8ZXZhbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAKaW5kZXggNjc2Yzg2NDAyOGY2NzE1YTFkODgxMGRiMzJjNTYxMDBhOGEyODQ4 MS4uNjJmZWU5ZmIxMDQxMDBhZDFmZTM5MmNjZTllYjgwMjg1NjIzMjY2NiAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5j cHAKQEAgLTQ3OSw2ICs0NzksMTMgQEAgdm9pZCBGcmFtZVZpZXc6OmFwcGx5T3ZlcmZsb3dUb1Zp ZXdwb3J0KFJlbmRlck9iamVjdCogbywgU2Nyb2xsYmFyTW9kZSYgaE1vZGUsIFMKIAogdm9pZCBG cmFtZVZpZXc6OmNhbGN1bGF0ZVNjcm9sbGJhck1vZGVzRm9yTGF5b3V0KFNjcm9sbGJhck1vZGUm IGhNb2RlLCBTY3JvbGxiYXJNb2RlJiB2TW9kZSkKIHsKKyAgICBjb25zdCBIVE1MRnJhbWVPd25l ckVsZW1lbnQqIG93bmVyID0gbV9mcmFtZS0+b3duZXJFbGVtZW50KCk7CisgICAgaWYgKG93bmVy ICYmIChvd25lci0+c2Nyb2xsaW5nTW9kZSgpID09IFNjcm9sbGJhckFsd2F5c09mZikpIHsKKyAg ICAgICAgaE1vZGUgPSBTY3JvbGxiYXJBbHdheXNPZmY7CisgICAgICAgIHZNb2RlID0gU2Nyb2xs YmFyQWx3YXlzT2ZmOworICAgICAgICByZXR1cm47CisgICAgfSAgCisgICAgCiAgICAgaWYgKG1f Y2FuSGF2ZVNjcm9sbGJhcnMpIHsKICAgICAgICAgaE1vZGUgPSBTY3JvbGxiYXJBdXRvOwogICAg ICAgICB2TW9kZSA9IFNjcm9sbGJhckF1dG87CkBAIC00OTQsMTIgKzUwMSw5IEBAIHZvaWQgRnJh bWVWaWV3OjpjYWxjdWxhdGVTY3JvbGxiYXJNb2Rlc0ZvckxheW91dChTY3JvbGxiYXJNb2RlJiBo TW9kZSwgU2Nyb2xsYmFyCiAgICAgICAgIE5vZGUqIGJvZHkgPSBkb2N1bWVudC0+Ym9keSgpOwog ICAgICAgICBpZiAoYm9keSAmJiBib2R5LT5yZW5kZXJlcigpKSB7CiAgICAgICAgICAgICBpZiAo Ym9keS0+aGFzVGFnTmFtZShmcmFtZXNldFRhZykgJiYgbV9mcmFtZS0+c2V0dGluZ3MoKSAmJiAh bV9mcmFtZS0+c2V0dGluZ3MoKS0+ZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpKSB7Ci0gICAgICAg ICAgICAgICAgYm9keS0+cmVuZGVyZXIoKS0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVlKTsKICAg ICAgICAgICAgICAgICB2TW9kZSA9IFNjcm9sbGJhckFsd2F5c09mZjsKICAgICAgICAgICAgICAg ICBoTW9kZSA9IFNjcm9sbGJhckFsd2F5c09mZjsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoYm9k eS0+aGFzVGFnTmFtZShib2R5VGFnKSkgewotICAgICAgICAgICAgICAgIGlmICghbV9maXJzdExh eW91dCAmJiBtX3NpemUuaGVpZ2h0KCkgIT0gbGF5b3V0SGVpZ2h0KCkgJiYgYm9keS0+cmVuZGVy ZXIoKS0+ZW5jbG9zaW5nQm94KCktPnN0cmV0Y2hlc1RvVmlld3BvcnQoKSkKLSAgICAgICAgICAg ICAgICAgICAgYm9keS0+cmVuZGVyZXIoKS0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVlKTsKICAg ICAgICAgICAgICAgICAvLyBJdCdzIHN1ZmZpY2llbnQgdG8ganVzdCBjaGVjayB0aGUgWCBvdmVy ZmxvdywKICAgICAgICAgICAgICAgICAvLyBzaW5jZSBpdCdzIGlsbGVnYWwgdG8gaGF2ZSB2aXNp YmxlIGluIG9ubHkgb25lIGRpcmVjdGlvbi4KICAgICAgICAgICAgICAgICBSZW5kZXJPYmplY3Qq IG8gPSByb290UmVuZGVyZXItPnN0eWxlKCktPm92ZXJmbG93WCgpID09IE9WSVNJQkxFICYmIGRv Y3VtZW50LT5kb2N1bWVudEVsZW1lbnQoKS0+aGFzVGFnTmFtZShodG1sVGFnKSA/IGJvZHktPnJl bmRlcmVyKCkgOiByb290UmVuZGVyZXI7CkBAIC01MDcsMjYgKzUxMSwxNCBAQCB2b2lkIEZyYW1l Vmlldzo6Y2FsY3VsYXRlU2Nyb2xsYmFyTW9kZXNGb3JMYXlvdXQoU2Nyb2xsYmFyTW9kZSYgaE1v ZGUsIFNjcm9sbGJhcgogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKHJvb3RSZW5k ZXJlcikgewogI2lmIEVOQUJMRShTVkcpCi0gICAgICAgICAgICBpZiAoZG9jdW1lbnRFbGVtZW50 LT5pc1NWR0VsZW1lbnQoKSkgewotICAgICAgICAgICAgICAgIGlmICghbV9maXJzdExheW91dCAm JiAobV9zaXplLndpZHRoKCkgIT0gbGF5b3V0V2lkdGgoKSB8fCBtX3NpemUuaGVpZ2h0KCkgIT0g bGF5b3V0SGVpZ2h0KCkpKQotICAgICAgICAgICAgICAgICAgICByb290UmVuZGVyZXItPnNldENo aWxkTmVlZHNMYXlvdXQodHJ1ZSk7Ci0gICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIGlm ICghZG9jdW1lbnRFbGVtZW50LT5pc1NWR0VsZW1lbnQoKSkgewogICAgICAgICAgICAgICAgIGFw cGx5T3ZlcmZsb3dUb1ZpZXdwb3J0KHJvb3RSZW5kZXJlciwgaE1vZGUsIHZNb2RlKTsKICNlbHNl CiAgICAgICAgICAgICBhcHBseU92ZXJmbG93VG9WaWV3cG9ydChyb290UmVuZGVyZXIsIGhNb2Rl LCB2TW9kZSk7CiAjZW5kaWYKICAgICAgICAgfQotI2lmZGVmIElOU1RSVU1FTlRfTEFZT1VUX1ND SEVEVUxJTkcKLSAgICAgICAgaWYgKG1fZmlyc3RMYXlvdXQgJiYgIWRvY3VtZW50LT5vd25lckVs ZW1lbnQoKSkKLSAgICAgICAgICAgIHByaW50ZigiRWxhcHNlZCB0aW1lIGJlZm9yZSBmaXJzdCBs YXlvdXQ6ICVkXG4iLCBkb2N1bWVudC0+ZWxhcHNlZFRpbWUoKSk7Ci0jZW5kaWYKLSAgICB9Ci0g ICAgCi0gICAgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IG1fZnJhbWUtPm93bmVyRWxl bWVudCgpOwotICAgIGlmIChvd25lciAmJiAob3duZXItPnNjcm9sbGluZ01vZGUoKSA9PSBTY3Jv bGxiYXJBbHdheXNPZmYpKSB7Ci0gICAgICAgIGhNb2RlID0gU2Nyb2xsYmFyQWx3YXlzT2ZmOwot ICAgICAgICB2TW9kZSA9IFNjcm9sbGJhckFsd2F5c09mZjsKLSAgICB9ICAgICAKKyAgICB9ICAg IAorfQogfQogICAgIAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKQEAgLTcxNiw5 ICs3MDgsMzUgQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZSkKIAog ICAgIG1fbmVzdGVkTGF5b3V0Q291bnQrKzsKIAotICAgIFNjcm9sbGJhck1vZGUgaE1vZGU7Ci0g ICAgU2Nyb2xsYmFyTW9kZSB2TW9kZTsKKyAgICBpZiAoIW1fbGF5b3V0Um9vdCkgeworICAgICAg ICBEb2N1bWVudCogZG9jdW1lbnQgPSBtX2ZyYW1lLT5kb2N1bWVudCgpOworICAgICAgICBOb2Rl KiBkb2N1bWVudEVsZW1lbnQgPSBkb2N1bWVudC0+ZG9jdW1lbnRFbGVtZW50KCk7CisgICAgICAg IFJlbmRlck9iamVjdCogcm9vdFJlbmRlcmVyID0gZG9jdW1lbnRFbGVtZW50ID8gZG9jdW1lbnRF bGVtZW50LT5yZW5kZXJlcigpIDogMDsKKyAgICAgICAgTm9kZSogYm9keSA9IGRvY3VtZW50LT5i b2R5KCk7CisgICAgICAgIGlmIChib2R5ICYmIGJvZHktPnJlbmRlcmVyKCkpIHsKKyAgICAgICAg ICAgIGlmIChib2R5LT5oYXNUYWdOYW1lKGZyYW1lc2V0VGFnKSAmJiBtX2ZyYW1lLT5zZXR0aW5n cygpICYmICFtX2ZyYW1lLT5zZXR0aW5ncygpLT5mcmFtZUZsYXR0ZW5pbmdFbmFibGVkKCkpIHsK KyAgICAgICAgICAgICAgICBib2R5LT5yZW5kZXJlcigpLT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRy dWUpOworICAgICAgICAgICAgfSBlbHNlIGlmIChib2R5LT5oYXNUYWdOYW1lKGJvZHlUYWcpKSB7 CisgICAgICAgICAgICAgICAgaWYgKCFtX2ZpcnN0TGF5b3V0ICYmIG1fc2l6ZS5oZWlnaHQoKSAh PSBsYXlvdXRIZWlnaHQoKSAmJiBib2R5LT5yZW5kZXJlcigpLT5lbmNsb3NpbmdCb3goKS0+c3Ry ZXRjaGVzVG9WaWV3cG9ydCgpKQorICAgICAgICAgICAgICAgICAgICBib2R5LT5yZW5kZXJlcigp LT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUpOworICAgICAgICAgICAgfQorICAgICAgICB9IGVs c2UgaWYgKHJvb3RSZW5kZXJlcikgeworI2lmIEVOQUJMRShTVkcpCisgICAgICAgICAgICBpZiAo ZG9jdW1lbnRFbGVtZW50LT5pc1NWR0VsZW1lbnQoKSkgeworICAgICAgICAgICAgICAgIGlmICgh bV9maXJzdExheW91dCAmJiAobV9zaXplLndpZHRoKCkgIT0gbGF5b3V0V2lkdGgoKSB8fCBtX3Np emUuaGVpZ2h0KCkgIT0gbGF5b3V0SGVpZ2h0KCkpKQorICAgICAgICAgICAgICAgICAgICByb290 UmVuZGVyZXItPnNldENoaWxkTmVlZHNMYXlvdXQodHJ1ZSk7CisgICAgICAgICAgICB9CisjZW5k aWYKKyAgICAgICAgfQorICAgICAgICAKKyNpZmRlZiBJTlNUUlVNRU5UX0xBWU9VVF9TQ0hFRFVM SU5HCisgICAgICAgIGlmIChtX2ZpcnN0TGF5b3V0ICYmICFkb2N1bWVudC0+b3duZXJFbGVtZW50 KCkpCisgICAgICAgICAgICBwcmludGYoIkVsYXBzZWQgdGltZSBiZWZvcmUgZmlyc3QgbGF5b3V0 OiAlZFxuIiwgZG9jdW1lbnQtPmVsYXBzZWRUaW1lKCkpOworI2VuZGlmICAgICAgICAKKyAgICB9 CiAgICAgCisgICAgU2Nyb2xsYmFyTW9kZSBoTW9kZTsKKyAgICBTY3JvbGxiYXJNb2RlIHZNb2Rl OyAgICAKICAgICBjYWxjdWxhdGVTY3JvbGxiYXJNb2Rlc0ZvckxheW91dChoTW9kZSwgdk1vZGUp OwogCiAgICAgbV9kb0Z1bGxSZXBhaW50ID0gIXN1YnRyZWUgJiYgKG1fZmlyc3RMYXlvdXQgfHwg dG9SZW5kZXJWaWV3KHJvb3QpLT5wcmludGluZygpKTsK 74314 2010-11-18 16:20:02 -0800 2010-12-02 02:12:45 -0800 Patch bug-47797-20101119111959.patch text/plain 4879 mikelawther ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTBmNmEyZTk1N2VhYmI5NzVmM2Y0ZTUzYjI4MGMwZDhiNDVkZWFmOS4uMDYzOTk1NDgzYzI4NDQ2 NWI5NjE0YjFmMGExZjgwMDYzZWVlZDhhNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0xMC0xOSAgTWlr ZSBMYXd0aGVyICA8bWlrZWxhd3RoZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENsZWFuIHVwIG9mIGlmcmFtZSBzY3JvbGxi YXIgbW9kZSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00Nzc5NworCisgICAgICAgIFB1bGwgc2V0Q2hpbGROZWVkc0xheW91dC9zZXROZWVkc0xh eW91dCBjYWxscyBvdXQgb2Ygc2Nyb2xsYmFyIG1vZGUKKyAgICAgICAgY2FsY3VsYXRpb24gbWV0 aG9kIGFuZCBwdXQgYmFjayBpbnRvIG1haW4gbGF5b3V0IGZ1bmN0aW9uLiAKKyAgICAgICAgRWFy bHkgZXhpdCBmcm9tIHRoZSBzY3JvbGxiYXIgY2FsYyB3aGVuIHNjcm9sbGJhcnMgYXJlIHR1cm5l ZCBvZmYuIAorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVWaWV3OjpjYWxjdWxhdGVTY3JvbGxiYXJNb2Rlc0ZvckxheW91dCk6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZVZpZXc6OmxheW91dCk6CisKIDIwMTAtMTEtMTcgIFpoZW55YW8gTW8g IDx6bW9AZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJ1c3NlbGwu CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuY3BwCmluZGV4IGZlMGJlNmEzMzI4NzY4NjY5MTBmNTc4MjNlZWFlNTYwNDEyMDMw YzguLjlhYzBlNjkyN2I3MjEzZDlmODZiZWZiOTVhYTlkN2JiODAyZGRlYTAgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcu Y3BwCkBAIC00ODksNiArNDg5LDEzIEBAIHZvaWQgRnJhbWVWaWV3OjphcHBseU92ZXJmbG93VG9W aWV3cG9ydChSZW5kZXJPYmplY3QqIG8sIFNjcm9sbGJhck1vZGUmIGhNb2RlLCBTCiAKIHZvaWQg RnJhbWVWaWV3OjpjYWxjdWxhdGVTY3JvbGxiYXJNb2Rlc0ZvckxheW91dChTY3JvbGxiYXJNb2Rl JiBoTW9kZSwgU2Nyb2xsYmFyTW9kZSYgdk1vZGUpCiB7CisgICAgY29uc3QgSFRNTEZyYW1lT3du ZXJFbGVtZW50KiBvd25lciA9IG1fZnJhbWUtPm93bmVyRWxlbWVudCgpOworICAgIGlmIChvd25l ciAmJiAob3duZXItPnNjcm9sbGluZ01vZGUoKSA9PSBTY3JvbGxiYXJBbHdheXNPZmYpKSB7Cisg ICAgICAgIGhNb2RlID0gU2Nyb2xsYmFyQWx3YXlzT2ZmOworICAgICAgICB2TW9kZSA9IFNjcm9s bGJhckFsd2F5c09mZjsKKyAgICAgICAgcmV0dXJuOworICAgIH0gIAorICAgIAogICAgIGlmICht X2NhbkhhdmVTY3JvbGxiYXJzKSB7CiAgICAgICAgIGhNb2RlID0gU2Nyb2xsYmFyQXV0bzsKICAg ICAgICAgdk1vZGUgPSBTY3JvbGxiYXJBdXRvOwpAQCAtNTA0LDcgKzUxMSw2IEBAIHZvaWQgRnJh bWVWaWV3OjpjYWxjdWxhdGVTY3JvbGxiYXJNb2Rlc0ZvckxheW91dChTY3JvbGxiYXJNb2RlJiBo TW9kZSwgU2Nyb2xsYmFyCiAgICAgICAgIE5vZGUqIGJvZHkgPSBkb2N1bWVudC0+Ym9keSgpOwog ICAgICAgICBpZiAoYm9keSAmJiBib2R5LT5yZW5kZXJlcigpKSB7CiAgICAgICAgICAgICBpZiAo Ym9keS0+aGFzVGFnTmFtZShmcmFtZXNldFRhZykgJiYgbV9mcmFtZS0+c2V0dGluZ3MoKSAmJiAh bV9mcmFtZS0+c2V0dGluZ3MoKS0+ZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpKSB7Ci0gICAgICAg ICAgICAgICAgYm9keS0+cmVuZGVyZXIoKS0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVlKTsKICAg ICAgICAgICAgICAgICB2TW9kZSA9IFNjcm9sbGJhckFsd2F5c09mZjsKICAgICAgICAgICAgICAg ICBoTW9kZSA9IFNjcm9sbGJhckFsd2F5c09mZjsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoYm9k eS0+aGFzVGFnTmFtZShib2R5VGFnKSkgewpAQCAtNTE1LDI2ICs1MjEsMTQgQEAgdm9pZCBGcmFt ZVZpZXc6OmNhbGN1bGF0ZVNjcm9sbGJhck1vZGVzRm9yTGF5b3V0KFNjcm9sbGJhck1vZGUmIGhN b2RlLCBTY3JvbGxiYXIKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIGlmIChyb290UmVu ZGVyZXIpIHsKICNpZiBFTkFCTEUoU1ZHKQotICAgICAgICAgICAgaWYgKGRvY3VtZW50RWxlbWVu dC0+aXNTVkdFbGVtZW50KCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoIW1fZmlyc3RMYXlvdXQg JiYgKG1fc2l6ZS53aWR0aCgpICE9IGxheW91dFdpZHRoKCkgfHwgbV9zaXplLmhlaWdodCgpICE9 IGxheW91dEhlaWdodCgpKSkKLSAgICAgICAgICAgICAgICAgICAgcm9vdFJlbmRlcmVyLT5zZXRD aGlsZE5lZWRzTGF5b3V0KHRydWUpOwotICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBp ZiAoIWRvY3VtZW50RWxlbWVudC0+aXNTVkdFbGVtZW50KCkpIHsKICAgICAgICAgICAgICAgICBh cHBseU92ZXJmbG93VG9WaWV3cG9ydChyb290UmVuZGVyZXIsIGhNb2RlLCB2TW9kZSk7CiAjZWxz ZQogICAgICAgICAgICAgYXBwbHlPdmVyZmxvd1RvVmlld3BvcnQocm9vdFJlbmRlcmVyLCBoTW9k ZSwgdk1vZGUpOwogI2VuZGlmCiAgICAgICAgIH0KLSNpZmRlZiBJTlNUUlVNRU5UX0xBWU9VVF9T Q0hFRFVMSU5HCi0gICAgICAgIGlmIChtX2ZpcnN0TGF5b3V0ICYmICFkb2N1bWVudC0+b3duZXJF bGVtZW50KCkpCi0gICAgICAgICAgICBwcmludGYoIkVsYXBzZWQgdGltZSBiZWZvcmUgZmlyc3Qg bGF5b3V0OiAlZFxuIiwgZG9jdW1lbnQtPmVsYXBzZWRUaW1lKCkpOwotI2VuZGlmCi0gICAgfQot ICAgIAotICAgIEhUTUxGcmFtZU93bmVyRWxlbWVudCogb3duZXIgPSBtX2ZyYW1lLT5vd25lckVs ZW1lbnQoKTsKLSAgICBpZiAob3duZXIgJiYgKG93bmVyLT5zY3JvbGxpbmdNb2RlKCkgPT0gU2Ny b2xsYmFyQWx3YXlzT2ZmKSkgewotICAgICAgICBoTW9kZSA9IFNjcm9sbGJhckFsd2F5c09mZjsK LSAgICAgICAgdk1vZGUgPSBTY3JvbGxiYXJBbHdheXNPZmY7Ci0gICAgfSAgICAgCisgICAgfSAg ICAKK30KIH0KICAgICAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCkBAIC03NjAs OSArNzU0LDM1IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUpCiAK ICAgICBtX25lc3RlZExheW91dENvdW50Kys7CiAKLSAgICBTY3JvbGxiYXJNb2RlIGhNb2RlOwot ICAgIFNjcm9sbGJhck1vZGUgdk1vZGU7CisgICAgaWYgKCFtX2xheW91dFJvb3QpIHsKKyAgICAg ICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gbV9mcmFtZS0+ZG9jdW1lbnQoKTsKKyAgICAgICAgTm9k ZSogZG9jdW1lbnRFbGVtZW50ID0gZG9jdW1lbnQtPmRvY3VtZW50RWxlbWVudCgpOworICAgICAg ICBSZW5kZXJPYmplY3QqIHJvb3RSZW5kZXJlciA9IGRvY3VtZW50RWxlbWVudCA/IGRvY3VtZW50 RWxlbWVudC0+cmVuZGVyZXIoKSA6IDA7CisgICAgICAgIE5vZGUqIGJvZHkgPSBkb2N1bWVudC0+ Ym9keSgpOworICAgICAgICBpZiAoYm9keSAmJiBib2R5LT5yZW5kZXJlcigpKSB7CisgICAgICAg ICAgICBpZiAoYm9keS0+aGFzVGFnTmFtZShmcmFtZXNldFRhZykgJiYgbV9mcmFtZS0+c2V0dGlu Z3MoKSAmJiAhbV9mcmFtZS0+c2V0dGluZ3MoKS0+ZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpKSB7 CisgICAgICAgICAgICAgICAgYm9keS0+cmVuZGVyZXIoKS0+c2V0Q2hpbGROZWVkc0xheW91dCh0 cnVlKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoYm9keS0+aGFzVGFnTmFtZShib2R5VGFnKSkg eworICAgICAgICAgICAgICAgIGlmICghbV9maXJzdExheW91dCAmJiBtX3NpemUuaGVpZ2h0KCkg IT0gbGF5b3V0SGVpZ2h0KCkgJiYgYm9keS0+cmVuZGVyZXIoKS0+ZW5jbG9zaW5nQm94KCktPnN0 cmV0Y2hlc1RvVmlld3BvcnQoKSkKKyAgICAgICAgICAgICAgICAgICAgYm9keS0+cmVuZGVyZXIo KS0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVlKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSBl bHNlIGlmIChyb290UmVuZGVyZXIpIHsKKyNpZiBFTkFCTEUoU1ZHKQorICAgICAgICAgICAgaWYg KGRvY3VtZW50RWxlbWVudC0+aXNTVkdFbGVtZW50KCkpIHsKKyAgICAgICAgICAgICAgICBpZiAo IW1fZmlyc3RMYXlvdXQgJiYgKG1fc2l6ZS53aWR0aCgpICE9IGxheW91dFdpZHRoKCkgfHwgbV9z aXplLmhlaWdodCgpICE9IGxheW91dEhlaWdodCgpKSkKKyAgICAgICAgICAgICAgICAgICAgcm9v dFJlbmRlcmVyLT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUpOworICAgICAgICAgICAgfQorI2Vu ZGlmCisgICAgICAgIH0KKyAgICAgICAgCisjaWZkZWYgSU5TVFJVTUVOVF9MQVlPVVRfU0NIRURV TElORworICAgICAgICBpZiAobV9maXJzdExheW91dCAmJiAhZG9jdW1lbnQtPm93bmVyRWxlbWVu dCgpKQorICAgICAgICAgICAgcHJpbnRmKCJFbGFwc2VkIHRpbWUgYmVmb3JlIGZpcnN0IGxheW91 dDogJWRcbiIsIGRvY3VtZW50LT5lbGFwc2VkVGltZSgpKTsKKyNlbmRpZiAgICAgICAgCisgICAg fQogICAgIAorICAgIFNjcm9sbGJhck1vZGUgaE1vZGU7CisgICAgU2Nyb2xsYmFyTW9kZSB2TW9k ZTsgICAgCiAgICAgY2FsY3VsYXRlU2Nyb2xsYmFyTW9kZXNGb3JMYXlvdXQoaE1vZGUsIHZNb2Rl KTsKIAogICAgIG1fZG9GdWxsUmVwYWludCA9ICFzdWJ0cmVlICYmIChtX2ZpcnN0TGF5b3V0IHx8 IHRvUmVuZGVyVmlldyhyb290KS0+cHJpbnRpbmcoKSk7Cg==