106307 2013-01-08 00:03:13 -0800 Rename 'IntSize toSize(const IntPoint&)' to 'toIntSize' 2013-01-08 01:28:34 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 steveblock steveblock apinheiro cfleizach dmazzoni eric haraken jdiggs mifenton ojan.autocc rwlbuis simon.fraser steveblock tkent tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 802094 0 steveblock 2013-01-08 00:03:13 -0800 Rename 'IntSize toSize(const IntPoint&)' to 'toIntSize' 802098 1 181662 steveblock 2013-01-08 00:05:50 -0800 Created attachment 181662 Patch 802099 2 steveblock 2013-01-08 00:07:01 -0800 This matches other method names which distinguish between sizes and points. See https://bugs.webkit.org/show_bug.cgi?id=105992#c4. 802100 3 181662 haraken 2013-01-08 00:09:28 -0800 Comment on attachment 181662 Patch LGTM 802129 4 181662 webkit.review.bot 2013-01-08 01:28:29 -0800 Comment on attachment 181662 Patch Clearing flags on attachment: 181662 Committed r139045: <http://trac.webkit.org/changeset/139045> 802130 5 webkit.review.bot 2013-01-08 01:28:34 -0800 All reviewed patches have been landed. Closing bug. 181662 2013-01-08 00:05:50 -0800 2013-01-08 01:28:29 -0800 Patch bug-106307-20130108190254.patch text/plain 14687 steveblock U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5MDM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQyMjQyZDg4YTJiMWYy NzIzYzk2NjBlZjU5ZTI0NmZkYzEzNjZiNi4uMGI2YjZmYmIxYzkzYjFkOGE1YTI2ZWI0NTdlMzY5 ODNjMGI3ZDczMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAxLTA4ICBTdGV2 ZSBCbG9jayAgPHN0ZXZlYmxvY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbmFtZSAnSW50 U2l6ZSB0b1NpemUoY29uc3QgSW50UG9pbnQmKScgdG8gJ3RvSW50U2l6ZScKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjMwNworCisgICAgICAgIFRo aXMgbWF0Y2hlcyBvdGhlciBtZXRob2QgbmFtZXMgd2hpY2ggZGlzdGluZ3Vpc2ggYmV0d2VlbiBz aXplcyBhbmQKKyAgICAgICAgcG9pbnRzLiBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwNTk5MiNjNC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBSZWZhY3RvcmluZyBvbmx5LCBubyBmdW5jdGlvbmFsIGNoYW5nZS4K KworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzY3JvbGxUbyk6 CisgICAgICAgICogaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MU2VsZWN0RWxlbWVudDo6bGlzdEJveERlZmF1bHRFdmVudEhhbmRsZXIpOgorICAgICAg ICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6 OnNjcm9sbE9mZnNldCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvSW50UG9pbnQuaDoK KyAgICAgICAgKFdlYkNvcmU6OnRvSW50U2l6ZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjp1cGRhdGVMYXllclBv c2l0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cG9zaXRpb25OZXdseUNy ZWF0ZWRPdmVyZmxvd0NvbnRyb2xzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpw YWludE92ZXJmbG93Q29udHJvbHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVH cmFwaGljc0xheWVyR2VvbWV0cnkpOgorCiAyMDEzLTAxLTA3ICBLZW50IFRhbXVyYSAgPHRrZW50 QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxMzc0MDYpOiBUZXh0IGluc2lk ZSBhbiBlbXB0eSBvcHRncm91cCBwcmV2ZW50cyBzdWJzZXF1ZW50IG9wdGlvbnMgZnJvbSBhcHBl YXJpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IDBhZTZhMjQzZjY4NjUxNjYx Y2ZmY2I3YTdjMzU0MWVkYWJjZDdjY2EuLjA0Yzc2MjFlYmEwNWQ3MWY4ZGZkMzJmYzNmZTZiMDBm MWY1MDUyNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDEzLTAxLTA4ICBTdGV2ZSBCbG9jayAgPHN0ZXZlYmxvY2tAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJlbmFtZSAnSW50U2l6ZSB0b1NpemUoY29uc3QgSW50UG9pbnQmKScgdG8gJ3RvSW50 U2l6ZScKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEw NjMwNworCisgICAgICAgIFRoaXMgbWF0Y2hlcyBvdGhlciBtZXRob2QgbmFtZXMgd2hpY2ggZGlz dGluZ3Vpc2ggYmV0d2VlbiBzaXplcyBhbmQKKyAgICAgICAgcG9pbnRzLiBTZWUgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTk5MiNjNC4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEFwaS9JblJlZ2lvblNjcm9sbGVy LmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5SZWdpb25TY3JvbGxlclByaXZh dGU6OnNldExheWVyU2Nyb2xsUG9zaXRpb24pOgorCiAyMDEzLTAxLTA3ICBHZW5ldmlldmUgTWFr ICA8Z21ha0ByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBUb3VjaCBFdmVudHMgYXJl IGZhbGxpbmcgdGhyb3VnaCBmdWxsc2NyZWVuIHZpZGVvCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n CmluZGV4IDAwMDQ3ZjY3MWVhYmU2YTVhN2YxMTU2ZDBjZTdiOGIxODA1YzlhYmQuLjI0MDFmYjhl MTk4YWRlZWJiMWFmN2Y3Yzk2MGFlY2QwMGY5NTIyYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTMtMDEtMDggIFN0ZXZlIEJsb2NrICA8c3RldmVibG9j a0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVuYW1lICdJbnRTaXplIHRvU2l6ZShjb25zdCBJ bnRQb2ludCYpJyB0byAndG9JbnRTaXplJworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA2MzA3CisKKyAgICAgICAgVGhpcyBtYXRjaGVzIG90aGVyIG1l dGhvZCBuYW1lcyB3aGljaCBkaXN0aW5ndWlzaCBiZXR3ZWVuIHNpemVzIGFuZAorICAgICAgICBw b2ludHMuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1OTky I2M0LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog c3JjL05vbkNvbXBvc2l0ZWRDb250ZW50SG9zdC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5vbkNv bXBvc2l0ZWRDb250ZW50SG9zdDo6c2V0Vmlld3BvcnQpOgorICAgICAgICAqIHNyYy9XZWJGcmFt ZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6Om1pbmltdW1TY3JvbGxP ZmZzZXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6Om1heGltdW1TY3JvbGxPZmZz ZXQpOgorCiAyMDEzLTAxLTA3ICBTdGV2ZSBCbG9jayAgPHN0ZXZlYmxvY2tAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFVzZSB0b1NpemUoKSB0byBjb252ZXJ0IGZyb20gSW50L0Zsb2F0UG9pbnQg dG8gSW50L0Zsb2F0U2l6ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKaW5kZXggNDNjZDNkZmE0ZDQ2ZGM3 NzgxZDI0NGY5YjhiMDlkMTliMWFhNjU4OC4uNDJlNTU3NjBjZWVlMDNjYzdiOGY3MDQzODY1ZmM0 Y2RiZTJlZjg2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC0zMzY2LDcgKzMzNjYsNyBAQCB2 b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNjcm9sbFRvKGNvbnN0IEludFBvaW50JiBw b2ludCkgY29uc3QKICAgICAgICAgcmV0dXJuOwogCiAgICAgUmVuZGVyTGF5ZXIqIGxheWVyID0g Ym94LT5sYXllcigpOwotICAgIGxheWVyLT5zY3JvbGxUb09mZnNldCh0b1NpemUocG9pbnQpLCBS ZW5kZXJMYXllcjo6U2Nyb2xsT2Zmc2V0Q2xhbXBlZCk7CisgICAgbGF5ZXItPnNjcm9sbFRvT2Zm c2V0KHRvSW50U2l6ZShwb2ludCksIFJlbmRlckxheWVyOjpTY3JvbGxPZmZzZXRDbGFtcGVkKTsK IH0KIAogI2lmIEVOQUJMRShNQVRITUwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxTZWxlY3RFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNlbGVjdEVs ZW1lbnQuY3BwCmluZGV4IDgwNzczNDBlNjZlZjRjMzZkMDVlZmY1YTE4MjZiOGU5NzU0ZmMwM2Yu LmQ3YTZmNGQ5MTZiYjY1YmI5NWNmMTAxNDRmODEwMjYzMjJlNzlmNWUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNlbGVjdEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTFNlbGVjdEVsZW1lbnQuY3BwCkBAIC0xMjg3LDcgKzEyODcsNyBAQCB2b2lk IEhUTUxTZWxlY3RFbGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZl bnQpCiAgICAgICAgIC8vIENvbnZlcnQgdG8gY29vcmRzIHJlbGF0aXZlIHRvIHRoZSBsaXN0IGJv eCBpZiBuZWVkZWQuCiAgICAgICAgIE1vdXNlRXZlbnQqIG1vdXNlRXZlbnQgPSBzdGF0aWNfY2Fz dDxNb3VzZUV2ZW50Kj4oZXZlbnQpOwogICAgICAgICBJbnRQb2ludCBsb2NhbE9mZnNldCA9IHJv dW5kZWRJbnRQb2ludChyZW5kZXJlcigpLT5hYnNvbHV0ZVRvTG9jYWwobW91c2VFdmVudC0+YWJz b2x1dGVMb2NhdGlvbigpLCBVc2VUcmFuc2Zvcm1zKSk7Ci0gICAgICAgIGludCBsaXN0SW5kZXgg PSB0b1JlbmRlckxpc3RCb3gocmVuZGVyZXIoKSktPmxpc3RJbmRleEF0T2Zmc2V0KHRvU2l6ZShs b2NhbE9mZnNldCkpOworICAgICAgICBpbnQgbGlzdEluZGV4ID0gdG9SZW5kZXJMaXN0Qm94KHJl bmRlcmVyKCkpLT5saXN0SW5kZXhBdE9mZnNldCh0b0ludFNpemUobG9jYWxPZmZzZXQpKTsKICAg ICAgICAgaWYgKGxpc3RJbmRleCA+PSAwKSB7CiAgICAgICAgICAgICBpZiAoIWRpc2FibGVkKCkp IHsKICNpZiBQTEFURk9STShNQUMpIHx8IChQTEFURk9STShDSFJPTUlVTSkgJiYgT1MoREFSV0lO KSkKQEAgLTEzMDcsNyArMTMwNyw3IEBAIHZvaWQgSFRNTFNlbGVjdEVsZW1lbnQ6Omxpc3RCb3hE ZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKICAgICAgICAgICAgIHJldHVybjsKIAog ICAgICAgICBJbnRQb2ludCBsb2NhbE9mZnNldCA9IHJvdW5kZWRJbnRQb2ludChyZW5kZXJlcigp LT5hYnNvbHV0ZVRvTG9jYWwobW91c2VFdmVudC0+YWJzb2x1dGVMb2NhdGlvbigpLCBVc2VUcmFu c2Zvcm1zKSk7Ci0gICAgICAgIGludCBsaXN0SW5kZXggPSB0b1JlbmRlckxpc3RCb3gocmVuZGVy ZXIoKSktPmxpc3RJbmRleEF0T2Zmc2V0KHRvU2l6ZShsb2NhbE9mZnNldCkpOworICAgICAgICBp bnQgbGlzdEluZGV4ID0gdG9SZW5kZXJMaXN0Qm94KHJlbmRlcmVyKCkpLT5saXN0SW5kZXhBdE9m ZnNldCh0b0ludFNpemUobG9jYWxPZmZzZXQpKTsKICAgICAgICAgaWYgKGxpc3RJbmRleCA+PSAw KSB7CiAgICAgICAgICAgICBpZiAoIWRpc2FibGVkKCkpIHsKICAgICAgICAgICAgICAgICBpZiAo bV9tdWx0aXBsZSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs Vmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCmluZGV4IDVkZGI2 OGIxMTU1ZDM1NGM1ZmUzODlkY2I0YzkwMDcwYzQxODM0NjAuLmUwNDNmNmU5Zjc0ODNkYzQxYzQ4 NWJjMWQ1ZjFhMDU0MDg2NGM3NDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Njcm9sbFZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgK QEAgLTE3MCw3ICsxNzAsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBGdW5jdGlvbnMgZm9yIHF1ZXJ5 aW5nIHRoZSBjdXJyZW50IHNjcm9sbGVkIHBvc2l0aW9uIChib3RoIGFzIGEgcG9pbnQsIGEgc2l6 ZSwgb3IgYXMgaW5kaXZpZHVhbCBYIGFuZCBZIHZhbHVlcykuCiAgICAgdmlydHVhbCBJbnRQb2lu dCBzY3JvbGxQb3NpdGlvbigpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIHZpc2libGVDb250ZW50 UmVjdCgpLmxvY2F0aW9uKCk7IH0KLSAgICBJbnRTaXplIHNjcm9sbE9mZnNldCgpIGNvbnN0IHsg cmV0dXJuIHRvU2l6ZSh2aXNpYmxlQ29udGVudFJlY3QoKS5sb2NhdGlvbigpKTsgfSAvLyBHZXRz IHRoZSBzY3JvbGxlZCBwb3NpdGlvbiBhcyBhbiBJbnRTaXplLiBDb252ZW5pZW50IGZvciBhZGRp bmcgdG8gb3RoZXIgc2l6ZXMuCisgICAgSW50U2l6ZSBzY3JvbGxPZmZzZXQoKSBjb25zdCB7IHJl dHVybiB0b0ludFNpemUodmlzaWJsZUNvbnRlbnRSZWN0KCkubG9jYXRpb24oKSk7IH0gLy8gR2V0 cyB0aGUgc2Nyb2xsZWQgcG9zaXRpb24gYXMgYW4gSW50U2l6ZS4gQ29udmVuaWVudCBmb3IgYWRk aW5nIHRvIG90aGVyIHNpemVzLgogICAgIHZpcnR1YWwgSW50UG9pbnQgbWF4aW11bVNjcm9sbFBv c2l0aW9uKCkgY29uc3QgT1ZFUlJJREU7IC8vIFRoZSBtYXhpbXVtIHBvc2l0aW9uIHdlIGNhbiBi ZSBzY3JvbGxlZCB0by4KICAgICB2aXJ0dWFsIEludFBvaW50IG1pbmltdW1TY3JvbGxQb3NpdGlv bigpIGNvbnN0IE9WRVJSSURFOyAvLyBUaGUgbWluaW11bSBwb3NpdGlvbiB3ZSBjYW4gYmUgc2Ny b2xsZWQgdG8uCiAgICAgLy8gQWRqdXN0IHRoZSBwYXNzZWQgaW4gc2Nyb2xsIHBvc2l0aW9uIHRv IGtlZXAgaXQgYmV0d2VlbiB0aGUgbWluaW11bSBhbmQgbWF4aW11bSBwb3NpdGlvbnMuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRQb2ludC5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW50UG9pbnQuaAppbmRleCAzMzFhYTk1ODg1 MjJhYzM2MDc4YzkzYWY1NmY3ZDE2MTBmOGViMDc5Li4zZTgxNDhhOWEwYjk4NDA0MDg5NDcyM2Nh ZDU2MDFkNDYwNGY0ZmY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9JbnRQb2ludC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0lu dFBvaW50LmgKQEAgLTIxMCw3ICsyMTAsNyBAQCBpbmxpbmUgYm9vbCBvcGVyYXRvciE9KGNvbnN0 IEludFBvaW50JiBhLCBjb25zdCBJbnRQb2ludCYgYikKICAgICByZXR1cm4gYS54KCkgIT0gYi54 KCkgfHwgYS55KCkgIT0gYi55KCk7CiB9CiAKLWlubGluZSBJbnRTaXplIHRvU2l6ZShjb25zdCBJ bnRQb2ludCYgYSkKK2lubGluZSBJbnRTaXplIHRvSW50U2l6ZShjb25zdCBJbnRQb2ludCYgYSkK IHsKICAgICByZXR1cm4gSW50U2l6ZShhLngoKSwgYS55KCkpOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggZGIwYTQ2YjU1MTJjZTVlYjljNDU5YWM0OWJj YWM0ZjRlNDY3NGYwMi4uMTU5MDQ0ZDgxN2Y1MjJjZThmZDk3YmE0YzZhOTlhMjcxZjlhMzI5ZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0zOTUsNyArMzk1 LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlvbnMoUmVuZGVyR2VvbWV0 cnlNYXAqIGdlb21ldHJ5TWFwLCBVcGRhdGVMYXkKICAgICAgICAgICAgIC8vIGFzIGNhblVzZUNv bnZlcnRUb0xheWVyQ29vcmRzIG1heSBiZSB0cnVlIGZvciBhbiBhbmNlc3RvciBsYXllci4KICAg ICAgICAgICAgIGNvbnZlcnRUb0xheWVyQ29vcmRzKHJvb3QoKSwgb2Zmc2V0RnJvbVJvb3QpOwog ICAgICAgICB9Ci0gICAgICAgIHBvc2l0aW9uT3ZlcmZsb3dDb250cm9scyh0b1NpemUocm91bmRl ZEludFBvaW50KG9mZnNldEZyb21Sb290KSkpOworICAgICAgICBwb3NpdGlvbk92ZXJmbG93Q29u dHJvbHModG9JbnRTaXplKHJvdW5kZWRJbnRQb2ludChvZmZzZXRGcm9tUm9vdCkpKTsKICAgICB9 CiAKICAgICB1cGRhdGVEZXNjZW5kYW50RGVwZW5kZW50RmxhZ3MoKTsKQEAgLTc5MCw3ICs3OTAs NyBAQCB2b2lkIFJlbmRlckxheWVyOjpwb3NpdGlvbk5ld2x5Q3JlYXRlZE92ZXJmbG93Q29udHJv bHMoKQogICAgICAgICBnZW9tZXRyeU1hcC5wdXNoTWFwcGluZ3NUb0FuY2VzdG9yKHBhcmVudCgp LCAwKTsKIAogICAgIExheW91dFBvaW50IG9mZnNldEZyb21Sb290ID0gTGF5b3V0UG9pbnQoZ2Vv bWV0cnlNYXAuYWJzb2x1dGVQb2ludChGbG9hdFBvaW50KCkpKTsKLSAgICBwb3NpdGlvbk92ZXJm bG93Q29udHJvbHModG9TaXplKHJvdW5kZWRJbnRQb2ludChvZmZzZXRGcm9tUm9vdCkpKTsKKyAg ICBwb3NpdGlvbk92ZXJmbG93Q29udHJvbHModG9JbnRTaXplKHJvdW5kZWRJbnRQb2ludChvZmZz ZXRGcm9tUm9vdCkpKTsKIH0KICNlbmRpZgogCkBAIC0zMTE4LDcgKzMxMTgsNyBAQCB2b2lkIFJl bmRlckxheWVyOjpwYWludE92ZXJmbG93Q29udHJvbHMoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0 LCBjb25zdCBJbnRQb2ludAogICAgIC8vIE1vdmUgdGhlIHNjcm9sbGJhciB3aWRnZXRzIGlmIG5l Y2Vzc2FyeS4gIFdlIG5vcm1hbGx5IG1vdmUgYW5kIHJlc2l6ZSB3aWRnZXRzIGR1cmluZyBsYXlv dXQsIGJ1dCBzb21ldGltZXMKICAgICAvLyB3aWRnZXRzIGNhbiBtb3ZlIHdpdGhvdXQgbGF5b3V0 IG9jY3VycmluZyAobW9zdCBub3RhYmx5IHdoZW4geW91IHNjcm9sbCBhIGRvY3VtZW50IHRoYXQK ICAgICAvLyBjb250YWlucyBmaXhlZCBwb3NpdGlvbmVkIGVsZW1lbnRzKS4KLSAgICBwb3NpdGlv bk92ZXJmbG93Q29udHJvbHModG9TaXplKGFkanVzdGVkUGFpbnRPZmZzZXQpKTsKKyAgICBwb3Np dGlvbk92ZXJmbG93Q29udHJvbHModG9JbnRTaXplKGFkanVzdGVkUGFpbnRPZmZzZXQpKTsKIAog ICAgIC8vIE5vdyB0aGF0IHdlJ3JlIHN1cmUgdGhlIHNjcm9sbGJhcnMgYXJlIGluIHRoZSByaWdo dCBwbGFjZSwgcGFpbnQgdGhlbS4KICAgICBpZiAobV9oQmFyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IGMyN2MyMWMzNmRkYmQ0NmFh YjQxYTViNTIyYjg0YWFjZjdlNmQyNGYuLmZiOGVhOGNhYzY1NWRiNTNmNjI2MjVhYzI5MTYxNDU2 NTE5MWFiNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuY3BwCkBAIC02MzUsNyArNjM1LDcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVw ZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpCiAgICAgfQogCiAgICAgbV9ncmFwaGljc0xheWVy LT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KHJlbGF0aXZlQ29tcG9zaXRpbmdCb3VuZHMubG9jYXRp b24oKSAtIGdyYXBoaWNzTGF5ZXJQYXJlbnRMb2NhdGlvbikpOwotICAgIG1fZ3JhcGhpY3NMYXll ci0+c2V0T2Zmc2V0RnJvbVJlbmRlcmVyKHRvU2l6ZShsb2NhbENvbXBvc2l0aW5nQm91bmRzLmxv Y2F0aW9uKCkpKTsKKyAgICBtX2dyYXBoaWNzTGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcih0 b0ludFNpemUobG9jYWxDb21wb3NpdGluZ0JvdW5kcy5sb2NhdGlvbigpKSk7CiAgICAgCiAgICAg RmxvYXRTaXplIG9sZFNpemUgPSBtX2dyYXBoaWNzTGF5ZXItPnNpemUoKTsKICAgICBGbG9hdFNp emUgbmV3U2l6ZSA9IHJlbGF0aXZlQ29tcG9zaXRpbmdCb3VuZHMuc2l6ZSgpOwpAQCAtNjU0LDcg KzY1NCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVyR2Vv bWV0cnkoKQogICAgICAgICBjbGlwcGluZ0JveCA9IGNsaXBCb3godG9SZW5kZXJCb3gocmVuZGVy ZXIoKSkpOwogICAgICAgICBjbGlwTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoY2xpcHBp bmdCb3gubG9jYXRpb24oKSAtIGxvY2FsQ29tcG9zaXRpbmdCb3VuZHMubG9jYXRpb24oKSkpOwog ICAgICAgICBjbGlwTGF5ZXItPnNldFNpemUoY2xpcHBpbmdCb3guc2l6ZSgpKTsKLSAgICAgICAg Y2xpcExheWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIodG9TaXplKGNsaXBwaW5nQm94LmxvY2F0 aW9uKCkpKTsKKyAgICAgICAgY2xpcExheWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIodG9JbnRT aXplKGNsaXBwaW5nQm94LmxvY2F0aW9uKCkpKTsKICAgICB9CiAgICAgCiAgICAgaWYgKG1fbWFz a0xheWVyKSB7CkBAIC03MDksNyArNzA5LDcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVw ZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpCiAgICAgICAgICAgICAvLyBJZiB3ZSBoYXZlIGEg Y2xpcHBpbmcgbGF5ZXIgKHdoaWNoIGNsaXBzIGRlc2NlbmRhbnRzKSwgdGhlbiB0aGUgZm9yZWdy b3VuZCBsYXllciBpcyBhIGNoaWxkIG9mIGl0LAogICAgICAgICAgICAgLy8gc28gdGhhdCBpdCBn ZXRzIGNvcnJlY3RseSBzb3J0ZWQgd2l0aCBjaGlsZHJlbi4gSW4gdGhhdCBjYXNlLCBwb3NpdGlv biByZWxhdGl2ZSB0byB0aGUgY2xpcHBpbmcgbGF5ZXIuCiAgICAgICAgICAgICBmb3JlZ3JvdW5k U2l6ZSA9IEZsb2F0U2l6ZShjbGlwcGluZ0JveC5zaXplKCkpOwotICAgICAgICAgICAgZm9yZWdy b3VuZE9mZnNldCA9IHRvU2l6ZShjbGlwcGluZ0JveC5sb2NhdGlvbigpKTsKKyAgICAgICAgICAg IGZvcmVncm91bmRPZmZzZXQgPSB0b0ludFNpemUoY2xpcHBpbmdCb3gubG9jYXRpb24oKSk7CiAg ICAgICAgIH0KIAogICAgICAgICBtX2ZvcmVncm91bmRMYXllci0+c2V0UG9zaXRpb24oZm9yZWdy b3VuZFBvc2l0aW9uKTsKQEAgLTc0Myw3ICs3NDMsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2lu Zzo6dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KCkKICAgICAgICAgbV9zY3JvbGxpbmdDb250 ZW50c0xheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KC1zY3JvbGxPZmZzZXQud2lkdGgoKSwg LXNjcm9sbE9mZnNldC5oZWlnaHQoKSkpOwogCiAgICAgICAgIEludFNpemUgb2xkU2Nyb2xsaW5n TGF5ZXJPZmZzZXQgPSBtX3Njcm9sbGluZ0xheWVyLT5vZmZzZXRGcm9tUmVuZGVyZXIoKTsKLSAg ICAgICAgbV9zY3JvbGxpbmdMYXllci0+c2V0T2Zmc2V0RnJvbVJlbmRlcmVyKC10b1NpemUocGFk ZGluZ0JveC5sb2NhdGlvbigpKSk7CisgICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXItPnNldE9mZnNl dEZyb21SZW5kZXJlcigtdG9JbnRTaXplKHBhZGRpbmdCb3gubG9jYXRpb24oKSkpOwogCiAgICAg ICAgIGJvb2wgcGFkZGluZ0JveE9mZnNldENoYW5nZWQgPSBvbGRTY3JvbGxpbmdMYXllck9mZnNl dCAhPSBtX3Njcm9sbGluZ0xheWVyLT5vZmZzZXRGcm9tUmVuZGVyZXIoKTsKIApAQCAtNzUxLDcg Kzc1MSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVyR2Vv bWV0cnkoKQogICAgICAgICBpZiAoc2Nyb2xsU2l6ZSAhPSBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5 ZXItPnNpemUoKSB8fCBwYWRkaW5nQm94T2Zmc2V0Q2hhbmdlZCkKICAgICAgICAgICAgIG1fc2Ny b2xsaW5nQ29udGVudHNMYXllci0+c2V0TmVlZHNEaXNwbGF5KCk7CiAKLSAgICAgICAgSW50U2l6 ZSBzY3JvbGxpbmdDb250ZW50c09mZnNldCA9IHRvU2l6ZShwYWRkaW5nQm94LmxvY2F0aW9uKCkg LSBzY3JvbGxPZmZzZXQpOworICAgICAgICBJbnRTaXplIHNjcm9sbGluZ0NvbnRlbnRzT2Zmc2V0 ID0gdG9JbnRTaXplKHBhZGRpbmdCb3gubG9jYXRpb24oKSAtIHNjcm9sbE9mZnNldCk7CiAgICAg ICAgIGlmIChzY3JvbGxpbmdDb250ZW50c09mZnNldCAhPSBtX3Njcm9sbGluZ0NvbnRlbnRzTGF5 ZXItPm9mZnNldEZyb21SZW5kZXJlcigpIHx8IHNjcm9sbFNpemUgIT0gbV9zY3JvbGxpbmdDb250 ZW50c0xheWVyLT5zaXplKCkpCiAgICAgICAgICAgICBjb21wb3NpdG9yKCktPnNjcm9sbGluZ0xh eWVyRGlkQ2hhbmdlKG1fb3duaW5nTGF5ZXIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyLmNwcAppbmRleCA0MDdhNzQ2NmNkZjQ2NjNkODlm MjY1MDBiYjY0NWE0OWFkNGE2NWFkLi4zOWRiNzUzNGVhNmRiZDg0NmJiNmIyYTM4NTU2MjVlN2Fm ODAxYjViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9u U2Nyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25T Y3JvbGxlci5jcHAKQEAgLTMxMyw3ICszMTMsNyBAQCBib29sIEluUmVnaW9uU2Nyb2xsZXJQcml2 YXRlOjpzZXRMYXllclNjcm9sbFBvc2l0aW9uKFJlbmRlckxheWVyKiBsYXllciwgY29uc3QgSQog ICAgIH0gZWxzZSB7CiAKICAgICAgICAgLy8gUmVuZGVyQm94LWJhc2VkIGVsZW1lbnRzIGNhc2Ug KHNjcm9sbGFibGUgYm94ZXMgKGRpdidzLCBwJ3MsIHRleHRhcmVhJ3MsIGV0YykpLgotICAgICAg ICBsYXllci0+c2Nyb2xsVG9PZmZzZXQodG9TaXplKHNjcm9sbFBvc2l0aW9uKSk7CisgICAgICAg IGxheWVyLT5zY3JvbGxUb09mZnNldCh0b0ludFNpemUoc2Nyb2xsUG9zaXRpb24pKTsKICAgICB9 CiAKICAgICBsYXllci0+cmVuZGVyZXIoKS0+ZnJhbWUoKS0+c2VsZWN0aW9uKCktPnVwZGF0ZUFw cGVhcmFuY2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL05vbkNv bXBvc2l0ZWRDb250ZW50SG9zdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Ob25D b21wb3NpdGVkQ29udGVudEhvc3QuY3BwCmluZGV4IDQ2ZGNiZWM0MDdiNDVmMDIyOTg3YmEyNmIy ODEwYWIwOGU0ZTMxMDMuLjQ4ZTJmYzEwZmI4Y2Q0YWEzMWQ1ZDM3MWFjZjI5ZjI0NjBkZWZhNzIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL05vbkNvbXBvc2l0ZWRDb250 ZW50SG9zdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvTm9uQ29tcG9zaXRl ZENvbnRlbnRIb3N0LmNwcApAQCAtMTIxLDcgKzEyMSw3IEBAIHZvaWQgTm9uQ29tcG9zaXRlZENv bnRlbnRIb3N0OjpzZXRWaWV3cG9ydChjb25zdCBXZWJDb3JlOjpJbnRTaXplJiB2aWV3cG9ydFNp emUsCiAgICAgLy8gSW4gUlRMLXN0eWxlIHBhZ2VzLCB0aGUgb3JpZ2luIG9mIHRoZSBpbml0aWFs IGNvbnRhaW5pbmcgYmxvY2sgZm9yIHRoZQogICAgIC8vIHJvb3QgbGF5ZXIgbWF5IGJlIHBvc2l0 aXZlOyB0cmFuc2xhdGUgdGhlIGxheWVyIHRvIGF2b2lkIG5lZ2F0aXZlCiAgICAgLy8gY29vcmRp bmF0ZXMuCi0gICAgbV9sYXllckFkanVzdCA9IC10b1NpemUoc2Nyb2xsT3JpZ2luKTsKKyAgICBt X2xheWVyQWRqdXN0ID0gLXRvSW50U2l6ZShzY3JvbGxPcmlnaW4pOwogICAgIGlmIChtX2dyYXBo aWNzTGF5ZXItPnRyYW5zZm9ybSgpLm00MSgpICE9IG1fbGF5ZXJBZGp1c3Qud2lkdGgoKSB8fCBt X2dyYXBoaWNzTGF5ZXItPnRyYW5zZm9ybSgpLm00MigpICE9IG1fbGF5ZXJBZGp1c3QuaGVpZ2h0 KCkpIHsKICAgICAgICAgV2ViQ29yZTo6VHJhbnNmb3JtYXRpb25NYXRyaXggdHJhbnNmb3JtID0g bV9ncmFwaGljc0xheWVyLT50cmFuc2Zvcm0oKTsKICAgICAgICAgdHJhbnNmb3JtLnNldE00MSht X2xheWVyQWRqdXN0LndpZHRoKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViRnJhbWVJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZy YW1lSW1wbC5jcHAKaW5kZXggMDMzZTZlODZlZTFjYzEzZDZkNzkyM2YxN2NiZDk1MjYwZGJhMTcy NS4uOWU3MjUyODhhMGRjNzE2YWJiODY0ZjAyYzE5MmI5Y2QzZTViNmEwZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCkBAIC02MDIsNyArNjAyLDcgQEAg V2ViU2l6ZSBXZWJGcmFtZUltcGw6Om1pbmltdW1TY3JvbGxPZmZzZXQoKSBjb25zdAogICAgIEZy YW1lVmlldyogdmlldyA9IGZyYW1lVmlldygpOwogICAgIGlmICghdmlldykKICAgICAgICAgcmV0 dXJuIFdlYlNpemUoKTsKLSAgICByZXR1cm4gdG9TaXplKHZpZXctPm1pbmltdW1TY3JvbGxQb3Np dGlvbigpKTsKKyAgICByZXR1cm4gdG9JbnRTaXplKHZpZXctPm1pbmltdW1TY3JvbGxQb3NpdGlv bigpKTsKIH0KIAogV2ViU2l6ZSBXZWJGcmFtZUltcGw6Om1heGltdW1TY3JvbGxPZmZzZXQoKSBj b25zdApAQCAtNjEwLDcgKzYxMCw3IEBAIFdlYlNpemUgV2ViRnJhbWVJbXBsOjptYXhpbXVtU2Ny b2xsT2Zmc2V0KCkgY29uc3QKICAgICBGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZVZpZXcoKTsKICAg ICBpZiAoIXZpZXcpCiAgICAgICAgIHJldHVybiBXZWJTaXplKCk7Ci0gICAgcmV0dXJuIHRvU2l6 ZSh2aWV3LT5tYXhpbXVtU2Nyb2xsUG9zaXRpb24oKSk7CisgICAgcmV0dXJuIHRvSW50U2l6ZSh2 aWV3LT5tYXhpbXVtU2Nyb2xsUG9zaXRpb24oKSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVJbXBsOjpz ZXRTY3JvbGxPZmZzZXQoY29uc3QgV2ViU2l6ZSYgb2Zmc2V0KQo=