110311 2013-02-19 23:48:24 -0800 [WK2] Remove m_viewportSize in WebPage. 2013-02-20 17:00:22 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 110299 110066 1 dongseong.hwang dongseong.hwang abecsi andersca benjamin cmarcelo jturcotte kenneth menard noam simon.fraser webkit.review.bot oldest_to_newest 837223 0 dongseong.hwang 2013-02-19 23:48:24 -0800 EFL and Qt use m_viewSize as a contents size while Apple use it as a viewport size, so EFL and Qt introduced m_viewportSize to make WebPage know a viewport size. EFL and Qt use m_viewSize as a contents size because the size of non compositing layer is contents size, and EFL and Qt mark whole non compositing layer as dirty using m_viewSize. Bug 110299 (http://webkit.org/b/110299) changes that it is not necessary to know m_viewSize when marking whole non compositing layer as dirty. So we can make EFL and Qt use m_viewSize as a viewport size also. This patch removes m_viewportSize and related methods to increase readability. 837226 1 189256 dongseong.hwang 2013-02-19 23:52:57 -0800 Created attachment 189256 Patch 837525 2 189256 andersca 2013-02-20 09:45:46 -0800 Comment on attachment 189256 Patch I'm glad that m_viewSize now means viewport size everywhere, r=me. 837549 3 189256 webkit.review.bot 2013-02-20 10:25:25 -0800 Comment on attachment 189256 Patch Clearing flags on attachment: 189256 Committed r143474: <http://trac.webkit.org/changeset/143474> 837550 4 webkit.review.bot 2013-02-20 10:25:29 -0800 All reviewed patches have been landed. Closing bug. 837952 5 dongseong.hwang 2013-02-20 17:00:22 -0800 (In reply to comment #2) > (From update of attachment 189256 [details]) > I'm glad that m_viewSize now means viewport size everywhere, r=me. Thank you for review. I'm glad too :) 189256 2013-02-19 23:52:57 -0800 2013-02-20 10:25:24 -0800 Patch bug-110311-20130220164817.patch text/plain 12893 dongseong.hwang U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGY3MjZmNmFhMjU4YWZi NzY5ODBkMTEzZDg1ZjZmMTQzZDU5YjY0ZC4uOTNiZTczNTExMWQ3NjQ4YTIxYmVlM2ZkOTk0ZTA1 ZWZiMGE3NDIwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ0IEBACiAyMDEzLTAyLTE5ICBIdWFu ZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgogCisgICAgICAgIFtXSzJdIFJl bW92ZSBtX3ZpZXdwb3J0U2l6ZSBpbiBXZWJQYWdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMzExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRUZMIGFuZCBRdCB1c2UgbV92aWV3U2l6ZSBhcyBhIGNv bnRlbnRzIHNpemUgd2hpbGUgQXBwbGUgdXNlIGl0IGFzIGEgdmlld3BvcnQKKyAgICAgICAgc2l6 ZSwgc28gRUZMIGFuZCBRdCBpbnRyb2R1Y2VkIG1fdmlld3BvcnRTaXplIHRvIG1ha2UgV2ViUGFn ZSBrbm93IGEgdmlld3BvcnQKKyAgICAgICAgc2l6ZS4KKworICAgICAgICBFRkwgYW5kIFF0IHVz ZSBtX3ZpZXdTaXplIGFzIGEgY29udGVudHMgc2l6ZSBiZWNhdXNlIHRoZSBzaXplIG9mIG5vbiBj b21wb3NpdGluZworICAgICAgICBsYXllciBpcyBjb250ZW50cyBzaXplLCBhbmQgRUZMIGFuZCBR dCBtYXJrIHdob2xlIG5vbiBjb21wb3NpdGluZyBsYXllciBhcyBkaXJ0eQorICAgICAgICB1c2lu ZyBtX3ZpZXdTaXplLiBCdWcgMTEwMjk5IChodHRwOi8vd2Via2l0Lm9yZy9iLzExMDI5OSkgY2hh bmdlcyB0aGF0IGl0IGlzIG5vdAorICAgICAgICBuZWNlc3NhcnkgdG8ga25vdyBtX3ZpZXdTaXpl IHdoZW4gbWFya2luZyB3aG9sZSBub24gY29tcG9zaXRpbmcgbGF5ZXIgYXMgZGlydHkuCisgICAg ICAgIFNvIHdlIGNhbiBtYWtlIEVGTCBhbmQgUXQgdXNlIG1fdmlld1NpemUgYXMgYSB2aWV3cG9y dCBzaXplIGFsc28uCisKKyAgICAgICAgVGhpcyBwYXRjaCByZW1vdmVzIG1fdmlld3BvcnRTaXpl IGFuZCByZWxhdGVkIG1ldGhvZHMgdG8gaW5jcmVhc2UgcmVhZGFiaWxpdHkuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL3F0L3Jhdy9xcmF3d2Vidmlldy5jcHA6CisgICAgICAgIChRUmF3V2Vi Vmlldzo6c2V0U2l6ZSk6CisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xs ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkaWRDaGFu Z2VWaWV3cG9ydFNpemUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6Cisg ICAgICAgIChXZWJQYWdlUHJveHkpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50 OjpwYWdlUmVjdCk6CisgICAgICAgIChXZWJLaXQ6OldlYkNocm9tZUNsaWVudDo6Y29udGVudHNT aXplQ2hhbmdlZCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1w bC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhSW1wbDo6dXBkYXRlQmFja2luZ1N0 b3JlU3RhdGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0U2l6ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OnNlbmRWaWV3cG9ydEF0dHJpYnV0ZXNDaGFuZ2VkKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAoV2ViUGFnZSk6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46CisKKzIwMTMtMDItMTkgIEh1YW5nIERv bmdzdW5nICA8bHV4dGVsbGFAY29tcGFueTEwMC5uZXQ+CisKICAgICAgICAgW1dLMl0gYWRkIHNl dE5lZWRzRGlzcGxheSBpbiBEcmF3aW5nQXJlYSB0byBtYXJrIHdob2xlIGxheWVyIGFzIGRpcnR5 LgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMjk5 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcmF3L3FyYXd3 ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcmF3L3FyYXd3ZWJ2 aWV3LmNwcAppbmRleCAzODk5MWRkZjY1YzFjM2UzYzcxNmE2ZDYwOWRjZDdmYzkyMDJkMDRkLi40 YWEzNTMzNzdmMTQyN2M1MTZlOTVlOWJiN2JhYmI2Njg0NWE5MmQ3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Jhdy9xcmF3d2Vidmlldy5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9yYXcvcXJhd3dlYnZpZXcuY3BwCkBAIC0zNDQs NyArMzQ0LDcgQEAgdm9pZCBRUmF3V2ViVmlldzo6c2V0U2l6ZShjb25zdCBRU2l6ZSYgc2l6ZSkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKGQtPm1fd2ViUGFnZVByb3h5LT51c2VGaXhlZExh eW91dCgpKQotICAgICAgICBkLT5tX3dlYlBhZ2VQcm94eS0+c2V0Vmlld3BvcnRTaXplKHNpemUp OworICAgICAgICBkcmF3aW5nQXJlYS0+c2V0U2l6ZShzaXplLCBXZWJDb3JlOjpJbnRTaXplKCkp OwogCiAgICAgZC0+bV9zaXplID0gc2l6ZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwCmluZGV4IDFhOWJkZTZkZTVjNzUzMmIz YjhjN2Y5MWNkNDVjMDY4NmVkNTZkMzAuLjBmNmJkMjIzMGVlZmU0NGU1M2JmY2QzNjAyZDY5MWIx MzU0Mjc3MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3Bv cnRDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdw b3J0Q29udHJvbGxlci5jcHAKQEAgLTI1MSw3ICsyNTEsNyBAQCB2b2lkIFBhZ2VWaWV3cG9ydENv bnRyb2xsZXI6OmRpZENoYW5nZVZpZXdwb3J0U2l6ZShjb25zdCBGbG9hdFNpemUmIG5ld1NpemUp CiAKICAgICAvLyBMZXQgdGhlIFdlYlByb2Nlc3Mga25vdyBhYm91dCB0aGUgbmV3IHZpZXdwb3J0 IHNpemUsIHNvIHRoYXQKICAgICAvLyBpdCBjYW4gcmVzaXplIHRoZSBjb250ZW50IGFjY29yZGlu Z2x5LgotICAgIG1fd2ViUGFnZVByb3h5LT5zZXRWaWV3cG9ydFNpemUocm91bmRlZEludFNpemUo bmV3U2l6ZSkpOworICAgIG1fd2ViUGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpLT5zZXRTaXplKHJv dW5kZWRJbnRTaXplKG5ld1NpemUpLCBJbnRTaXplKCkpOwogfQogCiB2b2lkIFBhZ2VWaWV3cG9y dENvbnRyb2xsZXI6OmRpZENoYW5nZUNvbnRlbnRzVmlzaWJpbGl0eShjb25zdCBGbG9hdFBvaW50 JiBwb3NpdGlvbiwgZmxvYXQgc2NhbGUsIGNvbnN0IEZsb2F0UG9pbnQmIHRyYWplY3RvcnlWZWN0 b3IpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDEyOWRm YjE5Y2I2NjA5MzY4MTQ1NzBkMGI1ODQyNGNiNTcxZTg0YTIuLjFiNTk5YTZiMmIyM2NkMzdlOGYz Y2UyYTQyN2M5MTA2MmJlN2QyNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCkBAIC0xMDA4LDE0ICsxMDA4LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmV4ZWN1 dGVFZGl0Q29tbWFuZChjb25zdCBTdHJpbmcmIGNvbW1hbmROYW1lKQogfQogICAgIAogI2lmIFVT RShUSUxFRF9CQUNLSU5HX1NUT1JFKQotdm9pZCBXZWJQYWdlUHJveHk6OnNldFZpZXdwb3J0U2l6 ZShjb25zdCBJbnRTaXplJiBzaXplKQotewotICAgIGlmICghaXNWYWxpZCgpKQotICAgICAgICBy ZXR1cm47Ci0KLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldFZpZXdw b3J0U2l6ZShzaXplKSwgbV9wYWdlSUQpOwotfQotCiB2b2lkIFdlYlBhZ2VQcm94eTo6Y29tbWl0 UGFnZVRyYW5zaXRpb25WaWV3cG9ydCgpCiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggMmE3ODFkNTFmM2IyOWRiYmQ0Nzli NzQ4NDY5MzJmNDc3ZmJmMTNlMy4uYTkwZWJjN2I3MzIyNTNjYTRlNDJmNjg1OTBhZmZhYjkxMGY0 NDQ5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtNDE5LDcg KzQxOSw2IEBAIHB1YmxpYzoKICAgICBQbGF0Zm9ybVdpZGdldCB2aWV3V2lkZ2V0KCk7CiAjZW5k aWYKICNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKLSAgICB2b2lkIHNldFZpZXdwb3J0U2l6 ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7CiAgICAgdm9pZCBjb21taXRQYWdlVHJhbnNpdGlv blZpZXdwb3J0KCk7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCmluZGV4IGRmYWJh OGI1NmQxZWQwMjhhYmY0YWMwYmYyOTVlY2Q0ZWUxN2I4ODUuLmQ1YjY3ZmNkMDM5N2I5MzU4YTli NTQ5NDViNDVhMDQ0M2RjNDU1YTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKQEAgLTExOSwx MSArMTE5LDcgQEAgRmxvYXRSZWN0IFdlYkNocm9tZUNsaWVudDo6d2luZG93UmVjdCgpCiAKIEZs b2F0UmVjdCBXZWJDaHJvbWVDbGllbnQ6OnBhZ2VSZWN0KCkKIHsKLSNpZiBVU0UoVElMRURfQkFD S0lOR19TVE9SRSkKLSAgICByZXR1cm4gRmxvYXRSZWN0KEZsb2F0UG9pbnQoKSwgbV9wYWdlLT52 aWV3cG9ydFNpemUoKSk7Ci0jZWxzZQogICAgIHJldHVybiBGbG9hdFJlY3QoRmxvYXRQb2ludCgp LCBtX3BhZ2UtPnNpemUoKSk7Ci0jZW5kaWYKIH0KIAogdm9pZCBXZWJDaHJvbWVDbGllbnQ6OmZv Y3VzKCkKQEAgLTQ0NiwxNCArNDQyLDExIEBAIHZvaWQgV2ViQ2hyb21lQ2xpZW50Ojpjb250ZW50 c1NpemVDaGFuZ2VkKEZyYW1lKiBmcmFtZSwgY29uc3QgSW50U2l6ZSYgc2l6ZSkgY29uCiAgICAg aWYgKGZyYW1lLT5wYWdlKCktPm1haW5GcmFtZSgpICE9IGZyYW1lKQogICAgICAgICByZXR1cm47 CiAKLSNpZiBQTEFURk9STShRVCkgfHwgUExBVEZPUk0oRUZMKQotICAgIGlmIChtX3BhZ2UtPnVz ZUZpeGVkTGF5b3V0KCkpIHsKLSAgICAgICAgLy8gVGhlIGJlbG93IG1ldGhvZCB1cGRhdGVzIHRo ZSBzaXplKCkuCi0gICAgICAgIG1fcGFnZS0+cmVzaXplVG9Db250ZW50c0lmTmVlZGVkKCk7Ci0g ICAgICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+bGF5ZXJUcmVlSG9zdCgpLT5zaXplRGlkQ2hh bmdlKG1fcGFnZS0+c2l6ZSgpKTsKLSAgICB9CisjaWYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNT KQorICAgIGlmIChtX3BhZ2UtPnVzZUZpeGVkTGF5b3V0KCkpCisgICAgICAgIG1fcGFnZS0+ZHJh d2luZ0FyZWEoKS0+bGF5ZXJUcmVlSG9zdCgpLT5zaXplRGlkQ2hhbmdlKHNpemUpOwogCi0gICAg bV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZUNvbnRlbnRzU2l6 ZShtX3BhZ2UtPnNpemUoKSkpOworICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpEaWRDaGFuZ2VDb250ZW50c1NpemUoc2l6ZSkpOwogI2VuZGlmCiAKICAgICBtX3BhZ2Ut PmRyYXdpbmdBcmVhKCktPm1haW5GcmFtZUNvbnRlbnRTaXplQ2hhbmdlZChzaXplKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwu Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5j cHAKaW5kZXggYjg4MDA1MjJiZDRkMWQxOTE5MTRmZjdiODExZDQ2MDY5NTE2ZmQ5Mi4uZTliNmRl YTZiMzY3YzlkZjAwNGNiNmVjNTdmZTRlNDgwZjZlYThkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAKQEAgLTM5Myw5 ICszOTMsMTEgQEAgdm9pZCBEcmF3aW5nQXJlYUltcGw6OnVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRl KHVpbnQ2NF90IHN0YXRlSUQsIGJvb2wgcmVzcG9uZEltbWUKICAgICAgICAgbV93ZWJQYWdlLT5z Y3JvbGxNYWluRnJhbWVJZk5vdEF0TWF4U2Nyb2xsUG9zaXRpb24oc2Nyb2xsT2Zmc2V0KTsKIAog ICAgICAgICBpZiAobV9sYXllclRyZWVIb3N0KSB7Ci0gICAgICAgICAgICAvLyBVc2UgdGhlIHBy ZXZpb3VzbHkgc2V0IHBhZ2Ugc2l6ZSBpbnN0ZWFkIG9mIHRoZSBhcmd1bWVudC4KLSAgICAgICAg ICAgIC8vIEl0IGdldHMgYWRqdXN0ZWQgcHJvcGVybHkgd2hlbiB1c2luZyB0aGUgZml4ZWQgbGF5 b3V0IG1vZGUuCi0gICAgICAgICAgICBtX2xheWVyVHJlZUhvc3QtPnNpemVEaWRDaGFuZ2UobV93 ZWJQYWdlLT5zaXplKCkpOworI2lmIFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKKyAgICAgICAg ICAgIC8vIENvb3JkaW5hdGVkIEdyYXBoaWNzIHNldHMgdGhlIHNpemUgb2YgdGhlIHJvb3QgbGF5 ZXIgdG8gY29udGVudHMgc2l6ZS4KKyAgICAgICAgICAgIGlmICghbV93ZWJQYWdlLT51c2VGaXhl ZExheW91dCgpKQorI2VuZGlmCisgICAgICAgICAgICAgICAgbV9sYXllclRyZWVIb3N0LT5zaXpl RGlkQ2hhbmdlKG1fd2ViUGFnZS0+c2l6ZSgpKTsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAg ICBtX2RpcnR5UmVnaW9uID0gbV93ZWJQYWdlLT5ib3VuZHMoKTsKICAgICB9IGVsc2UgewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDgxMWNh NjkwNWUxMTlmMzlkMjAwZmNjMTBjMzkyNTBhMDIyZWM5NGUuLjE2MDFkMTk0Nzg3ZmFkYmFhZWI5 OGNlMjkwZWM1ZmVkZmQ0YTM0MWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTk3OSwxMiArOTc5LDYgQEAgdm9pZCBXZWJQYWdlOjpzZXRT aXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHZpZXdTaXplKQogewogICAgIEZyYW1lVmlldyog dmlldyA9IG1fcGFnZS0+bWFpbkZyYW1lKCktPnZpZXcoKTsKIAotI2lmIFVTRShUSUxFRF9CQUNL SU5HX1NUT1JFKQotICAgIC8vIElmIHdlIGFyZSByZXNpemluZyB0byBjb250ZW50IGlnbm9yZSBl eHRlcm5hbCBhdHRlbXB0cy4KLSAgICBpZiAodmlldy0+dXNlRml4ZWRMYXlvdXQoKSkKLSAgICAg ICAgcmV0dXJuOwotI2VuZGlmCi0KICAgICBpZiAobV92aWV3U2l6ZSA9PSB2aWV3U2l6ZSkKICAg ICAgICAgcmV0dXJuOwogCkBAIC05OTMsNiArOTg3LDExIEBAIHZvaWQgV2ViUGFnZTo6c2V0U2l6 ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiB2aWV3U2l6ZSkKICAgICBtX2RyYXdpbmdBcmVhLT5z ZXROZWVkc0Rpc3BsYXkoKTsKICAgICAKICAgICBtX3ZpZXdTaXplID0gdmlld1NpemU7CisKKyNp ZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKKyAgICBpZiAodmlldy0+dXNlRml4ZWRMYXlvdXQo KSkKKyAgICAgICAgc2VuZFZpZXdwb3J0QXR0cmlidXRlc0NoYW5nZWQoKTsKKyNlbmRpZgogfQog CiAjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCkBAIC0xMDAzLDQzICsxMDAyLDI0IEBAIHZv aWQgV2ViUGFnZTo6c2V0Rml4ZWRWaXNpYmxlQ29udGVudFJlY3QoY29uc3QgSW50UmVjdCYgcmVj dCkKICAgICBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCktPnNldEZpeGVkVmlzaWJsZUNvbnRl bnRSZWN0KHJlY3QpOwogfQogCi12b2lkIFdlYlBhZ2U6OnJlc2l6ZVRvQ29udGVudHNJZk5lZWRl ZCgpCi17Ci0gICAgQVNTRVJUKG1fdXNlRml4ZWRMYXlvdXQpOwotCi0gICAgRnJhbWVWaWV3KiB2 aWV3ID0gbV9wYWdlLT5tYWluRnJhbWUoKS0+dmlldygpOwotCi0gICAgaWYgKCF2aWV3LT51c2VG aXhlZExheW91dCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBJbnRTaXplIG5ld1NpemUgPSB2 aWV3LT5jb250ZW50c1NpemUoKS5leHBhbmRlZFRvKHZpZXctPmZpeGVkTGF5b3V0U2l6ZSgpKTsK LQotICAgIGlmIChuZXdTaXplID09IG1fdmlld1NpemUpCi0gICAgICAgIHJldHVybjsKLQotICAg IG1fdmlld1NpemUgPSBuZXdTaXplOwotICAgIHZpZXctPnJlc2l6ZShuZXdTaXplKTsKLSAgICB2 aWV3LT5zZXROZWVkc0xheW91dCgpOwotfQotCiB2b2lkIFdlYlBhZ2U6OnNlbmRWaWV3cG9ydEF0 dHJpYnV0ZXNDaGFuZ2VkKCkKIHsKICAgICBBU1NFUlQobV91c2VGaXhlZExheW91dCk7CiAKICAg ICAvLyBWaWV3cG9ydCBwcm9wZXJ0aWVzIGhhdmUgbm8gaW1wYWN0IG9uIHplcm8gc2l6ZWQgZml4 ZWQgdmlld3BvcnRzLgotICAgIGlmIChtX3ZpZXdwb3J0U2l6ZS5pc0VtcHR5KCkpCisgICAgaWYg KG1fdmlld1NpemUuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBSZWNhbGN1 bGF0ZSB0aGUgcmVjb21tZW5kZWQgbGF5b3V0IHNpemUsIHdoZW4gdGhlIGF2YWlsYWJsZSBzaXpl IChkZXZpY2UgcGl4ZWwpIGNoYW5nZXMuCiAgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gbV9wYWdl LT5zZXR0aW5ncygpOwogCi0gICAgaW50IG1pbmltdW1MYXlvdXRGYWxsYmFja1dpZHRoID0gc3Rk OjptYXgoc2V0dGluZ3MtPmxheW91dEZhbGxiYWNrV2lkdGgoKSwgbV92aWV3cG9ydFNpemUud2lk dGgoKSk7CisgICAgaW50IG1pbmltdW1MYXlvdXRGYWxsYmFja1dpZHRoID0gc3RkOjptYXgoc2V0 dGluZ3MtPmxheW91dEZhbGxiYWNrV2lkdGgoKSwgbV92aWV3U2l6ZS53aWR0aCgpKTsKIAogICAg IC8vIElmIHVuc2V0ICB3ZSB1c2UgdGhlIHZpZXdwb3J0IGRpbWVuc2lvbnMuIFRoaXMgZml0cyB3 aXRoIHRoZSBiZWhhdmlvciBvZiBkZXNrdG9wIGJyb3dzZXJzLgotICAgIGludCBkZXZpY2VXaWR0 aCA9IChzZXR0aW5ncy0+ZGV2aWNlV2lkdGgoKSA+IDApID8gc2V0dGluZ3MtPmRldmljZVdpZHRo KCkgOiBtX3ZpZXdwb3J0U2l6ZS53aWR0aCgpOwotICAgIGludCBkZXZpY2VIZWlnaHQgPSAoc2V0 dGluZ3MtPmRldmljZUhlaWdodCgpID4gMCkgPyBzZXR0aW5ncy0+ZGV2aWNlSGVpZ2h0KCkgOiBt X3ZpZXdwb3J0U2l6ZS5oZWlnaHQoKTsKKyAgICBpbnQgZGV2aWNlV2lkdGggPSAoc2V0dGluZ3Mt PmRldmljZVdpZHRoKCkgPiAwKSA/IHNldHRpbmdzLT5kZXZpY2VXaWR0aCgpIDogbV92aWV3U2l6 ZS53aWR0aCgpOworICAgIGludCBkZXZpY2VIZWlnaHQgPSAoc2V0dGluZ3MtPmRldmljZUhlaWdo dCgpID4gMCkgPyBzZXR0aW5ncy0+ZGV2aWNlSGVpZ2h0KCkgOiBtX3ZpZXdTaXplLmhlaWdodCgp OwogCi0gICAgVmlld3BvcnRBdHRyaWJ1dGVzIGF0dHIgPSBjb21wdXRlVmlld3BvcnRBdHRyaWJ1 dGVzKG1fcGFnZS0+dmlld3BvcnRBcmd1bWVudHMoKSwgbWluaW11bUxheW91dEZhbGxiYWNrV2lk dGgsIGRldmljZVdpZHRoLCBkZXZpY2VIZWlnaHQsIDEsIG1fdmlld3BvcnRTaXplKTsKKyAgICBW aWV3cG9ydEF0dHJpYnV0ZXMgYXR0ciA9IGNvbXB1dGVWaWV3cG9ydEF0dHJpYnV0ZXMobV9wYWdl LT52aWV3cG9ydEFyZ3VtZW50cygpLCBtaW5pbXVtTGF5b3V0RmFsbGJhY2tXaWR0aCwgZGV2aWNl V2lkdGgsIGRldmljZUhlaWdodCwgMSwgbV92aWV3U2l6ZSk7CiAKICAgICBGcmFtZVZpZXcqIHZp ZXcgPSBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCk7CiAKQEAgLTEwNDgsNyArMTAyOCw3IEBA IHZvaWQgV2ViUGFnZTo6c2VuZFZpZXdwb3J0QXR0cmlidXRlc0NoYW5nZWQoKQogCiAgICAgLy8g UHV0IHRoZSB3aWR0aCBhbmQgaGVpZ2h0IHRvIHRoZSB2aWV3cG9ydCB3aWR0aCBhbmQgaGVpZ2h0 LiBJbiBjc3MgdW5pdHMgaG93ZXZlci4KICAgICAvLyBVc2UgRmxvYXRTaXplIHRvIGF2b2lkIHRy dW5jYXRlZCB2YWx1ZXMgZHVyaW5nIHNjYWxlLgotICAgIEZsb2F0U2l6ZSBjb250ZW50Rml4ZWRT aXplID0gbV92aWV3cG9ydFNpemU7CisgICAgRmxvYXRTaXplIGNvbnRlbnRGaXhlZFNpemUgPSBt X3ZpZXdTaXplOwogCiAjaWYgRU5BQkxFKENTU19ERVZJQ0VfQURBUFRBVElPTikKICAgICAvLyBD U1Mgdmlld3BvcnQgZGVzY3JpcHRvcnMgbWlnaHQgYmUgYXBwbGllZCB0byBhbHJlYWR5IGFmZmVj dGVkIHZpZXdwb3J0IHNpemUKQEAgLTEwNjYsMTkgKzEwNDYsNiBAQCB2b2lkIFdlYlBhZ2U6OnNl bmRWaWV3cG9ydEF0dHJpYnV0ZXNDaGFuZ2VkKCkKIAogICAgIHNlbmQoTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6RGlkQ2hhbmdlVmlld3BvcnRQcm9wZXJ0aWVzKGF0dHIpKTsKIH0KLQotdm9pZCBX ZWJQYWdlOjpzZXRWaWV3cG9ydFNpemUoY29uc3QgSW50U2l6ZSYgc2l6ZSkKLXsKLSAgICBBU1NF UlQobV91c2VGaXhlZExheW91dCk7Ci0KLSAgICBpZiAobV92aWV3cG9ydFNpemUgPT0gc2l6ZSkK LSAgICAgICAgcmV0dXJuOwotCi0gICAgbV92aWV3cG9ydFNpemUgPSBzaXplOwotCi0gICAgc2Vu ZFZpZXdwb3J0QXR0cmlidXRlc0NoYW5nZWQoKTsKLX0KLQogI2VuZGlmCiAKIHZvaWQgV2ViUGFn ZTo6c2Nyb2xsTWFpbkZyYW1lSWZOb3RBdE1heFNjcm9sbFBvc2l0aW9uKGNvbnN0IEludFNpemUm IHNjcm9sbE9mZnNldCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oCmluZGV4IGE2ZTA2MDYwMjcyNTFjNWRiMmMxZGZkZmRiOTgyZWVlZTRiYjI1YjguLmZkNzBi MTdiMzljY2FmNTk1NDNhMjQ0MTNhN2RkNDMxM2NmZTRkNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtMzc0LDEwICszNzQsNyBAQCBwdWJsaWM6 CiAjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAgdm9pZCBwYWdlRGlkUmVxdWVzdFNj cm9sbChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwogICAgIHZvaWQgc2V0Rml4ZWRWaXNpYmxl Q29udGVudFJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpOwotICAgIHZvaWQgcmVzaXplVG9D b250ZW50c0lmTmVlZGVkKCk7CiAgICAgdm9pZCBzZW5kVmlld3BvcnRBdHRyaWJ1dGVzQ2hhbmdl ZCgpOwotICAgIHZvaWQgc2V0Vmlld3BvcnRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsK LSAgICBXZWJDb3JlOjpJbnRTaXplIHZpZXdwb3J0U2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdmll d3BvcnRTaXplOyB9CiAjZW5kaWYKIAogI2lmIEVOQUJMRShDT05URVhUX01FTlVTKQpAQCAtODcx LDEwICs4NjgsNiBAQCBwcml2YXRlOgogI2VuZGlmCiAgICAgSW5qZWN0ZWRCdW5kbGVQYWdlRGlh Z25vc3RpY0xvZ2dpbmdDbGllbnQgbV9sb2dEaWFnbm9zdGljTWVzc2FnZUNsaWVudDsKIAotI2lm IFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQotICAgIFdlYkNvcmU6OkludFNpemUgbV92aWV3cG9y dFNpemU7Ci0jZW5kaWYKLQogICAgIEZpbmRDb250cm9sbGVyIG1fZmluZENvbnRyb2xsZXI7CiAj aWYgRU5BQkxFKFRPVUNIX0VWRU5UUykgJiYgUExBVEZPUk0oUVQpCiAgICAgVGFwSGlnaGxpZ2h0 Q29udHJvbGxlciBtX3RhcEhpZ2hsaWdodENvbnRyb2xsZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmluZGV4IDY3YmNl NmEyZDJmODc5MGEwNjhkYzMwZDlmYzgwMzA3YjE1N2QyZGUuLmM1Y2E5YWY2NWUzYjc4YmU3YmM4 N2FlODAyMzBjYThlZTE5YzVkM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCkBAIC0xMTYsMTAgKzExNiw2IEBAIG1l c3NhZ2VzIC0+IFdlYlBhZ2UgTGVnYWN5UmVjZWl2ZXIgewogICAgIFN1c3BlbmRBY3RpdmVET01P YmplY3RzQW5kQW5pbWF0aW9ucygpCiAgICAgUmVzdW1lQWN0aXZlRE9NT2JqZWN0c0FuZEFuaW1h dGlvbnMoKQogCi0jaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCi0gICAgU2V0Vmlld3BvcnRT aXplKFdlYkNvcmU6OkludFNpemUgc2l6ZSkKLSNlbmRpZgotCiAgICAgQ2xvc2UoKQogICAgIFRy eUNsb3NlKCkKIAo=