53249 2011-01-27 10:32:01 -0800 Add ability to do an unconstrained scroll on a ScrollView 2011-03-03 15:10:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 55077 1 sam sam abarth dglazkov eric fishd mihaip webkit.review.bot oldest_to_newest 340925 0 sam 2011-01-27 10:32:01 -0800 Add ability to do an unconstrained scroll on a ScrollView 340926 1 80346 sam 2011-01-27 10:36:50 -0800 Created attachment 80346 Patch 340934 2 80346 hyatt 2011-01-27 10:43:24 -0800 Comment on attachment 80346 Patch Devirtualize the overhang painting function and get it out of FrameView, since ultimately it will be a callout through HostWindow. r=me with that change. 341007 3 sam 2011-01-27 13:23:22 -0800 Landed in r76831. 341014 4 eric 2011-01-27 13:29:56 -0800 :( Borked the whole world. 341016 5 eric 2011-01-27 13:31:28 -0800 /Volumes/Big/WebKit-BuildSlave/leopard-intel-release/build/Source/WebCore/platform/ScrollView.cpp: In member function 'void WebCore::ScrollView::paintOverhangAreas(WebCore::GraphicsContext*, const WebCore::IntRect&, const WebCore::IntRect&)': /Volumes/Big/WebKit-BuildSlave/leopard-intel-release/build/Source/WebCore/platform/ScrollView.cpp:928: error: 'context' was not declared in this scope /Volumes/Big/WebKit-BuildSlave/leopard-intel-release/build/Source/WebCore/platform/ScrollView.cpp:929: error: 'horizontalOverhangRect' was not declared in this scope /Volumes/Big/WebKit-BuildSlave/leopard-intel-release/build/Source/WebCore/platform/ScrollView.cpp:933: error: 'verticalOverhangRect' was not declared in this scope 341022 6 webkit.review.bot 2011-01-27 13:48:00 -0800 http://trac.webkit.org/changeset/76831 might have broken Qt Linux Release 80346 2011-01-27 10:36:50 -0800 2011-01-27 10:43:24 -0800 Patch bug-53249-20110127103649.patch text/plain 14762 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc2ODEyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDUgQEAKKzIwMTEtMDEtMjcgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgYWJpbGl0eSB0byBkbyBhbiB1bmNvbnN0cmFpbmVkIHNjcm9sbCBv biBhIFNjcm9sbFZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTUzMjQ5CisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZVZpZXc6OnBhaW50T3ZlcmhhbmdBcmVhcyk6CisgICAgICAgICogcGFnZS9G cmFtZVZpZXcuaDoKKyAgICAgICAgUGFpbnQgdGhlIG92ZXJoYW5ncyB3aGl0ZSBmb3Igbm93Lgor CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT Y3JvbGxWaWV3OjpTY3JvbGxWaWV3KToKKyAgICAgICAgSW5pdGlhbGl6ZSBtX2NvbnN0cmFpbnNT Y3JvbGxpbmdUb0NvbnRlbnRFZGdlIHRvIHRydWUuCisKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bFZpZXc6OnNldFNjcm9sbE9mZnNldCk6CisgICAgICAgIE9ubHkgY29uc3RyYWluIHRoZSBvZmZz ZXQgaWYgdGhlIG1fY29uc3RyYWluc1Njcm9sbGluZ1RvQ29udGVudEVkZ2UgaXMgc2V0LgorCisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojp1cGRhdGVTY3JvbGxiYXJzKToKKyAgICAgICAg U2ltcGxpZnkgZXhwcmVzc2lvbiBjb252ZXJ0aW5nIGFuIEludFNpemUgdG8gYW4gSW50UG9pbnQu CisgICAgICAgIAorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6cGFpbnQpOgorICAgICAg ICBQYWludCB0aGUgb3ZlcmhhbmcgaWYgdGhlcmUgaXMgYW55LgorICAgICAgICAKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbFZpZXc6OmNhbGN1bGF0ZU92ZXJoYW5nQXJlYXNGb3JQYWludGluZyk6 CisgICAgICAgIENhbGN1bGF0ZSB0aGUgb3ZlcmhhbmcgaW4gdmlld3BvcnQgY29vcmRpbmF0ZXMg Zm9yIHBhaW50aW5nLgorCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6Y29uc3RyYWluc1Njcm9sbGluZ1RvQ29udGVudEVkZ2Up OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6c2V0Q29uc3RyYWluc1Njcm9sbGluZ1Rv Q29udGVudEVkZ2UpOgorICAgICAgICBBZGQgYml0IHRvIGNvbnRyb2wgd2hldGhlciB0aGUgc2Ny b2xsIHBvc2l0aW9uIHNob3VsZCBiZSBjb25zdHJhaW5lZAorICAgICAgICB0byB0aGUgY29udGVu dCBlZGdlIHdoZW4gc2V0LgorCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsYmFyVGhlbWVDb21w b3NpdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dXNlZFRvdGFsU2l6ZSk6CisgICAgICAgIChX ZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZTo6dGh1bWJQb3NpdGlvbik6CisgICAgICAg IChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZTo6dGh1bWJMZW5ndGgpOgorICAgICAg ICAqIHBsYXRmb3JtL21hYy9TY3JvbGxiYXJUaGVtZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6 OlNjcm9sbGJhclRoZW1lTWFjOjpwYWludCk6CisgICAgICAgIEltcHJvdmUgY2FsY3VsYXRpb25z IG9mIHRodW1iIHNpemUgYW5kIHBvc2l0aW9uIHRvIHRha2Ugb3ZlcmhhbmcgaW50byBhY2NvdW50 LgorCiAyMDExLTAxLTI3ICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQgV2luQ0UgYnVpbGQgZml4IGZvciByNzY3NDMuCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiA3Njc1OCkKKysrIFNvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjIwOSw2ICsyMjA5LDE5 IEBAIHZvaWQgRnJhbWVWaWV3OjpwYWludENvbnRlbnRzKEdyYXBoaWNzQ28KICAgICBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb246OmRpZFBhaW50KGNvb2tpZSk7CiB9CiAKK3ZvaWQgRnJhbWVWaWV3 OjpwYWludE92ZXJoYW5nQXJlYXMoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRS ZWN0JiBob3Jpem9udGFsT3ZlcmhhbmdSZWN0LCBjb25zdCBJbnRSZWN0JiB2ZXJ0aWNhbE92ZXJo YW5nUmVjdCkKK3sKKyAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgY2hlY2tpbmcgdGhlIGRp cnR5IHJlY3QuCisKKyAgICBjb250ZXh0LT5zZXRGaWxsQ29sb3IoQ29sb3I6OndoaXRlLCBDb2xv clNwYWNlRGV2aWNlUkdCKTsKKyAgICBpZiAoIWhvcml6b250YWxPdmVyaGFuZ1JlY3QuaXNFbXB0 eSgpKQorICAgICAgICBjb250ZXh0LT5maWxsUmVjdChob3Jpem9udGFsT3ZlcmhhbmdSZWN0KTsK KworICAgIGNvbnRleHQtPnNldEZpbGxDb2xvcihDb2xvcjo6d2hpdGUsIENvbG9yU3BhY2VEZXZp Y2VSR0IpOworICAgIGlmICghdmVydGljYWxPdmVyaGFuZ1JlY3QuaXNFbXB0eSgpKQorICAgICAg ICBjb250ZXh0LT5maWxsUmVjdCh2ZXJ0aWNhbE92ZXJoYW5nUmVjdCk7Cit9CisKIHZvaWQgRnJh bWVWaWV3OjpzZXRQYWludEJlaGF2aW9yKFBhaW50QmVoYXZpb3IgYmVoYXZpb3IpCiB7CiAgICAg bV9wYWludEJlaGF2aW9yID0gYmVoYXZpb3I7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJ KHJldmlzaW9uIDc2NzU4KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAkod29y a2luZyBjb3B5KQpAQCAtMTk3LDYgKzE5Nyw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlbW92ZVdp ZGdldFRvVXBkYXRlKFJlbmRlckVtYmVkZGVkT2JqZWN0Kik7CiAKICAgICB2aXJ0dWFsIHZvaWQg cGFpbnRDb250ZW50cyhHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0JiBkYW1hZ2VSZWN0 KTsKKyAgICB2aXJ0dWFsIHZvaWQgcGFpbnRPdmVyaGFuZ0FyZWFzKEdyYXBoaWNzQ29udGV4dCos IGNvbnN0IEludFJlY3QmIGhvcml6b250YWxPdmVyaGFuZ0FyZWEsIGNvbnN0IEludFJlY3QmIHZl cnRpY2FsT3ZlcmhhbmdBcmVhKTsKKwogICAgIHZvaWQgc2V0UGFpbnRCZWhhdmlvcihQYWludEJl aGF2aW9yKTsKICAgICBQYWludEJlaGF2aW9yIHBhaW50QmVoYXZpb3IoKSBjb25zdDsKICAgICBi b29sIGlzUGFpbnRpbmcoKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbFZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bFZpZXcuY3BwCShyZXZpc2lvbiA3Njc1OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbFZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw4ICszNSw3IEBACiAjaW5jbHVkZSAi U2Nyb2xsYmFyVGhlbWUuaCIKICNpbmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CiAKLQotdXNp bmcgc3RkOjptYXg7Cit1c2luZyBuYW1lc3BhY2Ugc3RkOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKQEAgLTU2LDYgKzU1LDcgQEAgU2Nyb2xsVmlldzo6U2Nyb2xsVmlldygpCiAgICAgLCBtX3Bh aW50c0VudGlyZUNvbnRlbnRzKGZhbHNlKQogICAgICwgbV9jbGlwc1JlcGFpbnRzKHRydWUpCiAg ICAgLCBtX2RlbGVnYXRlc1Njcm9sbGluZyhmYWxzZSkKKyAgICAsIG1fY29uc3RyYWluc1Njcm9s bGluZ1RvQ29udGVudEVkZ2UodHJ1ZSkKIHsKICAgICBwbGF0Zm9ybUluaXQoKTsKIH0KQEAgLTMy Miw4ICszMjIsMTIgQEAgaW50IFNjcm9sbFZpZXc6OnNjcm9sbFNpemUoU2Nyb2xsYmFyT3JpZQog CiB2b2lkIFNjcm9sbFZpZXc6OnNldFNjcm9sbE9mZnNldChjb25zdCBJbnRQb2ludCYgb2Zmc2V0 KQogewotICAgIGludCBob3Jpem9udGFsT2Zmc2V0ID0gc3RkOjptYXgoc3RkOjptaW4ob2Zmc2V0 LngoKSwgY29udGVudHNXaWR0aCgpIC0gdmlzaWJsZVdpZHRoKCkpLCAwKTsKLSAgICBpbnQgdmVy dGljYWxPZmZzZXQgPSBzdGQ6Om1heChzdGQ6Om1pbihvZmZzZXQueSgpLCBjb250ZW50c0hlaWdo dCgpIC0gdmlzaWJsZUhlaWdodCgpKSwgMCk7CisgICAgaW50IGhvcml6b250YWxPZmZzZXQgPSBv ZmZzZXQueCgpOworICAgIGludCB2ZXJ0aWNhbE9mZnNldCA9IG9mZnNldC55KCk7CisgICAgaWYg KGNvbnN0cmFpbnNTY3JvbGxpbmdUb0NvbnRlbnRFZGdlKCkpIHsKKyAgICAgICAgaG9yaXpvbnRh bE9mZnNldCA9IG1heChtaW4oaG9yaXpvbnRhbE9mZnNldCwgY29udGVudHNXaWR0aCgpIC0gdmlz aWJsZVdpZHRoKCkpLCAwKTsKKyAgICAgICAgdmVydGljYWxPZmZzZXQgPSBtYXgobWluKHZlcnRp Y2FsT2Zmc2V0LCBjb250ZW50c0hlaWdodCgpIC0gdmlzaWJsZUhlaWdodCgpKSwgMCk7CisgICAg fQogCiAgICAgSW50U2l6ZSBuZXdPZmZzZXQgPSBtX3Njcm9sbE9mZnNldDsKICAgICBuZXdPZmZz ZXQuc2V0V2lkdGgoaG9yaXpvbnRhbE9mZnNldCAtIG1fc2Nyb2xsT3JpZ2luLngoKSk7CkBAIC00 OTgsNyArNTAyLDcgQEAgdm9pZCBTY3JvbGxWaWV3Ojp1cGRhdGVTY3JvbGxiYXJzKGNvbnN0IAog CiAgICAgbV9pblVwZGF0ZVNjcm9sbGJhcnMgPSB0cnVlOwogCi0gICAgSW50UG9pbnQgc2Nyb2xs UG9pbnQgPSBhZGp1c3RTY3JvbGxQb3NpdGlvbldpdGhpblJhbmdlKEludFBvaW50KGRlc2lyZWRP ZmZzZXQud2lkdGgoKSwgZGVzaXJlZE9mZnNldC5oZWlnaHQoKSkpOworICAgIEludFBvaW50IHNj cm9sbFBvaW50ID0gYWRqdXN0U2Nyb2xsUG9zaXRpb25XaXRoaW5SYW5nZShJbnRQb2ludChkZXNp cmVkT2Zmc2V0KSk7CiAgICAgSW50U2l6ZSBzY3JvbGwoc2Nyb2xsUG9pbnQueCgpLCBzY3JvbGxQ b2ludC55KCkpOwogCiAgICAgaWYgKG1faG9yaXpvbnRhbFNjcm9sbGJhcikgewpAQCAtODYwLDYg Kzg2NCwxMyBAQCB2b2lkIFNjcm9sbFZpZXc6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogCiAKICAg ICBjb250ZXh0LT5yZXN0b3JlKCk7CiAKKyAgICBJbnRSZWN0IGhvcml6b250YWxPdmVyaGFuZ1Jl Y3Q7CisgICAgSW50UmVjdCB2ZXJ0aWNhbE92ZXJoYW5nUmVjdDsKKyAgICBjYWxjdWxhdGVPdmVy aGFuZ0FyZWFzRm9yUGFpbnRpbmcoaG9yaXpvbnRhbE92ZXJoYW5nUmVjdCwgdmVydGljYWxPdmVy aGFuZ1JlY3QpOworCisgICAgaWYgKCFob3Jpem9udGFsT3ZlcmhhbmdSZWN0LmlzRW1wdHkoKSB8 fCAhdmVydGljYWxPdmVyaGFuZ1JlY3QuaXNFbXB0eSgpKQorICAgICAgICBwYWludE92ZXJoYW5n QXJlYXMoY29udGV4dCwgaG9yaXpvbnRhbE92ZXJoYW5nUmVjdCwgdmVydGljYWxPdmVyaGFuZ1Jl Y3QpOworCiAgICAgLy8gTm93IHBhaW50IHRoZSBzY3JvbGxiYXJzLgogICAgIGlmICghbV9zY3Jv bGxiYXJzU3VwcHJlc3NlZCAmJiAobV9ob3Jpem9udGFsU2Nyb2xsYmFyIHx8IG1fdmVydGljYWxT Y3JvbGxiYXIpKSB7CiAgICAgICAgIGNvbnRleHQtPnNhdmUoKTsKQEAgLTg3OCw2ICs4ODksNDIg QEAgdm9pZCBTY3JvbGxWaWV3OjpwYWludChHcmFwaGljc0NvbnRleHQqIAogICAgICAgICBwYWlu dFBhblNjcm9sbEljb24oY29udGV4dCk7CiB9CiAKK3ZvaWQgU2Nyb2xsVmlldzo6Y2FsY3VsYXRl T3ZlcmhhbmdBcmVhc0ZvclBhaW50aW5nKEludFJlY3QmIGhvcml6b250YWxPdmVyaGFuZ1JlY3Qs IEludFJlY3QmIHZlcnRpY2FsT3ZlcmhhbmdSZWN0KQoreworICAgIGlmIChzY3JvbGxZKCkgPCAw KSB7CisgICAgICAgIGhvcml6b250YWxPdmVyaGFuZ1JlY3QgPSBmcmFtZVJlY3QoKTsKKyAgICAg ICAgaG9yaXpvbnRhbE92ZXJoYW5nUmVjdC5zZXRIZWlnaHQoLXNjcm9sbFkoKSk7CisgICAgfSBl bHNlIGlmIChzY3JvbGxZKCkgPiBjb250ZW50c0hlaWdodCgpIC0gdmlzaWJsZUNvbnRlbnRSZWN0 KHRydWUpLmhlaWdodCgpKSB7CisgICAgICAgIGludCBoZWlnaHQgPSBzY3JvbGxZKCkgLSAoY29u dGVudHNIZWlnaHQoKSAtIHZpc2libGVDb250ZW50UmVjdCh0cnVlKS5oZWlnaHQoKSk7CisgICAg ICAgIGhvcml6b250YWxPdmVyaGFuZ1JlY3QgPSBmcmFtZVJlY3QoKTsKKyAgICAgICAgaG9yaXpv bnRhbE92ZXJoYW5nUmVjdC5zZXRZKGZyYW1lUmVjdCgpLmJvdHRvbSgpIC0gaGVpZ2h0KTsKKyAg ICAgICAgaG9yaXpvbnRhbE92ZXJoYW5nUmVjdC5zZXRIZWlnaHQoaGVpZ2h0KTsKKyAgICB9CisK KyAgICBpZiAoc2Nyb2xsWCgpIDwgMCkgeworICAgICAgICB2ZXJ0aWNhbE92ZXJoYW5nUmVjdC5z ZXRXaWR0aCgtc2Nyb2xsWCgpKTsKKyAgICAgICAgdmVydGljYWxPdmVyaGFuZ1JlY3Quc2V0SGVp Z2h0KGZyYW1lUmVjdCgpLmhlaWdodCgpIC0gaG9yaXpvbnRhbE92ZXJoYW5nUmVjdC5oZWlnaHQo KSk7CisgICAgICAgIHZlcnRpY2FsT3ZlcmhhbmdSZWN0LnNldFgoZnJhbWVSZWN0KCkueCgpKTsK KyAgICAgICAgaWYgKGhvcml6b250YWxPdmVyaGFuZ1JlY3QueSgpID09IGZyYW1lUmVjdCgpLnko KSkKKyAgICAgICAgICAgIHZlcnRpY2FsT3ZlcmhhbmdSZWN0LnNldFkoZnJhbWVSZWN0KCkueSgp ICsgaG9yaXpvbnRhbE92ZXJoYW5nUmVjdC5oZWlnaHQoKSk7CisgICAgICAgIGVsc2UKKyAgICAg ICAgICAgIHZlcnRpY2FsT3ZlcmhhbmdSZWN0LnNldFkoZnJhbWVSZWN0KCkueSgpKTsKKyAgICB9 IGVsc2UgaWYgKHNjcm9sbFgoKSA+IGNvbnRlbnRzV2lkdGgoKSAtIHZpc2libGVDb250ZW50UmVj dCh0cnVlKS53aWR0aCgpKSB7CisgICAgICAgIGludCB3aWR0aCA9IHNjcm9sbFgoKSAtIChjb250 ZW50c1dpZHRoKCkgLSB2aXNpYmxlQ29udGVudFJlY3QodHJ1ZSkud2lkdGgoKSk7CisgICAgICAg IHZlcnRpY2FsT3ZlcmhhbmdSZWN0LnNldFdpZHRoKHdpZHRoKTsKKyAgICAgICAgdmVydGljYWxP dmVyaGFuZ1JlY3Quc2V0SGVpZ2h0KGZyYW1lUmVjdCgpLmhlaWdodCgpIC0gaG9yaXpvbnRhbE92 ZXJoYW5nUmVjdC5oZWlnaHQoKSk7CisgICAgICAgIHZlcnRpY2FsT3ZlcmhhbmdSZWN0LnNldFgo ZnJhbWVSZWN0KCkucmlnaHQoKSAtIHdpZHRoKTsKKyAgICAgICAgaWYgKGhvcml6b250YWxPdmVy aGFuZ1JlY3QueSgpID09IGZyYW1lUmVjdCgpLnkoKSkKKyAgICAgICAgICAgIHZlcnRpY2FsT3Zl cmhhbmdSZWN0LnNldFkoZnJhbWVSZWN0KCkueSgpICsgaG9yaXpvbnRhbE92ZXJoYW5nUmVjdC5o ZWlnaHQoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHZlcnRpY2FsT3ZlcmhhbmdSZWN0 LnNldFkoZnJhbWVSZWN0KCkueSgpKTsKKyAgICB9Cit9CisKK3ZvaWQgU2Nyb2xsVmlldzo6cGFp bnRPdmVyaGFuZ0FyZWFzKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmLCBjb25zdCBJ bnRSZWN0JikKK3sKK30KKwogYm9vbCBTY3JvbGxWaWV3Ojppc1BvaW50SW5TY3JvbGxiYXJDb3Ju ZXIoY29uc3QgSW50UG9pbnQmIHdpbmRvd1BvaW50KQogewogICAgIGlmICghc2Nyb2xsYmFyQ29y bmVyUHJlc2VudCgpKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAkocmV2 aXNpb24gNzY3NTgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgJKHdv cmtpbmcgY29weSkKQEAgLTE2Miw3ICsxNjIsMTEgQEAgcHVibGljOgogICAgIGludCBjb250ZW50 c1dpZHRoKCkgY29uc3QgeyByZXR1cm4gY29udGVudHNTaXplKCkud2lkdGgoKTsgfQogICAgIGlu dCBjb250ZW50c0hlaWdodCgpIGNvbnN0IHsgcmV0dXJuIGNvbnRlbnRzU2l6ZSgpLmhlaWdodCgp OyB9CiAgICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzU2l6ZShjb25zdCBJbnRTaXplJik7Ci0g ICAKKworICAgIC8vIEZ1bmN0aW9ucyBmb3IgY29udHJvbGxpbmcgaWYgeW91IGNhbiBzY3JvbGwg cGFzdCB0aGUgZW5kIG9mIHRoZSBkb2N1bWVudC4KKyAgICBib29sIGNvbnN0cmFpbnNTY3JvbGxp bmdUb0NvbnRlbnRFZGdlKCkgY29uc3QgeyByZXR1cm4gbV9jb25zdHJhaW5zU2Nyb2xsaW5nVG9D b250ZW50RWRnZTsgfQorICAgIHZvaWQgc2V0Q29uc3RyYWluc1Njcm9sbGluZ1RvQ29udGVudEVk Z2UoYm9vbCBjb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50RWRnZSkgeyBtX2NvbnN0cmFpbnNT Y3JvbGxpbmdUb0NvbnRlbnRFZGdlID0gY29uc3RyYWluc1Njcm9sbGluZ1RvQ29udGVudEVkZ2U7 IH0KKwogICAgIC8vIEZ1bmN0aW9ucyBmb3IgcXVlcnlpbmcgdGhlIGN1cnJlbnQgc2Nyb2xsZWQg cG9zaXRpb24gKGJvdGggYXMgYSBwb2ludCwgYSBzaXplLCBvciBhcyBpbmRpdmlkdWFsIFggYW5k IFkgdmFsdWVzKS4KICAgICBJbnRQb2ludCBzY3JvbGxQb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJu IHZpc2libGVDb250ZW50UmVjdCgpLmxvY2F0aW9uKCk7IH0KICAgICBJbnRTaXplIHNjcm9sbE9m ZnNldCgpIGNvbnN0IHsgcmV0dXJuIHZpc2libGVDb250ZW50UmVjdCgpLmxvY2F0aW9uKCkgLSBJ bnRQb2ludCgpOyB9IC8vIEdldHMgdGhlIHNjcm9sbGVkIHBvc2l0aW9uIGFzIGFuIEludFNpemUu IENvbnZlbmllbnQgZm9yIGFkZGluZyB0byBvdGhlciBzaXplcy4KQEAgLTI3NSw3ICsyNzksMTAg QEAgcHJvdGVjdGVkOgogCiAgICAgdmlydHVhbCB2b2lkIHJlcGFpbnRDb250ZW50UmVjdGFuZ2xl KGNvbnN0IEludFJlY3QmLCBib29sIG5vdyA9IGZhbHNlKTsKICAgICB2aXJ0dWFsIHZvaWQgcGFp bnRDb250ZW50cyhHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0JiBkYW1hZ2VSZWN0KSA9 IDA7Ci0gICAgCisKKyAgICB2b2lkIGNhbGN1bGF0ZU92ZXJoYW5nQXJlYXNGb3JQYWludGluZyhJ bnRSZWN0JiBob3Jpem9udGFsT3ZlcmhhbmdSZWN0LCBJbnRSZWN0JiB2ZXJ0aWNhbE92ZXJoYW5n UmVjdCk7CisgICAgdmlydHVhbCB2b2lkIHBhaW50T3ZlcmhhbmdBcmVhcyhHcmFwaGljc0NvbnRl eHQqLCBjb25zdCBJbnRSZWN0JiBob3Jpem9udGFsT3ZlcmhhbmdBcmVhLCBjb25zdCBJbnRSZWN0 JiB2ZXJ0aWNhbE92ZXJoYW5nQXJlYSk7CisKICAgICB2aXJ0dWFsIHZvaWQgY29udGVudHNSZXNp emVkKCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCB2aXNpYmxlQ29udGVudHNSZXNpemVkKCkgPSAw OwogCkBAIC0zMzUsNiArMzQyLDggQEAgcHJpdmF0ZToKICAgICBib29sIG1fY2xpcHNSZXBhaW50 czsKICAgICBib29sIG1fZGVsZWdhdGVzU2Nyb2xsaW5nOwogCisgICAgYm9vbCBtX2NvbnN0cmFp bnNTY3JvbGxpbmdUb0NvbnRlbnRFZGdlOworCiAgICAgLy8gVGhlcmUgYXJlIDggcG9zc2libGUg Y29tYmluYXRpb25zIG9mIHdyaXRpbmcgbW9kZSBhbmQgZGlyZWN0aW9uLiAgU2Nyb2xsIG9yaWdp biB3aWxsIGJlIG5vbi16ZXJvIGluIHRoZSB4IG9yIHkgYXhpcwogICAgIC8vIGlmIHRoZXJlIGlz IGFueSByZXZlcnNlZCBkaXJlY3Rpb24gb3Igd3JpdGluZy1tb2RlLiAgVGhlIGNvbWJpbmF0aW9u cyBhcmU6CiAgICAgLy8gd3JpdGluZy1tb2RlIC8gZGlyZWN0aW9uICAgICBzY3JvbGxPcmlnaW4u eCgpIHNldCAgICBzY3JvbGxPcmlnaW4ueSgpIHNldApJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRlLmNwcAkocmV2aXNpb24gNzY3 NTgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTM3LDYgKzM3LDggQEAKICNpbmNsdWRlICJTY3JvbGxhYmxl QXJlYS5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAKK3VzaW5nIG5hbWVzcGFjZSBzdGQ7CisK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogI2lmIFBMQVRGT1JNKFdJTikKQEAgLTI1NCwxMCArMjU2 LDIwIEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6OnNwbGl0VHJhY2sKICAgICB9CiB9 CiAKKy8vIFJldHVybnMgdGhlIHNpemUgcmVwcmVzZW50ZWQgYnkgdHJhY2sgdGFraW5nIGludG8g YWNjb3VudCBzY3JvbGxpbmcgcGFzdAorLy8gdGhlIGVuZCBvZiB0aGUgZG9jdW1lbnQuCitzdGF0 aWMgZmxvYXQgdXNlZFRvdGFsU2l6ZShTY3JvbGxiYXIqIHNjcm9sbGJhcikKK3sKKyAgICBmbG9h dCBvdmVyaGFuZ0F0U3RhcnQgPSAtc2Nyb2xsYmFyLT5jdXJyZW50UG9zKCk7CisgICAgZmxvYXQg b3ZlcmhhbmdBdEVuZCA9IHNjcm9sbGJhci0+Y3VycmVudFBvcygpICsgc2Nyb2xsYmFyLT52aXNp YmxlU2l6ZSgpIC0gc2Nyb2xsYmFyLT50b3RhbFNpemUoKTsKKyAgICBmbG9hdCBvdmVyaGFuZyA9 IG1heCgwLjBmLCBtYXgob3ZlcmhhbmdBdFN0YXJ0LCBvdmVyaGFuZ0F0RW5kKSk7CisgICAgcmV0 dXJuIHNjcm9sbGJhci0+dG90YWxTaXplKCkgKyBvdmVyaGFuZzsKK30KKwogaW50IFNjcm9sbGJh clRoZW1lQ29tcG9zaXRlOjp0aHVtYlBvc2l0aW9uKFNjcm9sbGJhciogc2Nyb2xsYmFyKQogewog ICAgIGlmIChzY3JvbGxiYXItPmVuYWJsZWQoKSkKLSAgICAgICAgcmV0dXJuIHNjcm9sbGJhci0+ Y3VycmVudFBvcygpICogKHRyYWNrTGVuZ3RoKHNjcm9sbGJhcikgLSB0aHVtYkxlbmd0aChzY3Jv bGxiYXIpKSAvIHNjcm9sbGJhci0+bWF4aW11bSgpOworICAgICAgICByZXR1cm4gbWF4KDAuMGYs IHNjcm9sbGJhci0+Y3VycmVudFBvcygpKSAqICh0cmFja0xlbmd0aChzY3JvbGxiYXIpIC0gdGh1 bWJMZW5ndGgoc2Nyb2xsYmFyKSkgLyAodXNlZFRvdGFsU2l6ZShzY3JvbGxiYXIpIC0gc2Nyb2xs YmFyLT52aXNpYmxlU2l6ZSgpKTsKICAgICByZXR1cm4gMDsKIH0KIApAQCAtMjY2LDcgKzI3OCw3 IEBAIGludCBTY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZTo6dGh1bWJMZW5ndGgKICAgICBpZiAoIXNj cm9sbGJhci0+ZW5hYmxlZCgpKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIGZsb2F0IHByb3Bv cnRpb24gPSAoZmxvYXQpc2Nyb2xsYmFyLT52aXNpYmxlU2l6ZSgpIC8gc2Nyb2xsYmFyLT50b3Rh bFNpemUoKTsKKyAgICBmbG9hdCBwcm9wb3J0aW9uID0gc2Nyb2xsYmFyLT52aXNpYmxlU2l6ZSgp IC8gdXNlZFRvdGFsU2l6ZShzY3JvbGxiYXIpOwogICAgIGludCB0cmFja0xlbiA9IHRyYWNrTGVu Z3RoKHNjcm9sbGJhcik7CiAgICAgaW50IGxlbmd0aCA9IHByb3BvcnRpb24gKiB0cmFja0xlbjsK ICAgICBsZW5ndGggPSBtYXgobGVuZ3RoLCBtaW5pbXVtVGh1bWJMZW5ndGgoc2Nyb2xsYmFyKSk7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyVGhlbWVNYWMubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbGJhclRoZW1l TWFjLm1tCShyZXZpc2lvbiA3Njc1OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9T Y3JvbGxiYXJUaGVtZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDE3LDE0ICs0MTcsMzEgQEAg c3RhdGljIGludCBzY3JvbGxiYXJQYXJ0VG9ISVByZXNzZWRTdGF0ZQogYm9vbCBTY3JvbGxiYXJU aGVtZU1hYzo6cGFpbnQoU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIEdyYXBoaWNzQ29udGV4dCogY29u dGV4dCwgY29uc3QgSW50UmVjdCYgZGFtYWdlUmVjdCkKIHsKICNpZiBkZWZpbmVkKFVTRV9XS19T Q1JPTExCQVJfUEFJTlRFUikKKyAgICBmbG9hdCB2YWx1ZSA9IDAuMGY7CisgICAgZmxvYXQgdG90 YWxTaXplID0gMC4wZjsKKworICAgIGlmIChzY3JvbGxiYXItPmN1cnJlbnRQb3MoKSA8IDApIHsK KyAgICAgICAgLy8gU2Nyb2xsZWQgcGFzdCB0aGUgdG9wLgorICAgICAgICB2YWx1ZSA9IDAuMGY7 CisgICAgICAgIHRvdGFsU2l6ZSA9IHNjcm9sbGJhci0+dG90YWxTaXplKCkgLSBzY3JvbGxiYXIt PmN1cnJlbnRQb3MoKTsKKyAgICB9IGVsc2UgaWYgKHNjcm9sbGJhci0+dmlzaWJsZVNpemUoKSAr IHNjcm9sbGJhci0+Y3VycmVudFBvcygpID4gc2Nyb2xsYmFyLT50b3RhbFNpemUoKSkgeworICAg ICAgICAvLyBTY3JvbGxlZCBwYXN0IHRoZSBib3R0b20uCisgICAgICAgIHZhbHVlID0gMS4wZjsK KyAgICAgICAgdG90YWxTaXplID0gc2Nyb2xsYmFyLT52aXNpYmxlU2l6ZSgpICsgc2Nyb2xsYmFy LT5jdXJyZW50UG9zKCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgLy8gV2l0aGluIHRoZSBib3Vu ZHMgb2YgdGhlIHNjcm9sbGFibGUgYXJlYS4KKyAgICAgICAgdmFsdWUgPSBzY3JvbGxiYXItPmN1 cnJlbnRQb3MoKSAvIHNjcm9sbGJhci0+bWF4aW11bSgpOworICAgICAgICB0b3RhbFNpemUgPSBz Y3JvbGxiYXItPnRvdGFsU2l6ZSgpOworICAgIH0KKwogICAgIGNvbnRleHQtPnNhdmUoKTsKICAg ICBjb250ZXh0LT5jbGlwKGRhbWFnZVJlY3QpOwogICAgIGNvbnRleHQtPnRyYW5zbGF0ZShzY3Jv bGxiYXItPmZyYW1lUmVjdCgpLngoKSwgc2Nyb2xsYmFyLT5mcmFtZVJlY3QoKS55KCkpOwogICAg IExvY2FsQ3VycmVudEdyYXBoaWNzQ29udGV4dCBsb2NhbENvbnRleHQoY29udGV4dCk7CiAgICAg d2tTY3JvbGxiYXJQYWludGVyUGFpbnQoc2Nyb2xsYmFyTWFwKCktPmdldChzY3JvbGxiYXIpLmdl dCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjcm9sbGJhci0+ZW5hYmxlZCgpLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjcm9sbGJhci0+Y3VycmVudFBvcygpIC8gc2Ny b2xsYmFyLT5tYXhpbXVtKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGljX2Nh c3Q8Q0dGbG9hdD4oc2Nyb2xsYmFyLT52aXNpYmxlU2l6ZSgpKSAvIHNjcm9sbGJhci0+dG90YWxT aXplKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmFsdWUsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8Q0dGbG9hdD4oc2Nyb2xsYmFyLT52aXNpYmxlU2l6 ZSgpKSAvIHRvdGFsU2l6ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY3JvbGxiYXIt PmZyYW1lUmVjdCgpKTsKICAgICBjb250ZXh0LT5yZXN0b3JlKCk7CiAgICAgcmV0dXJuIHRydWU7 CkBAIC00MzQsOSArNDUxLDI3IEBAIGJvb2wgU2Nyb2xsYmFyVGhlbWVNYWM6OnBhaW50KFNjcm9s bGJhcioKICAgICB0cmFja0luZm8udmVyc2lvbiA9IDA7CiAgICAgdHJhY2tJbmZvLmtpbmQgPSBz Y3JvbGxiYXItPmNvbnRyb2xTaXplKCkgPT0gUmVndWxhclNjcm9sbGJhciA/IGtUaGVtZU1lZGl1 bVNjcm9sbEJhciA6IGtUaGVtZVNtYWxsU2Nyb2xsQmFyOwogICAgIHRyYWNrSW5mby5ib3VuZHMg PSBzY3JvbGxiYXItPmZyYW1lUmVjdCgpOworCisgICAgZmxvYXQgbWF4aW11bSA9IDAuMGY7Cisg ICAgZmxvYXQgcG9zaXRpb24gPSAwLjBmOworICAgIGlmIChzY3JvbGxiYXItPmN1cnJlbnRQb3Mo KSA8IDApIHsKKyAgICAgICAgLy8gU2Nyb2xsZWQgcGFzdCB0aGUgdG9wLgorICAgICAgICBtYXhp bXVtID0gKHNjcm9sbGJhci0+dG90YWxTaXplKCkgLSBzY3JvbGxiYXItPmN1cnJlbnRQb3MoKSkg LSBzY3JvbGxiYXItPnZpc2libGVTaXplKCk7CisgICAgICAgIHBvc2l0aW9uID0gMDsKKyAgICB9 IGVsc2UgaWYgKHNjcm9sbGJhci0+dmlzaWJsZVNpemUoKSArIHNjcm9sbGJhci0+Y3VycmVudFBv cygpID4gc2Nyb2xsYmFyLT50b3RhbFNpemUoKSkgeworICAgICAgICAvLyBTY3JvbGxlZCBwYXN0 IHRoZSBib3R0b20uCisgICAgICAgIG1heGltdW0gPSBzY3JvbGxiYXItPmN1cnJlbnRQb3MoKTsK KyAgICAgICAgcG9zaXRpb24gPSBtYXhpbXVtOworICAgIH0gZWxzZSB7CisgICAgICAgIC8vIFdp dGhpbiB0aGUgYm91bmRzIG9mIHRoZSBzY3JvbGxhYmxlIGFyZWEuCisgICAgICAgIG1heGltdW0g PSBzY3JvbGxiYXItPm1heGltdW0oKTsKKyAgICAgICAgcG9zaXRpb24gPSBzY3JvbGxiYXItPmN1 cnJlbnRQb3MoKTsKKyAgICB9CisKICAgICB0cmFja0luZm8ubWluID0gMDsKLSAgICB0cmFja0lu Zm8ubWF4ID0gc2Nyb2xsYmFyLT5tYXhpbXVtKCk7Ci0gICAgdHJhY2tJbmZvLnZhbHVlID0gc2Ny b2xsYmFyLT5jdXJyZW50UG9zKCk7CisgICAgdHJhY2tJbmZvLm1heCA9IHN0YXRpY19jYXN0PGlu dD4obWF4aW11bSk7CisgICAgdHJhY2tJbmZvLnZhbHVlID0gc3RhdGljX2Nhc3Q8aW50Pihwb3Np dGlvbik7CisKICAgICB0cmFja0luZm8udHJhY2tJbmZvLnNjcm9sbGJhci52aWV3c2l6ZSA9IHNj cm9sbGJhci0+dmlzaWJsZVNpemUoKTsKICAgICB0cmFja0luZm8uYXR0cmlidXRlcyA9IDA7CiAg ICAgaWYgKHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyKQo=