97922 2012-09-28 09:55:22 -0700 [BlackBerry] Extend composited in-region scrolling to iframes/frames 2012-09-28 10:23:56 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tonikitoo tonikitoo mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 730757 0 tonikitoo 2012-09-28 09:55:22 -0700 SSIA 730758 1 166268 tonikitoo 2012-09-28 09:59:08 -0700 Created attachment 166268 patch 730760 2 webkit.review.bot 2012-09-28 10:02:24 -0700 Attachment 166268 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/blackberry/Api/InRegionScrol..." exit_code: 1 Source/WebKit/blackberry/Api/InRegionScroller.cpp:33: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 730762 3 166268 yong.li.webkit 2012-09-28 10:08:13 -0700 Comment on attachment 166268 patch View in context: https://bugs.webkit.org/attachment.cgi?id=166268&action=review r+ with some comments > Source/WebKit/blackberry/Api/InRegionScroller.cpp:154 > + if (scrollTarget == Platform::ScrollViewBase::BlockElement) { > + RenderLayerBacking* backing = static_cast<RenderLayerBacking*>(graphicsLayer->client()); > + layer = backing->owningLayer(); > + } else { > + RenderLayerCompositor* compositor = static_cast<RenderLayerCompositor*>(graphicsLayer->client()); > + layer = compositor->rootRenderLayer(); > + } static_cast<> worries me. Is it possible to add something to GraphicsLayerClient? > Source/WebKit/blackberry/Api/InRegionScroller.h:41 > + bool setScrollPositionWebKitThread(unsigned camouflagedLayer, const Platform::IntPoint& /*scrollPosition*/, > + bool /*acceleratedScrolling*/, Platform::ScrollViewBase::ScrollTarget); why are we using /* */ here? 730777 4 166268 tonikitoo 2012-09-28 10:23:18 -0700 Comment on attachment 166268 patch View in context: https://bugs.webkit.org/attachment.cgi?id=166268&action=review >> Source/WebKit/blackberry/Api/InRegionScroller.cpp:33 >> +#include "RenderLayerCompositor.h" > > Alphabetical sorting problem. [build/include_order] [4] fixed >> Source/WebKit/blackberry/Api/InRegionScroller.cpp:154 >> + } > > static_cast<> worries me. Is it possible to add something to GraphicsLayerClient? I guess so: we can add ::isRenderLayerCompositing() ::isRenderLayerBacking() methods to GraphicsLayerClient.h maybe. Will file a bug. >> Source/WebKit/blackberry/Api/InRegionScroller.h:41 >> + bool /*acceleratedScrolling*/, Platform::ScrollViewBase::ScrollTarget); > > why are we using /* */ here? will change. 730779 5 tonikitoo 2012-09-28 10:23:56 -0700 https://trac.webkit.org/changeset/129916 166268 2012-09-28 09:59:08 -0700 2012-09-28 10:23:18 -0700 patch 0001-BlackBerry-Extend-composited-in-region-scrolling-to-.patch text/plain 11718 tonikitoo RnJvbSA4NDY4MmNhZGNmMWU0MzRlMDg2NjIwMDlkMDhiYTRjMjViNTJmZDNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog RnJpLCAyOCBTZXAgMjAxMiAxMjo1Nzo1MSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtCbGFja0Jl cnJ5XSBFeHRlbmQgY29tcG9zaXRlZCAgaW4tcmVnaW9uIHNjcm9sbGluZyB0bwogaWZyYW1lcy9m cmFtZXMKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzkyMiBQUiAj MTk3MDkzCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KUGF0Y2ggYnkgQW50b25pbyBHb21l cyA8YWdvbWVzQHJpbS5jb20+CkludGVybmFseSByZXZpZXdlZCBieSBBcnZpZCBOaWxzc29uLgoK QWRkIHN1cHBvcnQgZm9yIGNvbXBvc2l0ZWQgc2Nyb2xsaW5nIGluIGEgaW5uZXIgZnJhbWUgbGV2 ZWw6CgoxKSBXaGVuIGNyZWF0aW5nIGFuIEluUmVnaW9uU2Nyb2xsYWJsZUFyZWEsIGZvciBhIGlu bmVyIHNjcm9sbGFibGUgZnJhbWUsCmNhY2hlIGFuZCBjYW1vdWZsYWcgdGhlIGFwcHJvcHJpYXRl ZCBzY3JvbGwgbGF5ZXIgKGkuZS4gUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpzY3JvbGxMYXllcik7 CgoyKSBEaWZmZXJlbnRpYXRlIHdoYXQgdHlwZSBvZiBzY3JvbGwgdGFyZ2V0IHdlIGFyZSBhdDog QmxvY2tFbGVtZW50IG9yCklubmVyRnJhbWU7CgozKSBDaGFuZ2UgdGhlIHNpZ25hdHVyZSBvZiB0 aGUgcHVibGljIG1ldGhvZHMgdG8gc3VwcG9ydCBhbmQgbmV3bHkgcGFzc2VkCmluIFNjcm9sbFRh cmdldCBwYXJhbWV0ZXI7CkFzIGEgc2lkZSBub3RlLCB0aGlzIHBhcmFtZXRlciBpcyBuZWVkZWQg aW4gb3JkZXIgdG8ga25vdyB3aGF0IGNsYXNzIHRvIHN0YXRpY19jYXN0CnRoZSBHcmFwaGljc0xh eWVyOjpjbGllbnQgdG86IGluIHRoZSBjYXNlIG9mIGEgY29tcG9zaXRlZCBzY3JvbGxhYmxlIGlu bmVyIGZyYW1lLCB0aGUgY2xpZW50CmlzIGEgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOyBpbiBjYXNl IG9mIGEgY29tcG9zaXRlZCBzY3JvbGxhYmxlIGJsb2NrIGVsZW1lbnQsIHRoZSBjbGllbnQKaXMg YSBSZW5kZXJMYXllckJhY2tpbmcuCgoqIEFwaS9JblJlZ2lvblNjcm9sbGVyLmNwcDoKKEJsYWNr QmVycnk6OldlYktpdDo6SW5SZWdpb25TY3JvbGxlcjo6c2V0U2Nyb2xsUG9zaXRpb25XZWJLaXRU aHJlYWQpOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6c2V0 U2Nyb2xsUG9zaXRpb25XZWJLaXRUaHJlYWQpOgoqIEFwaS9JblJlZ2lvblNjcm9sbGVyLmg6Ciog QXBpL0luUmVnaW9uU2Nyb2xsZXJfcC5oOgooSW5SZWdpb25TY3JvbGxlclByaXZhdGUpOgoqIFdl YkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuaDoKKFdlYkNvcmU6OkNocm9tZUNs aWVudEJsYWNrQmVycnk6OmFsbG93ZWRDb21wb3NpdGluZ1RyaWdnZXJzKToKKiBXZWJLaXRTdXBw b3J0L0luUmVnaW9uU2Nyb2xsYWJsZUFyZWEuY3BwOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpJblJl Z2lvblNjcm9sbGFibGVBcmVhOjpJblJlZ2lvblNjcm9sbGFibGVBcmVhKToKLS0tCiBTb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXIuY3BwICB8ICAgMTkgKysrKysr KystLS0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlci5oICAg IHwgICAgNCArKy0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxl cl9wLmggIHwgICAgMyArLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyAgICAg ICAgICAgICAgICAgfCAgIDM1ICsrKysrKysrKysrKysrKysrKysrCiAuLi4vV2ViS2l0U3VwcG9y dC9JblJlZ2lvblNjcm9sbGFibGVBcmVhLmNwcCAgICAgICB8ICAgMTggKysrKysrKystLQogNSBm aWxlcyBjaGFuZ2VkLCA2OSBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXIuY3BwIGIv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyLmNwcAppbmRleCAy NGRhOWQ2Li4yNDNlYzFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L0luUmVnaW9uU2Nyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkv SW5SZWdpb25TY3JvbGxlci5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJQYWdlLmgi CiAjaW5jbHVkZSAiUmVuZGVyQm94LmgiCiAjaW5jbHVkZSAiUmVuZGVyTGF5ZXIuaCIKKyNpbmNs dWRlICJSZW5kZXJMYXllckNvbXBvc2l0b3IuaCIKICNpbmNsdWRlICJSZW5kZXJMYXllckJhY2tp bmcuaCIKICNpbmNsdWRlICJSZW5kZXJPYmplY3QuaCIKICNpbmNsdWRlICJSZW5kZXJWaWV3Lmgi CkBAIC02NCwxMiArNjUsMTMgQEAgYm9vbCBJblJlZ2lvblNjcm9sbGVyOjpzZXRTY3JvbGxQb3Np dGlvbkNvbXBvc2l0aW5nVGhyZWFkKHVuc2lnbmVkIGNhbW91ZmxhZ2VkTGEKICAgICByZXR1cm4g ZC0+c2V0U2Nyb2xsUG9zaXRpb25Db21wb3NpdGluZ1RocmVhZChjYW1vdWZsYWdlZExheWVyLCBk LT5tX3dlYlBhZ2UtPm1hcEZyb21UcmFuc2Zvcm1lZChzY3JvbGxQb3NpdGlvbikpOwogfQogCi1i b29sIEluUmVnaW9uU2Nyb2xsZXI6OnNldFNjcm9sbFBvc2l0aW9uV2ViS2l0VGhyZWFkKHVuc2ln bmVkIGNhbW91ZmxhZ2VkTGF5ZXIsIGNvbnN0IFBsYXRmb3JtOjpJbnRQb2ludCYgc2Nyb2xsUG9z aXRpb24sIGJvb2wgc3VwcG9ydHNBY2NlbGVyYXRlZFNjcm9sbGluZykKK2Jvb2wgSW5SZWdpb25T Y3JvbGxlcjo6c2V0U2Nyb2xsUG9zaXRpb25XZWJLaXRUaHJlYWQodW5zaWduZWQgY2Ftb3VmbGFn ZWRMYXllciwgY29uc3QgUGxhdGZvcm06OkludFBvaW50JiBzY3JvbGxQb3NpdGlvbiwKKyAgICBi b29sIHN1cHBvcnRzQWNjZWxlcmF0ZWRTY3JvbGxpbmcsIFBsYXRmb3JtOjpTY3JvbGxWaWV3QmFz ZTo6U2Nyb2xsVGFyZ2V0IHNjcm9sbFRhcmdldCkKIHsKICAgICBBU1NFUlQoUGxhdGZvcm06Ondl YktpdFRocmVhZE1lc3NhZ2VDbGllbnQoKS0+aXNDdXJyZW50VGhyZWFkKCkpOwogCiAgICAgLy8g RklYTUU6IE5lZ2F0aXZlIHZhbHVlcyB3b24ndCB3b3JrIHdpdGggbWFwe1RvLEZyb219VHJhbnNm b3JtIG1ldGhvZHMuCi0gICAgcmV0dXJuIGQtPnNldFNjcm9sbFBvc2l0aW9uV2ViS2l0VGhyZWFk KGNhbW91ZmxhZ2VkTGF5ZXIsIGQtPm1fd2ViUGFnZS0+bWFwRnJvbVRyYW5zZm9ybWVkKHNjcm9s bFBvc2l0aW9uKSwgc3VwcG9ydHNBY2NlbGVyYXRlZFNjcm9sbGluZyk7CisgICAgcmV0dXJuIGQt PnNldFNjcm9sbFBvc2l0aW9uV2ViS2l0VGhyZWFkKGNhbW91ZmxhZ2VkTGF5ZXIsIGQtPm1fd2Vi UGFnZS0+bWFwRnJvbVRyYW5zZm9ybWVkKHNjcm9sbFBvc2l0aW9uKSwgc3VwcG9ydHNBY2NlbGVy YXRlZFNjcm9sbGluZywgc2Nyb2xsVGFyZ2V0KTsKIH0KIAogSW5SZWdpb25TY3JvbGxlclByaXZh dGU6OkluUmVnaW9uU2Nyb2xsZXJQcml2YXRlKFdlYlBhZ2VQcml2YXRlKiB3ZWJQYWdlUHJpdmF0 ZSkKQEAgLTEzMiw3ICsxMzQsOCBAQCBib29sIEluUmVnaW9uU2Nyb2xsZXJQcml2YXRlOjpzZXRT Y3JvbGxQb3NpdGlvbkNvbXBvc2l0aW5nVGhyZWFkKHVuc2lnbmVkIGNhbW91ZgogICAgIHJldHVy biB0cnVlOwogfQogCi1ib29sIEluUmVnaW9uU2Nyb2xsZXJQcml2YXRlOjpzZXRTY3JvbGxQb3Np dGlvbldlYktpdFRocmVhZCh1bnNpZ25lZCBjYW1vdWZsYWdlZExheWVyLCBjb25zdCBXZWJDb3Jl OjpJbnRQb2ludCYgc2Nyb2xsUG9zaXRpb24sIGJvb2wgc3VwcG9ydHNBY2NlbGVyYXRlZFNjcm9s bGluZykKK2Jvb2wgSW5SZWdpb25TY3JvbGxlclByaXZhdGU6OnNldFNjcm9sbFBvc2l0aW9uV2Vi S2l0VGhyZWFkKHVuc2lnbmVkIGNhbW91ZmxhZ2VkTGF5ZXIsIGNvbnN0IFdlYkNvcmU6OkludFBv aW50JiBzY3JvbGxQb3NpdGlvbiwKKyAgICBib29sIHN1cHBvcnRzQWNjZWxlcmF0ZWRTY3JvbGxp bmcsIFBsYXRmb3JtOjpTY3JvbGxWaWV3QmFzZTo6U2Nyb2xsVGFyZ2V0IHNjcm9sbFRhcmdldCkK IHsKICAgICBSZW5kZXJMYXllciogbGF5ZXIgPSAwOwogCkBAIC0xNDEsOCArMTQ0LDE0IEBAIGJv b2wgSW5SZWdpb25TY3JvbGxlclByaXZhdGU6OnNldFNjcm9sbFBvc2l0aW9uV2ViS2l0VGhyZWFk KHVuc2lnbmVkIGNhbW91ZmxhZ2VkCiAgICAgICAgIEFTU0VSVChsYXllcldlYktpdFRocmVhZCk7 CiAgICAgICAgIGlmIChsYXllcldlYktpdFRocmVhZC0+b3duZXIoKSkgewogICAgICAgICAgICAg R3JhcGhpY3NMYXllciogZ3JhcGhpY3NMYXllciA9IGxheWVyV2ViS2l0VGhyZWFkLT5vd25lcigp OwotICAgICAgICAgICAgUmVuZGVyTGF5ZXJCYWNraW5nKiBiYWNraW5nID0gc3RhdGljX2Nhc3Q8 UmVuZGVyTGF5ZXJCYWNraW5nKj4oZ3JhcGhpY3NMYXllci0+Y2xpZW50KCkpOwotICAgICAgICAg ICAgbGF5ZXIgPSBiYWNraW5nLT5vd25pbmdMYXllcigpOworCisgICAgICAgICAgICBpZiAoc2Ny b2xsVGFyZ2V0ID09IFBsYXRmb3JtOjpTY3JvbGxWaWV3QmFzZTo6QmxvY2tFbGVtZW50KSB7Cisg ICAgICAgICAgICAgICAgUmVuZGVyTGF5ZXJCYWNraW5nKiBiYWNraW5nID0gc3RhdGljX2Nhc3Q8 UmVuZGVyTGF5ZXJCYWNraW5nKj4oZ3JhcGhpY3NMYXllci0+Y2xpZW50KCkpOworICAgICAgICAg ICAgICAgIGxheWVyID0gYmFja2luZy0+b3duaW5nTGF5ZXIoKTsKKyAgICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAgICAgUmVuZGVyTGF5ZXJDb21wb3NpdG9yKiBjb21wb3NpdG9yID0g c3RhdGljX2Nhc3Q8UmVuZGVyTGF5ZXJDb21wb3NpdG9yKj4oZ3JhcGhpY3NMYXllci0+Y2xpZW50 KCkpOworICAgICAgICAgICAgICAgIGxheWVyID0gY29tcG9zaXRvci0+cm9vdFJlbmRlckxheWVy KCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBOb2Rl KiBub2RlID0gcmVpbnRlcnByZXRfY2FzdDxOb2RlKj4oY2Ftb3VmbGFnZWRMYXllcik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXIuaCBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlci5oCmluZGV4IDMy OTFmOTcuLjU5MTdiYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkv SW5SZWdpb25TY3JvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5S ZWdpb25TY3JvbGxlci5oCkBAIC0yMiw2ICsyMiw3IEBACiAjaW5jbHVkZSAiQmxhY2tCZXJyeUds b2JhbC5oIgogCiAjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtUHJpbWl0aXZlcy5oPgorI2lu Y2x1ZGUgPGludGVyYWN0aW9uL1Njcm9sbFZpZXdCYXNlLmg+CiAKIG5hbWVzcGFjZSBCbGFja0Jl cnJ5IHsKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtMzYsNyArMzcsOCBAQCBwdWJsaWM6CiAgICAg fkluUmVnaW9uU2Nyb2xsZXIoKTsKIAogICAgIGJvb2wgc2V0U2Nyb2xsUG9zaXRpb25Db21wb3Np dGluZ1RocmVhZCh1bnNpZ25lZCBjYW1vdWZsYWdlZExheWVyLCBjb25zdCBQbGF0Zm9ybTo6SW50 UG9pbnQmIC8qc2Nyb2xsUG9zaXRpb24qLyk7Ci0gICAgYm9vbCBzZXRTY3JvbGxQb3NpdGlvbldl YktpdFRocmVhZCh1bnNpZ25lZCBjYW1vdWZsYWdlZExheWVyLCBjb25zdCBQbGF0Zm9ybTo6SW50 UG9pbnQmIC8qc2Nyb2xsUG9zaXRpb24qLywgYm9vbCBhY2NlbGVyYXRlZFNjcm9sbGluZyk7Cisg ICAgYm9vbCBzZXRTY3JvbGxQb3NpdGlvbldlYktpdFRocmVhZCh1bnNpZ25lZCBjYW1vdWZsYWdl ZExheWVyLCBjb25zdCBQbGF0Zm9ybTo6SW50UG9pbnQmIC8qc2Nyb2xsUG9zaXRpb24qLywKKyAg ICAgICAgYm9vbCAvKmFjY2VsZXJhdGVkU2Nyb2xsaW5nKi8sIFBsYXRmb3JtOjpTY3JvbGxWaWV3 QmFzZTo6U2Nyb2xsVGFyZ2V0KTsKIAogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgV2ViUGFn ZVByaXZhdGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVn aW9uU2Nyb2xsZXJfcC5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNj cm9sbGVyX3AuaAppbmRleCA5OTg4YjgzLi5jYjMwYzdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXJfcC5oCisrKyBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlcl9wLmgKQEAgLTQ3LDcgKzQ3LDggQEAg cHVibGljOgogICAgIGJvb2wgaXNBY3RpdmUoKSBjb25zdDsKIAogICAgIGJvb2wgc2V0U2Nyb2xs UG9zaXRpb25Db21wb3NpdGluZ1RocmVhZCh1bnNpZ25lZCBjYW1vdWZsYWdlZExheWVyLCBjb25z dCBXZWJDb3JlOjpJbnRQb2ludCYgc2Nyb2xsUG9zaXRpb24pOwotICAgIGJvb2wgc2V0U2Nyb2xs UG9zaXRpb25XZWJLaXRUaHJlYWQodW5zaWduZWQgY2Ftb3VmbGFnZWRMYXllciwgY29uc3QgV2Vi Q29yZTo6SW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBib29sIHN1cHBvcnRzQWNjZWxlcmF0ZWRT Y3JvbGxpbmcpOworICAgIGJvb2wgc2V0U2Nyb2xsUG9zaXRpb25XZWJLaXRUaHJlYWQodW5zaWdu ZWQgY2Ftb3VmbGFnZWRMYXllciwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHNjcm9sbFBvc2l0 aW9uLAorICAgICAgICBib29sIC8qYWNjZWxlcmF0ZWRTY3JvbGxpbmcqLywgUGxhdGZvcm06OlNj cm9sbFZpZXdCYXNlOjpTY3JvbGxUYXJnZXQpOwogCiAgICAgdm9pZCBjYWxjdWxhdGVJblJlZ2lv blNjcm9sbGFibGVBcmVhc0ZvclBvaW50KGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7CiAgICAg Y29uc3Qgc3RkOjp2ZWN0b3I8UGxhdGZvcm06OlNjcm9sbFZpZXdCYXNlKj4mIGFjdGl2ZUluUmVn aW9uU2Nyb2xsYWJsZUFyZWFzKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA1NDU4Nzg0Li4yOTg4MzdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAg LTEsNSArMSw0MCBAQAogMjAxMi0wOS0yOCAgQW50b25pbyBHb21lcyAgPGFnb21lc0ByaW0uY29t PgogCisgICAgICAgIFtCbGFja0JlcnJ5XSBFeHRlbmQgY29tcG9zaXRlZCAgaW4tcmVnaW9uIHNj cm9sbGluZyB0byBpZnJhbWVzL2ZyYW1lcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTc5MjIKKyAgICAgICAgUFIgIzE5NzA5MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICBJbnRlcm5hbHkgcmV2aWV3ZWQgYnkg QXJ2aWQgTmlsc3Nvbi4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3IgY29tcG9zaXRlZCBzY3Jv bGxpbmcgaW4gYSBpbm5lciBmcmFtZSBsZXZlbDoKKworICAgICAgICAxKSBXaGVuIGNyZWF0aW5n IGFuIEluUmVnaW9uU2Nyb2xsYWJsZUFyZWEsIGZvciBhIGlubmVyIHNjcm9sbGFibGUgZnJhbWUs CisgICAgICAgIGNhY2hlIGFuZCBjYW1vdWZsYWcgdGhlIGFwcHJvcHJpYXRlZCBzY3JvbGwgbGF5 ZXIgKGkuZS4gUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpzY3JvbGxMYXllcik7CisKKyAgICAgICAg MikgRGlmZmVyZW50aWF0ZSB3aGF0IHR5cGUgb2Ygc2Nyb2xsIHRhcmdldCB3ZSBhcmUgYXQ6IEJs b2NrRWxlbWVudCBvcgorICAgICAgICBJbm5lckZyYW1lOworCisgICAgICAgIDMpIENoYW5nZSB0 aGUgc2lnbmF0dXJlIG9mIHRoZSBwdWJsaWMgbWV0aG9kcyB0byBzdXBwb3J0IGFuZCBuZXdseSBw YXNzZWQKKyAgICAgICAgaW4gU2Nyb2xsVGFyZ2V0IHBhcmFtZXRlcjsKKyAgICAgICAgQXMgYSBz aWRlIG5vdGUsIHRoaXMgcGFyYW1ldGVyIGlzIG5lZWRlZCBpbiBvcmRlciB0byBrbm93IHdoYXQg Y2xhc3MgdG8gc3RhdGljX2Nhc3QKKyAgICAgICAgdGhlIEdyYXBoaWNzTGF5ZXI6OmNsaWVudCB0 bzogaW4gdGhlIGNhc2Ugb2YgYSBjb21wb3NpdGVkIHNjcm9sbGFibGUgaW5uZXIgZnJhbWUsIHRo ZSBjbGllbnQKKyAgICAgICAgaXMgYSBSZW5kZXJMYXllckNvbXBvc2l0b3I7IGluIGNhc2Ugb2Yg YSBjb21wb3NpdGVkIHNjcm9sbGFibGUgYmxvY2sgZWxlbWVudCwgdGhlIGNsaWVudAorICAgICAg ICBpcyBhIFJlbmRlckxheWVyQmFja2luZy4KKworICAgICAgICAqIEFwaS9JblJlZ2lvblNjcm9s bGVyLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5SZWdpb25TY3JvbGxlcjo6 c2V0U2Nyb2xsUG9zaXRpb25XZWJLaXRUaHJlYWQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2Vi S2l0OjpJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6c2V0U2Nyb2xsUG9zaXRpb25XZWJLaXRUaHJl YWQpOgorICAgICAgICAqIEFwaS9JblJlZ2lvblNjcm9sbGVyLmg6CisgICAgICAgICogQXBpL0lu UmVnaW9uU2Nyb2xsZXJfcC5oOgorICAgICAgICAoSW5SZWdpb25TY3JvbGxlclByaXZhdGUpOgor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuaDoKKyAgICAg ICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudEJsYWNrQmVycnk6OmFsbG93ZWRDb21wb3NpdGluZ1Ry aWdnZXJzKToKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0luUmVnaW9uU2Nyb2xsYWJsZUFyZWEu Y3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJblJlZ2lvblNjcm9sbGFibGVBcmVh OjpJblJlZ2lvblNjcm9sbGFibGVBcmVhKToKKworMjAxMi0wOS0yOCAgQW50b25pbyBHb21lcyAg PGFnb21lc0ByaW0uY29tPgorCiAgICAgICAgIFtCbGFja0JlcnJ5XSBFeGl0aW5nIGZ1bGxzY3Jl ZW4gZG9lcyBub3Qgc2V0IHRoZSBjb3JyZWN0IHNjcm9sbCBwb3NpdGlvbgogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc5MTcKICAgICAgICAgUFIgIzIx MjkyMApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQv SW5SZWdpb25TY3JvbGxhYmxlQXJlYS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2Vi S2l0U3VwcG9ydC9JblJlZ2lvblNjcm9sbGFibGVBcmVhLmNwcAppbmRleCA0YjJjMDk1Li44MzRm MzQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9J blJlZ2lvblNjcm9sbGFibGVBcmVhLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViS2l0U3VwcG9ydC9JblJlZ2lvblNjcm9sbGFibGVBcmVhLmNwcApAQCAtMjUsNiArMjUsNyBA QAogI2luY2x1ZGUgIlJlbmRlckJveC5oIgogI2luY2x1ZGUgIlJlbmRlckxheWVyLmgiCiAjaW5j bHVkZSAiUmVuZGVyTGF5ZXJCYWNraW5nLmgiCisjaW5jbHVkZSAiUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmgiCiAjaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5o IgogI2luY2x1ZGUgIldlYlBhZ2VfcC5oIgpAQCAtNjMsMTEgKzY0LDE0IEBAIEluUmVnaW9uU2Ny b2xsYWJsZUFyZWE6OkluUmVnaW9uU2Nyb2xsYWJsZUFyZWEoV2ViUGFnZVByaXZhdGUqIHdlYlBh Z2UsIFJlbmRlckxhCiAKICAgICBpZiAobGF5ZXJSZW5kZXJlci0+aXNSZW5kZXJWaWV3KCkpIHsg Ly8gI2RvY3VtZW50IGNhc2UKIAorICAgICAgICBSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gdG9S ZW5kZXJWaWV3KGxheWVyUmVuZGVyZXIpOworICAgICAgICBBU1NFUlQocmVuZGVyVmlldyk7CisK ICAgICAgICAgRnJhbWVWaWV3KiB2aWV3ID0gdG9SZW5kZXJWaWV3KGxheWVyUmVuZGVyZXIpLT5m cmFtZVZpZXcoKTsKICAgICAgICAgQVNTRVJUKHZpZXcpOwogCiAgICAgICAgIEZyYW1lKiBmcmFt ZSA9IHZpZXctPmZyYW1lKCk7Ci0gICAgICAgIEFTU0VSVF9VTlVTRUQoZnJhbWUsIGZyYW1lKTsK KyAgICAgICAgQVNTRVJUKGZyYW1lKTsKIAogICAgICAgICBtX3Njcm9sbFBvc2l0aW9uID0gbV93 ZWJQYWdlLT5tYXBUb1RyYW5zZm9ybWVkKHZpZXctPnNjcm9sbFBvc2l0aW9uKCkpOwogICAgICAg ICBtX2NvbnRlbnRzU2l6ZSA9IG1fd2ViUGFnZS0+bWFwVG9UcmFuc2Zvcm1lZCh2aWV3LT5jb250 ZW50c1NpemUoKSk7CkBAIC03Niw4ICs4MCwxNCBAQCBJblJlZ2lvblNjcm9sbGFibGVBcmVhOjpJ blJlZ2lvblNjcm9sbGFibGVBcmVhKFdlYlBhZ2VQcml2YXRlKiB3ZWJQYWdlLCBSZW5kZXJMYQog ICAgICAgICBtX3Njcm9sbHNIb3Jpem9udGFsbHkgPSB2aWV3LT5jb250ZW50c1dpZHRoKCkgPiB2 aWV3LT52aXNpYmxlV2lkdGgoKTsKICAgICAgICAgbV9zY3JvbGxzVmVydGljYWxseSA9IHZpZXct PmNvbnRlbnRzSGVpZ2h0KCkgPiB2aWV3LT52aXNpYmxlSGVpZ2h0KCk7CiAKLSAgICAgICAgbV9j YW1vdWZsYWdlZENvbXBvc2l0ZWRTY3JvbGxhYmxlTGF5ZXIgPSByZWludGVycHJldF9jYXN0PHVu c2lnbmVkPihtX2xheWVyLT5lbmNsb3NpbmdFbGVtZW50KCkpOyAvLyBGSVhNRTogTmVlZHMgY29t cG9zaXRlZCBsYXllciBmb3IgaW5uZXIgZnJhbWVzLgotICAgICAgICBtX2NhY2hlZE5vbkNvbXBv c2l0ZWRTY3JvbGxhYmxlTm9kZSA9IG1fbGF5ZXItPmVuY2xvc2luZ0VsZW1lbnQoKTsKKyAgICAg ICAgbV9zdXBwb3J0c0NvbXBvc2l0ZWRTY3JvbGxpbmcgPSB0cnVlOworCisgICAgICAgIG1fc2Ny b2xsVGFyZ2V0ID0gSW5uZXJGcmFtZTsKKworICAgICAgICBBU1NFUlQoIW1fY2FjaGVkTm9uQ29t cG9zaXRlZFNjcm9sbGFibGVOb2RlKTsKKworICAgICAgICBtX2NhbW91ZmxhZ2VkQ29tcG9zaXRl ZFNjcm9sbGFibGVMYXllciA9IHJlaW50ZXJwcmV0X2Nhc3Q8dW5zaWduZWQ+KHJlbmRlclZpZXct PmNvbXBvc2l0b3IoKS0+c2Nyb2xsTGF5ZXIoKS0+cGxhdGZvcm1MYXllcigpKTsKKyAgICAgICAg bV9jYWNoZWRDb21wb3NpdGVkU2Nyb2xsYWJsZUxheWVyID0gcmVuZGVyVmlldy0+Y29tcG9zaXRv cigpLT5zY3JvbGxMYXllcigpLT5wbGF0Zm9ybUxheWVyKCk7CiAKICAgICB9IGVsc2UgeyAvLyBS ZW5kZXJCb3gtYmFzZWQgZWxlbWVudHMgY2FzZSAoc2Nyb2xsYWJsZSBib3hlcyAoZGl2J3MsIHAn cywgdGV4dGFyZWEncywgZXRjKSkuCiAKQEAgLTkzLDYgKzEwMyw4IEBAIEluUmVnaW9uU2Nyb2xs YWJsZUFyZWE6OkluUmVnaW9uU2Nyb2xsYWJsZUFyZWEoV2ViUGFnZVByaXZhdGUqIHdlYlBhZ2Us IFJlbmRlckxhCiAgICAgICAgIG1fc2Nyb2xsc0hvcml6b250YWxseSA9IGJveC0+c2Nyb2xsV2lk dGgoKSAhPSBib3gtPmNsaWVudFdpZHRoKCkgJiYgYm94LT5zY3JvbGxzT3ZlcmZsb3dYKCk7CiAg ICAgICAgIG1fc2Nyb2xsc1ZlcnRpY2FsbHkgPSBib3gtPnNjcm9sbEhlaWdodCgpICE9IGJveC0+ Y2xpZW50SGVpZ2h0KCkgJiYgYm94LT5zY3JvbGxzT3ZlcmZsb3dZKCk7CiAKKyAgICAgICAgbV9z Y3JvbGxUYXJnZXQgPSBCbG9ja0VsZW1lbnQ7CisKICAgICAgICAgLy8gQm90aCBjYWNoZXMgYmVs b3cgYXJlIHNlbGYtZXhjbHVzaXZlLgogICAgICAgICBpZiAobV9sYXllci0+dXNlc0NvbXBvc2l0 ZWRTY3JvbGxpbmcoKSkgewogICAgICAgICAgICAgbV9mb3JjZUNvbnRlbnRUb0JlVmVydGljYWxs eVNjcm9sbGFibGUgPSB0cnVlOwotLSAKMS43LjUuNAoK