84607 2012-04-23 09:59:04 -0700 Cut dependency on RenderLayer::scrollRectToVisible outside rendering 2012-04-23 16:50:07 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 83811 1 jchaffraix jchaffraix jamesr simon.fraser webkit.review.bot oldest_to_newest 607772 0 jchaffraix 2012-04-23 09:59:04 -0700 Currently the logic assumes that there is a RenderLayer to handle a scrollRectToVisible action as it needs to query the enclosing RenderLayer. This exposes RenderLayer to the non-rendering code, thus exposing needlessly a rendering-only concept. Patch forthcoming. 607795 1 138376 jchaffraix 2012-04-23 10:23:22 -0700 Created attachment 138376 Proposed fix 1: Add RenderObject::scrollRectToVisible. 608188 2 138376 webkit.review.bot 2012-04-23 16:49:55 -0700 Comment on attachment 138376 Proposed fix 1: Add RenderObject::scrollRectToVisible. Clearing flags on attachment: 138376 Committed r114962: <http://trac.webkit.org/changeset/114962> 608189 3 webkit.review.bot 2012-04-23 16:50:07 -0700 All reviewed patches have been landed. Closing bug. 138376 2012-04-23 10:23:22 -0700 2012-04-23 16:49:54 -0700 Proposed fix 1: Add RenderObject::scrollRectToVisible. bug-84607-20120423102321.patch text/plain 14527 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NDcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODZiMDM3NTBlYjBmMjk1 MzMzN2I3ZDEzYWRlZGY2YTk3MDUzZTMxOS4uZWQzNGU1MGQ5NzU4MTczZTY4MzhhNGRhMDgxOTNi YzQ4Y2E1NjEwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDEyLTA0LTIzICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIEN1dCBkZXBl bmRlbmN5IG9uIFJlbmRlckxheWVyOjpzY3JvbGxSZWN0VG9WaXNpYmxlIG91dHNpZGUgcmVuZGVy aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDYw NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExheWVy aW5nIGZpeCBvbmx5LCB0aGVyZSBzaG91bGQgYmUgbm8gY2hhbmdlIGJlaGF2aW9yLgorCisgICAg ICAgIEJlY2F1c2Ugd2UgZG9uJ3QgaGF2ZSBhbiBhY2Nlc3NvciBvbiBSZW5kZXJPYmplY3QsIGEg bG90IG9mIHRoZSBjb2RlIG5lZWRzCisgICAgICAgIHRvIGtub3cgYWJvdXQgUmVuZGVyTGF5ZXIu IFRoaXMgaXMgbm90IG5lY2Vzc2FyeSBhbmQgZXhwb3NlcyBSZW5kZXJMYXllciB0bworICAgICAg ICBvYmplY3RzIHRoYXQgc2hvdWxkbid0IGtub3cgYWJvdXQgaXQuCisKKyAgICAgICAgVGhpcyBw YXRjaCBhZGRzIGEgUmVuZGVyT2JqZWN0OjpzY3JvbGxSZWN0VG9WaXNpYmxlIHdpdGggdGhlIGFk LWhvYyBleHBsYW5hdGlvbgorICAgICAgICBhcyB0byB3aHkgaXQgaXNuJ3Qgb24gUmVuZGVyQm94 IChzY3JvbGxpbmcgaXMgYSBSZW5kZXJCb3ggY29uY2VwdCkuCisKKyAgICAgICAgKiBXZWJDb3Jl LmV4cC5pbjoKKyAgICAgICAgKiBXZWJDb3JlLm9yZGVyOgorICAgICAgICBVcGRhdGVkIHRvIGV4 cG9zZSB0aGUgbmV3IG1ldGhvZC4KKworICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNjcm9sbEludG9WaWV3KToKKyAgICAgICAgKFdlYkNvcmU6 OkVsZW1lbnQ6OnNjcm9sbEludG9WaWV3SWZOZWVkZWQpOgorICAgICAgICAoV2ViQ29yZTo6RWxl bWVudDo6dXBkYXRlRm9jdXNBcHBlYXJhbmNlKToKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OmZpbmRTdHJpbmdBbmRTY3JvbGxUb1Zpc2li bGUpOgorICAgICAgICAqIGVkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVTZWxlY3Rpb246OnJldmVhbFNlbGVjdGlvbik6CisgICAgICAgICogcGFnZS9G cmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzY3JvbGxUb0FuY2hv cik6CisgICAgICAgIFVwZGF0ZWQgdGhvc2UgY2FsbCBzaXRlcyB0byB1c2UgdGhlIG5ldyBmdW5j dGlvbi4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICBSZW1v dmVkIFNjcm9sbEJlaGF2aW9yLmggI2luY2x1ZGUgYW5kIGRlZmF1bHQgYXJndW1lbnQgdmFsdWVz CisgICAgICAgIGFzIHdlIGFyZSBhbHdheXMgY2FsbGVkIHRocm91Z2ggUmVuZGVyT2JqZWN0IG5v dy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyT2JqZWN0OjpzY3JvbGxSZWN0VG9WaXNpYmxlKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisgICAgICAgIEFkZGVkIGEgbmV3IGZ1bmN0aW9uIHRoYXQg anVzdCBmb3J3YXJkcyB0byB0aGUgZW5jbG9zaW5nIGxheWVyCisgICAgICAgIGlmIGFueS4gV2Ug cmV0dXJuIHdoZXRoZXIgd2UgYWN0dWFsbHkgdHJpZWQgdG8gc2Nyb2xsIHRvIG1hdGNoCisgICAg ICAgIHNvbWUgY2FsbCBzaXRlcyBleHBlY3RhdGlvbnMuCisKIDIwMTItMDQtMTcgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENoYW5nZSBSZW5kZXJUaGVtZUNo cm9taXVtU2tpYSBwYWludCBtZXRob2RzIHRvIHVzZSBwaXhlbCBzbmFwcGluZwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdl TG9nCmluZGV4IDI4NGZhNTg5ZjI2MTU2NmZmMWI3ODAzZGMwZjlmZThhNWE3YWQ2NjYuLjE4NDU4 NTc1OTRlMDI1YmQwOTFjZWExMjk5ZDcyNzVjOWJkZmYzNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAxMi0wNC0yMyAgSnVsaWVuIENoYWZmcmFpeCAgPGpjaGFmZnJhaXhA d2Via2l0Lm9yZz4KKworICAgICAgICBDdXQgZGVwZW5kZW5jeSBvbiBSZW5kZXJMYXllcjo6c2Ny b2xsUmVjdFRvVmlzaWJsZSBvdXRzaWRlIHJlbmRlcmluZworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ2MDcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViRnJhbWUubW06CisgICAgICAg ICgtW1dlYkZyYW1lIF9zY3JvbGxET01SYW5nZVRvVmlzaWJsZTpdKToKKyAgICAgICAgVXBkYXRl ZCB0byB1c2UgUmVuZGVyT2JqZWN0OjpzY3JvbGxSZWN0VG9WaXNpYmxlIGFuZCBub3QgZGVwZW5k IG9uIFJlbmRlckxheWVyLgorCiAyMDEyLTA0LTE3ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBw bGUuY29tPgogCiAgICAgICAgIEV4aXRpbmcgZnVsbCBzY3JlZW4gdmlkZW8gYnJpbmdzIHRoZSB3 cm9uZyBTYWZhcmkgd2luZG93IHRvIHRoZSBmb3JlZ3JvdW5kCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmlu ZGV4IDExMjk3NzVkZDNkMGRjMGUxNjAwNmY5NTlkNmMyZjFkMjM4M2Q0YTcuLmE4M2Y0NDlhMTdl MWZmMDhhOTM1YmZjMTE1MDExODEzNWM3OGEyYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0y MjAsNyArMjIwLDcgQEAgX19aTjdXZWJDb3JlMTFNZW1vcnlDYWNoZTEzc2V0Q2FwYWNpdGllc0Vq amoKIF9fWk43V2ViQ29yZTExTWVtb3J5Q2FjaGUxNGV2aWN0UmVzb3VyY2VzRXYKIF9fWk43V2Vi Q29yZTExTWVtb3J5Q2FjaGUxOWdldE9yaWdpbnNXaXRoQ2FjaGVFUk4zV1RGN0hhc2hTZXRJTlMx XzZSZWZQdHJJTlNfMTRTZWN1cml0eU9yaWdpbkVFRU5TXzE4U2VjdXJpdHlPcmlnaW5IYXNoRU5T MV8xMEhhc2hUcmFpdHNJUzVfRUVFRQogX19aTjdXZWJDb3JlMTFNZW1vcnlDYWNoZTI1cmVtb3Zl UmVzb3VyY2VzV2l0aE9yaWdpbkVQTlNfMTRTZWN1cml0eU9yaWdpbkUKLV9fWk43V2ViQ29yZTEx UmVuZGVyTGF5ZXIxOXNjcm9sbFJlY3RUb1Zpc2libGVFUktOU183SW50UmVjdEVSS05TXzE1U2Ny b2xsQWxpZ25tZW50RVM2XworX19aTjdXZWJDb3JlMTJSZW5kZXJPYmplY3QxOXNjcm9sbFJlY3RU b1Zpc2libGVFUktOU183SW50UmVjdEVSS05TXzE1U2Nyb2xsQWxpZ25tZW50RVM2XwogX19aTjdX ZWJDb3JlMTFVUkxXaXRoRGF0YUVQNk5TRGF0YVA1TlNVUkwKIF9fWk43V2ViQ29yZTExZ2xvYmFs UG9pbnRFUks4X05TUG9pbnRQOE5TV2luZG93CiBfX1pON1dlYkNvcmUxMW1lbW9yeUNhY2hlRXYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUub3JkZXIgYi9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLm9yZGVyCmluZGV4IDFkMzFhZjQzNjVmYjA2MzVjYTZlZWM0MjRlZDE0MjAwZTFi ZDAwNDYuLmZiMDVjNzA3ODg3OWI2ZThkOWVkZTE2YmU3ZjRjZTk2ZjQ0NjNiNmYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUub3JkZXIKKysrIGIvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS5vcmRlcgpAQCAtMzYxOCw3ICszNjE4LDcgQEAgX19aTjdXZWJDb3JlMTRUcmFuc2Zvcm1T dGF0ZTRtb3ZlRWlpTlMwXzIxVHJhbnNmb3JtQWNjdW11bGF0aW9uRQogX19aTks3V2ViQ29yZTEw UmVuZGVyVmlldzE5bWFwTG9jYWxUb0NvbnRhaW5lckVQTlNfMjBSZW5kZXJCb3hNb2RlbE9iamVj dEViYlJOU18xNFRyYW5zZm9ybVN0YXRlRQogX19aTjdXZWJDb3JlMTRUcmFuc2Zvcm1TdGF0ZTdm bGF0dGVuRXYKIF9fWk5LN1dlYkNvcmUxM0NvbnRhaW5lck5vZGUxOWdldExvd2VyUmlnaHRDb3Ju ZXJFUk5TXzEwRmxvYXRQb2ludEUKLV9fWk43V2ViQ29yZTExUmVuZGVyTGF5ZXIxOXNjcm9sbFJl Y3RUb1Zpc2libGVFUktOU183SW50UmVjdEViUktOU18xNVNjcm9sbEFsaWdubWVudEVTNl8KK19f Wk43V2ViQ29yZTEyUmVuZGVyT2JqZWN0MTlzY3JvbGxSZWN0VG9WaXNpYmxlRVJLTlNfN0ludFJl Y3RFUktOU18xNVNjcm9sbEFsaWdubWVudEVTNl8KIF9fWk5LN1dlYkNvcmU5UmVuZGVyQm94Mjhj YW5CZVByb2dyYW1hdGljYWxseVNjcm9sbGVkRWIKIF9fWk43V2ViQ29yZTExUmVuZGVyTGF5ZXIx NWdldFJlY3RUb0V4cG9zZUVSS05TXzdJbnRSZWN0RVMzX1JLTlNfMTVTY3JvbGxBbGlnbm1lbnRF UzZfCiBfX1pOSzdXZWJDb3JlNkNocm9tZTE4c2Nyb2xsUmVjdEludG9WaWV3RVJLTlNfN0ludFJl Y3RFCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggZDY0MWI4NWFmNjcwOWQ0NzExNTY2MmZkMTI1 ODZlZGQ5NTQxZDA5MC4uYmU4M2UyMmU3NTc0M2MzYzkyMTgwNzkyNTJjNTMwYzAzMDI4ZGQ1OCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9FbGVtZW50LmNwcApAQCAtNTgsNyArNTgsNiBAQAogI2luY2x1ZGUgIk5vZGVS ZW5kZXJTdHlsZS5oIgogI2luY2x1ZGUgIk5vZGVSZW5kZXJpbmdDb250ZXh0LmgiCiAjaW5jbHVk ZSAiUGFnZS5oIgotI2luY2x1ZGUgIlJlbmRlckxheWVyLmgiCiAjaW5jbHVkZSAiUmVuZGVyUmVn aW9uLmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgogI2luY2x1ZGUgIlJlbmRlcldpZGdldC5o IgpAQCAtMjQ5LDkgKzI0OCw5IEBAIHZvaWQgRWxlbWVudDo6c2Nyb2xsSW50b1ZpZXcoYm9vbCBh bGlnblRvVG9wKQogICAgIExheW91dFJlY3QgYm91bmRzID0gZ2V0UmVjdCgpOwogICAgIC8vIEFs aWduIHRvIHRoZSB0b3AgLyBib3R0b20gYW5kIHRvIHRoZSBjbG9zZXN0IGVkZ2UuCiAgICAgaWYg KGFsaWduVG9Ub3ApCi0gICAgICAgIHJlbmRlcmVyKCktPmVuY2xvc2luZ0xheWVyKCktPnNjcm9s bFJlY3RUb1Zpc2libGUoYm91bmRzLCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVk ZWQsIFNjcm9sbEFsaWdubWVudDo6YWxpZ25Ub3BBbHdheXMpOworICAgICAgICByZW5kZXJlcigp LT5zY3JvbGxSZWN0VG9WaXNpYmxlKGJvdW5kcywgU2Nyb2xsQWxpZ25tZW50OjphbGlnblRvRWRn ZUlmTmVlZGVkLCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9wQWx3YXlzKTsKICAgICBlbHNlCi0g ICAgICAgIHJlbmRlcmVyKCktPmVuY2xvc2luZ0xheWVyKCktPnNjcm9sbFJlY3RUb1Zpc2libGUo Ym91bmRzLCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQsIFNjcm9sbEFsaWdu bWVudDo6YWxpZ25Cb3R0b21BbHdheXMpOworICAgICAgICByZW5kZXJlcigpLT5zY3JvbGxSZWN0 VG9WaXNpYmxlKGJvdW5kcywgU2Nyb2xsQWxpZ25tZW50OjphbGlnblRvRWRnZUlmTmVlZGVkLCBT Y3JvbGxBbGlnbm1lbnQ6OmFsaWduQm90dG9tQWx3YXlzKTsKIH0KIAogdm9pZCBFbGVtZW50Ojpz Y3JvbGxJbnRvVmlld0lmTmVlZGVkKGJvb2wgY2VudGVySWZOZWVkZWQpCkBAIC0yNjMsOSArMjYy LDkgQEAgdm9pZCBFbGVtZW50OjpzY3JvbGxJbnRvVmlld0lmTmVlZGVkKGJvb2wgY2VudGVySWZO ZWVkZWQpCiAKICAgICBMYXlvdXRSZWN0IGJvdW5kcyA9IGdldFJlY3QoKTsKICAgICBpZiAoY2Vu dGVySWZOZWVkZWQpCi0gICAgICAgIHJlbmRlcmVyKCktPmVuY2xvc2luZ0xheWVyKCktPnNjcm9s bFJlY3RUb1Zpc2libGUoYm91bmRzLCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduQ2VudGVySWZOZWVk ZWQsIFNjcm9sbEFsaWdubWVudDo6YWxpZ25DZW50ZXJJZk5lZWRlZCk7CisgICAgICAgIHJlbmRl cmVyKCktPnNjcm9sbFJlY3RUb1Zpc2libGUoYm91bmRzLCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWdu Q2VudGVySWZOZWVkZWQsIFNjcm9sbEFsaWdubWVudDo6YWxpZ25DZW50ZXJJZk5lZWRlZCk7CiAg ICAgZWxzZQotICAgICAgICByZW5kZXJlcigpLT5lbmNsb3NpbmdMYXllcigpLT5zY3JvbGxSZWN0 VG9WaXNpYmxlKGJvdW5kcywgU2Nyb2xsQWxpZ25tZW50OjphbGlnblRvRWRnZUlmTmVlZGVkLCBT Y3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQpOworICAgICAgICByZW5kZXJlcigp LT5zY3JvbGxSZWN0VG9WaXNpYmxlKGJvdW5kcywgU2Nyb2xsQWxpZ25tZW50OjphbGlnblRvRWRn ZUlmTmVlZGVkLCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQpOwogfQogCiB2 b2lkIEVsZW1lbnQ6OnNjcm9sbEJ5VW5pdHMoaW50IHVuaXRzLCBTY3JvbGxHcmFudWxhcml0eSBn cmFudWxhcml0eSkKQEAgLTE1NzcsNyArMTU3Niw3IEBAIHZvaWQgRWxlbWVudDo6dXBkYXRlRm9j dXNBcHBlYXJhbmNlKGJvb2wgLypyZXN0b3JlUHJldmlvdXNTZWxlY3Rpb24qLykKICAgICAgICAg ICAgIGZyYW1lLT5zZWxlY3Rpb24oKS0+cmV2ZWFsU2VsZWN0aW9uKCk7CiAgICAgICAgIH0KICAg ICB9IGVsc2UgaWYgKHJlbmRlcmVyKCkgJiYgIXJlbmRlcmVyKCktPmlzV2lkZ2V0KCkpCi0gICAg ICAgIHJlbmRlcmVyKCktPmVuY2xvc2luZ0xheWVyKCktPnNjcm9sbFJlY3RUb1Zpc2libGUoZ2V0 UmVjdCgpKTsKKyAgICAgICAgcmVuZGVyZXIoKS0+c2Nyb2xsUmVjdFRvVmlzaWJsZShnZXRSZWN0 KCkpOwogfQogCiB2b2lkIEVsZW1lbnQ6OmJsdXIoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZWRpdGluZy9FZGl0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3Bw CmluZGV4IDI5NGViOTRiNTI3Yjg2OWE5MjM1NGNhYzZkOTkxYWFhMmVmZjI0MjQuLmZlOGU1N2M1 MTRhODE4NmZkNTQ4MTViODI0ODJlZTcxNzI1ZmVmY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvRWRpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRv ci5jcHAKQEAgLTcwLDcgKzcwLDYgQEAKICNpbmNsdWRlICJUZXh0Q2hlY2tpbmdIZWxwZXIuaCIK ICNpbmNsdWRlICJSZW1vdmVGb3JtYXRDb21tYW5kLmgiCiAjaW5jbHVkZSAiUmVuZGVyQmxvY2su aCIKLSNpbmNsdWRlICJSZW5kZXJMYXllci5oIgogI2luY2x1ZGUgIlJlbmRlclBhcnQuaCIKICNp bmNsdWRlICJSZW5kZXJUZXh0Q29udHJvbC5oIgogI2luY2x1ZGUgIlJlbmRlcmVkUG9zaXRpb24u aCIKQEAgLTI3MzAsNyArMjcyOSw3IEBAIFBhc3NSZWZQdHI8UmFuZ2U+IEVkaXRvcjo6ZmluZFN0 cmluZ0FuZFNjcm9sbFRvVmlzaWJsZShjb25zdCBTdHJpbmcmIHRhcmdldCwgUmFuCiAgICAgaWYg KCFuZXh0TWF0Y2gpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgbmV4dE1hdGNoLT5maXJzdE5v ZGUoKS0+cmVuZGVyZXIoKS0+ZW5jbG9zaW5nTGF5ZXIoKS0+c2Nyb2xsUmVjdFRvVmlzaWJsZShu ZXh0TWF0Y2gtPmJvdW5kaW5nQm94KCksCisgICAgbmV4dE1hdGNoLT5maXJzdE5vZGUoKS0+cmVu ZGVyZXIoKS0+c2Nyb2xsUmVjdFRvVmlzaWJsZShuZXh0TWF0Y2gtPmJvdW5kaW5nQm94KCksCiAg ICAgICAgIFNjcm9sbEFsaWdubWVudDo6YWxpZ25DZW50ZXJJZk5lZWRlZCwgU2Nyb2xsQWxpZ25t ZW50OjphbGlnbkNlbnRlcklmTmVlZGVkKTsKIAogICAgIHJldHVybiBuZXh0TWF0Y2gucmVsZWFz ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcAppbmRleCA5NmU4 NjE4NGVmZGIyNDY1Zjg2NDRkZDNkN2ZlZjlmNmQ4M2FhOTZmLi44MzgyM2Q1OWFkOTcwMDhhMjkz MWY1OGYyOTQ0YTQwYThkMWJmOTIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L0ZyYW1lU2VsZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2Vs ZWN0aW9uLmNwcApAQCAtNTAsNyArNTAsNiBAQAogI2luY2x1ZGUgIklubGluZVRleHRCb3guaCIK ICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUmFuZ2UuaCIKLSNpbmNsdWRlICJSZW5kZXJM YXllci5oIgogI2luY2x1ZGUgIlJlbmRlclRleHQuaCIKICNpbmNsdWRlICJSZW5kZXJUZXh0Q29u dHJvbC5oIgogI2luY2x1ZGUgIlJlbmRlclRoZW1lLmgiCkBAIC0xOTUzLDEwICsxOTUyLDggQEAg dm9pZCBGcmFtZVNlbGVjdGlvbjo6cmV2ZWFsU2VsZWN0aW9uKGNvbnN0IFNjcm9sbEFsaWdubWVu dCYgYWxpZ25tZW50LCBib29sIHJldmUKICAgICAgICAgLy8gRklYTUU6IFRoaXMgY29kZSBvbmx5 IGhhbmRsZXMgc2Nyb2xsaW5nIHRoZSBzdGFydENvbnRhaW5lcidzIGxheWVyLCBidXQKICAgICAg ICAgLy8gdGhlIHNlbGVjdGlvbiByZWN0IGNvdWxkIGludGVyc2VjdCBtb3JlIHRoYW4ganVzdCB0 aGF0LgogICAgICAgICAvLyBTZWUgPHJkYXI6Ly9wcm9ibGVtLzQ3OTk4OTk+LgotICAgICAgICBp ZiAoUmVuZGVyTGF5ZXIqIGxheWVyID0gc3RhcnQuZGVwcmVjYXRlZE5vZGUoKS0+cmVuZGVyZXIo KS0+ZW5jbG9zaW5nTGF5ZXIoKSkgewotICAgICAgICAgICAgbGF5ZXItPnNjcm9sbFJlY3RUb1Zp c2libGUocmVjdCwgYWxpZ25tZW50LCBhbGlnbm1lbnQpOworICAgICAgICBpZiAoc3RhcnQuZGVw cmVjYXRlZE5vZGUoKS0+cmVuZGVyZXIoKS0+c2Nyb2xsUmVjdFRvVmlzaWJsZShyZWN0LCBhbGln bm1lbnQsIGFsaWdubWVudCkpCiAgICAgICAgICAgICB1cGRhdGVBcHBlYXJhbmNlKCk7Ci0gICAg ICAgIH0KICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCBjZjExZTVm NThhOGZiYmIzNTRhNjUwNWU1NDQ4NWNmZTI4NGY3ZTViLi5jMTFiZDJjMWJkYzEzMGE3Y2FkNjI4 MGFjOTllY2Y1MTVlMTZhMTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0yMjQ4 LDcgKzIyNDgsNyBAQCB2b2lkIEZyYW1lVmlldzo6c2Nyb2xsVG9BbmNob3IoKQogCiAgICAgLy8g U2Nyb2xsIG5lc3RlZCBsYXllcnMgYW5kIGZyYW1lcyB0byByZXZlYWwgdGhlIGFuY2hvci4KICAg ICAvLyBBbGlnbiB0byB0aGUgdG9wIGFuZCB0byB0aGUgY2xvc2VzdCBzaWRlICh0aGlzIG1hdGNo ZXMgb3RoZXIgYnJvd3NlcnMpLgotICAgIGFuY2hvck5vZGUtPnJlbmRlcmVyKCktPmVuY2xvc2lu Z0xheWVyKCktPnNjcm9sbFJlY3RUb1Zpc2libGUocmVjdCwgU2Nyb2xsQWxpZ25tZW50OjphbGln blRvRWRnZUlmTmVlZGVkLCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9wQWx3YXlzKTsKKyAgICBh bmNob3JOb2RlLT5yZW5kZXJlcigpLT5zY3JvbGxSZWN0VG9WaXNpYmxlKHJlY3QsIFNjcm9sbEFs aWdubWVudDo6YWxpZ25Ub0VkZ2VJZk5lZWRlZCwgU2Nyb2xsQWxpZ25tZW50OjphbGlnblRvcEFs d2F5cyk7CiAKICAgICBpZiAoQVhPYmplY3RDYWNoZTo6YWNjZXNzaWJpbGl0eUVuYWJsZWQoKSkK ICAgICAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNoZSgpLT5oYW5kbGVTY3Jv bGxlZFRvQW5jaG9yKGFuY2hvck5vZGUuZ2V0KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuaAppbmRleCA2MGI3NjZkNzk5ZDUyYTYyZGUwNWU3NDg1MjE5Y2VhMjRlZWM1N2Vh Li42NjFiODZiNjdmODQ1NTMxMTQ0YTU2Y2Y1MTU5NmE5N2JiM2U1NTMwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtNDksNyArNDksNiBAQAogI2VuZGlmCiAjaW5j bHVkZSAiUGFpbnRJbmZvLmgiCiAjaW5jbHVkZSAiUmVuZGVyQm94LmgiCi0jaW5jbHVkZSAiU2Ny b2xsQmVoYXZpb3IuaCIKICNpbmNsdWRlICJTY3JvbGxhYmxlQXJlYS5oIgogI2luY2x1ZGUgPHd0 Zi9Pd25QdHIuaD4KIApAQCAtMzAxLDcgKzMwMCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNjcm9s bFRvWE9mZnNldChpbnQgeCwgU2Nyb2xsT2Zmc2V0Q2xhbXBpbmcgY2xhbXAgPSBTY3JvbGxPZmZz ZXRVbmNsYW1wZWQpIHsgc2Nyb2xsVG9PZmZzZXQoeCwgc2Nyb2xsWU9mZnNldCgpLCBjbGFtcCk7 IH0KICAgICB2b2lkIHNjcm9sbFRvWU9mZnNldChpbnQgeSwgU2Nyb2xsT2Zmc2V0Q2xhbXBpbmcg Y2xhbXAgPSBTY3JvbGxPZmZzZXRVbmNsYW1wZWQpIHsgc2Nyb2xsVG9PZmZzZXQoc2Nyb2xsWE9m ZnNldCgpLCB5LCBjbGFtcCk7IH0KIAotICAgIHZvaWQgc2Nyb2xsUmVjdFRvVmlzaWJsZShjb25z dCBMYXlvdXRSZWN0JiwgY29uc3QgU2Nyb2xsQWxpZ25tZW50JiBhbGlnblggPSBTY3JvbGxBbGln bm1lbnQ6OmFsaWduQ2VudGVySWZOZWVkZWQsIGNvbnN0IFNjcm9sbEFsaWdubWVudCYgYWxpZ25Z ID0gU2Nyb2xsQWxpZ25tZW50OjphbGlnbkNlbnRlcklmTmVlZGVkKTsKKyAgICB2b2lkIHNjcm9s bFJlY3RUb1Zpc2libGUoY29uc3QgTGF5b3V0UmVjdCYsIGNvbnN0IFNjcm9sbEFsaWdubWVudCYg YWxpZ25YLCBjb25zdCBTY3JvbGxBbGlnbm1lbnQmIGFsaWduWSk7CiAKICAgICBMYXlvdXRSZWN0 IGdldFJlY3RUb0V4cG9zZShjb25zdCBMYXlvdXRSZWN0JiB2aXNpYmxlUmVjdCwgY29uc3QgTGF5 b3V0UmVjdCYgZXhwb3NlUmVjdCwgY29uc3QgU2Nyb2xsQWxpZ25tZW50JiBhbGlnblgsIGNvbnN0 IFNjcm9sbEFsaWdubWVudCYgYWxpZ25ZKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyT2JqZWN0LmNwcAppbmRleCBiZjkyMDFhMDVlZWIzYWQxMGI0N2U3MDA1NWRiM2VjYjlmZjJk OThmLi4yNTA0YWYwMmJhNDJhY2UwZjQyYWIyMGYzNTkwOTQ2ZTc5Y2E1ZWE3IDEwMDc1NQotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAtNTMzLDYgKzUzMywxNiBAQCBS ZW5kZXJMYXllciogUmVuZGVyT2JqZWN0OjplbmNsb3NpbmdMYXllcigpIGNvbnN0CiAgICAgcmV0 dXJuIDA7CiB9CiAKK2Jvb2wgUmVuZGVyT2JqZWN0OjpzY3JvbGxSZWN0VG9WaXNpYmxlKGNvbnN0 IExheW91dFJlY3QmIHJlY3QsIGNvbnN0IFNjcm9sbEFsaWdubWVudCYgYWxpZ25YLCBjb25zdCBT Y3JvbGxBbGlnbm1lbnQmIGFsaWduWSkKK3sKKyAgICBSZW5kZXJMYXllciogZW5jbG9zaW5nTGF5 ZXIgPSB0aGlzLT5lbmNsb3NpbmdMYXllcigpOworICAgIGlmICghZW5jbG9zaW5nTGF5ZXIpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGVuY2xvc2luZ0xheWVyLT5zY3JvbGxSZWN0VG9W aXNpYmxlKHJlY3QsIGFsaWduWCwgYWxpZ25ZKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogUmVu ZGVyQm94KiBSZW5kZXJPYmplY3Q6OmVuY2xvc2luZ0JveCgpIGNvbnN0CiB7CiAgICAgUmVuZGVy T2JqZWN0KiBjdXJyID0gY29uc3RfY2FzdDxSZW5kZXJPYmplY3QqPih0aGlzKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAppbmRleCBmYjNkZWE5Yjc3YmJjMjVhMDRlOTM4 ZDY1NDM4MTk1MmViMmVjMmQ5Li4wYjAzZTQxMDcyMzM5MTQ1YTdkNmU0NTgwZDA3ZWNjZGI5MDkz MTM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCkBAIC0zNSw2ICsz NSw3IEBACiAjaW5jbHVkZSAiUGFpbnRQaGFzZS5oIgogI2luY2x1ZGUgIlJlbmRlck9iamVjdENo aWxkTGlzdC5oIgogI2luY2x1ZGUgIlJlbmRlclN0eWxlLmgiCisjaW5jbHVkZSAiU2Nyb2xsQmVo YXZpb3IuaCIKICNpbmNsdWRlICJUZXh0QWZmaW5pdHkuaCIKICNpbmNsdWRlICJUcmFuc2Zvcm1h dGlvbk1hdHJpeC5oIgogI2luY2x1ZGUgPHd0Zi9VbnVzZWRQYXJhbS5oPgpAQCAtMjAxLDYgKzIw Miw5IEBAIHB1YmxpYzoKICAgICB2b2lkIG1vdmVMYXllcnMoUmVuZGVyTGF5ZXIqIG9sZFBhcmVu dCwgUmVuZGVyTGF5ZXIqIG5ld1BhcmVudCk7CiAgICAgUmVuZGVyTGF5ZXIqIGZpbmROZXh0TGF5 ZXIoUmVuZGVyTGF5ZXIqIHBhcmVudExheWVyLCBSZW5kZXJPYmplY3QqIHN0YXJ0UG9pbnQsIGJv b2wgY2hlY2tQYXJlbnQgPSB0cnVlKTsKIAorICAgIC8vIFNjcm9sbGluZyBpcyBhIFJlbmRlckJv eCBjb25jZXB0LCBob3dldmVyIHNvbWUgY29kZSBqdXN0IGNhcmVzIGFib3V0IHJlY3Vyc2l2ZWx5 IHNjcm9sbGluZyBvdXIgZW5jbG9zaW5nIFNjcm9sbGFibGVBcmVhKHMpLgorICAgIGJvb2wgc2Ny b2xsUmVjdFRvVmlzaWJsZShjb25zdCBMYXlvdXRSZWN0JiwgY29uc3QgU2Nyb2xsQWxpZ25tZW50 JiBhbGlnblggPSBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduQ2VudGVySWZOZWVkZWQsIGNvbnN0IFNj cm9sbEFsaWdubWVudCYgYWxpZ25ZID0gU2Nyb2xsQWxpZ25tZW50OjphbGlnbkNlbnRlcklmTmVl ZGVkKTsKKwogICAgIC8vIENvbnZlbmllbmNlIGZ1bmN0aW9uIGZvciBnZXR0aW5nIHRvIHRoZSBu ZWFyZXN0IGVuY2xvc2luZyBib3ggb2YgYSBSZW5kZXJPYmplY3QuCiAgICAgUmVuZGVyQm94KiBl bmNsb3NpbmdCb3goKSBjb25zdDsKICAgICBSZW5kZXJCb3hNb2RlbE9iamVjdCogZW5jbG9zaW5n Qm94TW9kZWxPYmplY3QoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViRnJhbWUubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1t CmluZGV4IDIyNTMxNGZhZGM0OGI4ZmU3ZDhhM2VmMzViZWUxMjU5MWVlM2Y2NWEuLmRmODc0ODQ1 MTQ3NWNkZDJjZTUyMjI3YTVmZTJkYzVhZjcwNDA4ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmll dy9XZWJGcmFtZS5tbQpAQCAtODAsNyArODAsNiBAQAogI2ltcG9ydCA8V2ViQ29yZS9QbGF0Zm9y bUV2ZW50RmFjdG9yeU1hYy5oPgogI2ltcG9ydCA8V2ViQ29yZS9QbHVnaW5EYXRhLmg+CiAjaW1w b3J0IDxXZWJDb3JlL1ByaW50Q29udGV4dC5oPgotI2ltcG9ydCA8V2ViQ29yZS9SZW5kZXJMYXll ci5oPgogI2ltcG9ydCA8V2ViQ29yZS9SZW5kZXJQYXJ0Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1Jl bmRlclZpZXcuaD4KICNpbXBvcnQgPFdlYkNvcmUvUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQuaD4K QEAgLTYzMiwxMSArNjMxLDggQEAgc3RhdGljIGlubGluZSBXZWJEYXRhU291cmNlICpkYXRhU291 cmNlKERvY3VtZW50TG9hZGVyKiBsb2FkZXIpCiAgICAgTlNSZWN0IHJhbmdlUmVjdCA9IFtzZWxm IF9maXJzdFJlY3RGb3JET01SYW5nZTpyYW5nZV07ICAgIAogICAgIE5vZGUgKnN0YXJ0Tm9kZSA9 IGNvcmUoW3JhbmdlIHN0YXJ0Q29udGFpbmVyXSk7CiAgICAgICAgIAotICAgIGlmIChzdGFydE5v ZGUgJiYgc3RhcnROb2RlLT5yZW5kZXJlcigpKSB7Ci0gICAgICAgIFJlbmRlckxheWVyICpsYXll ciA9IHN0YXJ0Tm9kZS0+cmVuZGVyZXIoKS0+ZW5jbG9zaW5nTGF5ZXIoKTsKLSAgICAgICAgaWYg KGxheWVyKQotICAgICAgICAgICAgbGF5ZXItPnNjcm9sbFJlY3RUb1Zpc2libGUoZW5jbG9zaW5n SW50UmVjdChyYW5nZVJlY3QpLCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQs IFNjcm9sbEFsaWdubWVudDo6YWxpZ25Ub0VkZ2VJZk5lZWRlZCk7Ci0gICAgfQorICAgIGlmIChz dGFydE5vZGUgJiYgc3RhcnROb2RlLT5yZW5kZXJlcigpKQorICAgICAgICBzdGFydE5vZGUtPnJl bmRlcmVyKCktPnNjcm9sbFJlY3RUb1Zpc2libGUoZW5jbG9zaW5nSW50UmVjdChyYW5nZVJlY3Qp LCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQsIFNjcm9sbEFsaWdubWVudDo6 YWxpZ25Ub0VkZ2VJZk5lZWRlZCk7CiB9CiAKIC0gKEJPT0wpX25lZWRzTGF5b3V0Cg==