78050 2012-02-07 15:21:47 -0800 Scrolling tree should keep track of region we can't do fast scrolling for 2012-02-07 15:50:11 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca eric mitz simon.fraser tkent webkit.review.bot oldest_to_newest 551457 0 andersca 2012-02-07 15:21:47 -0800 Scrolling tree should keep track of region we can't do fast scrolling for 551466 1 125944 andersca 2012-02-07 15:26:31 -0800 Created attachment 125944 Patch 551473 2 125944 mitz 2012-02-07 15:36:55 -0800 Comment on attachment 125944 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125944&action=review > Source/WebCore/page/FrameView.cpp:2552 > +IntRect FrameView::scrollableAreaBoundingBox() const Why are scrollbars included in the scrollable area? > Source/WebCore/page/FrameView.h:374 > + virtual IntRect scrollableAreaBoundingBox() const; Why not OVERRIDE? > Source/WebCore/page/scrolling/ScrollingCoordinator.cpp:103 > + // such as subframes, overflow divs and render list boxes. I’d just say “list boxes”. > Source/WebCore/rendering/RenderLayer.h:325 > + virtual IntRect scrollableAreaBoundingBox() const; Why public, why not OVERRIDE? > Source/WebCore/rendering/RenderListBox.h:123 > + virtual IntRect scrollableAreaBoundingBox() const; Why not OVERRIDE? 551484 3 andersca 2012-02-07 15:44:34 -0800 (In reply to comment #2) > (From update of attachment 125944 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=125944&action=review > > > Source/WebCore/page/FrameView.cpp:2552 > > +IntRect FrameView::scrollableAreaBoundingBox() const > > Why are scrollbars included in the scrollable area? Because when you have your mouse over a scrollbar, you don't want to do fast scrolling. > > > Source/WebCore/page/FrameView.h:374 > > + virtual IntRect scrollableAreaBoundingBox() const; > > Why not OVERRIDE? Fixed. > > > Source/WebCore/page/scrolling/ScrollingCoordinator.cpp:103 > > + // such as subframes, overflow divs and render list boxes. > > I’d just say “list boxes”. Fixed. > > > Source/WebCore/rendering/RenderLayer.h:325 > > + virtual IntRect scrollableAreaBoundingBox() const; > > Why public, why not OVERRIDE? Fixed. > > > Source/WebCore/rendering/RenderListBox.h:123 > > + virtual IntRect scrollableAreaBoundingBox() const; > > Why not OVERRIDE? Fixed. Thanks for reviewing! 551497 4 andersca 2012-02-07 15:50:11 -0800 Committed r107001: <http://trac.webkit.org/changeset/107001> 125944 2012-02-07 15:26:31 -0800 2012-02-07 15:36:54 -0800 Patch bug-78050-20120207152702.patch text/plain 12818 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2OTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzBkYWQ3ZWY0MjQzMTZj OTI3YjFjMzVkNzMxYTZiODk4YjZiMjRjMy4uZTQ1ODllMGQ5MTk2MDdiMjhiNzQyY2IxYjcyNTM3 OTI4NDgwOTVjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEyLTAyLTA3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU2Nyb2xsaW5nIHRy ZWUgc2hvdWxkIGtlZXAgdHJhY2sgb2YgcmVnaW9uIHdlIGNhbid0IGRvIGZhc3Qgc2Nyb2xsaW5n IGZvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzgw NTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBj dXJyZW50bHkgd29uJ3QgZG8gZmFzdCBzY3JvbGxpbmcgZm9yIHN1YmZyYW1lcyBhbmQgb3RoZXIg dHlwZXMgb2Ygc2Nyb2xsYWJsZSBhcmVhcy4KKyAgICAgICAgQmVjYXVzZSBvZiB0aGlzLCB3ZSds bCBoYXZlIHRoZSBzY3JvbGxpbmcgdHJlZSBrZWVwIGEgcmVnaW9uIG9mIHRoZSBwYWdlIGZvciB3 aGljaCB3ZSBjYW4ndAorICAgICAgICBkbyBmYXN0IHNjcm9sbGluZy4gVGhpcyByZWdpb24gd2ls bCBiZSB1cGRhdGVkIGFmdGVyIGxheW91dC4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2Nyb2xsYWJsZUFyZWFCb3VuZGluZ0Jv eCk6CisgICAgICAgIFJldHVybiB0aGUgYm91bmRpbmcgYm94LgorCisgICAgICAgICogcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsaW5nQ29vcmRpbmF0b3I6OmZyYW1lVmlld0xheW91dFVwZGF0ZWQpOgorICAgICAgICBHbyB0 aHJvdWdoIGFsbCB0aGUgc2Nyb2xsYWJsZSBhcmVhcyBpbiB0aGlzIGZyYW1lIHZpZXcgYW5kIGNv bXB1dGUgdGhlIHJlZ2lvbiB3aGljaCB3ZSBjYW4ndCBkbworICAgICAgICBmYXN0IHNjcm9sbGlu ZyBmb3IuCisKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWU6OmNvbW1pdE5ld1RyZWVTdGF0ZSk6CisgICAg ICAgIFVwZGF0ZSB0aGUgbm9uLWZhc3Qtc2Nyb2xsYWJsZSByZWdpb24uCisKKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU3RhdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U2Nyb2xsaW5nVHJlZVN0YXRlOjpzZXROb25GYXN0U2Nyb2xsYWJsZVJlZ2lvbik6CisgICAgICAg IFNldCB0aGUgbm9uLWZhc3Qtc2Nyb2xsYWJsZSByZWdpb24gaWYgaXQncyBjaGFuZ2VkLgorCisg ICAgICAgICogcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaDoKKyAgICAgICAgQWRkIHNjcm9sbGFi bGVBcmVhQm91bmRpbmdCb3ggbWVtYmVyIGZ1bmN0aW9uLgorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzY3JvbGxh YmxlQXJlYUJvdW5kaW5nQm94KToKKyAgICAgICAgUmV0dXJuIHRoZSBib3VuZGluZyBib3guCisK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMaXN0Qm94OjpzY3JvbGxhYmxlQXJlYUJvdW5kaW5nQm94KToKKyAgICAgICAgUmV0 dXJuIHRoZSBib3VuZGluZyBib3guCisKIDIwMTItMDItMDYgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBTY3JvbGxhYmxlQXJlYVNldCBzaG91bGQgYmUg bW92ZWQgZnJvbSBQYWdlIHRvIEZyYW1lVmlldwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmlu ZGV4IGQwYTEwYzhmMzAyYjhlYjVhMjI4ZWQ5M2FlYTg0OTlhMzBmMjQzYmYuLjkyN2E5MDJlZTBk ZGZkODUyNDc3ZTE5YWRlZTVjZWQ4M2FhMmNhYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5j cHAKQEAgLTI1NDksNiArMjU0OSwxMiBAQCBTY3JvbGxhYmxlQXJlYSogRnJhbWVWaWV3OjplbmNs b3NpbmdTY3JvbGxhYmxlQXJlYSgpIGNvbnN0CiAgICAgcmV0dXJuIDA7CiB9CiAKK0ludFJlY3Qg RnJhbWVWaWV3OjpzY3JvbGxhYmxlQXJlYUJvdW5kaW5nQm94KCkgY29uc3QKK3sKKyAgICAvLyBG SVhNRTogVGhpcyBpc24ndCBjb3JyZWN0IGZvciB0cmFuc2Zvcm1lZCBmcmFtZXMuIFdlIHByb2Jh Ymx5IG5lZWQgdG8gYXNrIHRoZSByZW5kZXJlciBpbnN0ZWFkLgorICAgIHJldHVybiBmcmFtZVJl Y3QoKTsKK30KKwogYm9vbCBGcmFtZVZpZXc6OnNob3VsZFN1c3BlbmRTY3JvbGxBbmltYXRpb25z KCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9mcmFtZS0+bG9hZGVyKCktPnN0YXRlKCkgIT0gRnJh bWVTdGF0ZUNvbXBsZXRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZp ZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5kZXggY2Q4ZWFhMTI4Y2I1 MGFiMDVmZjQ5YzdmMWQ1ZGMxODcwYWY4MGFmMC4uNmU4ZjZhMTY1YTkxMDcyMTViYTEwN2MxOWJl N2ViODY3ZDBkNDc2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBAIC0zNzEsNiArMzcxLDcg QEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgc2V0VmlzaWJsZVNjcm9sbGVyVGh1bWJSZWN0 KGNvbnN0IEludFJlY3QmKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNPbkFjdGl2ZVBhZ2UoKSBjb25z dDsKICAgICB2aXJ0dWFsIFNjcm9sbGFibGVBcmVhKiBlbmNsb3NpbmdTY3JvbGxhYmxlQXJlYSgp IGNvbnN0OworICAgIHZpcnR1YWwgSW50UmVjdCBzY3JvbGxhYmxlQXJlYUJvdW5kaW5nQm94KCkg Y29uc3Q7CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgdmlydHVhbCBH cmFwaGljc0xheWVyKiBsYXllckZvckhvcml6b250YWxTY3JvbGxiYXIoKSBjb25zdCBPVkVSUklE RTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nv b3JkaW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nv b3JkaW5hdG9yLmNwcAppbmRleCA2NmM0MmQxNWM5MGQyMDY0ZTZkN2UxN2E3MWJiNDIwYjVjYTI5 NDgyLi5kMGJkYjAyMTRjYTcwMDgwMmM0ZWVmYTk5ZjFmMTExY2U4NWJkMmQ4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3Iu Y3BwCkBAIC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSAiSW50UmVjdC5oIgogI2luY2x1ZGUgIlBh Z2UuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIKKyNpbmNsdWRlICJSZWdpb24u aCIKICNpbmNsdWRlICJTY3JvbGxBbmltYXRvci5oIgogI2luY2x1ZGUgIlNjcm9sbGluZ1RocmVh ZC5oIgogI2luY2x1ZGUgIlNjcm9sbGluZ1RyZWUuaCIKQEAgLTk4LDYgKzk5LDIyIEBAIHZvaWQg U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmZyYW1lVmlld0xheW91dFVwZGF0ZWQoRnJhbWVWaWV3KiBm cmFtZVZpZXcpCiAgICAgaWYgKCFjb29yZGluYXRlc1Njcm9sbGluZ0ZvckZyYW1lVmlldyhmcmFt ZVZpZXcpKQogICAgICAgICByZXR1cm47CiAKKyAgICAvLyBDb21wdXRlIHRoZSByZWdpb24gb2Yg dGhlIHBhZ2UgdGhhdCB3ZSBjYW4ndCBkbyBmYXN0IHNjcm9sbGluZyBmb3IuIFRoaXMgY3VycmVu dGx5IGluY2x1ZGVzIGFsbCBzY3JvbGxhYmxlIGFyZWFzLAorICAgIC8vIHN1Y2ggYXMgc3ViZnJh bWVzLCBvdmVyZmxvdyBkaXZzIGFuZCByZW5kZXIgbGlzdCBib3hlcy4KKyAgICBSZWdpb24gbm9u U2Nyb2xsYWJsZVJlZ2lvbjsKKyAgICBpZiAoY29uc3QgRnJhbWVWaWV3OjpTY3JvbGxhYmxlQXJl YVNldCogc2Nyb2xsYWJsZUFyZWFzID0gZnJhbWVWaWV3LT5zY3JvbGxhYmxlQXJlYXMoKSkgewor ICAgICAgICBmb3IgKEZyYW1lVmlldzo6U2Nyb2xsYWJsZUFyZWFTZXQ6OmNvbnN0X2l0ZXJhdG9y IGl0ID0gc2Nyb2xsYWJsZUFyZWFzLT5iZWdpbigpLCBlbmQgPSBzY3JvbGxhYmxlQXJlYXMtPmVu ZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICAgICAgICAgIFNjcm9sbGFibGVBcmVhKiBzY3Jv bGxhYmxlQXJlYSA9ICppdDsKKworICAgICAgICAgICAgLy8gQ2hlY2sgaWYgdGhpcyBhcmVhIGNh biBiZSBzY3JvbGxlZCBhdCBhbGwuCisgICAgICAgICAgICBpZiAoKCFzY3JvbGxhYmxlQXJlYS0+ aG9yaXpvbnRhbFNjcm9sbGJhcigpIHx8ICFzY3JvbGxhYmxlQXJlYS0+aG9yaXpvbnRhbFNjcm9s bGJhcigpLT5lbmFibGVkKCkpCisgICAgICAgICAgICAgICAgJiYgKCFzY3JvbGxhYmxlQXJlYS0+ dmVydGljYWxTY3JvbGxiYXIoKSB8fCAhc2Nyb2xsYWJsZUFyZWEtPnZlcnRpY2FsU2Nyb2xsYmFy KCktPmVuYWJsZWQoKSkpCisgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAg IG5vblNjcm9sbGFibGVSZWdpb24udW5pdGUoc2Nyb2xsYWJsZUFyZWEtPnNjcm9sbGFibGVBcmVh Qm91bmRpbmdCb3goKSk7CisgICAgICAgIH0KKyAgICB9CisKICAgICBtX3Njcm9sbGluZ1RyZWVT dGF0ZS0+c2V0Vmlld3BvcnRSZWN0KEludFJlY3QoSW50UG9pbnQoKSwgZnJhbWVWaWV3LT52aXNp YmxlQ29udGVudFJlY3QoKS5zaXplKCkpKTsKICAgICBtX3Njcm9sbGluZ1RyZWVTdGF0ZS0+c2V0 Q29udGVudHNTaXplKGZyYW1lVmlldy0+Y29udGVudHNTaXplKCkpOwogICAgIHNjaGVkdWxlVHJl ZVN0YXRlQ29tbWl0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1RyZWUuY3BwCmluZGV4IGY5YTNhMzJkZGNlZDYwMjgyMjE4MTI3ZWZjMjRhODg2NTYzYzE0 YTMuLjBiZmQ3MDk1ZmRiNzAyZDA5ZmZiNDIwNmViNmZmOWExZjc1MWU4MDUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwCkBAIC04OSwxMCAr ODksMTMgQEAgdm9pZCBTY3JvbGxpbmdUcmVlOjpjb21taXROZXdUcmVlU3RhdGUoUGFzc093blB0 cjxTY3JvbGxpbmdUcmVlU3RhdGU+IHNjcm9sbGluZ1QKIHsKICAgICBBU1NFUlQoU2Nyb2xsaW5n VGhyZWFkOjppc0N1cnJlbnRUaHJlYWQoKSk7CiAKLSAgICBpZiAoc2Nyb2xsaW5nVHJlZVN0YXRl LT5jaGFuZ2VkUHJvcGVydGllcygpICYgU2Nyb2xsaW5nVHJlZVN0YXRlOjpXaGVlbEV2ZW50SGFu ZGxlckNvdW50KSB7CisgICAgaWYgKHNjcm9sbGluZ1RyZWVTdGF0ZS0+Y2hhbmdlZFByb3BlcnRp ZXMoKSAmIChTY3JvbGxpbmdUcmVlU3RhdGU6OldoZWVsRXZlbnRIYW5kbGVyQ291bnQgfCBTY3Jv bGxpbmdUcmVlU3RhdGU6Ok5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uKSkgewogICAgICAgICBNdXRl eExvY2tlciBsb2NrKG1fbXV0ZXgpOwogCi0gICAgICAgIG1faGFzV2hlZWxFdmVudEhhbmRsZXJz ID0gc2Nyb2xsaW5nVHJlZVN0YXRlLT53aGVlbEV2ZW50SGFuZGxlckNvdW50KCk7CisgICAgICAg IGlmIChzY3JvbGxpbmdUcmVlU3RhdGUtPmNoYW5nZWRQcm9wZXJ0aWVzKCkgJiBTY3JvbGxpbmdU cmVlU3RhdGU6OldoZWVsRXZlbnRIYW5kbGVyQ291bnQpCisgICAgICAgICAgICBtX2hhc1doZWVs RXZlbnRIYW5kbGVycyA9IHNjcm9sbGluZ1RyZWVTdGF0ZS0+d2hlZWxFdmVudEhhbmRsZXJDb3Vu dCgpOworICAgICAgICBpZiAoc2Nyb2xsaW5nVHJlZVN0YXRlLT5jaGFuZ2VkUHJvcGVydGllcygp ICYgU2Nyb2xsaW5nVHJlZVN0YXRlOjpOb25GYXN0U2Nyb2xsYWJsZVJlZ2lvbikKKyAgICAgICAg ICAgIG1fbm9uRmFzdFNjcm9sbGFibGVSZWdpb24gPSBzY3JvbGxpbmdUcmVlU3RhdGUtPm5vbkZh c3RTY3JvbGxhYmxlUmVnaW9uKCk7CiAgICAgfQogCiAgICAgbV9yb290Tm9kZS0+dXBkYXRlKHNj cm9sbGluZ1RyZWVTdGF0ZS5nZXQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdUcmVlLmgKaW5kZXggMzg3Yjg4NGRkNmM1ZmExNmZiZTRlMDMzZjVhNWZkNDkw Mzc3YjY2OC4uNWY1NjkyMGNlYTM5YjU3NWU0Y2ZmNDMwNTdmZWU5MDVlYTE2MTQxYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaApAQCAtMjgsNiAr MjgsNyBAQAogCiAjaWYgRU5BQkxFKFRIUkVBREVEX1NDUk9MTElORykKIAorI2luY2x1ZGUgIlJl Z2lvbi5oIgogI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvUGFzc093blB0 ci5oPgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CkBAIC03MSw2ICs3Miw3IEBAIHByaXZh dGU6CiAgICAgT3duUHRyPFNjcm9sbGluZ1RyZWVOb2RlPiBtX3Jvb3ROb2RlOwogCiAgICAgTXV0 ZXggbV9tdXRleDsKKyAgICBSZWdpb24gbV9ub25GYXN0U2Nyb2xsYWJsZVJlZ2lvbjsKICAgICBi b29sIG1faGFzV2hlZWxFdmVudEhhbmRsZXJzOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVN0YXRlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTdGF0ZS5jcHAKaW5kZXggOTE1MGU4NTI3 OTI3MjgxMjlkNjNjMDNiOWQyOWEyNjJkZTEyYjJlNS4uYzM2ODE1MmMzY2RlZmJiODRiNTUxOTYx OGFlZmQ5ZDg1N2U3YWNlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nVHJlZVN0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdUcmVlU3RhdGUuY3BwCkBAIC02Myw2ICs2MywxNSBAQCB2b2lkIFNjcm9s bGluZ1RyZWVTdGF0ZTo6c2V0Q29udGVudHNTaXplKGNvbnN0IEludFNpemUmIGNvbnRlbnRzU2l6 ZSkKICAgICBtX2NoYW5nZWRQcm9wZXJ0aWVzIHw9IENvbnRlbnRzU2l6ZTsKIH0KIAordm9pZCBT Y3JvbGxpbmdUcmVlU3RhdGU6OnNldE5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uKGNvbnN0IFJlZ2lv biYgbm9uRmFzdFNjcm9sbGFibGVSZWdpb24pCit7CisgICAgaWYgKG1fbm9uRmFzdFNjcm9sbGFi bGVSZWdpb24gPT0gbm9uRmFzdFNjcm9sbGFibGVSZWdpb24pCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fbm9uRmFzdFNjcm9sbGFibGVSZWdpb24gPSBub25GYXN0U2Nyb2xsYWJsZVJlZ2lvbjsK KyAgICBtX2NoYW5nZWRQcm9wZXJ0aWVzIHw9IE5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uOworfQor CiB2b2lkIFNjcm9sbGluZ1RyZWVTdGF0ZTo6c2V0V2hlZWxFdmVudEhhbmRsZXJDb3VudCh1bnNp Z25lZCB3aGVlbEV2ZW50SGFuZGxlckNvdW50KQogewogICAgIGlmIChtX3doZWVsRXZlbnRIYW5k bGVyQ291bnQgPT0gd2hlZWxFdmVudEhhbmRsZXJDb3VudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTdGF0ZS5oIGIvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVN0YXRlLmgKaW5kZXggOWNkNmRlMWFmMTNh MjE0NzJmNTg0NTQ3M2E4ZWU4N2UxYzc1YWEwNS4uZmRlODg0OTIyNjY2ZDEwMTYyNTk3YjA2MDkw NGE0NDJmMGRlYjUxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nVHJlZVN0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nVHJlZVN0YXRlLmgKQEAgLTMwLDYgKzMwLDcgQEAKIAogI2luY2x1ZGUgIkdyYXBo aWNzTGF5ZXIuaCIKICNpbmNsdWRlICJJbnRSZWN0LmgiCisjaW5jbHVkZSAiUmVnaW9uLmgiCiAj aW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KIAogI2lmIFBMQVRGT1JNKE1BQykKQEAgLTUwLDgg KzUxLDkgQEAgcHVibGljOgogICAgIGVudW0gQ2hhbmdlZFByb3BlcnR5IHsKICAgICAgICAgVmll d3BvcnRSZWN0ID0gMSA8PCAwLAogICAgICAgICBDb250ZW50c1NpemUgPSAxIDw8IDEsCi0gICAg ICAgIFdoZWVsRXZlbnRIYW5kbGVyQ291bnQgPSAxIDw8IDIsCi0gICAgICAgIFNjcm9sbExheWVy ID0gMSA8PCAzLAorICAgICAgICBOb25GYXN0U2Nyb2xsYWJsZVJlZ2lvbiA9IDEgPDwgMiwKKyAg ICAgICAgV2hlZWxFdmVudEhhbmRsZXJDb3VudCA9IDEgPDwgMywKKyAgICAgICAgU2Nyb2xsTGF5 ZXIgPSAxIDw8IDQsCiAgICAgfTsKIAogICAgIGJvb2wgaGFzQ2hhbmdlZFByb3BlcnRpZXMoKSBj b25zdCB7IHJldHVybiBtX2NoYW5nZWRQcm9wZXJ0aWVzOyB9CkBAIC02Myw2ICs2NSw5IEBAIHB1 YmxpYzoKICAgICBjb25zdCBJbnRTaXplJiBjb250ZW50c1NpemUoKSBjb25zdCB7IHJldHVybiBt X2NvbnRlbnRzU2l6ZTsgfQogICAgIHZvaWQgc2V0Q29udGVudHNTaXplKGNvbnN0IEludFNpemUm KTsKIAorICAgIGNvbnN0IFJlZ2lvbiYgbm9uRmFzdFNjcm9sbGFibGVSZWdpb24oKSBjb25zdCB7 IHJldHVybiBtX25vbkZhc3RTY3JvbGxhYmxlUmVnaW9uOyB9CisgICAgdm9pZCBzZXROb25GYXN0 U2Nyb2xsYWJsZVJlZ2lvbihjb25zdCBSZWdpb24mKTsKKwogICAgIHVuc2lnbmVkIHdoZWVsRXZl bnRIYW5kbGVyQ291bnQoKSBjb25zdCB7IHJldHVybiBtX3doZWVsRXZlbnRIYW5kbGVyQ291bnQ7 IH0KICAgICB2b2lkIHNldFdoZWVsRXZlbnRIYW5kbGVyQ291bnQodW5zaWduZWQpOwogCkBAIC04 MCw2ICs4NSw4IEBAIHByaXZhdGU6CiAgICAgSW50UmVjdCBtX3ZpZXdwb3J0UmVjdDsKICAgICBJ bnRTaXplIG1fY29udGVudHNTaXplOwogCisgICAgUmVnaW9uIG1fbm9uRmFzdFNjcm9sbGFibGVS ZWdpb247CisKICAgICB1bnNpZ25lZCBtX3doZWVsRXZlbnRIYW5kbGVyQ291bnQ7CiAKICNpZiBQ TEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxh YmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAppbmRl eCA3YjA0OWRjZDA1ZDMxMTE4OTkyYjA4NzdjODAzOGRjNmZmNzRkMGRiLi4wOTZjMDJlOWIxM2Mw YzgxZjM2ZTc1ZTNjZTUxZTA3N2RhZTlhYjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbGFibGVBcmVhLmgKQEAgLTE1NSw2ICsxNTUsOSBAQCBwdWJsaWM6CiAgICAgLy8gTm90ZSB0 aGF0IHRoaXMgb25seSByZXR1cm5zIHNjcm9sbGFibGUgYXJlYXMgdGhhdCBjYW4gYWN0dWFsbHkg YmUgc2Nyb2xsZWQuCiAgICAgdmlydHVhbCBTY3JvbGxhYmxlQXJlYSogZW5jbG9zaW5nU2Nyb2xs YWJsZUFyZWEoKSBjb25zdCA9IDA7CiAKKyAgICAvLyBSZXR1cm5zIHRoZSBib3VuZGluZyBib3gg b2YgdGhpcyBzY3JvbGxhYmxlIGFyZWEsIGluIHRoZSBjb29yZGluYXRlIHN5c3RlbSBvZiB0aGUg ZW5jbG9zaW5nIHNjcm9sbCB2aWV3LgorICAgIHZpcnR1YWwgSW50UmVjdCBzY3JvbGxhYmxlQXJl YUJvdW5kaW5nQm94KCkgY29uc3QgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQorCiAgICAgYm9v bCBpc1Bpbm5lZEluQm90aERpcmVjdGlvbnMoY29uc3QgSW50U2l6ZSYpIGNvbnN0OwogICAgIGJv b2wgaXNQaW5uZWRIb3Jpem9udGFsbHlJbkRpcmVjdGlvbihpbnQgaG9yaXpvbnRhbFNjcm9sbERl bHRhKSBjb25zdDsKICAgICBib29sIGlzUGlubmVkVmVydGljYWxseUluRGlyZWN0aW9uKGludCB2 ZXJ0aWNhbFNjcm9sbERlbHRhKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwCmluZGV4IGZlZTI3ZTk2OGE2MmFlYjhlZDNjMmI3MWYyMDZlYjQ3YjgwNTdkMzEu LmFmOTEwYzU0YzJlN2NmYWUxM2RjOGVkMWE1NDFhNmRmNzUzNmRiOWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtODg2LDYgKzg4NiwxMSBAQCBSZW5kZXJM YXllciogUmVuZGVyTGF5ZXI6OmVuY2xvc2luZ1Njcm9sbGFibGVMYXllcigpIGNvbnN0CiAgICAg cmV0dXJuIDA7CiB9CiAKK0ludFJlY3QgUmVuZGVyTGF5ZXI6OnNjcm9sbGFibGVBcmVhQm91bmRp bmdCb3goKSBjb25zdAoreworICAgIHJldHVybiByZW5kZXJlcigpLT5hYnNvbHV0ZUJvdW5kaW5n Qm94UmVjdCgpOworfQorCiBSZW5kZXJMYXllciogUmVuZGVyTGF5ZXI6OmVuY2xvc2luZ1RyYW5z Zm9ybWVkQW5jZXN0b3IoKSBjb25zdAogewogICAgIFJlbmRlckxheWVyKiBjdXJyID0gcGFyZW50 KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IGRmOTliZWNiYjNi ODg3MmU4MzM0YjE3MDE0NjU0Zjg5MGY3Mjk0ZGYuLjA2ZDFiYmJmYzdiYmUyMjkyMzUyZWJmMWQ4 OGQwMDkxMWY0MmVmOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBA IC0zMjIsNiArMzIyLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgU2Nyb2xsYmFyKiBob3Jpem9u dGFsU2Nyb2xsYmFyKCkgY29uc3QgeyByZXR1cm4gbV9oQmFyLmdldCgpOyB9CiAgICAgdmlydHVh bCBTY3JvbGxiYXIqIHZlcnRpY2FsU2Nyb2xsYmFyKCkgY29uc3QgeyByZXR1cm4gbV92QmFyLmdl dCgpOyB9CiAgICAgdmlydHVhbCBTY3JvbGxhYmxlQXJlYSogZW5jbG9zaW5nU2Nyb2xsYWJsZUFy ZWEoKSBjb25zdDsKKyAgICB2aXJ0dWFsIEludFJlY3Qgc2Nyb2xsYWJsZUFyZWFCb3VuZGluZ0Jv eCgpIGNvbnN0OwogCiAgICAgaW50IHZlcnRpY2FsU2Nyb2xsYmFyV2lkdGgoT3ZlcmxheVNjcm9s bGJhclNpemVSZWxldmFuY3kgPSBJZ25vcmVPdmVybGF5U2Nyb2xsYmFyU2l6ZSkgY29uc3Q7CiAg ICAgaW50IGhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQoT3ZlcmxheVNjcm9sbGJhclNpemVSZWxl dmFuY3kgPSBJZ25vcmVPdmVybGF5U2Nyb2xsYmFyU2l6ZSkgY29uc3Q7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKaW5kZXggOWIxOWM3OWQwZWUwYzUzZGE4Nzgx ZDYxMTM3NTMyMGRkMjljZTQyNC4uNTlhM2Y3OTUwNTE5NzFmNGY5N2NlYTUzZDljYzdiNDEwNTA3 YzI0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcApAQCAt ODIxLDYgKzgyMSwxMSBAQCBTY3JvbGxhYmxlQXJlYSogUmVuZGVyTGlzdEJveDo6ZW5jbG9zaW5n U2Nyb2xsYWJsZUFyZWEoKSBjb25zdAogICAgIHJldHVybiAwOwogfQogCitJbnRSZWN0IFJlbmRl ckxpc3RCb3g6OnNjcm9sbGFibGVBcmVhQm91bmRpbmdCb3goKSBjb25zdAoreworICAgIHJldHVy biBhYnNvbHV0ZUJvdW5kaW5nQm94UmVjdCgpOworfQorCiBQYXNzUmVmUHRyPFNjcm9sbGJhcj4g UmVuZGVyTGlzdEJveDo6Y3JlYXRlU2Nyb2xsYmFyKCkKIHsKICAgICBSZWZQdHI8U2Nyb2xsYmFy PiB3aWRnZXQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlz dEJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaAppbmRleCBl Zjk0NzJlYmU4OWVlMmFkMTdjZjY4NTQyODE3ODkyOWU1M2FjNDliLi41N2ViZTU1Yjg3ZWE1NDIw ZmQzNmQ5NGNkZDFjNDc0NjdjZDg2MGZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGlzdEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMaXN0Qm94LmgKQEAgLTEyMCw2ICsxMjAsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9v bCBpc09uQWN0aXZlUGFnZSgpIGNvbnN0OwogCiAgICAgdmlydHVhbCBTY3JvbGxhYmxlQXJlYSog ZW5jbG9zaW5nU2Nyb2xsYWJsZUFyZWEoKSBjb25zdDsKKyAgICB2aXJ0dWFsIEludFJlY3Qgc2Ny b2xsYWJsZUFyZWFCb3VuZGluZ0JveCgpIGNvbnN0OwogCiAgICAgLy8gTk9URTogVGhpcyBzaG91 bGQgb25seSBiZSBjYWxsZWQgYnkgdGhlIG92ZXJyaWRlbiBzZXRTY3JvbGxPZmZzZXQgZnJvbSBT Y3JvbGxhYmxlQXJlYS4KICAgICB2b2lkIHNjcm9sbFRvKGludCBuZXdPZmZzZXQpOwo=