135031 2014-07-17 15:49:03 -0700 Fixed position elements are misplaced when a WK1 view has contentInsets set 2015-09-14 11:13:24 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified NEW InRadar P2 Normal --- 135056 1 bdakin webkit-unassigned bdakin sam simon.fraser thorton oldest_to_newest 1023129 0 bdakin 2014-07-17 15:49:03 -0700 Fixed position elements are misplaced when a WK1 view has contentInsets set. <rdar://problem/17682335> 1023132 1 235098 bdakin 2014-07-17 15:53:21 -0700 Created attachment 235098 Patch 1023135 2 235098 thorton 2014-07-17 16:03:14 -0700 Comment on attachment 235098 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=235098&action=review > Source/WebCore/platform/mac/ScrollViewMac.mm:127 > + IntSize frameSize = IntSize([scrollView() frame].size); No need for the " = IntSize" > Source/WebCore/platform/mac/ScrollViewMac.mm:135 > END_BLOCK_OBJC_EXCEPTIONS; does this need to be before return? I think it might, but I am not sure > Source/WebCore/platform/mac/ScrollViewMac.mm:137 > return IntRect(); why is this still here? 1023136 3 bdakin 2014-07-17 16:08:01 -0700 (In reply to comment #2) > (From update of attachment 235098 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=235098&action=review > > > Source/WebCore/platform/mac/ScrollViewMac.mm:127 > > + IntSize frameSize = IntSize([scrollView() frame].size); > > No need for the " = IntSize" > Fixed. > > Source/WebCore/platform/mac/ScrollViewMac.mm:135 > > END_BLOCK_OBJC_EXCEPTIONS; > > does this need to be before return? I think it might, but I am not sure > > > Source/WebCore/platform/mac/ScrollViewMac.mm:137 > > return IntRect(); > > why is this still here? Both of these have the same answer: this is what the function previously did. It had the normal return statement just before END_BLOCK_OBJC_EXCEPTIONS, and then a generic return after. Other functions in ScrollViewMac that return things follow this convention as well. 1023139 4 thorton 2014-07-17 16:43:55 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 235098 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=235098&action=review > > > > > Source/WebCore/platform/mac/ScrollViewMac.mm:127 > > > + IntSize frameSize = IntSize([scrollView() frame].size); > > > > No need for the " = IntSize" > > > > Fixed. > > > > Source/WebCore/platform/mac/ScrollViewMac.mm:135 > > > END_BLOCK_OBJC_EXCEPTIONS; > > > > does this need to be before return? I think it might, but I am not sure > > > > > Source/WebCore/platform/mac/ScrollViewMac.mm:137 > > > return IntRect(); > > > > why is this still here? > > Both of these have the same answer: this is what the function previously did. It had the normal return statement just before END_BLOCK_OBJC_EXCEPTIONS, and then a generic return after. Other functions in ScrollViewMac that return things follow this convention as well. Because that's what they do when they get an exception inside the blocking block. Okie! 1023364 5 235148 bdakin 2014-07-18 14:48:58 -0700 Created attachment 235148 Patch that does not break Yosemite tests 1125670 6 235098 ossy 2015-09-14 11:13:24 -0700 Comment on attachment 235098 Patch Cleared Tim Horton's review+ from obsolete attachment 235098 so that this bug does not appear in http://webkit.org/pending-commit. 235098 2014-07-17 15:53:21 -0700 2015-09-14 11:13:24 -0700 Patch for-review.txt text/plain 4078 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MTIwMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA3LTE3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBGaXhlZCBwb3NpdGlvbiBlbGVtZW50 cyBhcmUgbWlzcGxhY2VkIHdoZW4gYSBXSzEgdmlldyBoYXMgY29udGVudEluc2V0cyBzZXQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTAzMQorICAg ICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzY4MjMz NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbTlNT Y3JvbGxWaWV3IGRvY3VtZW50VmlzaWJsZVJlY3RdIGlzIG5vdCB0aGUgcmVjdCB0aGF0IHdlIGFy ZSBsb29raW5nIGZvciB3aGVuIAorICAgICAgICB0aGlzIGZ1bmN0aW9uIGlzIGNhbGxlZC4gV2Vi Q29yZSBpcyBpbnRlcmVzdGVkIGluIHRoZSByZWN0IHRoYXQgZG9lcyBub3QgaW5jbHVkZSAKKyAg ICAgICAgY29udGVudCB0aGF0IGlzIHdpdGhpbiB0aGUgaW5zZXQgcmVnaW9uLgorCisgICAgICAg IEltcGxlbWVudCBjb250cmFjdCgpIHRvIGF2b2lkIHRoZSBhd2t3YXJkbmVzcyBvZiBjYWxsaW5n IGV4cGFuZCgpIHdpdGggbmVnYXRpdmUgCisgICAgICAgIHZhbHVlcy4KKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9JbnRTaXplLmg6CisgICAgICAgIChXZWJDb3JlOjpJbnRTaXplOjpjb250 cmFjdCk6CisKKyAgICAgICAgVXNlIF9pbnNldEJvdW5kcyBpbnN0ZWFkIG9mIGRvY3VtZW50Vmlz aWJsZVJlY3QsIGFuZCB3aGVuIGl04oCZcyBuZWNlc3NhcnkgdG8gdXNlIAorICAgICAgICB0aGUg ZnJhbWXigJlzIGRpbWVuc2lvbnMsIGV4dHJhY3QgdGhlIGluc2V0IGZyb20gdGhhdCBzaXplLgor ICAgICAgICAqIHBsYXRmb3JtL21hYy9TY3JvbGxWaWV3TWFjLm1tOgorICAgICAgICAoV2ViQ29y ZTo6U2Nyb2xsVmlldzo6cGxhdGZvcm1WaXNpYmxlQ29udGVudFJlY3QpOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsVmlldzo6cGxhdGZvcm1WaXNpYmxlQ29udGVudFNpemUpOgorCiAyMDE0LTA3 LTE3ICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CiAKICAgICAgICAgW1JFR1JF U1NJT04gV0syXVRoZSBtZW51IGJhciBkb2VzIG5vdCBzaG93IHVwIHdoZW4gdGFwcGluZyBvbiB0 aGUgY2FyZXQuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRTaXpl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW50U2l6 ZS5oCShyZXZpc2lvbiAxNzExODkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9JbnRTaXplLmgJKHdvcmtpbmcgY29weSkKQEAgLTgxLDYgKzgxLDEyIEBAIHB1YmxpYzoKICAg ICAgICAgbV9oZWlnaHQgKz0gaGVpZ2h0OwogICAgIH0KIAorICAgIHZvaWQgY29udHJhY3QoaW50 IHdpZHRoLCBpbnQgaGVpZ2h0KQorICAgIHsKKyAgICAgICAgbV93aWR0aCAtPSB3aWR0aDsKKyAg ICAgICAgbV9oZWlnaHQgLT0gaGVpZ2h0OworICAgIH0KKwogICAgIHZvaWQgc2NhbGUoZmxvYXQg d2lkdGhTY2FsZSwgZmxvYXQgaGVpZ2h0U2NhbGUpCiAgICAgewogICAgICAgICBtX3dpZHRoID0g c3RhdGljX2Nhc3Q8aW50PihzdGF0aWNfY2FzdDxmbG9hdD4obV93aWR0aCkgKiB3aWR0aFNjYWxl KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxWaWV3TWFjLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxWaWV3TWFjLm1t CShyZXZpc2lvbiAxNzExODkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xs Vmlld01hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzQsNiArMzQsMTQgQEAKICNpbXBvcnQgIk5v dEltcGxlbWVudGVkLmgiCiAjaW1wb3J0ICJXZWJDb3JlRnJhbWVWaWV3LmgiCiAKK0BpbnRlcmZh Y2UgTlNDbGlwVmlldyAoRGV0YWlscykKKy0gKE5TUmVjdClfaW5zZXRCb3VuZHM7CitAZW5kCisK K0BpbnRlcmZhY2UgTlNTY3JvbGxWaWV3IChEZXRhaWxzKQorLSAoTlNFZGdlSW5zZXRzKWNvbnRl bnRJbnNldHM7CitAZW5kCisKIEBpbnRlcmZhY2UgTlNXaW5kb3cgKFdlYldpbmRvd0RldGFpbHMp CiAtIChCT09MKV9uZWVkc1RvUmVzZXREcmFnTWFyZ2luczsKIC0gKHZvaWQpX3NldE5lZWRzVG9S ZXNldERyYWdNYXJnaW5zOihCT09MKW5lZWRzOwpAQCAtMTA3LDIzICsxMTUsMzEgQEAgYm9vbCBT Y3JvbGxWaWV3OjpwbGF0Zm9ybUNhbkJsaXRPblNjcm9sbAogSW50UmVjdCBTY3JvbGxWaWV3Ojpw bGF0Zm9ybVZpc2libGVDb250ZW50UmVjdChib29sIGluY2x1ZGVTY3JvbGxiYXJzKSBjb25zdAog ewogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKLSAgICBJbnRSZWN0IHJlc3VsdCA9 IGVuY2xvc2luZ0ludFJlY3QoW3Njcm9sbFZpZXcoKSBkb2N1bWVudFZpc2libGVSZWN0XSk7Ci0g ICAgaWYgKGluY2x1ZGVTY3JvbGxiYXJzKQotICAgICAgICByZXN1bHQuc2V0U2l6ZShJbnRTaXpl KFtzY3JvbGxWaWV3KCkgZnJhbWVdLnNpemUpKTsKLSAgICByZXR1cm4gcmVzdWx0OworCisgICAg SW50UmVjdCB2aXNpYmxlQ29udGVudFJlY3Q7CisjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9S RVFVSVJFRCA+PSAxMDEwMAorICAgIHZpc2libGVDb250ZW50UmVjdCA9IGVuY2xvc2luZ0ludFJl Y3QoW1tzY3JvbGxWaWV3KCkgY29udGVudFZpZXddIF9pbnNldEJvdW5kc10pOworI2Vsc2UKKyAg ICB2aXNpYmxlQ29udGVudFJlY3QgPSBlbmNsb3NpbmdJbnRSZWN0KFtzY3JvbGxWaWV3KCkgZG9j dW1lbnRWaXNpYmxlUmVjdF0pOworI2VuZGlmCisKKyAgICBpZiAoaW5jbHVkZVNjcm9sbGJhcnMp IHsKKyAgICAgICAgSW50U2l6ZSBmcmFtZVNpemUgPSBJbnRTaXplKFtzY3JvbGxWaWV3KCkgZnJh bWVdLnNpemUpOworI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMDAK KyAgICAgICAgZnJhbWVTaXplLmNvbnRyYWN0KHNjcm9sbFZpZXcoKS5jb250ZW50SW5zZXRzLmxl ZnQgKyBzY3JvbGxWaWV3KCkuY29udGVudEluc2V0cy5yaWdodCwgc2Nyb2xsVmlldygpLmNvbnRl bnRJbnNldHMudG9wICsgc2Nyb2xsVmlldygpLmNvbnRlbnRJbnNldHMuYm90dG9tKTsKKyNlbmRp ZgorICAgICAgICB2aXNpYmxlQ29udGVudFJlY3Quc2V0U2l6ZShmcmFtZVNpemUpOworICAgIH0K KworICAgIHJldHVybiB2aXNpYmxlQ29udGVudFJlY3Q7CiAgICAgRU5EX0JMT0NLX09CSkNfRVhD RVBUSU9OUzsKKwogICAgIHJldHVybiBJbnRSZWN0KCk7CiB9CiAKIEludFNpemUgU2Nyb2xsVmll dzo6cGxhdGZvcm1WaXNpYmxlQ29udGVudFNpemUoYm9vbCBpbmNsdWRlU2Nyb2xsYmFycykgY29u c3QKIHsKLSAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7Ci0gICAgaWYgKGluY2x1ZGVT Y3JvbGxiYXJzKQotICAgICAgICByZXR1cm4gSW50U2l6ZShbc2Nyb2xsVmlldygpIGZyYW1lXS5z aXplKTsKLQotICAgIHJldHVybiBleHBhbmRlZEludFNpemUoRmxvYXRTaXplKFtzY3JvbGxWaWV3 KCkgZG9jdW1lbnRWaXNpYmxlUmVjdF0uc2l6ZSkpOwotICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQ VElPTlM7Ci0gICAgcmV0dXJuIEludFNpemUoKTsKKyAgICByZXR1cm4gcGxhdGZvcm1WaXNpYmxl Q29udGVudFJlY3QoaW5jbHVkZVNjcm9sbGJhcnMpLnNpemUoKTsKIH0KIAogdm9pZCBTY3JvbGxW aWV3OjpwbGF0Zm9ybVNldENvbnRlbnRzU2l6ZSgpCg== 235148 2014-07-18 14:48:58 -0700 2014-07-18 15:23:13 -0700 Patch that does not break Yosemite tests for-review-2.txt text/plain 4049 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MTI0NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE0LTA3LTE4ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBGaXhlZCBwb3NpdGlvbiBlbGVtZW50 cyBhcmUgbWlzcGxhY2VkIHdoZW4gYSBXSzEgdmlldyBoYXMgY29udGVudEluc2V0cyBzZXQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTAzMQorICAg ICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzY4MjMz NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbTlNT Y3JvbGxWaWV3IGRvY3VtZW50VmlzaWJsZVJlY3RdIGluY2x1ZGVzIGNvbnRlbnQgdGhhdCBpcyB3 aXRoaW4gdGhlIGluc2V0LWFyZWEgCisgICAgICAgIG9mIGEgdmlldywgYnV0IFdlYkNvcmUgaXMg aW50ZXJlc3RlZCBpbiB0aGUgY29udGVudCB0aGF0IGlzIGZ1bGx5IHZpc2libGUsIHNvIHdlIAor ICAgICAgICBuZWVkIHRvIGZhY3RvciB0aGUgaW5zZXQgc2l6ZXMgb3V0IG9mIHRoaXMgcmVjdC4K KworICAgICAgICBJbXBsZW1lbnQgY29udHJhY3QoKSB0byBhdm9pZCB0aGUgYXdrd2FyZG5lc3Mg b2YgY2FsbGluZyBleHBhbmQoKSB3aXRoIG5lZ2F0aXZlIAorICAgICAgICB2YWx1ZXMuCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvSW50U2l6ZS5oOgorICAgICAgICAoV2ViQ29yZTo6SW50 U2l6ZTo6Y29udHJhY3QpOgorCisgICAgICAgIEZhY3RvciBvdXQgaW5zZXRzCisgICAgICAgICog cGxhdGZvcm0vbWFjL1Njcm9sbFZpZXdNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxW aWV3OjpwbGF0Zm9ybVZpc2libGVDb250ZW50UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3Jv bGxWaWV3OjpwbGF0Zm9ybVZpc2libGVDb250ZW50U2l6ZSk6CisKIDIwMTQtMDctMTggIFRpbSBI b3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgVGFrZSBuYXZpZ2F0 aW9uIHNuYXBzaG90cyB3aGVuZXZlciB0aGUgY3VycmVudCBiYWNrLWZvcndhcmQgaXRlbSBpcyBn b2luZyB0byBjaGFuZ2UKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0lu dFNpemUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9J bnRTaXplLmgJKHJldmlzaW9uIDE3MTIyNSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0ludFNpemUuaAkod29ya2luZyBjb3B5KQpAQCAtODEsNiArODEsMTIgQEAgcHVibGlj OgogICAgICAgICBtX2hlaWdodCArPSBoZWlnaHQ7CiAgICAgfQogCisgICAgdm9pZCBjb250cmFj dChpbnQgd2lkdGgsIGludCBoZWlnaHQpCisgICAgeworICAgICAgICBtX3dpZHRoIC09IHdpZHRo OworICAgICAgICBtX2hlaWdodCAtPSBoZWlnaHQ7CisgICAgfQorCiAgICAgdm9pZCBzY2FsZShm bG9hdCB3aWR0aFNjYWxlLCBmbG9hdCBoZWlnaHRTY2FsZSkKICAgICB7CiAgICAgICAgIG1fd2lk dGggPSBzdGF0aWNfY2FzdDxpbnQ+KHN0YXRpY19jYXN0PGZsb2F0PihtX3dpZHRoKSAqIHdpZHRo U2NhbGUpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbFZpZXdNYWMu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbFZpZXdN YWMubW0JKHJldmlzaW9uIDE3MTIyNSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9T Y3JvbGxWaWV3TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw2ICszNCwxMCBAQAogI2ltcG9y dCAiTm90SW1wbGVtZW50ZWQuaCIKICNpbXBvcnQgIldlYkNvcmVGcmFtZVZpZXcuaCIKIAorQGlu dGVyZmFjZSBOU1Njcm9sbFZpZXcgKERldGFpbHMpCistIChOU0VkZ2VJbnNldHMpY29udGVudElu c2V0czsKK0BlbmQKKwogQGludGVyZmFjZSBOU1dpbmRvdyAoV2ViV2luZG93RGV0YWlscykKIC0g KEJPT0wpX25lZWRzVG9SZXNldERyYWdNYXJnaW5zOwogLSAodm9pZClfc2V0TmVlZHNUb1Jlc2V0 RHJhZ01hcmdpbnM6KEJPT0wpbmVlZHM7CkBAIC0xMDcsMjMgKzExMSwzMCBAQCBib29sIFNjcm9s bFZpZXc6OnBsYXRmb3JtQ2FuQmxpdE9uU2Nyb2xsCiBJbnRSZWN0IFNjcm9sbFZpZXc6OnBsYXRm b3JtVmlzaWJsZUNvbnRlbnRSZWN0KGJvb2wgaW5jbHVkZVNjcm9sbGJhcnMpIGNvbnN0CiB7CiAg ICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TOwotICAgIEludFJlY3QgcmVzdWx0ID0gZW5j bG9zaW5nSW50UmVjdChbc2Nyb2xsVmlldygpIGRvY3VtZW50VmlzaWJsZVJlY3RdKTsKLSAgICBp ZiAoaW5jbHVkZVNjcm9sbGJhcnMpCi0gICAgICAgIHJlc3VsdC5zZXRTaXplKEludFNpemUoW3Nj cm9sbFZpZXcoKSBmcmFtZV0uc2l6ZSkpOwotICAgIHJldHVybiByZXN1bHQ7CisKKyAgICBJbnRS ZWN0IHZpc2libGVDb250ZW50UmVjdCA9IGVuY2xvc2luZ0ludFJlY3QoW3Njcm9sbFZpZXcoKSBk b2N1bWVudFZpc2libGVSZWN0XSk7CisjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF RCA+PSAxMDEwMAorICAgIHZpc2libGVDb250ZW50UmVjdC5tb3ZlKHNjcm9sbFZpZXcoKS5jb250 ZW50SW5zZXRzLmxlZnQsIHNjcm9sbFZpZXcoKS5jb250ZW50SW5zZXRzLnRvcCk7CisgICAgdmlz aWJsZUNvbnRlbnRSZWN0LmNvbnRyYWN0KHNjcm9sbFZpZXcoKS5jb250ZW50SW5zZXRzLmxlZnQg KyBzY3JvbGxWaWV3KCkuY29udGVudEluc2V0cy5yaWdodCwgc2Nyb2xsVmlldygpLmNvbnRlbnRJ bnNldHMudG9wICsgc2Nyb2xsVmlldygpLmNvbnRlbnRJbnNldHMuYm90dG9tKTsKKyNlbmRpZgor CisgICAgaWYgKGluY2x1ZGVTY3JvbGxiYXJzKSB7CisgICAgICAgIEludFNpemUgZnJhbWVTaXpl ID0gSW50U2l6ZShbc2Nyb2xsVmlldygpIGZyYW1lXS5zaXplKTsKKyNpZiBfX01BQ19PU19YX1ZF UlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwCisgICAgICAgIGZyYW1lU2l6ZS5jb250cmFjdChz Y3JvbGxWaWV3KCkuY29udGVudEluc2V0cy5sZWZ0ICsgc2Nyb2xsVmlldygpLmNvbnRlbnRJbnNl dHMucmlnaHQsIHNjcm9sbFZpZXcoKS5jb250ZW50SW5zZXRzLnRvcCArIHNjcm9sbFZpZXcoKS5j b250ZW50SW5zZXRzLmJvdHRvbSk7CisjZW5kaWYKKyAgICAgICAgdmlzaWJsZUNvbnRlbnRSZWN0 LnNldFNpemUoZnJhbWVTaXplKTsKKyAgICB9CisKKyAgICByZXR1cm4gdmlzaWJsZUNvbnRlbnRS ZWN0OwogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CisKICAgICByZXR1cm4gSW50UmVj dCgpOwogfQogCiBJbnRTaXplIFNjcm9sbFZpZXc6OnBsYXRmb3JtVmlzaWJsZUNvbnRlbnRTaXpl KGJvb2wgaW5jbHVkZVNjcm9sbGJhcnMpIGNvbnN0CiB7Ci0gICAgQkVHSU5fQkxPQ0tfT0JKQ19F WENFUFRJT05TOwotICAgIGlmIChpbmNsdWRlU2Nyb2xsYmFycykKLSAgICAgICAgcmV0dXJuIElu dFNpemUoW3Njcm9sbFZpZXcoKSBmcmFtZV0uc2l6ZSk7Ci0KLSAgICByZXR1cm4gZXhwYW5kZWRJ bnRTaXplKEZsb2F0U2l6ZShbc2Nyb2xsVmlldygpIGRvY3VtZW50VmlzaWJsZVJlY3RdLnNpemUp KTsKLSAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwotICAgIHJldHVybiBJbnRTaXplKCk7 CisgICAgcmV0dXJuIHBsYXRmb3JtVmlzaWJsZUNvbnRlbnRSZWN0KGluY2x1ZGVTY3JvbGxiYXJz KS5zaXplKCk7CiB9CiAKIHZvaWQgU2Nyb2xsVmlldzo6cGxhdGZvcm1TZXRDb250ZW50c1NpemUo KQo=