102022 2012-11-12 17:40:45 -0800 Change calculateLayerBounds() from a static function to a member function 2012-11-12 21:25:21 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser eric simon.fraser webkit.review.bot oldest_to_newest 765037 0 simon.fraser 2012-11-12 17:40:45 -0800 Change calculateLayerBounds() from a static function to a member function 765039 1 173773 simon.fraser 2012-11-12 17:41:43 -0800 Created attachment 173773 Patch 765198 2 simon.fraser 2012-11-12 21:25:21 -0800 http://trac.webkit.org/changeset/134355 173773 2012-11-12 17:41:43 -0800 2012-11-12 18:08:38 -0800 Patch bug-102022-20121112173945.patch text/plain 13711 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTcyODM1ZTFiNmQxMGFh Nzg1MDkwZDg1NWEyZTI1YWU3NzE4NGE0NC4uMzUxZTVlYTUyNTUyMmExNGJhYmM1NmMwOWVjNTg2 MTU0OTcxYzk1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEyLTExLTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIENoYW5nZSBjYWxj dWxhdGVMYXllckJvdW5kcygpIGZyb20gYSBzdGF0aWMgZnVuY3Rpb24gdG8gYSBtZW1iZXIgZnVu Y3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEw MjAyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNh bGN1bGF0ZUxheWVyQm91bmRzKCkgaGFzIGdyb3duIGludG8gYSBzdWJzdGFudGlhbCBmdW5jdGlv biBhZnRlcgorICAgICAgICBzdGFydGluZyBsaXZlIGFzIGEgbGl0dGxlIHV0aWxpdHkgZnVuY3Rp b24sIHNvIG1ha2UgaXQgYSBtZW1iZXIgZnVuY3Rpb24KKyAgICAgICAgb2YgUmVuZGVyTGF5ZXIs IGFuZCBhZGp1c3QgY2FsbGVycyBhY2NvcmRpbmdseS4KKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2V0RmlsdGVy QmFja2VuZE5lZWRzUmVwYWludGluZ0luUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllcjo6cGFpbnRMYXllckNvbnRlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy OjpjYWxjdWxhdGVMYXllckJvdW5kcyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVy Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNhbGN1bGF0ZUNvbXBvc2l0ZWRC b3VuZHMpOgorCisyMDEyLTExLTEyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu Y29tPgorCiAgICAgICAgIEZpeCBmaWx0ZXIgZGlydHkgcmVjdCByZWdyZXNzaW9uIGZyb20gcjEz NDMxMQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAy MDAyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IGRkNDYx NWM3MDdlZTMyN2Q0ZDM1YmJhNTlhYWMxYThhMDIzODdiZDcuLmM5ZDg2OWNjZTM5M2ViZTEyNTU2 Y2ZiNTQ0MjhlN2EzZWE2MGM1ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcApAQCAtMTExNiw3ICsxMTE2LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6c2V0RmlsdGVy QmFja2VuZE5lZWRzUmVwYWludGluZ0luUmVjdChjb25zdCBMYXlvdXRSZWN0JiByZWN0LAogICAg ICAgICAvLyBJZiB3ZSBoYXZlIGF0IGxlYXN0IG9uZSBjdXN0b20gc2hhZGVyLCB3ZSBuZWVkIHRv IHVwZGF0ZSB0aGUgd2hvbGUgYm91bmRpbmcgYm94IG9mIHRoZSBsYXllciwgYmVjYXVzZSB0aGUK ICAgICAgICAgLy8gc2hhZGVyIGNhbiBhZGRyZXNzIGFueSBvdXB1dCBwaXhlbC4KICAgICAgICAg Ly8gTm90ZTogVGhpcyBpcyBvbmx5IGZvciBvdXRwdXQgcmVjdCwgc28gdGhlcmUncyBubyBuZWVk IHRvIGV4cGFuZCB0aGUgZGlydHkgc291cmNlIHJlY3QuCi0gICAgICAgIHJlY3RGb3JSZXBhaW50 LnVuaXRlKGNhbGN1bGF0ZUxheWVyQm91bmRzKHRoaXMsIHRoaXMpKTsKKyAgICAgICAgcmVjdEZv clJlcGFpbnQudW5pdGUoY2FsY3VsYXRlTGF5ZXJCb3VuZHModGhpcykpOwogICAgIH0KICNlbmRp ZgogICAgIApAQCAtMzE5Miw3ICszMTkyLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRMYXll ckNvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgTGF5ZXJQYWludGkKICAg ICAgICAgICAgIGhhc0NsaXBQYXRoID0gdHJ1ZTsKICAgICAgICAgICAgIGNvbnRleHQtPnNhdmUo KTsKICAgICAgICAgICAgIFNoYXBlQ2xpcFBhdGhPcGVyYXRpb24qIGNsaXBQYXRoID0gc3RhdGlj X2Nhc3Q8U2hhcGVDbGlwUGF0aE9wZXJhdGlvbio+KHN0eWxlLT5jbGlwUGF0aCgpKTsKLSAgICAg ICAgICAgIGNvbnRleHQtPmNsaXBQYXRoKGNsaXBQYXRoLT5wYXRoKGNhbGN1bGF0ZUxheWVyQm91 bmRzKHRoaXMsIHBhaW50aW5nSW5mby5yb290TGF5ZXIsIDApKSwgY2xpcFBhdGgtPndpbmRSdWxl KCkpOworICAgICAgICAgICAgY29udGV4dC0+Y2xpcFBhdGgoY2xpcFBhdGgtPnBhdGgoY2FsY3Vs YXRlTGF5ZXJCb3VuZHMocGFpbnRpbmdJbmZvLnJvb3RMYXllciwgMCkpLCBjbGlwUGF0aC0+d2lu ZFJ1bGUoKSk7CiAgICAgICAgIH0KICNpZiBFTkFCTEUoU1ZHKQogICAgICAgICBlbHNlIGlmIChz dHlsZS0+Y2xpcFBhdGgoKS0+Z2V0T3BlcmF0aW9uVHlwZSgpID09IENsaXBQYXRoT3BlcmF0aW9u OjpSRUZFUkVOQ0UpIHsKQEAgLTMyMDEsNyArMzIwMSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBh aW50TGF5ZXJDb250ZW50cyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheWVyUGFp bnRpCiAgICAgICAgICAgICAvLyBGSVhNRTogSXQgZG9lc24ndCB3b3JrIHdpdGggZm9yd2FyZCBv ciBleHRlcm5hbCBTVkcgcmVmZXJlbmNlcyAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkwNDA1KQogICAgICAgICAgICAgRWxlbWVudCogZWxlbWVudCA9IGRvY3VtZW50 ID8gZG9jdW1lbnQtPmdldEVsZW1lbnRCeUlkKHJlZmVyZW5jZUNsaXBQYXRoT3BlcmF0aW9uLT5m cmFnbWVudCgpKSA6IDA7CiAgICAgICAgICAgICBpZiAoZWxlbWVudCAmJiBlbGVtZW50LT5oYXNU YWdOYW1lKFNWR05hbWVzOjpjbGlwUGF0aFRhZykgJiYgZWxlbWVudC0+cmVuZGVyZXIoKSkKLSAg ICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxSZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXIqPihlbGVt ZW50LT5yZW5kZXJlcigpKS0+YXBwbHlDbGlwcGluZ1RvQ29udGV4dChyZW5kZXJlcigpLCBjYWxj dWxhdGVMYXllckJvdW5kcyh0aGlzLCBwYWludGluZ0luZm8ucm9vdExheWVyLCAwKSwgcGFpbnRp bmdJbmZvLnBhaW50RGlydHlSZWN0LCBjb250ZXh0KTsKKyAgICAgICAgICAgICAgICBzdGF0aWNf Y2FzdDxSZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXIqPihlbGVtZW50LT5yZW5kZXJlcigpKS0+YXBw bHlDbGlwcGluZ1RvQ29udGV4dChyZW5kZXJlcigpLCBjYWxjdWxhdGVMYXllckJvdW5kcyhwYWlu dGluZ0luZm8ucm9vdExheWVyLCAwKSwgcGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0LCBjb250 ZXh0KTsKICAgICAgICAgfQogI2VuZGlmCiAgICAgfQpAQCAtMzIxNiw3ICszMjE2LDcgQEAgdm9p ZCBSZW5kZXJMYXllcjo6cGFpbnRMYXllckNvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCogY29udGV4 dCwgY29uc3QgTGF5ZXJQYWludGkKICAgICAgICAgQVNTRVJUKGZpbHRlckluZm8pOwogICAgICAg ICBMYXlvdXRSZWN0IGZpbHRlclJlcGFpbnRSZWN0ID0gZmlsdGVySW5mby0+ZGlydHlTb3VyY2VS ZWN0KCk7CiAgICAgICAgIGZpbHRlclJlcGFpbnRSZWN0Lm1vdmUocm9vdExheWVyT2Zmc2V0Lngo KSwgcm9vdExheWVyT2Zmc2V0LnkoKSk7Ci0gICAgICAgIGlmIChmaWx0ZXJQYWludGVyLnByZXBh cmVGaWx0ZXJFZmZlY3QodGhpcywgY2FsY3VsYXRlTGF5ZXJCb3VuZHModGhpcywgcGFpbnRpbmdJ bmZvLnJvb3RMYXllciwgMCksIHBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdCwgZmlsdGVyUmVw YWludFJlY3QpKSB7CisgICAgICAgIGlmIChmaWx0ZXJQYWludGVyLnByZXBhcmVGaWx0ZXJFZmZl Y3QodGhpcywgY2FsY3VsYXRlTGF5ZXJCb3VuZHMocGFpbnRpbmdJbmZvLnJvb3RMYXllciwgMCks IHBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdCwgZmlsdGVyUmVwYWludFJlY3QpKSB7CiAgICAg ICAgICAgICAvLyBOb3cgd2Uga25vdyBmb3Igc3VyZSwgdGhhdCB0aGUgc291cmNlIGltYWdlIHdp bGwgYmUgdXBkYXRlZCwgc28gd2UgY2FuIHJldmVydCBvdXIgdHJhY2tpbmcgcmVwYWludCByZWN0 IGJhY2sgdG8gemVyby4KICAgICAgICAgICAgIGZpbHRlckluZm8tPnJlc2V0RGlydHlTb3VyY2VS ZWN0KCk7CiAKQEAgLTQzNzMsMTcgKzQzNzMsMTcgQEAgSW50UmVjdCBSZW5kZXJMYXllcjo6YWJz b2x1dGVCb3VuZGluZ0JveCgpIGNvbnN0CiAgICAgcmV0dXJuIHBpeGVsU25hcHBlZEludFJlY3Qo Ym91bmRpbmdCb3gocm9vdCgpKSk7CiB9CiAKLUludFJlY3QgUmVuZGVyTGF5ZXI6OmNhbGN1bGF0 ZUxheWVyQm91bmRzKGNvbnN0IFJlbmRlckxheWVyKiBsYXllciwgY29uc3QgUmVuZGVyTGF5ZXIq IGFuY2VzdG9yTGF5ZXIsIENhbGN1bGF0ZUxheWVyQm91bmRzRmxhZ3MgZmxhZ3MpCitJbnRSZWN0 IFJlbmRlckxheWVyOjpjYWxjdWxhdGVMYXllckJvdW5kcyhjb25zdCBSZW5kZXJMYXllciogYW5j ZXN0b3JMYXllciwgQ2FsY3VsYXRlTGF5ZXJCb3VuZHNGbGFncyBmbGFncykgY29uc3QKIHsKLSAg ICBpZiAoIWxheWVyLT5pc1NlbGZQYWludGluZ0xheWVyKCkpCisgICAgaWYgKCFpc1NlbGZQYWlu dGluZ0xheWVyKCkpCiAgICAgICAgIHJldHVybiBJbnRSZWN0KCk7CiAKICAgICAvLyBGSVhNRTog VGhpcyBjb3VsZCBiZSBpbXByb3ZlZCB0byBkbyBhIGNoZWNrIGxpa2UgaGFzVmlzaWJsZU5vbkNv bXBvc2l0aW5nRGVzY2VuZGFudExheWVycygpIChidWcgOTI1ODApLgotICAgIGlmICgoZmxhZ3Mg JiBFeGNsdWRlSGlkZGVuRGVzY2VuZGFudHMpICYmIGxheWVyICE9IGFuY2VzdG9yTGF5ZXIgJiYg IWxheWVyLT5oYXNWaXNpYmxlQ29udGVudCgpICYmICFsYXllci0+aGFzVmlzaWJsZURlc2NlbmRh bnQoKSkKKyAgICBpZiAoKGZsYWdzICYgRXhjbHVkZUhpZGRlbkRlc2NlbmRhbnRzKSAmJiB0aGlz ICE9IGFuY2VzdG9yTGF5ZXIgJiYgIWhhc1Zpc2libGVDb250ZW50KCkgJiYgIWhhc1Zpc2libGVE ZXNjZW5kYW50KCkpCiAgICAgICAgIHJldHVybiBJbnRSZWN0KCk7CiAKLSAgICBSZW5kZXJMYXll ck1vZGVsT2JqZWN0KiByZW5kZXJlciA9IGxheWVyLT5yZW5kZXJlcigpOwotICAgIExheW91dFJl Y3QgYm91bmRpbmdCb3hSZWN0ID0gbGF5ZXItPmxvY2FsQm91bmRpbmdCb3goKTsKKyAgICBSZW5k ZXJMYXllck1vZGVsT2JqZWN0KiByZW5kZXJlciA9IHRoaXMtPnJlbmRlcmVyKCk7CisgICAgTGF5 b3V0UmVjdCBib3VuZGluZ0JveFJlY3QgPSBsb2NhbEJvdW5kaW5nQm94KCk7CiAgICAgaWYgKHJl bmRlcmVyLT5pc0JveCgpKQogICAgICAgICB0b1JlbmRlckJveChyZW5kZXJlciktPmZsaXBGb3JX cml0aW5nTW9kZShib3VuZGluZ0JveFJlY3QpOwogICAgIGVsc2UKQEAgLTQ0MDUsMTMgKzQ0MDUs MTMgQEAgSW50UmVjdCBSZW5kZXJMYXllcjo6Y2FsY3VsYXRlTGF5ZXJCb3VuZHMoY29uc3QgUmVu ZGVyTGF5ZXIqIGxheWVyLCBjb25zdCBSZW5kZXIKICAgICBMYXlvdXRSZWN0IHVuaW9uQm91bmRz ID0gYm91bmRpbmdCb3hSZWN0OwogCiAgICAgaWYgKGZsYWdzICYgVXNlTG9jYWxDbGlwUmVjdElm UG9zc2libGUpIHsKLSAgICAgICAgTGF5b3V0UmVjdCBsb2NhbENsaXBSZWN0ID0gbGF5ZXItPmxv Y2FsQ2xpcFJlY3QoKTsKKyAgICAgICAgTGF5b3V0UmVjdCBsb2NhbENsaXBSZWN0ID0gdGhpcy0+ bG9jYWxDbGlwUmVjdCgpOwogICAgICAgICBpZiAobG9jYWxDbGlwUmVjdCAhPSBQYWludEluZm86 OmluZmluaXRlUmVjdCgpKSB7Ci0gICAgICAgICAgICBpZiAoKGZsYWdzICYgSW5jbHVkZVNlbGZU cmFuc2Zvcm0pICYmIGxheWVyLT5wYWludHNXaXRoVHJhbnNmb3JtKFBhaW50QmVoYXZpb3JOb3Jt YWwpKQotICAgICAgICAgICAgICAgIGxvY2FsQ2xpcFJlY3QgPSBsYXllci0+dHJhbnNmb3JtKCkt Pm1hcFJlY3QobG9jYWxDbGlwUmVjdCk7CisgICAgICAgICAgICBpZiAoKGZsYWdzICYgSW5jbHVk ZVNlbGZUcmFuc2Zvcm0pICYmIHBhaW50c1dpdGhUcmFuc2Zvcm0oUGFpbnRCZWhhdmlvck5vcm1h bCkpCisgICAgICAgICAgICAgICAgbG9jYWxDbGlwUmVjdCA9IHRyYW5zZm9ybSgpLT5tYXBSZWN0 KGxvY2FsQ2xpcFJlY3QpOwogCiAgICAgICAgICAgICBMYXlvdXRQb2ludCBhbmNlc3RvclJlbE9m ZnNldDsKLSAgICAgICAgICAgIGxheWVyLT5jb252ZXJ0VG9MYXllckNvb3JkcyhhbmNlc3Rvckxh eWVyLCBhbmNlc3RvclJlbE9mZnNldCk7CisgICAgICAgICAgICBjb252ZXJ0VG9MYXllckNvb3Jk cyhhbmNlc3RvckxheWVyLCBhbmNlc3RvclJlbE9mZnNldCk7CiAgICAgICAgICAgICBsb2NhbENs aXBSZWN0Lm1vdmVCeShhbmNlc3RvclJlbE9mZnNldCk7CiAgICAgICAgICAgICByZXR1cm4gcGl4 ZWxTbmFwcGVkSW50UmVjdChsb2NhbENsaXBSZWN0KTsKICAgICAgICAgfQpAQCAtNDQyMCw0OSAr NDQyMCw0OSBAQCBJbnRSZWN0IFJlbmRlckxheWVyOjpjYWxjdWxhdGVMYXllckJvdW5kcyhjb25z dCBSZW5kZXJMYXllciogbGF5ZXIsIGNvbnN0IFJlbmRlcgogICAgIC8vIEZJWE1FOiBzaG91bGQg cHJvYmFibHkganVzdCBwYXNzICdmbGFncycgZG93biB0byBkZXNjZW5kYW50cy4KICAgICBDYWxj dWxhdGVMYXllckJvdW5kc0ZsYWdzIGRlc2NlbmRhbnRGbGFncyA9IERlZmF1bHRDYWxjdWxhdGVM YXllckJvdW5kc0ZsYWdzIHwgKGZsYWdzICYgRXhjbHVkZUhpZGRlbkRlc2NlbmRhbnRzKTsKIAot ICAgIGNvbnN0X2Nhc3Q8UmVuZGVyTGF5ZXIqPihsYXllciktPnVwZGF0ZUxheWVyTGlzdHNJZk5l ZWRlZCgpOworICAgIGNvbnN0X2Nhc3Q8UmVuZGVyTGF5ZXIqPih0aGlzKS0+dXBkYXRlTGF5ZXJM aXN0c0lmTmVlZGVkKCk7CiAKLSAgICBpZiAoUmVuZGVyTGF5ZXIqIHJlZmxlY3Rpb24gPSBsYXll ci0+cmVmbGVjdGlvbkxheWVyKCkpIHsKKyAgICBpZiAoUmVuZGVyTGF5ZXIqIHJlZmxlY3Rpb24g PSByZWZsZWN0aW9uTGF5ZXIoKSkgewogICAgICAgICBpZiAoIXJlZmxlY3Rpb24tPmlzQ29tcG9z aXRlZCgpKSB7Ci0gICAgICAgICAgICBJbnRSZWN0IGNoaWxkVW5pb25Cb3VuZHMgPSBjYWxjdWxh dGVMYXllckJvdW5kcyhyZWZsZWN0aW9uLCBsYXllciwgZGVzY2VuZGFudEZsYWdzKTsKKyAgICAg ICAgICAgIEludFJlY3QgY2hpbGRVbmlvbkJvdW5kcyA9IHJlZmxlY3Rpb24tPmNhbGN1bGF0ZUxh eWVyQm91bmRzKHRoaXMsIGRlc2NlbmRhbnRGbGFncyk7CiAgICAgICAgICAgICB1bmlvbkJvdW5k cy51bml0ZShjaGlsZFVuaW9uQm91bmRzKTsKICAgICAgICAgfQogICAgIH0KICAgICAKLSAgICBB U1NFUlQobGF5ZXItPmlzU3RhY2tpbmdDb250ZXh0KCkgfHwgKCFsYXllci0+cG9zWk9yZGVyTGlz dCgpIHx8ICFsYXllci0+cG9zWk9yZGVyTGlzdCgpLT5zaXplKCkpKTsKKyAgICBBU1NFUlQoaXNT dGFja2luZ0NvbnRleHQoKSB8fCAoIXBvc1pPcmRlckxpc3QoKSB8fCAhcG9zWk9yZGVyTGlzdCgp LT5zaXplKCkpKTsKIAogI2lmICFBU1NFUlRfRElTQUJMRUQKLSAgICBMYXllckxpc3RNdXRhdGlv bkRldGVjdG9yIG11dGF0aW9uQ2hlY2tlcihjb25zdF9jYXN0PFJlbmRlckxheWVyKj4obGF5ZXIp KTsKKyAgICBMYXllckxpc3RNdXRhdGlvbkRldGVjdG9yIG11dGF0aW9uQ2hlY2tlcihjb25zdF9j YXN0PFJlbmRlckxheWVyKj4odGhpcykpOwogI2VuZGlmCiAKLSAgICBpZiAoVmVjdG9yPFJlbmRl ckxheWVyKj4qIG5lZ1pPcmRlckxpc3QgPSBsYXllci0+bmVnWk9yZGVyTGlzdCgpKSB7CisgICAg aWYgKFZlY3RvcjxSZW5kZXJMYXllcio+KiBuZWdaT3JkZXJMaXN0ID0gdGhpcy0+bmVnWk9yZGVy TGlzdCgpKSB7CiAgICAgICAgIHNpemVfdCBsaXN0U2l6ZSA9IG5lZ1pPcmRlckxpc3QtPnNpemUo KTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAgICAg ICAgICAgICBSZW5kZXJMYXllciogY3VyTGF5ZXIgPSBuZWdaT3JkZXJMaXN0LT5hdChpKTsKICAg ICAgICAgICAgIGlmICghY3VyTGF5ZXItPmlzQ29tcG9zaXRlZCgpKSB7Ci0gICAgICAgICAgICAg ICAgSW50UmVjdCBjaGlsZFVuaW9uQm91bmRzID0gY2FsY3VsYXRlTGF5ZXJCb3VuZHMoY3VyTGF5 ZXIsIGxheWVyLCBkZXNjZW5kYW50RmxhZ3MpOworICAgICAgICAgICAgICAgIEludFJlY3QgY2hp bGRVbmlvbkJvdW5kcyA9IGN1ckxheWVyLT5jYWxjdWxhdGVMYXllckJvdW5kcyh0aGlzLCBkZXNj ZW5kYW50RmxhZ3MpOwogICAgICAgICAgICAgICAgIHVuaW9uQm91bmRzLnVuaXRlKGNoaWxkVW5p b25Cb3VuZHMpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQogCi0gICAgaWYgKFZl Y3RvcjxSZW5kZXJMYXllcio+KiBwb3NaT3JkZXJMaXN0ID0gbGF5ZXItPnBvc1pPcmRlckxpc3Qo KSkgeworICAgIGlmIChWZWN0b3I8UmVuZGVyTGF5ZXIqPiogcG9zWk9yZGVyTGlzdCA9IHRoaXMt PnBvc1pPcmRlckxpc3QoKSkgewogICAgICAgICBzaXplX3QgbGlzdFNpemUgPSBwb3NaT3JkZXJM aXN0LT5zaXplKCk7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGlzdFNpemU7ICsr aSkgewogICAgICAgICAgICAgUmVuZGVyTGF5ZXIqIGN1ckxheWVyID0gcG9zWk9yZGVyTGlzdC0+ YXQoaSk7CiAgICAgICAgICAgICBpZiAoIWN1ckxheWVyLT5pc0NvbXBvc2l0ZWQoKSkgewotICAg ICAgICAgICAgICAgIEludFJlY3QgY2hpbGRVbmlvbkJvdW5kcyA9IGNhbGN1bGF0ZUxheWVyQm91 bmRzKGN1ckxheWVyLCBsYXllciwgZGVzY2VuZGFudEZsYWdzKTsKKyAgICAgICAgICAgICAgICBJ bnRSZWN0IGNoaWxkVW5pb25Cb3VuZHMgPSBjdXJMYXllci0+Y2FsY3VsYXRlTGF5ZXJCb3VuZHMo dGhpcywgZGVzY2VuZGFudEZsYWdzKTsKICAgICAgICAgICAgICAgICB1bmlvbkJvdW5kcy51bml0 ZShjaGlsZFVuaW9uQm91bmRzKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIAot ICAgIGlmIChWZWN0b3I8UmVuZGVyTGF5ZXIqPiogbm9ybWFsRmxvd0xpc3QgPSBsYXllci0+bm9y bWFsRmxvd0xpc3QoKSkgeworICAgIGlmIChWZWN0b3I8UmVuZGVyTGF5ZXIqPiogbm9ybWFsRmxv d0xpc3QgPSB0aGlzLT5ub3JtYWxGbG93TGlzdCgpKSB7CiAgICAgICAgIHNpemVfdCBsaXN0U2l6 ZSA9IG5vcm1hbEZsb3dMaXN0LT5zaXplKCk7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgbGlzdFNpemU7ICsraSkgewogICAgICAgICAgICAgUmVuZGVyTGF5ZXIqIGN1ckxheWVyID0g bm9ybWFsRmxvd0xpc3QtPmF0KGkpOwogICAgICAgICAgICAgaWYgKCFjdXJMYXllci0+aXNDb21w b3NpdGVkKCkpIHsKLSAgICAgICAgICAgICAgICBJbnRSZWN0IGN1ckFic0JvdW5kcyA9IGNhbGN1 bGF0ZUxheWVyQm91bmRzKGN1ckxheWVyLCBsYXllciwgZGVzY2VuZGFudEZsYWdzKTsKKyAgICAg ICAgICAgICAgICBJbnRSZWN0IGN1ckFic0JvdW5kcyA9IGN1ckxheWVyLT5jYWxjdWxhdGVMYXll ckJvdW5kcyh0aGlzLCBkZXNjZW5kYW50RmxhZ3MpOwogICAgICAgICAgICAgICAgIHVuaW9uQm91 bmRzLnVuaXRlKGN1ckFic0JvdW5kcyk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTQ0 NzIsMjUgKzQ0NzIsMjUgQEAgSW50UmVjdCBSZW5kZXJMYXllcjo6Y2FsY3VsYXRlTGF5ZXJCb3Vu ZHMoY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyLCBjb25zdCBSZW5kZXIKICAgICAvLyBGSVhNRTog V2UgY2FuIG9wdGltaXplIHRoZSBzaXplIG9mIHRoZSBjb21wb3NpdGVkIGxheWVycywgYnkgbm90 IGVubGFyZ2luZwogICAgIC8vIGZpbHRlcmVkIGFyZWFzIHdpdGggdGhlIG91dHNldHMgaWYgd2Ug a25vdyB0aGF0IHRoZSBmaWx0ZXIgaXMgZ29pbmcgdG8gcmVuZGVyIGluIGhhcmR3YXJlLgogICAg IC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTIzOQotICAgIGlm ICgoZmxhZ3MgJiBJbmNsdWRlTGF5ZXJGaWx0ZXJPdXRzZXRzKSAmJiBsYXllci0+cmVuZGVyZXIo KS0+c3R5bGUoKS0+aGFzRmlsdGVyT3V0c2V0cygpKSB7CisgICAgaWYgKChmbGFncyAmIEluY2x1 ZGVMYXllckZpbHRlck91dHNldHMpICYmIHJlbmRlcmVyLT5zdHlsZSgpLT5oYXNGaWx0ZXJPdXRz ZXRzKCkpIHsKICAgICAgICAgaW50IHRvcE91dHNldDsKICAgICAgICAgaW50IHJpZ2h0T3V0c2V0 OwogICAgICAgICBpbnQgYm90dG9tT3V0c2V0OwogICAgICAgICBpbnQgbGVmdE91dHNldDsKLSAg ICAgICAgbGF5ZXItPnJlbmRlcmVyKCktPnN0eWxlKCktPmdldEZpbHRlck91dHNldHModG9wT3V0 c2V0LCByaWdodE91dHNldCwgYm90dG9tT3V0c2V0LCBsZWZ0T3V0c2V0KTsKKyAgICAgICAgcmVu ZGVyZXItPnN0eWxlKCktPmdldEZpbHRlck91dHNldHModG9wT3V0c2V0LCByaWdodE91dHNldCwg Ym90dG9tT3V0c2V0LCBsZWZ0T3V0c2V0KTsKICAgICAgICAgdW5pb25Cb3VuZHMubW92ZSgtbGVm dE91dHNldCwgLXRvcE91dHNldCk7CiAgICAgICAgIHVuaW9uQm91bmRzLmV4cGFuZChsZWZ0T3V0 c2V0ICsgcmlnaHRPdXRzZXQsIHRvcE91dHNldCArIGJvdHRvbU91dHNldCk7CiAgICAgfQogI2Vu ZGlmCiAKLSAgICBpZiAoKGZsYWdzICYgSW5jbHVkZVNlbGZUcmFuc2Zvcm0pICYmIGxheWVyLT5w YWludHNXaXRoVHJhbnNmb3JtKFBhaW50QmVoYXZpb3JOb3JtYWwpKSB7Ci0gICAgICAgIFRyYW5z Zm9ybWF0aW9uTWF0cml4KiBhZmZpbmVUcmFucyA9IGxheWVyLT50cmFuc2Zvcm0oKTsKKyAgICBp ZiAoKGZsYWdzICYgSW5jbHVkZVNlbGZUcmFuc2Zvcm0pICYmIHBhaW50c1dpdGhUcmFuc2Zvcm0o UGFpbnRCZWhhdmlvck5vcm1hbCkpIHsKKyAgICAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXgqIGFm ZmluZVRyYW5zID0gdHJhbnNmb3JtKCk7CiAgICAgICAgIGJvdW5kaW5nQm94UmVjdCA9IGFmZmlu ZVRyYW5zLT5tYXBSZWN0KGJvdW5kaW5nQm94UmVjdCk7CiAgICAgICAgIHVuaW9uQm91bmRzID0g YWZmaW5lVHJhbnMtPm1hcFJlY3QodW5pb25Cb3VuZHMpOwogICAgIH0KIAogICAgIExheW91dFBv aW50IGFuY2VzdG9yUmVsT2Zmc2V0OwotICAgIGxheWVyLT5jb252ZXJ0VG9MYXllckNvb3Jkcyhh bmNlc3RvckxheWVyLCBhbmNlc3RvclJlbE9mZnNldCk7CisgICAgY29udmVydFRvTGF5ZXJDb29y ZHMoYW5jZXN0b3JMYXllciwgYW5jZXN0b3JSZWxPZmZzZXQpOwogICAgIHVuaW9uQm91bmRzLm1v dmVCeShhbmNlc3RvclJlbE9mZnNldCk7CiAgICAgCiAgICAgcmV0dXJuIHBpeGVsU25hcHBlZElu dFJlY3QodW5pb25Cb3VuZHMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApp bmRleCAzNWEzODFjNWRlMDRlODBkNjU3MWEwZTM1MzJhOThmYjRhOTdjMWQ5Li43ZGNhNDdlZmY3 ODdjOGMwOWNmYmQ2YTUzY2EzMGM3NTc1MDNhMTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuaApAQCAtNTY1LDcgKzU2NSw3IEBAIHB1YmxpYzoKICAgICAgICAgRGVmYXVs dENhbGN1bGF0ZUxheWVyQm91bmRzRmxhZ3MgPSAgSW5jbHVkZVNlbGZUcmFuc2Zvcm0gfCBVc2VM b2NhbENsaXBSZWN0SWZQb3NzaWJsZSB8IEluY2x1ZGVMYXllckZpbHRlck91dHNldHMKICAgICB9 OwogICAgIHR5cGVkZWYgdW5zaWduZWQgQ2FsY3VsYXRlTGF5ZXJCb3VuZHNGbGFnczsKLSAgICBz dGF0aWMgSW50UmVjdCBjYWxjdWxhdGVMYXllckJvdW5kcyhjb25zdCBSZW5kZXJMYXllciosIGNv bnN0IFJlbmRlckxheWVyKiBhbmNlc3RvckxheWVyLCBDYWxjdWxhdGVMYXllckJvdW5kc0ZsYWdz ID0gRGVmYXVsdENhbGN1bGF0ZUxheWVyQm91bmRzRmxhZ3MpOworICAgIEludFJlY3QgY2FsY3Vs YXRlTGF5ZXJCb3VuZHMoY29uc3QgUmVuZGVyTGF5ZXIqIGFuY2VzdG9yTGF5ZXIsIENhbGN1bGF0 ZUxheWVyQm91bmRzRmxhZ3MgPSBEZWZhdWx0Q2FsY3VsYXRlTGF5ZXJCb3VuZHNGbGFncykgY29u c3Q7CiAgICAgCiAgICAgLy8gV0FSTklORzogVGhpcyBtZXRob2QgcmV0dXJucyB0aGUgb2Zmc2V0 IGZvciB0aGUgcGFyZW50IGFzIHRoaXMgaXMgd2hhdCB1cGRhdGVMYXllclBvc2l0aW9ucyBleHBl Y3RzLgogICAgIExheW91dFBvaW50IGNvbXB1dGVPZmZzZXRGcm9tUm9vdChib29sJiBoYXNMYXll ck9mZnNldCkgY29uc3Q7CkBAIC03NTUsNyArNzU1LDcgQEAgcHJpdmF0ZToKICAgICAgICAgT3Zl cmxhcFRlc3RSZXF1ZXN0TWFwKiBvdmVybGFwVGVzdFJlcXVlc3RzOyAvLyBNYXkgYmUgbnVsbC4K ICAgICAgICAgUGFpbnRCZWhhdmlvciBwYWludEJlaGF2aW9yOwogICAgIH07Ci0gICAgCisgICAg ICAgIAogICAgIHZvaWQgcGFpbnRMYXllcihHcmFwaGljc0NvbnRleHQqLCBjb25zdCBMYXllclBh aW50aW5nSW5mbyYsIFBhaW50TGF5ZXJGbGFncyk7CiAgICAgdm9pZCBwYWludExheWVyQ29udGVu dHNBbmRSZWZsZWN0aW9uKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IExheWVyUGFpbnRpbmdJbmZv JiwgUGFpbnRMYXllckZsYWdzKTsKICAgICB2b2lkIHBhaW50TGF5ZXJDb250ZW50cyhHcmFwaGlj c0NvbnRleHQqLCBjb25zdCBMYXllclBhaW50aW5nSW5mbyYsIFBhaW50TGF5ZXJGbGFncyk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3Bw CmluZGV4IGI1YjQ1NmIzYTI0YWM1YWJmMWRiMmFhOWU2MjZmZGQwNDZhNDEzZjIuLmJkODViYzNh NzgyYjE2NTZkMzBhMTEzOThjYmE3NmQyNjA2OGYyMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC02NjUsNyArNjY1LDcg QEAgSW50UmVjdCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNhbGN1bGF0ZUNvbXBvc2l0ZWRCb3Vu ZHMoY29uc3QgUmVuZGVyTGF5ZXIqIGxheWUKIHsKICAgICBpZiAoIWNhbkJlQ29tcG9zaXRlZChs YXllcikpCiAgICAgICAgIHJldHVybiBJbnRSZWN0KCk7Ci0gICAgcmV0dXJuIFJlbmRlckxheWVy OjpjYWxjdWxhdGVMYXllckJvdW5kcyhsYXllciwgYW5jZXN0b3JMYXllciwgUmVuZGVyTGF5ZXI6 OkRlZmF1bHRDYWxjdWxhdGVMYXllckJvdW5kc0ZsYWdzIHwgUmVuZGVyTGF5ZXI6OkV4Y2x1ZGVI aWRkZW5EZXNjZW5kYW50cyk7CisgICAgcmV0dXJuIGxheWVyLT5jYWxjdWxhdGVMYXllckJvdW5k cyhhbmNlc3RvckxheWVyLCBSZW5kZXJMYXllcjo6RGVmYXVsdENhbGN1bGF0ZUxheWVyQm91bmRz RmxhZ3MgfCBSZW5kZXJMYXllcjo6RXhjbHVkZUhpZGRlbkRlc2NlbmRhbnRzKTsKIH0KIAogdm9p ZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmxheWVyV2FzQWRkZWQoUmVuZGVyTGF5ZXIqIC8qcGFy ZW50Ki8sIFJlbmRlckxheWVyKiAvKmNoaWxkKi8pCg==