128009 2014-01-31 12:38:01 -0800 Subpixel rendering: Enable subpixel positioning/sizing/hairline border painting. 2014-02-07 13:46:07 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 128049 127524 1 zalan zalan commit-queue esprehn+autocc glenn jonlee kondapallykalyan roger_fong simon.fraser webkit-bug-importer oldest_to_newest 974421 0 zalan 2014-01-31 12:38:01 -0800 Initial patch. 974455 1 webkit-bug-importer 2014-01-31 13:44:41 -0800 <rdar://problem/15960268> 974742 2 222914 zalan 2014-02-01 23:57:28 -0800 Created attachment 222914 Patch 974745 3 zalan 2014-02-01 23:58:17 -0800 EWS will fail on that as it needs code from bug 128049 974801 4 222930 zalan 2014-02-02 12:03:54 -0800 Created attachment 222930 Patch 974827 5 222930 commit-queue 2014-02-02 13:54:15 -0800 Comment on attachment 222930 Patch Clearing flags on attachment: 222930 Committed r163272: <http://trac.webkit.org/changeset/163272> 974828 6 commit-queue 2014-02-02 13:54:17 -0800 All reviewed patches have been landed. Closing bug. 978019 7 roger_fong 2014-02-07 13:46:07 -0800 This caused many tests to crash on Windows. Bug filed here: https://bugs.webkit.org/show_bug.cgi?id=128395 222914 2014-02-01 23:57:28 -0800 2014-02-02 12:03:50 -0800 Patch bug-128009-20140201235721.patch text/plain 5784 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTAxM2RlMGM5MDFkMjRk YjIzZmNjYTRmZmNkNWE3YzZmM2NmNzM0OS4uM2ZkNzIxN2E5Njk3Y2NhZWM0NzFmY2M1ZDg1Yjg4 NTdjZjBkNDM2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTAyLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU3VicGl4ZWwgcmVuZGVyaW5n OiBFbmFibGUgc3VicGl4ZWwgcG9zaXRpb25pbmcvc2l6aW5nL2hhaXJsaW5lIGJvcmRlciBwYWlu dGluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy ODAwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNu YXAgYW5kIGNsaXAgdG8gZGV2aWNlIHBpeGVscyB3aGVuIHBhaW50aW5nIGJveGVzLiBFbmFibGUg aGFpcmxpbmUgcGFpbnRpbmcKKyAgICAgICAgZm9yIHNvbGlkIGJvcmRlci4KKworICAgICAgICBO byBleGlzdGluZyBjb250ZXh0IHRvIHRlc3QgdGhpcyBmdW5jdGlvbmFsaXR5IHlldC4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRGaWxsTGF5ZXJFeHRlbmRlZCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6ZHJhd0JveFNpZGVGcm9tUGF0aCk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJPYmplY3Q6OmRyYXdMaW5lRm9yQm94U2lkZSk6CisgICAgICAgICogcmVuZGVyaW5n L3N0eWxlL1JlbmRlclN0eWxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpn ZXRSb3VuZGVkQm9yZGVyRm9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpnZXRS b3VuZGVkSW5uZXJCb3JkZXJGb3IpOgorCiAyMDE0LTAyLTAxICBCZW5qYW1pbiBQb3VsYWluICA8 YnBvdWxhaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEltcHJvdmUgdGhlIEphdmFTY3JpcHQgYmlu ZGluZ3Mgb2YgRGF0YXNldERPTVN0cmluZ01hcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKaW5kZXggMTcyNmUxOTU1OWE2ZThiOWFlMDBm ZDExNWZlNmQxMDQ3ZTU3ODdiZS4uNjZmNTIyZTNhMTRkYTEyZmIzY2Y3OGU2ZWViYWJjMDgxM2Fm MzMxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVs T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxP YmplY3QuY3BwCkBAIC02NTUsNyArNjU1LDcgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6 cGFpbnRGaWxsTGF5ZXJFeHRlbmRlZChjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY28KICAg ICAgICAgICAgICAgICBjb250ZXh0LT5yZXN0b3JlKCk7CiAgICAgICAgICAgICB9CiAgICAgICAg IH0gZWxzZQotICAgICAgICAgICAgY29udGV4dC0+ZmlsbFJlY3QocGl4ZWxTbmFwcGVkSW50UmVj dChyZWN0KSwgYmdDb2xvciwgc3R5bGUoKS5jb2xvclNwYWNlKCkpOworICAgICAgICAgICAgY29u dGV4dC0+ZmlsbFJlY3QocGl4ZWxTbmFwcGVkRm9yUGFpbnRpbmcocmVjdCwgY29udGV4dC0+cGl4 ZWxTbmFwcGluZ0ZhY3RvcigpKSwgYmdDb2xvciwgc3R5bGUoKS5jb2xvclNwYWNlKCkpOwogCiAg ICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yMTE2LDcgKzIxMTYsNyBAQCB2b2lkIFJlbmRlckJv eE1vZGVsT2JqZWN0OjpkcmF3Qm94U2lkZUZyb21QYXRoKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhp Y3NDb250ZXh0LAogCiAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRTdHJva2VTdHlsZShOb1N0cm9r ZSk7CiAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRGaWxsQ29sb3IoY29sb3IsIHN0eWxlLT5jb2xv clNwYWNlKCkpOwotICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJhd1JlY3QocGl4ZWxTbmFwcGVkSW50 UmVjdChib3JkZXJSZWN0KSk7CisgICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3UmVjdChwaXhlbFNu YXBwZWRGb3JQYWludGluZyhib3JkZXJSZWN0LCBncmFwaGljc0NvbnRleHQtPnBpeGVsU25hcHBp bmdGYWN0b3IoKSkpOwogfQogCiBzdGF0aWMgdm9pZCBmaW5kSW5uZXJWZXJ0ZXgoY29uc3QgRmxv YXRQb2ludCYgb3V0ZXJDb3JuZXIsIGNvbnN0IEZsb2F0UG9pbnQmIGlubmVyQ29ybmVyLCBjb25z dCBGbG9hdFBvaW50JiBjZW50ZXJQb2ludCwgRmxvYXRQb2ludCYgcmVzdWx0KQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCAyOGM5ODgwMjM3YmE2NjVmM2Jl Yjg2MzUxOWNiNWE2ZGFkNzI5OGQyLi43NTNjZjE5NzBlMTg3YWY0Yjg2ODkzOWI3ODFlYzUyMGZl OWE0YjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAt NzQ5LDggKzc0OSwxMSBAQCB2b2lkIFJlbmRlck9iamVjdDo6ZHJhd0xpbmVGb3JCb3hTaWRlKEdy YXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBpbnQgeDEsCiAgICAgICAgIGxlbmd0aCA9 IHkyIC0geTE7CiAgICAgfQogCisgICAgZmxvYXQgcGl4ZWxTbmFwcGluZ0ZhY3RvciA9IGdyYXBo aWNzQ29udGV4dC0+cGl4ZWxTbmFwcGluZ0ZhY3RvcigpOwogICAgIC8vIEZJWE1FOiBXZSByZWFs bHkgd291bGQgbGlrZSB0aGlzIGNoZWNrIHRvIGJlIGFuIEFTU0VSVCBhcyB3ZSBkb24ndCB3YW50 IHRvIGRyYXcgZW1wdHkgYm9yZGVycy4gSG93ZXZlcgogICAgIC8vIG5vdGhpbmcgZ3VhcmFudGVl cyB0aGF0IHRoZSBmb2xsb3dpbmcgcmVjdXJzaXZlIGNhbGxzIHRvIGRyYXdMaW5lRm9yQm94U2lk ZSB3aWxsIGhhdmUgbm9uLW51bGwgZGltZW5zaW9ucy4KKyAgICB0aGlja25lc3MgPSByb3VuZFRv RGV2aWNlUGl4ZWwodGhpY2tuZXNzLCBwaXhlbFNuYXBwaW5nRmFjdG9yKTsKKyAgICBsZW5ndGgg PSByb3VuZFRvRGV2aWNlUGl4ZWwobGVuZ3RoLCBwaXhlbFNuYXBwaW5nRmFjdG9yKTsKICAgICBp ZiAoIXRoaWNrbmVzcyB8fCAhbGVuZ3RoKQogICAgICAgICByZXR1cm47CiAKQEAgLTkyNCw3ICs5 MjcsNyBAQCB2b2lkIFJlbmRlck9iamVjdDo6ZHJhd0xpbmVGb3JCb3hTaWRlKEdyYXBoaWNzQ29u dGV4dCogZ3JhcGhpY3NDb250ZXh0LCBpbnQgeDEsCiAgICAgICAgICAgICAgICAgLy8gdGhpcyBt YXR0ZXJzIGZvciByZWN0cyBpbiB0cmFuc2Zvcm1lZCBjb250ZXh0cy4KICAgICAgICAgICAgICAg ICBib29sIHdhc0FudGlhbGlhc2VkID0gZ3JhcGhpY3NDb250ZXh0LT5zaG91bGRBbnRpYWxpYXMo KTsKICAgICAgICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPnNldFNob3VsZEFudGlhbGlhcyhh bnRpYWxpYXMpOwotICAgICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJhd1JlY3QoSW50 UmVjdCh4MSwgeTEsIHgyIC0geDEsIHkyIC0geTEpKTsKKyAgICAgICAgICAgICAgICBncmFwaGlj c0NvbnRleHQtPmRyYXdSZWN0KHBpeGVsU25hcHBlZEZvclBhaW50aW5nKHgxLCB5MSwgeDIgLSB4 MSwgeTIgLSB5MSwgcGl4ZWxTbmFwcGluZ0ZhY3RvcikpOwogICAgICAgICAgICAgICAgIGdyYXBo aWNzQ29udGV4dC0+c2V0U2hvdWxkQW50aWFsaWFzKHdhc0FudGlhbGlhc2VkKTsKICAgICAgICAg ICAgICAgICBncmFwaGljc0NvbnRleHQtPnNldFN0cm9rZVN0eWxlKG9sZFN0cm9rZVN0eWxlKTsK ICAgICAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1JlbmRlclN0eWxlLmNwcAppbmRleCBiYjIwYTA1ZjU2Y2RkNTMwNzJjY2E1YjRiNGMzMDhh ZTU0MWUwODViLi5hNTc1YjBiNzM0MTYwNDJhNWE1NWUzNDU1YmZkMDM0NThiZDkyMzRmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKQEAgLTEx MzIsMTEgKzExMzIsMTAgQEAgdm9pZCBSZW5kZXJTdHlsZTo6c2V0VmVydGljYWxCb3JkZXJTcGFj aW5nKHNob3J0IHYpIHsgU0VUX1ZBUihpbmhlcml0ZWQsIHZlcnRpY2EKIAogUm91bmRlZFJlY3Qg UmVuZGVyU3R5bGU6OmdldFJvdW5kZWRCb3JkZXJGb3IoY29uc3QgTGF5b3V0UmVjdCYgYm9yZGVy UmVjdCwgUmVuZGVyVmlldyogcmVuZGVyVmlldywgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdl LCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKSBjb25zdAogewotICAgIEludFJlY3Qgc25h cHBlZEJvcmRlclJlY3QocGl4ZWxTbmFwcGVkSW50UmVjdChib3JkZXJSZWN0KSk7Ci0gICAgUm91 bmRlZFJlY3Qgcm91bmRlZFJlY3Qoc25hcHBlZEJvcmRlclJlY3QpOworICAgIFJvdW5kZWRSZWN0 IHJvdW5kZWRSZWN0KGJvcmRlclJlY3QpOwogICAgIGlmIChoYXNCb3JkZXJSYWRpdXMoKSkgewot ICAgICAgICBSb3VuZGVkUmVjdDo6UmFkaWkgcmFkaWkgPSBjYWxjUmFkaWlGb3Ioc3Vycm91bmQt PmJvcmRlciwgc25hcHBlZEJvcmRlclJlY3Quc2l6ZSgpLCByZW5kZXJWaWV3KTsKLSAgICAgICAg cmFkaWkuc2NhbGUoY2FsY0NvbnN0cmFpbnRTY2FsZUZvcihzbmFwcGVkQm9yZGVyUmVjdCwgcmFk aWkpKTsKKyAgICAgICAgUm91bmRlZFJlY3Q6OlJhZGlpIHJhZGlpID0gY2FsY1JhZGlpRm9yKHN1 cnJvdW5kLT5ib3JkZXIsIGJvcmRlclJlY3Quc2l6ZSgpLCByZW5kZXJWaWV3KTsKKyAgICAgICAg cmFkaWkuc2NhbGUoY2FsY0NvbnN0cmFpbnRTY2FsZUZvcihib3JkZXJSZWN0LCByYWRpaSkpOwog ICAgICAgICByb3VuZGVkUmVjdC5pbmNsdWRlTG9naWNhbEVkZ2VzKHJhZGlpLCBpc0hvcml6b250 YWxXcml0aW5nTW9kZSgpLCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBpbmNsdWRlTG9naWNhbFJp Z2h0RWRnZSk7CiAgICAgfQogICAgIHJldHVybiByb3VuZGVkUmVjdDsKQEAgLTExNjIsNyArMTE2 MSw3IEBAIFJvdW5kZWRSZWN0IFJlbmRlclN0eWxlOjpnZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3Io Y29uc3QgTGF5b3V0UmVjdCYgYm9yZGVyUmVjdCwKICAgICAgICAgICAgICAgIGJvcmRlclJlY3Qu d2lkdGgoKSAtIGxlZnRXaWR0aCAtIHJpZ2h0V2lkdGgsIAogICAgICAgICAgICAgICAgYm9yZGVy UmVjdC5oZWlnaHQoKSAtIHRvcFdpZHRoIC0gYm90dG9tV2lkdGgpOwogCi0gICAgUm91bmRlZFJl Y3Qgcm91bmRlZFJlY3QocGl4ZWxTbmFwcGVkSW50UmVjdChpbm5lclJlY3QpKTsKKyAgICBSb3Vu ZGVkUmVjdCByb3VuZGVkUmVjdChpbm5lclJlY3QpOwogCiAgICAgaWYgKGhhc0JvcmRlclJhZGl1 cygpKSB7CiAgICAgICAgIFJvdW5kZWRSZWN0OjpSYWRpaSByYWRpaSA9IGdldFJvdW5kZWRCb3Jk ZXJGb3IoYm9yZGVyUmVjdCkucmFkaWkoKTsK 222930 2014-02-02 12:03:54 -0800 2014-02-02 13:54:15 -0800 Patch bug-128009-20140202120341.patch text/plain 6504 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjNjNzVhZmFjYTM1ODVh OGZjNDliY2E1MTdiZmMxNmIwMmM5ZWQxYi4uYzkwODAyNDgzZGJiMmJlODFkYzc0MDY0OGQ4YTE2 NjE2Yzg2YWE5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE0LTAyLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgU3VicGl4ZWwgcmVuZGVyaW5n OiBFbmFibGUgc3VicGl4ZWwgcG9zaXRpb25pbmcvc2l6aW5nL2hhaXJsaW5lIGJvcmRlciBwYWlu dGluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy ODAwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNu YXAgYW5kIGNsaXAgdG8gZGV2aWNlIHBpeGVscyB3aGVuIHBhaW50aW5nIGJveGVzLiBFbmFibGUg aGFpcmxpbmUgcGFpbnRpbmcKKyAgICAgICAgZm9yIHNvbGlkIGJvcmRlci4KKworICAgICAgICBO byBleGlzdGluZyBjb250ZXh0IHRvIHRlc3QgdGhpcyBmdW5jdGlvbmFsaXR5IHlldC4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRGaWxsTGF5ZXJFeHRlbmRlZCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6ZHJhd0JveFNpZGVGcm9tUGF0aCk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJPYmplY3Q6OmRyYXdMaW5lRm9yQm94U2lkZSk6CisgICAgICAgICogcmVuZGVyaW5n L3N0eWxlL1JlbmRlclN0eWxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpn ZXRSb3VuZGVkQm9yZGVyRm9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpnZXRS b3VuZGVkSW5uZXJCb3JkZXJGb3IpOgorCisyMDE0LTAyLTAyICBaYWxhbiBCdWp0YXMgIDx6YWxh bkBhcHBsZS5jb20+CisKICAgICAgICAgU3VicGl4ZWwgcmVuZGVyaW5nOiBJbnRyb2R1Y2UgZGV2 aWNlIHBpeGVsIHNuYXBwaW5nIGhlbHBlciBmdW5jdGlvbnMuCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgwNDkKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKaW5kZXggNzUxZDM3MjdhMTg4 ZjQ2MDRmNTg2NGM4NGVhZWI3NzIwNTVmY2NkYi4uMmI0YjUyNmUxYzNhMjc3MDU5NzkxMmE3ZmM1 ZGRmNDdjZDM1NjNmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveE1vZGVsT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94TW9kZWxPYmplY3QuY3BwCkBAIC02NTUsNyArNjU1LDcgQEAgdm9pZCBSZW5kZXJCb3hNb2Rl bE9iamVjdDo6cGFpbnRGaWxsTGF5ZXJFeHRlbmRlZChjb25zdCBQYWludEluZm8mIHBhaW50SW5m bywgY28KICAgICAgICAgICAgICAgICBjb250ZXh0LT5yZXN0b3JlKCk7CiAgICAgICAgICAgICB9 CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgY29udGV4dC0+ZmlsbFJlY3QocGl4ZWxTbmFw cGVkSW50UmVjdChyZWN0KSwgYmdDb2xvciwgc3R5bGUoKS5jb2xvclNwYWNlKCkpOworICAgICAg ICAgICAgY29udGV4dC0+ZmlsbFJlY3QocGl4ZWxTbmFwcGVkRm9yUGFpbnRpbmcocmVjdCwgY29u dGV4dC0+cGl4ZWxTbmFwcGluZ0ZhY3RvcigpKSwgYmdDb2xvciwgc3R5bGUoKS5jb2xvclNwYWNl KCkpOwogCiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yMTE2LDcgKzIxMTYsNyBAQCB2b2lk IFJlbmRlckJveE1vZGVsT2JqZWN0OjpkcmF3Qm94U2lkZUZyb21QYXRoKEdyYXBoaWNzQ29udGV4 dCogZ3JhcGhpY3NDb250ZXh0LAogCiAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRTdHJva2VTdHls ZShOb1N0cm9rZSk7CiAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRGaWxsQ29sb3IoY29sb3IsIHN0 eWxlLT5jb2xvclNwYWNlKCkpOwotICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJhd1JlY3QocGl4ZWxT bmFwcGVkSW50UmVjdChib3JkZXJSZWN0KSk7CisgICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3UmVj dChwaXhlbFNuYXBwZWRGb3JQYWludGluZyhib3JkZXJSZWN0LCBncmFwaGljc0NvbnRleHQtPnBp eGVsU25hcHBpbmdGYWN0b3IoKSkpOwogfQogCiBzdGF0aWMgdm9pZCBmaW5kSW5uZXJWZXJ0ZXgo Y29uc3QgRmxvYXRQb2ludCYgb3V0ZXJDb3JuZXIsIGNvbnN0IEZsb2F0UG9pbnQmIGlubmVyQ29y bmVyLCBjb25zdCBGbG9hdFBvaW50JiBjZW50ZXJQb2ludCwgRmxvYXRQb2ludCYgcmVzdWx0KQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCA0ZjhhYTc4YmM0 YzNlYjNkY2YwNDBiYjI0MWUwOWFlYTU5YzQ3YjYyLi5jMzRmZjcyNzUxZjJiMTRhNTY2MWJjMDQx Y2YxNGFlYzIxOWNiZWQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmNwcApAQCAtNzQ5LDE1ICs3NDksMjMgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmRyYXdMaW5lRm9y Qm94U2lkZShHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwgTGF5b3V0VW4KICAgICAg ICAgbGVuZ3RoID0geTIgLSB5MTsKICAgICB9CiAKKyAgICBpZiAoYm9yZGVyU3R5bGUgPT0gRE9V QkxFICYmIHRoaWNrbmVzcyA8IDMpCisgICAgICAgIGJvcmRlclN0eWxlID0gU09MSUQ7CisKKyAg ICBmbG9hdCBwaXhlbFNuYXBwaW5nRmFjdG9yID0gZ3JhcGhpY3NDb250ZXh0LT5waXhlbFNuYXBw aW5nRmFjdG9yKCk7CiAgICAgLy8gRklYTUU6IFdlIHJlYWxseSB3b3VsZCBsaWtlIHRoaXMgY2hl Y2sgdG8gYmUgYW4gQVNTRVJUIGFzIHdlIGRvbid0IHdhbnQgdG8gZHJhdyBlbXB0eSBib3JkZXJz LiBIb3dldmVyCiAgICAgLy8gbm90aGluZyBndWFyYW50ZWVzIHRoYXQgdGhlIGZvbGxvd2luZyBy ZWN1cnNpdmUgY2FsbHMgdG8gZHJhd0xpbmVGb3JCb3hTaWRlIHdpbGwgaGF2ZSBub24tbnVsbCBk aW1lbnNpb25zLgotICAgIC8vIEZJWE1FOiBmbG9vcmluZyBpcyBhIHRlbXBvcmFyeSBzb2x1dGlv biB1bnRpbCB0aGUgZGV2aWNlIHBpeGVsIHNuYXBwaW5nIGlzIGFkZGVkIGhlcmUuCi0gICAgaWYg KCFmbG9vcih0aGlja25lc3MpIHx8ICFmbG9vcihsZW5ndGgpKQorICAgIC8vIEZJWE1FOiBmbG9v cmluZyBpcyBhIHRlbXBvcmFyeSBzb2x1dGlvbiB1bnRpbCB0aGUgZGV2aWNlIHBpeGVsIHNuYXBw aW5nIGlzIGFkZGVkIGhlcmUgZm9yIGFsbCBib3JkZXIgdHlwZXMuCisgICAgaWYgKGJvcmRlclN0 eWxlID09IFNPTElEKSB7CisgICAgICAgIHRoaWNrbmVzcyA9IHJvdW5kVG9EZXZpY2VQaXhlbCh0 aGlja25lc3MsIHBpeGVsU25hcHBpbmdGYWN0b3IpOworICAgICAgICBsZW5ndGggPSByb3VuZFRv RGV2aWNlUGl4ZWwobGVuZ3RoLCBwaXhlbFNuYXBwaW5nRmFjdG9yKTsKKyAgICB9IGVsc2Ugewor ICAgICAgICB0aGlja25lc3MgPSBmbG9vcmYodGhpY2tuZXNzKTsKKyAgICAgICAgbGVuZ3RoID0g Zmxvb3JmKGxlbmd0aCk7CisgICAgfQorICAgIGlmICghdGhpY2tuZXNzIHx8ICFsZW5ndGgpCiAg ICAgICAgIHJldHVybjsKIAotICAgIGlmIChib3JkZXJTdHlsZSA9PSBET1VCTEUgJiYgdGhpY2tu ZXNzIDwgMykKLSAgICAgICAgYm9yZGVyU3R5bGUgPSBTT0xJRDsKLQogICAgIGNvbnN0IFJlbmRl clN0eWxlJiBzdHlsZSA9IHRoaXMtPnN0eWxlKCk7CiAgICAgc3dpdGNoIChib3JkZXJTdHlsZSkg ewogICAgICAgICBjYXNlIEJOT05FOgpAQCAtOTI1LDcgKzkzMyw3IEBAIHZvaWQgUmVuZGVyT2Jq ZWN0OjpkcmF3TGluZUZvckJveFNpZGUoR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQs IExheW91dFVuCiAgICAgICAgICAgICAgICAgLy8gdGhpcyBtYXR0ZXJzIGZvciByZWN0cyBpbiB0 cmFuc2Zvcm1lZCBjb250ZXh0cy4KICAgICAgICAgICAgICAgICBib29sIHdhc0FudGlhbGlhc2Vk ID0gZ3JhcGhpY3NDb250ZXh0LT5zaG91bGRBbnRpYWxpYXMoKTsKICAgICAgICAgICAgICAgICBn cmFwaGljc0NvbnRleHQtPnNldFNob3VsZEFudGlhbGlhcyhhbnRpYWxpYXMpOwotICAgICAgICAg ICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJhd1JlY3QoSW50UmVjdCh4MSwgeTEsIHgyIC0geDEs IHkyIC0geTEpKTsKKyAgICAgICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdSZWN0KHBp eGVsU25hcHBlZEZvclBhaW50aW5nKHgxLCB5MSwgeDIgLSB4MSwgeTIgLSB5MSwgcGl4ZWxTbmFw cGluZ0ZhY3RvcikpOwogICAgICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+c2V0U2hvdWxk QW50aWFsaWFzKHdhc0FudGlhbGlhc2VkKTsKICAgICAgICAgICAgICAgICBncmFwaGljc0NvbnRl eHQtPnNldFN0cm9rZVN0eWxlKG9sZFN0cm9rZVN0eWxlKTsKICAgICAgICAgICAgICAgICByZXR1 cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcApp bmRleCA1MDRhZWM3MjJlNTFlN2FhZTg1OTg2YThjNTY1NjQyMGI0ZTkzMzJmLi4xZWE1ZjYxYTM0 ZmEzZjMzNDI4MDUyYThlOGEzYjM2ZGMxNTViYTQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKQEAgLTExMzIsMTEgKzExMzIsMTAgQEAgdm9p ZCBSZW5kZXJTdHlsZTo6c2V0VmVydGljYWxCb3JkZXJTcGFjaW5nKHNob3J0IHYpIHsgU0VUX1ZB Uihpbmhlcml0ZWQsIHZlcnRpY2EKIAogUm91bmRlZFJlY3QgUmVuZGVyU3R5bGU6OmdldFJvdW5k ZWRCb3JkZXJGb3IoY29uc3QgTGF5b3V0UmVjdCYgYm9yZGVyUmVjdCwgUmVuZGVyVmlldyogcmVu ZGVyVmlldywgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2Fs UmlnaHRFZGdlKSBjb25zdAogewotICAgIEludFJlY3Qgc25hcHBlZEJvcmRlclJlY3QocGl4ZWxT bmFwcGVkSW50UmVjdChib3JkZXJSZWN0KSk7Ci0gICAgUm91bmRlZFJlY3Qgcm91bmRlZFJlY3Qo c25hcHBlZEJvcmRlclJlY3QpOworICAgIFJvdW5kZWRSZWN0IHJvdW5kZWRSZWN0KGJvcmRlclJl Y3QpOwogICAgIGlmIChoYXNCb3JkZXJSYWRpdXMoKSkgewotICAgICAgICBSb3VuZGVkUmVjdDo6 UmFkaWkgcmFkaWkgPSBjYWxjUmFkaWlGb3Ioc3Vycm91bmQtPmJvcmRlciwgc25hcHBlZEJvcmRl clJlY3Quc2l6ZSgpLCByZW5kZXJWaWV3KTsKLSAgICAgICAgcmFkaWkuc2NhbGUoY2FsY0NvbnN0 cmFpbnRTY2FsZUZvcihzbmFwcGVkQm9yZGVyUmVjdCwgcmFkaWkpKTsKKyAgICAgICAgUm91bmRl ZFJlY3Q6OlJhZGlpIHJhZGlpID0gY2FsY1JhZGlpRm9yKHN1cnJvdW5kLT5ib3JkZXIsIGJvcmRl clJlY3Quc2l6ZSgpLCByZW5kZXJWaWV3KTsKKyAgICAgICAgcmFkaWkuc2NhbGUoY2FsY0NvbnN0 cmFpbnRTY2FsZUZvcihib3JkZXJSZWN0LCByYWRpaSkpOwogICAgICAgICByb3VuZGVkUmVjdC5p bmNsdWRlTG9naWNhbEVkZ2VzKHJhZGlpLCBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpLCBpbmNs dWRlTG9naWNhbExlZnRFZGdlLCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSk7CiAgICAgfQogICAg IHJldHVybiByb3VuZGVkUmVjdDsKQEAgLTExNjIsNyArMTE2MSw3IEBAIFJvdW5kZWRSZWN0IFJl bmRlclN0eWxlOjpnZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3IoY29uc3QgTGF5b3V0UmVjdCYgYm9y ZGVyUmVjdCwKICAgICAgICAgICAgICAgIGJvcmRlclJlY3Qud2lkdGgoKSAtIGxlZnRXaWR0aCAt IHJpZ2h0V2lkdGgsIAogICAgICAgICAgICAgICAgYm9yZGVyUmVjdC5oZWlnaHQoKSAtIHRvcFdp ZHRoIC0gYm90dG9tV2lkdGgpOwogCi0gICAgUm91bmRlZFJlY3Qgcm91bmRlZFJlY3QocGl4ZWxT bmFwcGVkSW50UmVjdChpbm5lclJlY3QpKTsKKyAgICBSb3VuZGVkUmVjdCByb3VuZGVkUmVjdChp bm5lclJlY3QpOwogCiAgICAgaWYgKGhhc0JvcmRlclJhZGl1cygpKSB7CiAgICAgICAgIFJvdW5k ZWRSZWN0OjpSYWRpaSByYWRpaSA9IGdldFJvdW5kZWRCb3JkZXJGb3IoYm9yZGVyUmVjdCkucmFk aWkoKTsK