55917 2011-03-07 19:26:02 -0800 [EFL] Adjust functions of ScrollbarEfl.cpp to WebKit coding style 2011-03-07 23:05:22 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 gyuyoung.kim gyuyoung.kim commit-queue kenneth leandro lucas.de.marchi tkent tonikitoo oldest_to_newest 363774 0 gyuyoung.kim 2011-03-07 19:26:02 -0800 ScrollbarEfl.cpp uses efl coding style. WebCore's efl port needs to follow WebKit style. 363786 1 85014 gyuyoung.kim 2011-03-07 20:17:43 -0800 Created attachment 85014 Patch I change variables with more meaningful name. 363788 2 85014 tkent 2011-03-07 20:28:02 -0800 Comment on attachment 85014 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=85014&action=review > Source/WebCore/platform/efl/ScrollbarEfl.cpp:176 > + message->val[0] = pos / (float)(tSize - vSize); We prefer C++-style casts though the style guide doesn't mention it. This should be static_cast<float>(tSize - vSize). > Source/WebCore/platform/efl/ScrollbarEfl.cpp:178 > + message->val[0] = 0.0; See "Floating point literals" in http://www.webkit.org/coding/coding-style.html > do not append .0, .f and .0f to floating point literals. 363803 3 85017 gyuyoung.kim 2011-03-07 21:10:33 -0800 Created attachment 85017 Modified Patch I fix your point. :-) 363837 4 85017 commit-queue 2011-03-07 23:05:16 -0800 Comment on attachment 85017 Modified Patch Clearing flags on attachment: 85017 Committed r80540: <http://trac.webkit.org/changeset/80540> 363838 5 commit-queue 2011-03-07 23:05:22 -0800 All reviewed patches have been landed. Closing bug. 85014 2011-03-07 20:17:43 -0800 2011-03-07 21:10:33 -0800 Patch patch-scrollbar.txt text/plain 7345 gyuyoung.kim ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmMDdhZDA2Li45YTUzMzk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDMtMDcgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbRUZMXSBB ZGp1c3QgZnVuY3Rpb25zIG9mIFNjcm9sbGJhckVmbC5jcHAgdG8gV2ViS2l0IGNvZGluZyBzdHls ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU5MTcK KworICAgICAgICBBZGp1c3Qgd2Via2l0IHN0eWxlIHRvIFNjcm9sbGJhckVmbCBmaWxlcy4KKwor ICAgICAgICAqIHBsYXRmb3JtL2VmbC9TY3JvbGxiYXJFZmwuY3BwOgorICAgICAgICAoc2Nyb2xs YmFyRWZsRWRqZU1lc3NhZ2UpOgorICAgICAgICAoU2Nyb2xsYmFyRWZsOjpzZXRQYXJlbnQpOgor ICAgICAgICAoU2Nyb2xsYmFyRWZsOjp1cGRhdGVUaHVtYlBvc2l0aW9uQW5kUHJvcG9ydGlvbik6 CisgICAgICAgIChTY3JvbGxiYXJFZmw6OmZyYW1lUmVjdHNDaGFuZ2VkKToKKyAgICAgICAgKFNj cm9sbGJhckVmbDo6cGFpbnQpOgorICAgICAgICAqIHBsYXRmb3JtL2VmbC9TY3JvbGxiYXJFZmwu aDoKKwogMjAxMS0wMy0wNyAgQWxpY2UgQm94aGFsbCAgPGFib3hoYWxsQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZWZsL1Njcm9sbGJhckVmbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9lZmwvU2Nyb2xsYmFyRWZsLmNwcAppbmRleCBlNzFkMWUzLi44OGFlNjU0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvU2Nyb2xsYmFyRWZsLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvU2Nyb2xsYmFyRWZsLmNwcApAQCAtNjQsNTAgKzY0 LDUwIEBAIFNjcm9sbGJhckVmbDo6flNjcm9sbGJhckVmbCgpCiAgICAgc2V0RXZhc09iamVjdCgw KTsKIH0KIAotc3RhdGljIHZvaWQgc2Nyb2xsYmFyRWZsRWRqZU1lc3NhZ2Uodm9pZCogZGF0YSwg RXZhc19PYmplY3QqIG8sIEVkamVfTWVzc2FnZV9UeXBlIHR5cGUsIGludCBpZCwgdm9pZCogbXNn KQorc3RhdGljIHZvaWQgc2Nyb2xsYmFyRWZsRWRqZU1lc3NhZ2Uodm9pZCogZGF0YSwgRXZhc19P YmplY3QqIG9iamVjdCwgRWRqZV9NZXNzYWdlX1R5cGUgbWVzc2FnZVR5cGUsIGludCBpZCwgdm9p ZCogbWVzc2FnZSkKIHsKICAgICBTY3JvbGxiYXJFZmwqIHRoYXQgPSBzdGF0aWNfY2FzdDxTY3Jv bGxiYXJFZmwqPihkYXRhKTsKLSAgICBFZGplX01lc3NhZ2VfRmxvYXQqIG07Ci0gICAgaW50IHY7 CisgICAgRWRqZV9NZXNzYWdlX0Zsb2F0KiBtZXNzYWdlRmxvYXQ7CisgICAgaW50IHZhbHVlOwog CiAgICAgaWYgKCFpZCkgewogICAgICAgICBFSU5BX0xPR19FUlIoIlVua25vd24gbWVzc2FnZSBp ZCAnJWQnIGZyb20gc2Nyb2xsIGJhciB0aGVtZS4iLCBpZCk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKLSAgICBpZiAodHlwZSAhPSBFREpFX01FU1NBR0VfRkxPQVQpIHsKKyAgICBpZiAobWVz c2FnZVR5cGUgIT0gRURKRV9NRVNTQUdFX0ZMT0FUKSB7CiAgICAgICAgIEVJTkFfTE9HX0VSUigi TWVzc2FnZSBpZCAnJWQnIG9mIGluY29ycmVjdCB0eXBlIGZyb20gc2Nyb2xsIGJhciB0aGVtZS4g IgogICAgICAgICAgICAgICAgICAgICAgIkV4cGVjdGVkICclZCcsIGdvdCAnJWQnLiIsCi0gICAg ICAgICAgICAgICAgICAgICBpZCwgRURKRV9NRVNTQUdFX0ZMT0FULCB0eXBlKTsKKyAgICAgICAg ICAgICAgICAgICAgIGlkLCBFREpFX01FU1NBR0VfRkxPQVQsIG1lc3NhZ2VUeXBlKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIAotICAgIG0gPSBzdGF0aWNfY2FzdDxFZGplX01lc3NhZ2VfRmxv YXQqPihtc2cpOwotICAgIHYgPSBtLT52YWwgKiAodGhhdC0+dG90YWxTaXplKCkgLSB0aGF0LT52 aXNpYmxlU2l6ZSgpKTsKLSAgICB0aGF0LT5zY3JvbGxhYmxlQXJlYSgpLT5zY3JvbGxUb09mZnNl dFdpdGhvdXRBbmltYXRpb24odGhhdC0+b3JpZW50YXRpb24oKSwgdik7CisgICAgbWVzc2FnZUZs b2F0ID0gc3RhdGljX2Nhc3Q8RWRqZV9NZXNzYWdlX0Zsb2F0Kj4obWVzc2FnZSk7CisgICAgdmFs dWUgPSBtZXNzYWdlRmxvYXQtPnZhbCAqICh0aGF0LT50b3RhbFNpemUoKSAtIHRoYXQtPnZpc2li bGVTaXplKCkpOworICAgIHRoYXQtPnNjcm9sbGFibGVBcmVhKCktPnNjcm9sbFRvT2Zmc2V0V2l0 aG91dEFuaW1hdGlvbih0aGF0LT5vcmllbnRhdGlvbigpLCB2YWx1ZSk7CiB9CiAKIHZvaWQgU2Ny b2xsYmFyRWZsOjpzZXRQYXJlbnQoU2Nyb2xsVmlldyogdmlldykKIHsKLSAgICBFdmFzX09iamVj dCogbyA9IGV2YXNPYmplY3QoKTsKKyAgICBFdmFzX09iamVjdCogb2JqZWN0ID0gZXZhc09iamVj dCgpOwogICAgIEV2YXNfQ29vcmQgdywgaDsKIAogICAgIFdpZGdldDo6c2V0UGFyZW50KHZpZXcp OwogCi0gICAgaWYgKCFvKSB7CisgICAgaWYgKCFvYmplY3QpIHsKICAgICAgICAgaWYgKCF2aWV3 KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIG8gPSBlZGplX29iamVjdF9hZGQodmll dy0+ZXZhcygpKTsKLSAgICAgICAgaWYgKCFvKSB7CisgICAgICAgIG9iamVjdCA9IGVkamVfb2Jq ZWN0X2FkZCh2aWV3LT5ldmFzKCkpOworICAgICAgICBpZiAoIW9iamVjdCkgewogICAgICAgICAg ICAgRUlOQV9MT0dfRVJSKCJDb3VsZCBub3QgY3JlYXRlIGVkamUgb2JqZWN0IGZvciB2aWV3PSVw IChldmFzPSVwKSIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgdmlldywgdmlldy0+ZXZhcygp KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICBlZGplX29iamVjdF9t ZXNzYWdlX2hhbmRsZXJfc2V0KG8sIHNjcm9sbGJhckVmbEVkamVNZXNzYWdlLCB0aGlzKTsKLSAg ICAgICAgc2V0RXZhc09iamVjdChvKTsKKyAgICAgICAgZWRqZV9vYmplY3RfbWVzc2FnZV9oYW5k bGVyX3NldChvYmplY3QsIHNjcm9sbGJhckVmbEVkamVNZXNzYWdlLCB0aGlzKTsKKyAgICAgICAg c2V0RXZhc09iamVjdChvYmplY3QpOwogICAgIH0gZWxzZSBpZiAoIXZpZXcpIHsKLSAgICAgICAg ZXZhc19vYmplY3RfaGlkZShvKTsKKyAgICAgICAgZXZhc19vYmplY3RfaGlkZShvYmplY3QpOwog ICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xMTcsMjMgKzExNywyMyBAQCB2b2lkIFNjcm9s bGJhckVmbDo6c2V0UGFyZW50KFNjcm9sbFZpZXcqIHZpZXcpCiAKICAgICBpZiAodGhlbWUuaXNF bXB0eSgpKSB7CiAgICAgICAgIEVJTkFfTE9HX0VSUigiQ291bGQgbm90IGxvYWQgdGhlbWUgJyVz Jzogbm8gdGhlbWUgcGF0aCBzZXQuIiwgZ3JvdXApOwotICAgICAgICBldmFzX29iamVjdF9oaWRl KG8pOworICAgICAgICBldmFzX29iamVjdF9oaWRlKG9iamVjdCk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKLSAgICBpZiAoIWVkamVfb2JqZWN0X2ZpbGVfc2V0KG8sIHRoZW1lLnV0ZjgoKS5k YXRhKCksIGdyb3VwKSkgewotICAgICAgICBFZGplX0xvYWRfRXJyb3IgZXJyID0gZWRqZV9vYmpl Y3RfbG9hZF9lcnJvcl9nZXQobyk7Ci0gICAgICAgIGNvbnN0IGNoYXIqIGVycm1zZyA9IGVkamVf bG9hZF9lcnJvcl9zdHIoZXJyKTsKKyAgICBpZiAoIWVkamVfb2JqZWN0X2ZpbGVfc2V0KG9iamVj dCwgdGhlbWUudXRmOCgpLmRhdGEoKSwgZ3JvdXApKSB7CisgICAgICAgIEVkamVfTG9hZF9FcnJv ciBlcnIgPSBlZGplX29iamVjdF9sb2FkX2Vycm9yX2dldChvYmplY3QpOworICAgICAgICBjb25z dCBjaGFyKiBlcnJtZXNzYWdlID0gZWRqZV9sb2FkX2Vycm9yX3N0cihlcnIpOwogICAgICAgICBF SU5BX0xPR19FUlIoIkNvdWxkIG5vdCBsb2FkIHRoZW1lICclcycgZnJvbSBmaWxlICclcyc6ICMl ZCAnJXMnIiwKLSAgICAgICAgICAgICAgICAgICAgIGdyb3VwLCB0aGVtZS51dGY4KCkuZGF0YSgp LCBlcnIsIGVycm1zZyk7CisgICAgICAgICAgICAgICAgICAgICBncm91cCwgdGhlbWUudXRmOCgp LmRhdGEoKSwgZXJyLCBlcnJtZXNzYWdlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAg IHNldFBsYXRmb3JtV2lkZ2V0KG8pOwotICAgIGV2YXNfb2JqZWN0X3NtYXJ0X21lbWJlcl9hZGQo bywgdmlldy0+ZXZhc09iamVjdCgpKTsKLSAgICBldmFzX29iamVjdF9zaG93KG8pOworICAgIHNl dFBsYXRmb3JtV2lkZ2V0KG9iamVjdCk7CisgICAgZXZhc19vYmplY3Rfc21hcnRfbWVtYmVyX2Fk ZChvYmplY3QsIHZpZXctPmV2YXNPYmplY3QoKSk7CisgICAgZXZhc19vYmplY3Rfc2hvdyhvYmpl Y3QpOwogCi0gICAgZWRqZV9vYmplY3Rfc2l6ZV9taW5fZ2V0KG8sICZ3LCAmaCk7CisgICAgZWRq ZV9vYmplY3Rfc2l6ZV9taW5fZ2V0KG9iamVjdCwgJncsICZoKTsKIAogICAgIEludFJlY3QgcmVj dCA9IGZyYW1lUmVjdCgpOwogICAgIHJlY3Quc2V0U2l6ZShJbnRTaXplKHcsIGgpKTsKQEAgLTE2 OCwyMSArMTY4LDIxIEBAIHZvaWQgU2Nyb2xsYmFyRWZsOjp1cGRhdGVUaHVtYlBvc2l0aW9uQW5k UHJvcG9ydGlvbigpCiAgICAgbV9sYXN0VG90YWxTaXplID0gdFNpemU7CiAgICAgbV9sYXN0Vmlz aWJsZVNpemUgPSB2U2l6ZTsKIAotICAgIEVkamVfTWVzc2FnZV9GbG9hdF9TZXQqIG1zZyA9IHN0 YXRpY19jYXN0PEVkamVfTWVzc2FnZV9GbG9hdF9TZXQqPgorICAgIEVkamVfTWVzc2FnZV9GbG9h dF9TZXQqIG1lc3NhZ2UgPSBzdGF0aWNfY2FzdDxFZGplX01lc3NhZ2VfRmxvYXRfU2V0Kj4KICAg ICAgICAgKGFsbG9jYShzaXplb2YoRWRqZV9NZXNzYWdlX0Zsb2F0X1NldCkgKyBzaXplb2YoZmxv YXQpKSk7Ci0gICAgbXNnLT5jb3VudCA9IDI7CisgICAgbWVzc2FnZS0+Y291bnQgPSAyOwogCiAg ICAgaWYgKHRTaXplIC0gdlNpemUgPiAwKQotICAgICAgICBtc2ctPnZhbFswXSA9IHBvcyAvIChm bG9hdCkodFNpemUgLSB2U2l6ZSk7CisgICAgICAgIG1lc3NhZ2UtPnZhbFswXSA9IHBvcyAvIChm bG9hdCkodFNpemUgLSB2U2l6ZSk7CiAgICAgZWxzZQotICAgICAgICBtc2ctPnZhbFswXSA9IDAu MDsKKyAgICAgICAgbWVzc2FnZS0+dmFsWzBdID0gMC4wOwogCiAgICAgaWYgKHRTaXplID4gMCkK LSAgICAgICAgbXNnLT52YWxbMV0gPSB2U2l6ZSAvIChmbG9hdCl0U2l6ZTsKKyAgICAgICAgbWVz c2FnZS0+dmFsWzFdID0gdlNpemUgLyAoZmxvYXQpdFNpemU7CiAgICAgZWxzZQotICAgICAgICBt c2ctPnZhbFsxXSA9IDAuMDsKKyAgICAgICAgbWVzc2FnZS0+dmFsWzFdID0gMC4wOwogCi0gICAg ZWRqZV9vYmplY3RfbWVzc2FnZV9zZW5kKHBsYXRmb3JtV2lkZ2V0KCksIEVESkVfTUVTU0FHRV9G TE9BVF9TRVQsIDAsIG1zZyk7CisgICAgZWRqZV9vYmplY3RfbWVzc2FnZV9zZW5kKHBsYXRmb3Jt V2lkZ2V0KCksIEVESkVfTUVTU0FHRV9GTE9BVF9TRVQsIDAsIG1lc3NhZ2UpOwogfQogCiB2b2lk IFNjcm9sbGJhckVmbDo6c2V0RnJhbWVSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCkBAIC0xOTMs MTAgKzE5MywxMCBAQCB2b2lkIFNjcm9sbGJhckVmbDo6c2V0RnJhbWVSZWN0KGNvbnN0IEludFJl Y3QmIHJlY3QpCiAKIHZvaWQgU2Nyb2xsYmFyRWZsOjpmcmFtZVJlY3RzQ2hhbmdlZCgpCiB7Ci0g ICAgRXZhc19PYmplY3QqIG8gPSBwbGF0Zm9ybVdpZGdldCgpOworICAgIEV2YXNfT2JqZWN0KiBv YmplY3QgPSBwbGF0Zm9ybVdpZGdldCgpOwogICAgIEV2YXNfQ29vcmQgeCwgeTsKIAotICAgIGlm ICghcGFyZW50KCkgfHwgIW8pCisgICAgaWYgKCFwYXJlbnQoKSB8fCAhb2JqZWN0KQogICAgICAg ICByZXR1cm47CiAKICAgICBJbnRSZWN0IHJlY3QgPSBmcmFtZVJlY3QoKTsKQEAgLTIwNiwxMSAr MjA2LDExIEBAIHZvaWQgU2Nyb2xsYmFyRWZsOjpmcmFtZVJlY3RzQ2hhbmdlZCgpCiAgICAgICAg IHJlY3Quc2V0TG9jYXRpb24ocGFyZW50KCktPmNvbnRlbnRzVG9XaW5kb3cocmVjdC5sb2NhdGlv bigpKSk7CiAKICAgICBldmFzX29iamVjdF9nZW9tZXRyeV9nZXQocm9vdCgpLT5ldmFzT2JqZWN0 KCksICZ4LCAmeSwgMCwgMCk7Ci0gICAgZXZhc19vYmplY3RfbW92ZShvLCB4ICsgcmVjdC54KCks IHkgKyByZWN0LnkoKSk7Ci0gICAgZXZhc19vYmplY3RfcmVzaXplKG8sIHJlY3Qud2lkdGgoKSwg cmVjdC5oZWlnaHQoKSk7CisgICAgZXZhc19vYmplY3RfbW92ZShvYmplY3QsIHggKyByZWN0Lngo KSwgeSArIHJlY3QueSgpKTsKKyAgICBldmFzX29iamVjdF9yZXNpemUob2JqZWN0LCByZWN0Lndp ZHRoKCksIHJlY3QuaGVpZ2h0KCkpOwogfQogCi12b2lkIFNjcm9sbGJhckVmbDo6cGFpbnQoR3Jh cGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQordm9pZCBTY3JvbGxi YXJFZmw6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBJbnRS ZWN0JiBkYW1hZ2VSZWN0KQogewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9lZmwvU2Nyb2xsYmFyRWZsLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvU2Ny b2xsYmFyRWZsLmgKaW5kZXggMDlkYzY0Zi4uMWY2N2QyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZWZsL1Njcm9sbGJhckVmbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2VmbC9TY3JvbGxiYXJFZmwuaApAQCAtNDksNyArNDksNyBAQCBwdWJsaWM6CiAKICAg ICB2aXJ0dWFsIHZvaWQgZnJhbWVSZWN0c0NoYW5nZWQoKTsKIAotICAgIHZpcnR1YWwgdm9pZCBw YWludChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGRhbWFnZVJlY3Qp OworICAgIHZpcnR1YWwgdm9pZCBwYWludChHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0 Jik7CiAKIHByb3RlY3RlZDoKICAgICBTY3JvbGxiYXJFZmwoU2Nyb2xsYWJsZUFyZWEqLCBTY3Jv bGxiYXJPcmllbnRhdGlvbiwgU2Nyb2xsYmFyQ29udHJvbFNpemUpOwpAQCAtNTgsNyArNTgsNyBA QCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVRodW1iUG9zaXRpb24oKTsKICAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlVGh1bWJQcm9wb3J0aW9uKCk7CiAKLSAgICB2aXJ0dWFsIHZv aWQgc2V0UGFyZW50KFNjcm9sbFZpZXcqIHZpZXcpOworICAgIHZpcnR1YWwgdm9pZCBzZXRQYXJl bnQoU2Nyb2xsVmlldyopOwogCiBwcml2YXRlOgogICAgIGludCBtX2xhc3RQb3M7Cg== 85017 2011-03-07 21:10:33 -0800 2011-03-07 23:05:16 -0800 Modified Patch patch-scrollbar.txt text/plain 7369 gyuyoung.kim ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmMDdhZDA2Li45YTUzMzk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDMtMDcgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbRUZMXSBB ZGp1c3QgZnVuY3Rpb25zIG9mIFNjcm9sbGJhckVmbC5jcHAgdG8gV2ViS2l0IGNvZGluZyBzdHls ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU5MTcK KworICAgICAgICBBZGp1c3Qgd2Via2l0IHN0eWxlIHRvIFNjcm9sbGJhckVmbCBmaWxlcy4KKwor ICAgICAgICAqIHBsYXRmb3JtL2VmbC9TY3JvbGxiYXJFZmwuY3BwOgorICAgICAgICAoc2Nyb2xs YmFyRWZsRWRqZU1lc3NhZ2UpOgorICAgICAgICAoU2Nyb2xsYmFyRWZsOjpzZXRQYXJlbnQpOgor ICAgICAgICAoU2Nyb2xsYmFyRWZsOjp1cGRhdGVUaHVtYlBvc2l0aW9uQW5kUHJvcG9ydGlvbik6 CisgICAgICAgIChTY3JvbGxiYXJFZmw6OmZyYW1lUmVjdHNDaGFuZ2VkKToKKyAgICAgICAgKFNj cm9sbGJhckVmbDo6cGFpbnQpOgorICAgICAgICAqIHBsYXRmb3JtL2VmbC9TY3JvbGxiYXJFZmwu aDoKKwogMjAxMS0wMy0wNyAgQWxpY2UgQm94aGFsbCAgPGFib3hoYWxsQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZWZsL1Njcm9sbGJhckVmbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9lZmwvU2Nyb2xsYmFyRWZsLmNwcAppbmRleCBlNzFkMWUzLi4xNjJjMmExIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvU2Nyb2xsYmFyRWZsLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvU2Nyb2xsYmFyRWZsLmNwcApAQCAtNjQsNTAgKzY0 LDUwIEBAIFNjcm9sbGJhckVmbDo6flNjcm9sbGJhckVmbCgpCiAgICAgc2V0RXZhc09iamVjdCgw KTsKIH0KIAotc3RhdGljIHZvaWQgc2Nyb2xsYmFyRWZsRWRqZU1lc3NhZ2Uodm9pZCogZGF0YSwg RXZhc19PYmplY3QqIG8sIEVkamVfTWVzc2FnZV9UeXBlIHR5cGUsIGludCBpZCwgdm9pZCogbXNn KQorc3RhdGljIHZvaWQgc2Nyb2xsYmFyRWZsRWRqZU1lc3NhZ2Uodm9pZCogZGF0YSwgRXZhc19P YmplY3QqIG9iamVjdCwgRWRqZV9NZXNzYWdlX1R5cGUgbWVzc2FnZVR5cGUsIGludCBpZCwgdm9p ZCogbWVzc2FnZSkKIHsKICAgICBTY3JvbGxiYXJFZmwqIHRoYXQgPSBzdGF0aWNfY2FzdDxTY3Jv bGxiYXJFZmwqPihkYXRhKTsKLSAgICBFZGplX01lc3NhZ2VfRmxvYXQqIG07Ci0gICAgaW50IHY7 CisgICAgRWRqZV9NZXNzYWdlX0Zsb2F0KiBtZXNzYWdlRmxvYXQ7CisgICAgaW50IHZhbHVlOwog CiAgICAgaWYgKCFpZCkgewogICAgICAgICBFSU5BX0xPR19FUlIoIlVua25vd24gbWVzc2FnZSBp ZCAnJWQnIGZyb20gc2Nyb2xsIGJhciB0aGVtZS4iLCBpZCk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKLSAgICBpZiAodHlwZSAhPSBFREpFX01FU1NBR0VfRkxPQVQpIHsKKyAgICBpZiAobWVz c2FnZVR5cGUgIT0gRURKRV9NRVNTQUdFX0ZMT0FUKSB7CiAgICAgICAgIEVJTkFfTE9HX0VSUigi TWVzc2FnZSBpZCAnJWQnIG9mIGluY29ycmVjdCB0eXBlIGZyb20gc2Nyb2xsIGJhciB0aGVtZS4g IgogICAgICAgICAgICAgICAgICAgICAgIkV4cGVjdGVkICclZCcsIGdvdCAnJWQnLiIsCi0gICAg ICAgICAgICAgICAgICAgICBpZCwgRURKRV9NRVNTQUdFX0ZMT0FULCB0eXBlKTsKKyAgICAgICAg ICAgICAgICAgICAgIGlkLCBFREpFX01FU1NBR0VfRkxPQVQsIG1lc3NhZ2VUeXBlKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIAotICAgIG0gPSBzdGF0aWNfY2FzdDxFZGplX01lc3NhZ2VfRmxv YXQqPihtc2cpOwotICAgIHYgPSBtLT52YWwgKiAodGhhdC0+dG90YWxTaXplKCkgLSB0aGF0LT52 aXNpYmxlU2l6ZSgpKTsKLSAgICB0aGF0LT5zY3JvbGxhYmxlQXJlYSgpLT5zY3JvbGxUb09mZnNl dFdpdGhvdXRBbmltYXRpb24odGhhdC0+b3JpZW50YXRpb24oKSwgdik7CisgICAgbWVzc2FnZUZs b2F0ID0gc3RhdGljX2Nhc3Q8RWRqZV9NZXNzYWdlX0Zsb2F0Kj4obWVzc2FnZSk7CisgICAgdmFs dWUgPSBtZXNzYWdlRmxvYXQtPnZhbCAqICh0aGF0LT50b3RhbFNpemUoKSAtIHRoYXQtPnZpc2li bGVTaXplKCkpOworICAgIHRoYXQtPnNjcm9sbGFibGVBcmVhKCktPnNjcm9sbFRvT2Zmc2V0V2l0 aG91dEFuaW1hdGlvbih0aGF0LT5vcmllbnRhdGlvbigpLCB2YWx1ZSk7CiB9CiAKIHZvaWQgU2Ny b2xsYmFyRWZsOjpzZXRQYXJlbnQoU2Nyb2xsVmlldyogdmlldykKIHsKLSAgICBFdmFzX09iamVj dCogbyA9IGV2YXNPYmplY3QoKTsKKyAgICBFdmFzX09iamVjdCogb2JqZWN0ID0gZXZhc09iamVj dCgpOwogICAgIEV2YXNfQ29vcmQgdywgaDsKIAogICAgIFdpZGdldDo6c2V0UGFyZW50KHZpZXcp OwogCi0gICAgaWYgKCFvKSB7CisgICAgaWYgKCFvYmplY3QpIHsKICAgICAgICAgaWYgKCF2aWV3 KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIG8gPSBlZGplX29iamVjdF9hZGQodmll dy0+ZXZhcygpKTsKLSAgICAgICAgaWYgKCFvKSB7CisgICAgICAgIG9iamVjdCA9IGVkamVfb2Jq ZWN0X2FkZCh2aWV3LT5ldmFzKCkpOworICAgICAgICBpZiAoIW9iamVjdCkgewogICAgICAgICAg ICAgRUlOQV9MT0dfRVJSKCJDb3VsZCBub3QgY3JlYXRlIGVkamUgb2JqZWN0IGZvciB2aWV3PSVw IChldmFzPSVwKSIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgdmlldywgdmlldy0+ZXZhcygp KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICBlZGplX29iamVjdF9t ZXNzYWdlX2hhbmRsZXJfc2V0KG8sIHNjcm9sbGJhckVmbEVkamVNZXNzYWdlLCB0aGlzKTsKLSAg ICAgICAgc2V0RXZhc09iamVjdChvKTsKKyAgICAgICAgZWRqZV9vYmplY3RfbWVzc2FnZV9oYW5k bGVyX3NldChvYmplY3QsIHNjcm9sbGJhckVmbEVkamVNZXNzYWdlLCB0aGlzKTsKKyAgICAgICAg c2V0RXZhc09iamVjdChvYmplY3QpOwogICAgIH0gZWxzZSBpZiAoIXZpZXcpIHsKLSAgICAgICAg ZXZhc19vYmplY3RfaGlkZShvKTsKKyAgICAgICAgZXZhc19vYmplY3RfaGlkZShvYmplY3QpOwog ICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xMTcsMjMgKzExNywyMyBAQCB2b2lkIFNjcm9s bGJhckVmbDo6c2V0UGFyZW50KFNjcm9sbFZpZXcqIHZpZXcpCiAKICAgICBpZiAodGhlbWUuaXNF bXB0eSgpKSB7CiAgICAgICAgIEVJTkFfTE9HX0VSUigiQ291bGQgbm90IGxvYWQgdGhlbWUgJyVz Jzogbm8gdGhlbWUgcGF0aCBzZXQuIiwgZ3JvdXApOwotICAgICAgICBldmFzX29iamVjdF9oaWRl KG8pOworICAgICAgICBldmFzX29iamVjdF9oaWRlKG9iamVjdCk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKLSAgICBpZiAoIWVkamVfb2JqZWN0X2ZpbGVfc2V0KG8sIHRoZW1lLnV0ZjgoKS5k YXRhKCksIGdyb3VwKSkgewotICAgICAgICBFZGplX0xvYWRfRXJyb3IgZXJyID0gZWRqZV9vYmpl Y3RfbG9hZF9lcnJvcl9nZXQobyk7Ci0gICAgICAgIGNvbnN0IGNoYXIqIGVycm1zZyA9IGVkamVf bG9hZF9lcnJvcl9zdHIoZXJyKTsKKyAgICBpZiAoIWVkamVfb2JqZWN0X2ZpbGVfc2V0KG9iamVj dCwgdGhlbWUudXRmOCgpLmRhdGEoKSwgZ3JvdXApKSB7CisgICAgICAgIEVkamVfTG9hZF9FcnJv ciBlcnIgPSBlZGplX29iamVjdF9sb2FkX2Vycm9yX2dldChvYmplY3QpOworICAgICAgICBjb25z dCBjaGFyKiBlcnJtZXNzYWdlID0gZWRqZV9sb2FkX2Vycm9yX3N0cihlcnIpOwogICAgICAgICBF SU5BX0xPR19FUlIoIkNvdWxkIG5vdCBsb2FkIHRoZW1lICclcycgZnJvbSBmaWxlICclcyc6ICMl ZCAnJXMnIiwKLSAgICAgICAgICAgICAgICAgICAgIGdyb3VwLCB0aGVtZS51dGY4KCkuZGF0YSgp LCBlcnIsIGVycm1zZyk7CisgICAgICAgICAgICAgICAgICAgICBncm91cCwgdGhlbWUudXRmOCgp LmRhdGEoKSwgZXJyLCBlcnJtZXNzYWdlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAg IHNldFBsYXRmb3JtV2lkZ2V0KG8pOwotICAgIGV2YXNfb2JqZWN0X3NtYXJ0X21lbWJlcl9hZGQo bywgdmlldy0+ZXZhc09iamVjdCgpKTsKLSAgICBldmFzX29iamVjdF9zaG93KG8pOworICAgIHNl dFBsYXRmb3JtV2lkZ2V0KG9iamVjdCk7CisgICAgZXZhc19vYmplY3Rfc21hcnRfbWVtYmVyX2Fk ZChvYmplY3QsIHZpZXctPmV2YXNPYmplY3QoKSk7CisgICAgZXZhc19vYmplY3Rfc2hvdyhvYmpl Y3QpOwogCi0gICAgZWRqZV9vYmplY3Rfc2l6ZV9taW5fZ2V0KG8sICZ3LCAmaCk7CisgICAgZWRq ZV9vYmplY3Rfc2l6ZV9taW5fZ2V0KG9iamVjdCwgJncsICZoKTsKIAogICAgIEludFJlY3QgcmVj dCA9IGZyYW1lUmVjdCgpOwogICAgIHJlY3Quc2V0U2l6ZShJbnRTaXplKHcsIGgpKTsKQEAgLTE2 OCwyMSArMTY4LDIxIEBAIHZvaWQgU2Nyb2xsYmFyRWZsOjp1cGRhdGVUaHVtYlBvc2l0aW9uQW5k UHJvcG9ydGlvbigpCiAgICAgbV9sYXN0VG90YWxTaXplID0gdFNpemU7CiAgICAgbV9sYXN0Vmlz aWJsZVNpemUgPSB2U2l6ZTsKIAotICAgIEVkamVfTWVzc2FnZV9GbG9hdF9TZXQqIG1zZyA9IHN0 YXRpY19jYXN0PEVkamVfTWVzc2FnZV9GbG9hdF9TZXQqPgorICAgIEVkamVfTWVzc2FnZV9GbG9h dF9TZXQqIG1lc3NhZ2UgPSBzdGF0aWNfY2FzdDxFZGplX01lc3NhZ2VfRmxvYXRfU2V0Kj4KICAg ICAgICAgKGFsbG9jYShzaXplb2YoRWRqZV9NZXNzYWdlX0Zsb2F0X1NldCkgKyBzaXplb2YoZmxv YXQpKSk7Ci0gICAgbXNnLT5jb3VudCA9IDI7CisgICAgbWVzc2FnZS0+Y291bnQgPSAyOwogCiAg ICAgaWYgKHRTaXplIC0gdlNpemUgPiAwKQotICAgICAgICBtc2ctPnZhbFswXSA9IHBvcyAvIChm bG9hdCkodFNpemUgLSB2U2l6ZSk7CisgICAgICAgIG1lc3NhZ2UtPnZhbFswXSA9IHBvcyAvIHN0 YXRpY19jYXN0PGZsb2F0Pih0U2l6ZSAtIHZTaXplKTsKICAgICBlbHNlCi0gICAgICAgIG1zZy0+ dmFsWzBdID0gMC4wOworICAgICAgICBtZXNzYWdlLT52YWxbMF0gPSAwLjA7CiAKICAgICBpZiAo dFNpemUgPiAwKQotICAgICAgICBtc2ctPnZhbFsxXSA9IHZTaXplIC8gKGZsb2F0KXRTaXplOwor ICAgICAgICBtZXNzYWdlLT52YWxbMV0gPSB2U2l6ZSAvIHN0YXRpY19jYXN0PGZsb2F0Pih0U2l6 ZSk7CiAgICAgZWxzZQotICAgICAgICBtc2ctPnZhbFsxXSA9IDAuMDsKKyAgICAgICAgbWVzc2Fn ZS0+dmFsWzFdID0gMC4wOwogCi0gICAgZWRqZV9vYmplY3RfbWVzc2FnZV9zZW5kKHBsYXRmb3Jt V2lkZ2V0KCksIEVESkVfTUVTU0FHRV9GTE9BVF9TRVQsIDAsIG1zZyk7CisgICAgZWRqZV9vYmpl Y3RfbWVzc2FnZV9zZW5kKHBsYXRmb3JtV2lkZ2V0KCksIEVESkVfTUVTU0FHRV9GTE9BVF9TRVQs IDAsIG1lc3NhZ2UpOwogfQogCiB2b2lkIFNjcm9sbGJhckVmbDo6c2V0RnJhbWVSZWN0KGNvbnN0 IEludFJlY3QmIHJlY3QpCkBAIC0xOTMsMTAgKzE5MywxMCBAQCB2b2lkIFNjcm9sbGJhckVmbDo6 c2V0RnJhbWVSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCiAKIHZvaWQgU2Nyb2xsYmFyRWZsOjpm cmFtZVJlY3RzQ2hhbmdlZCgpCiB7Ci0gICAgRXZhc19PYmplY3QqIG8gPSBwbGF0Zm9ybVdpZGdl dCgpOworICAgIEV2YXNfT2JqZWN0KiBvYmplY3QgPSBwbGF0Zm9ybVdpZGdldCgpOwogICAgIEV2 YXNfQ29vcmQgeCwgeTsKIAotICAgIGlmICghcGFyZW50KCkgfHwgIW8pCisgICAgaWYgKCFwYXJl bnQoKSB8fCAhb2JqZWN0KQogICAgICAgICByZXR1cm47CiAKICAgICBJbnRSZWN0IHJlY3QgPSBm cmFtZVJlY3QoKTsKQEAgLTIwNiwxMSArMjA2LDExIEBAIHZvaWQgU2Nyb2xsYmFyRWZsOjpmcmFt ZVJlY3RzQ2hhbmdlZCgpCiAgICAgICAgIHJlY3Quc2V0TG9jYXRpb24ocGFyZW50KCktPmNvbnRl bnRzVG9XaW5kb3cocmVjdC5sb2NhdGlvbigpKSk7CiAKICAgICBldmFzX29iamVjdF9nZW9tZXRy eV9nZXQocm9vdCgpLT5ldmFzT2JqZWN0KCksICZ4LCAmeSwgMCwgMCk7Ci0gICAgZXZhc19vYmpl Y3RfbW92ZShvLCB4ICsgcmVjdC54KCksIHkgKyByZWN0LnkoKSk7Ci0gICAgZXZhc19vYmplY3Rf cmVzaXplKG8sIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CisgICAgZXZhc19vYmplY3Rf bW92ZShvYmplY3QsIHggKyByZWN0LngoKSwgeSArIHJlY3QueSgpKTsKKyAgICBldmFzX29iamVj dF9yZXNpemUob2JqZWN0LCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOwogfQogCi12b2lk IFNjcm9sbGJhckVmbDo6cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRS ZWN0JiByZWN0KQordm9pZCBTY3JvbGxiYXJFZmw6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogZ3Jh cGhpY3NDb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkYW1hZ2VSZWN0KQogewogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvU2Nyb2xsYmFyRWZsLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9lZmwvU2Nyb2xsYmFyRWZsLmgKaW5kZXggMDlkYzY0Zi4uMWY2N2Qy ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1Njcm9sbGJhckVmbC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9TY3JvbGxiYXJFZmwuaApAQCAtNDks NyArNDksNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgZnJhbWVSZWN0c0NoYW5nZWQo KTsKIAotICAgIHZpcnR1YWwgdm9pZCBwYWludChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNv bnN0IEludFJlY3QmIGRhbWFnZVJlY3QpOworICAgIHZpcnR1YWwgdm9pZCBwYWludChHcmFwaGlj c0NvbnRleHQqLCBjb25zdCBJbnRSZWN0Jik7CiAKIHByb3RlY3RlZDoKICAgICBTY3JvbGxiYXJF ZmwoU2Nyb2xsYWJsZUFyZWEqLCBTY3JvbGxiYXJPcmllbnRhdGlvbiwgU2Nyb2xsYmFyQ29udHJv bFNpemUpOwpAQCAtNTgsNyArNTgsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lkIHVw ZGF0ZVRodW1iUG9zaXRpb24oKTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlVGh1bWJQcm9wb3J0 aW9uKCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0UGFyZW50KFNjcm9sbFZpZXcqIHZpZXcpOwor ICAgIHZpcnR1YWwgdm9pZCBzZXRQYXJlbnQoU2Nyb2xsVmlldyopOwogCiBwcml2YXRlOgogICAg IGludCBtX2xhc3RQb3M7Cg==