51420 2010-12-21 14:23:53 -0800 Clean up some GraphicsContext code 2010-12-21 21:58:56 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 22102 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 325200 0 simon.fraser 2010-12-21 14:23:53 -0800 Gonna clean up a few inconsistencies in GraphicsContext. 325228 1 77156 simon.fraser 2010-12-21 15:19:07 -0800 Created attachment 77156 Include the shadow color's color space in graphics state 325380 2 simon.fraser 2010-12-21 21:58:56 -0800 http://trac.webkit.org/changeset/74463 77156 2010-12-21 15:19:07 -0800 2010-12-21 15:30:50 -0800 Include the shadow color's color space in graphics state bug-51420-20101221151905.patch text/plain 11295 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTJkMDJjZmU3ZDQxZmEzMDYwOTAyMmNkYzQyN2FhYThjYWMwN2RlMi4uNmNkNTZmOWJjYmU1NGFh NmNjMjNjOWU3MjA2ZTA4NGEyOWZmM2EyOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxMC0xMi0yMSAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbmNsdWRlIHRoZSBzaGFkb3cgY29sb3Igc3Bh Y2UgYXMgcGFydCBvZiB0aGUgR3JhcGhpY3NDb250ZXh0IHN0YXRlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTQyMAorICAgICAgICAKKyAgICAgICAg SW5jbHVkZSB0aGUgQ29sb3JTcGFjZSBmb3IgdGhlIHNoYWRvdyBjb2xvciBhcyBwYXJ0IG9mIHRo ZSBncmFwaGljcworICAgICAgICBzdGF0ZS4gVGhpcyB3aWxsIGJlIHVzZWQgbGF0ZXIgZm9yIGEg c2hhZG93IGltcGxlbWVudGF0aW9uIHRoYXQKKyAgICAgICAgZG9lcyBub3QgcmVseSBvbiBwbGF0 Zm9ybSBzaGFkb3cgY29kZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNz Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnNldFNoYWRv dyk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmNsZWFyU2hhZG93KToKKyAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6Z2V0U2hhZG93KToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dFN0YXRlOjpHcmFwaGljc0NvbnRleHRTdGF0ZSk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENocm9taXVtV2luLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlRyYW5zcGFyZW5jeUF3YXJlRm9udFBhaW50ZXI6OlRyYW5zcGFyZW5jeUF3YXJlR2x5 cGhQYWludGVyOjpkcmF3R2x5cGhzKToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmRyYXdDb21w bGV4VGV4dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRNYWMubW06Cisg ICAgICAgIChXZWJDb3JlOjpGb250OjpkcmF3R2x5cGhzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9za2lhL1NraWFGb250V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OndpbmRvd3ND YW5IYW5kbGVEcmF3VGV4dFNoYWRvdyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2lu L0ZvbnRDR1dpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkcmF3R0RJR2x5cGhzKToKKyAgICAg ICAgKFdlYkNvcmU6OkZvbnQ6OmRyYXdHbHlwaHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL3dpbmNlL0dyYXBoaWNzQ29udGV4dFdpbkNFLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDo6ZmlsbFJvdW5kZWRSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzQ29udGV4dDo6ZHJhd1RleHQpOgorCiAyMDEwLTEyLTIxICBZb25nIExpICA8eW9saUByaW0u Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAgYi9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAKaW5kZXggOWI2MjFmODlhOTYzYjMwZjRl Yzg0NmY4NzIyMzEzODI3MjIyM2Y4YS4uZjMyMzk2OTNhMjc1OTA4MTczNjBiMzMyZjYxZTdmMzVm ZDY1NzYxZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0Nv bnRleHQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0 LmNwcApAQCAtMTM1LDYgKzEzNSw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRTaGFkb3co Y29uc3QgRmxvYXRTaXplJiBvZmZzZXQsIGZsb2F0IGJsdXIsIGNvbnN0IENvbG9yCiAgICAgbV9z dGF0ZS5zaGFkb3dPZmZzZXQgPSBvZmZzZXQ7CiAgICAgbV9zdGF0ZS5zaGFkb3dCbHVyID0gYmx1 cjsKICAgICBtX3N0YXRlLnNoYWRvd0NvbG9yID0gY29sb3I7CisgICAgbV9zdGF0ZS5zaGFkb3dD b2xvclNwYWNlID0gY29sb3JTcGFjZTsKICAgICBzZXRQbGF0Zm9ybVNoYWRvdyhvZmZzZXQsIGJs dXIsIGNvbG9yLCBjb2xvclNwYWNlKTsKIH0KIApAQCAtMTQzLDE0ICsxNDQsMTYgQEAgdm9pZCBH cmFwaGljc0NvbnRleHQ6OmNsZWFyU2hhZG93KCkKICAgICBtX3N0YXRlLnNoYWRvd09mZnNldCA9 IEZsb2F0U2l6ZSgpOwogICAgIG1fc3RhdGUuc2hhZG93Qmx1ciA9IDA7CiAgICAgbV9zdGF0ZS5z aGFkb3dDb2xvciA9IENvbG9yKCk7CisgICAgbV9zdGF0ZS5zaGFkb3dDb2xvclNwYWNlID0gQ29s b3JTcGFjZURldmljZVJHQjsKICAgICBjbGVhclBsYXRmb3JtU2hhZG93KCk7CiB9CiAKLWJvb2wg R3JhcGhpY3NDb250ZXh0OjpnZXRTaGFkb3coRmxvYXRTaXplJiBvZmZzZXQsIGZsb2F0JiBibHVy LCBDb2xvciYgY29sb3IpIGNvbnN0Citib29sIEdyYXBoaWNzQ29udGV4dDo6Z2V0U2hhZG93KEZs b2F0U2l6ZSYgb2Zmc2V0LCBmbG9hdCYgYmx1ciwgQ29sb3ImIGNvbG9yLCBDb2xvclNwYWNlJiBj b2xvclNwYWNlKSBjb25zdAogewogICAgIG9mZnNldCA9IG1fc3RhdGUuc2hhZG93T2Zmc2V0Owog ICAgIGJsdXIgPSBtX3N0YXRlLnNoYWRvd0JsdXI7CiAgICAgY29sb3IgPSBtX3N0YXRlLnNoYWRv d0NvbG9yOworICAgIGNvbG9yU3BhY2UgPSBtX3N0YXRlLnNoYWRvd0NvbG9yU3BhY2U7CiAKICAg ICByZXR1cm4gY29sb3IuaXNWYWxpZCgpICYmIGNvbG9yLmFscGhhKCkgJiYgKGJsdXIgfHwgb2Zm c2V0LndpZHRoKCkgfHwgb2Zmc2V0LmhlaWdodCgpKTsKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmggYi9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCmluZGV4IDc0NWY3ZWExZDJiMTE1Yzg4MjhiZTIzMzFh Y2JmOGQ0NmMyNmFjNTkuLjZhNWNmY2NmZjhmNjk5YWVlNTdhNmU2YjQ3NzcyN2JkNTkzMmI5MTgg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgK KysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaApAQCAtMTYy LDYgKzE2Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICwgZmlsbFJ1bGUo UlVMRV9OT05aRVJPKQogICAgICAgICAgICAgLCBzdHJva2VDb2xvclNwYWNlKENvbG9yU3BhY2VE ZXZpY2VSR0IpCiAgICAgICAgICAgICAsIGZpbGxDb2xvclNwYWNlKENvbG9yU3BhY2VEZXZpY2VS R0IpCisgICAgICAgICAgICAsIHNoYWRvd0NvbG9yU3BhY2UoQ29sb3JTcGFjZURldmljZVJHQikK ICAgICAgICAgICAgICwgY29tcG9zaXRlT3BlcmF0b3IoQ29tcG9zaXRlU291cmNlT3ZlcikKICAg ICAgICAgICAgICwgc2hvdWxkQW50aWFsaWFzKHRydWUpCiAgICAgICAgICAgICAsIHNob3VsZFNt b290aEZvbnRzKHRydWUpCkBAIC0xOTUsNiArMTk2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiAgICAgICAgIENvbG9yU3BhY2Ugc3Ryb2tlQ29sb3JTcGFjZTsKICAgICAgICAgQ29sb3JTcGFj ZSBmaWxsQ29sb3JTcGFjZTsKKyAgICAgICAgQ29sb3JTcGFjZSBzaGFkb3dDb2xvclNwYWNlOwog CiAgICAgICAgIENvbXBvc2l0ZU9wZXJhdG9yIGNvbXBvc2l0ZU9wZXJhdG9yOwogCkBAIC0zNDQs NyArMzQ2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIGVuZFRyYW5zcGFy ZW5jeUxheWVyKCk7CiAKICAgICAgICAgdm9pZCBzZXRTaGFkb3coY29uc3QgRmxvYXRTaXplJiwg ZmxvYXQgYmx1ciwgY29uc3QgQ29sb3ImLCBDb2xvclNwYWNlKTsKLSAgICAgICAgYm9vbCBnZXRT aGFkb3coRmxvYXRTaXplJiwgZmxvYXQmLCBDb2xvciYpIGNvbnN0OworICAgICAgICBib29sIGdl dFNoYWRvdyhGbG9hdFNpemUmLCBmbG9hdCYsIENvbG9yJiwgQ29sb3JTcGFjZSYpIGNvbnN0Owog ICAgICAgICB2b2lkIGNsZWFyU2hhZG93KCk7CiAKICAgICAgICAgdm9pZCBkcmF3Rm9jdXNSaW5n KGNvbnN0IFZlY3RvcjxJbnRSZWN0PiYsIGludCB3aWR0aCwgaW50IG9mZnNldCwgY29uc3QgQ29s b3ImKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9u dENocm9taXVtV2luLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9u dENocm9taXVtV2luLmNwcAppbmRleCAwYTZmZjc4MWE1M2U0NDM5NjA3NDg0YTE3NDY3MzY4YmZl NWU2ZjY1Li4xYTAwODMzZmVlY2IyZjNhODQyZmI5Y2U5OTlhNmIxZjkwZGEwMGQyIDEwMDY0NAot LS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDaHJvbWl1bVdpbi5j cHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2hyb21pdW1X aW4uY3BwCkBAIC0yNzcsNyArMjc3LDggQEAgYm9vbCBUcmFuc3BhcmVuY3lBd2FyZUdseXBoUGFp bnRlcjo6ZHJhd0dseXBocyhpbnQgbnVtR2x5cGhzLAogICAgIEZsb2F0U2l6ZSBzaGFkb3dPZmZz ZXQ7CiAgICAgZmxvYXQgc2hhZG93Qmx1cjsKICAgICBDb2xvciBzaGFkb3dDb2xvcjsKLSAgICBp ZiAobV9ncmFwaGljc0NvbnRleHQtPmdldFNoYWRvdyhzaGFkb3dPZmZzZXQsIHNoYWRvd0JsdXIs IHNoYWRvd0NvbG9yKSkgeworICAgIENvbG9yU3BhY2Ugc2hhZG93Q29sb3JTcGFjZTsKKyAgICBp ZiAobV9ncmFwaGljc0NvbnRleHQtPmdldFNoYWRvdyhzaGFkb3dPZmZzZXQsIHNoYWRvd0JsdXIs IHNoYWRvd0NvbG9yLCBzaGFkb3dDb2xvclNwYWNlKSkgewogICAgICAgICAvLyBJZiB0aGVyZSBp cyBhIHNoYWRvdyBhbmQgdGhpcyBjb2RlIGlzIHJlYWNoZWQsIHdpbmRvd3NDYW5IYW5kbGVEcmF3 VGV4dFNoYWRvdygpCiAgICAgICAgIC8vIHdpbGwgaGF2ZSBhbHJlYWR5IHJldHVybmVkIHRydWUg ZHVyaW5nIHRoZSBjdG9yIGluaXRpYXRpemF0aW9uIG9mIG1fdXNlR0RJCiAgICAgICAgIEFTU0VS VChzaGFkb3dDb2xvci5hbHBoYSgpID09IDI1NSk7CkBAIC00ODksNyArNDkwLDggQEAgdm9pZCBG b250OjpkcmF3Q29tcGxleFRleHQoR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsCiAg ICAgRmxvYXRTaXplIHNoYWRvd09mZnNldDsKICAgICBmbG9hdCBzaGFkb3dCbHVyOwogICAgIENv bG9yIHNoYWRvd0NvbG9yOwotICAgIGlmIChncmFwaGljc0NvbnRleHQtPmdldFNoYWRvdyhzaGFk b3dPZmZzZXQsIHNoYWRvd0JsdXIsIHNoYWRvd0NvbG9yKSAmJiB3aW5kb3dzQ2FuSGFuZGxlRHJh d1RleHRTaGFkb3coZ3JhcGhpY3NDb250ZXh0KSkgeworICAgIENvbG9yU3BhY2Ugc2hhZG93Q29s b3JTcGFjZTsKKyAgICBpZiAoZ3JhcGhpY3NDb250ZXh0LT5nZXRTaGFkb3coc2hhZG93T2Zmc2V0 LCBzaGFkb3dCbHVyLCBzaGFkb3dDb2xvciwgc2hhZG93Q29sb3JTcGFjZSkgJiYgd2luZG93c0Nh bkhhbmRsZURyYXdUZXh0U2hhZG93KGdyYXBoaWNzQ29udGV4dCkpIHsKICAgICAgICAgQ09MT1JS RUYgdGV4dENvbG9yID0gc2tpYTo6U2tDb2xvclRvQ09MT1JSRUYoU2tDb2xvclNldEFSR0IoMjU1 LCBzaGFkb3dDb2xvci5yZWQoKSwgc2hhZG93Q29sb3IuZ3JlZW4oKSwgc2hhZG93Q29sb3IuYmx1 ZSgpKSk7CiAgICAgICAgIENPTE9SUkVGIHNhdmVkVGV4dENvbG9yID0gR2V0VGV4dENvbG9yKGhk Yyk7CiAgICAgICAgIFNldFRleHRDb2xvcihoZGMsIHRleHRDb2xvcik7CmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250TWFjLm1tIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9tYWMvRm9udE1hYy5tbQppbmRleCA0MDNmYmUwOGZjMmVhNmQ3ODVmZTNlMDQw NzEyMzkxZTRiZmY0YzZiLi4yMTY5NDkwZDQwYmY3NDdiM2EzODA3MmUyMDEwNDM1ZmMxOWQ2OTU4 IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250TWFjLm1tCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRNYWMubW0KQEAgLTE2OSw4ICsx NjksOSBAQCB2b2lkIEZvbnQ6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBj b25zdCBTaW1wbGVGb250RGF0YSogZm9udCwgY29ucwogICAgIEZsb2F0U2l6ZSBzaGFkb3dPZmZz ZXQ7CiAgICAgZmxvYXQgc2hhZG93Qmx1cjsKICAgICBDb2xvciBzaGFkb3dDb2xvcjsKKyAgICBD b2xvclNwYWNlIHNoYWRvd0NvbG9yU3BhY2U7CiAgICAgQ29sb3JTcGFjZSBmaWxsQ29sb3JTcGFj ZSA9IGNvbnRleHQtPmZpbGxDb2xvclNwYWNlKCk7Ci0gICAgY29udGV4dC0+Z2V0U2hhZG93KHNo YWRvd09mZnNldCwgc2hhZG93Qmx1ciwgc2hhZG93Q29sb3IpOworICAgIGNvbnRleHQtPmdldFNo YWRvdyhzaGFkb3dPZmZzZXQsIHNoYWRvd0JsdXIsIHNoYWRvd0NvbG9yLCBzaGFkb3dDb2xvclNw YWNlKTsKIAogICAgIGJvb2wgaGFzU2ltcGxlU2hhZG93ID0gY29udGV4dC0+dGV4dERyYXdpbmdN b2RlKCkgPT0gVGV4dE1vZGVGaWxsICYmIHNoYWRvd0NvbG9yLmlzVmFsaWQoKSAmJiAhc2hhZG93 Qmx1ciAmJiAhcGxhdGZvcm1EYXRhLmlzQ29sb3JCaXRtYXBGb250KCk7CiAgICAgaWYgKGhhc1Np bXBsZVNoYWRvdykgewpAQCAtMTc4LDcgKzE3OSw3IEBAIHZvaWQgRm9udDo6ZHJhd0dseXBocyhH cmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IFNpbXBsZUZvbnREYXRhKiBmb250LCBjb25z CiAgICAgICAgIGNvbnRleHQtPmNsZWFyU2hhZG93KCk7CiAgICAgICAgIENvbG9yIGZpbGxDb2xv ciA9IGNvbnRleHQtPmZpbGxDb2xvcigpOwogICAgICAgICBDb2xvciBzaGFkb3dGaWxsQ29sb3Io c2hhZG93Q29sb3IucmVkKCksIHNoYWRvd0NvbG9yLmdyZWVuKCksIHNoYWRvd0NvbG9yLmJsdWUo KSwgc2hhZG93Q29sb3IuYWxwaGEoKSAqIGZpbGxDb2xvci5hbHBoYSgpIC8gMjU1KTsKLSAgICAg ICAgY29udGV4dC0+c2V0RmlsbENvbG9yKHNoYWRvd0ZpbGxDb2xvciwgZmlsbENvbG9yU3BhY2Up OworICAgICAgICBjb250ZXh0LT5zZXRGaWxsQ29sb3Ioc2hhZG93RmlsbENvbG9yLCBzaGFkb3dD b2xvclNwYWNlKTsKICAgICAgICAgQ0dDb250ZXh0U2V0VGV4dFBvc2l0aW9uKGNnQ29udGV4dCwg cG9pbnQueCgpICsgc2hhZG93T2Zmc2V0LndpZHRoKCksIHBvaW50LnkoKSArIHNoYWRvd09mZnNl dC5oZWlnaHQoKSk7CiAgICAgICAgIHNob3dHbHlwaHNXaXRoQWR2YW5jZXMoZm9udCwgY2dDb250 ZXh0LCBnbHlwaEJ1ZmZlci5nbHlwaHMoZnJvbSksIGdseXBoQnVmZmVyLmFkdmFuY2VzKGZyb20p LCBudW1HbHlwaHMpOwogICAgICAgICBpZiAoZm9udC0+c3ludGhldGljQm9sZE9mZnNldCgpKSB7 CkBAIC0xOTYsNyArMTk3LDcgQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4 dCogY29udGV4dCwgY29uc3QgU2ltcGxlRm9udERhdGEqIGZvbnQsIGNvbnMKICAgICB9CiAKICAg ICBpZiAoaGFzU2ltcGxlU2hhZG93KQotICAgICAgICBjb250ZXh0LT5zZXRTaGFkb3coc2hhZG93 T2Zmc2V0LCBzaGFkb3dCbHVyLCBzaGFkb3dDb2xvciwgZmlsbENvbG9yU3BhY2UpOworICAgICAg ICBjb250ZXh0LT5zZXRTaGFkb3coc2hhZG93T2Zmc2V0LCBzaGFkb3dCbHVyLCBzaGFkb3dDb2xv ciwgc2hhZG93Q29sb3JTcGFjZSk7CiAKICAgICBpZiAoY2hhbmdlRm9udFNtb290aGluZykKICAg ICAgICAgQ0dDb250ZXh0U2V0U2hvdWxkU21vb3RoRm9udHMoY2dDb250ZXh0LCBvcmlnaW5hbFNo b3VsZFVzZUZvbnRTbW9vdGhpbmcpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9za2lhL1NraWFGb250V2luLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tp YS9Ta2lhRm9udFdpbi5jcHAKaW5kZXggNjJhNGQ5NjU2MjFkZGJiODEzZjQxYjVjYjFlOWVlZTQy NmNlYTgzMy4uNTA0NmM1MGE1OGUwNTA5N2QzMTM2NDI2ZmNhNTU1OWEwOWVhMzkxMCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1NraWFGb250V2luLmNwcAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2tpYUZvbnRXaW4uY3BwCkBAIC0yMjUs OCArMjI1LDkgQEAgYm9vbCB3aW5kb3dzQ2FuSGFuZGxlRHJhd1RleHRTaGFkb3coR3JhcGhpY3ND b250ZXh0ICpjb250ZXh0KQogICAgIEZsb2F0U2l6ZSBzaGFkb3dPZmZzZXQ7CiAgICAgZmxvYXQg c2hhZG93Qmx1cjsKICAgICBDb2xvciBzaGFkb3dDb2xvcjsKKyAgICBDb2xvclNwYWNlIHNoYWRv d0NvbG9yU3BhY2U7CiAKLSAgICBib29sIGhhc1NoYWRvdyA9IGNvbnRleHQtPmdldFNoYWRvdyhz aGFkb3dPZmZzZXQsIHNoYWRvd0JsdXIsIHNoYWRvd0NvbG9yKTsKKyAgICBib29sIGhhc1NoYWRv dyA9IGNvbnRleHQtPmdldFNoYWRvdyhzaGFkb3dPZmZzZXQsIHNoYWRvd0JsdXIsIHNoYWRvd0Nv bG9yLCBzaGFkb3dDb2xvclNwYWNlKTsKICAgICByZXR1cm4gKGhhc1NoYWRvdyAmJiAoc2hhZG93 Qmx1ciA9PSAwKSAmJiAoc2hhZG93Q29sb3IuYWxwaGEoKSA9PSAyNTUpICYmIChjb250ZXh0LT5m aWxsQ29sb3IoKS5hbHBoYSgpID09IDI1NSkpOwogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q0dXaW4uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy93aW4vRm9udENHV2luLmNwcAppbmRleCBhMjc4NzJiZWM3NTA4YzdjOTMxODEzNzk5YWYx OGIwMWM1ZGMwYmUzLi4yMTk0ZWY3MTAwOTY4MTRkZWYxNmY5OGY4MWU4YmRiZWU0NDg3OWMyIDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q0dXaW4uY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDR1dpbi5jcHAKQEAgLTE0Myw3 ICsxNDMsOSBAQCBzdGF0aWMgdm9pZCBkcmF3R0RJR2x5cGhzKEdyYXBoaWNzQ29udGV4dCogZ3Jh cGhpY3NDb250ZXh0LCBjb25zdCBTaW1wbGVGb250RGF0YQogICAgICAgICAgICAgRmxvYXRTaXpl IG9mZnNldDsKICAgICAgICAgICAgIGZsb2F0IGJsdXI7CiAgICAgICAgICAgICBDb2xvciBjb2xv cjsKLSAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+Z2V0U2hhZG93KG9mZnNldCwgYmx1ciwg Y29sb3IpOworICAgICAgICAgICAgQ29sb3JTcGFjZSBzaGFkb3dDb2xvclNwYWNlOworCisgICAg ICAgICAgICBncmFwaGljc0NvbnRleHQtPmdldFNoYWRvdyhvZmZzZXQsIGJsdXIsIGNvbG9yLCBz aGFkb3dDb2xvclNwYWNlKTsKICAgICAgICAgICAgIGRyYXdJbnRvQml0bWFwID0gb2Zmc2V0Lndp ZHRoKCkgfHwgb2Zmc2V0LmhlaWdodCgpIHx8IGJsdXI7CiAgICAgICAgIH0KICAgICB9CkBAIC0z NTIsNyArMzU0LDggQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogZ3Jh cGhpY3NDb250ZXh0LCBjb25zdCBTaW1wbGVGb250RGF0YSogZm8KICAgICBGbG9hdFNpemUgc2hh ZG93T2Zmc2V0OwogICAgIGZsb2F0IHNoYWRvd0JsdXI7CiAgICAgQ29sb3Igc2hhZG93Q29sb3I7 Ci0gICAgZ3JhcGhpY3NDb250ZXh0LT5nZXRTaGFkb3coc2hhZG93T2Zmc2V0LCBzaGFkb3dCbHVy LCBzaGFkb3dDb2xvcik7CisgICAgQ29sb3JTcGFjZSBzaGFkb3dDb2xvclNwYWNlOworICAgIGdy YXBoaWNzQ29udGV4dC0+Z2V0U2hhZG93KHNoYWRvd09mZnNldCwgc2hhZG93Qmx1ciwgc2hhZG93 Q29sb3IsIHNoYWRvd0NvbG9yU3BhY2UpOwogCiAgICAgYm9vbCBoYXNTaW1wbGVTaGFkb3cgPSBn cmFwaGljc0NvbnRleHQtPnRleHREcmF3aW5nTW9kZSgpID09IFRleHRNb2RlRmlsbCAmJiBzaGFk b3dDb2xvci5pc1ZhbGlkKCkgJiYgIXNoYWRvd0JsdXI7CiAgICAgaWYgKGhhc1NpbXBsZVNoYWRv dykgewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9HcmFwaGlj c0NvbnRleHRXaW5DRS5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBo aWNzQ29udGV4dFdpbkNFLmNwcAppbmRleCBiMDFmZmY1NDAzMTZmNjRlMGI0NTRkMDBmMjRjMDIy NGRlYzMwODA4Li4xZWExYTY0OGJmMGM5YjA0MmVhZjQ5YmU2OGM1YzQ5NDY1MzU2ZTFmIDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBoaWNzQ29udGV4dFdp bkNFLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBoaWNzQ29u dGV4dFdpbkNFLmNwcApAQCAtMTIwNiw4ICsxMjA2LDkgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6 OmZpbGxSb3VuZGVkUmVjdChjb25zdCBJbnRSZWN0JiBmaWxsUmVjdCwgY29uc3QgSW50U2l6ZSYg dG8KICAgICBGbG9hdFNpemUgc2hhZG93T2Zmc2V0OwogICAgIGZsb2F0IHNoYWRvd0JsdXIgPSAw OwogICAgIENvbG9yIHNoYWRvd0NvbG9yOworICAgIENvbG9yU3BhY2Ugc2hhZG93Q29sb3JTcGFj ZTsKICAgICAgICAgCi0gICAgZ2V0U2hhZG93KHNoYWRvd09mZnNldCwgc2hhZG93Qmx1ciwgc2hh ZG93Q29sb3IpOworICAgIGdldFNoYWRvdyhzaGFkb3dPZmZzZXQsIHNoYWRvd0JsdXIsIHNoYWRv d0NvbG9yLCBzaGFkb3dDb2xvclNwYWNlKTsKICAgICAKICAgICBJbnRSZWN0IGRzdFJlY3QgPSBm aWxsUmVjdDsKICAgICAKQEAgLTE2MjMsOCArMTYyNCw5IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0 OjpkcmF3VGV4dChjb25zdCBTaW1wbGVGb250RGF0YSogZm9udERhdGEsIGNvbnN0IEdseXBoQnVm ZmVyCiAgICAgRmxvYXRTaXplIHNoYWRvd09mZnNldDsKICAgICBmbG9hdCBzaGFkb3dCbHVyID0g MDsKICAgICBDb2xvciBzaGFkb3dDb2xvcjsKKyAgICBDb2xvclNwYWNlIHNoYWRvd0NvbG9yU3Bh Y2U7CiAgICAgYm9vbCBoYXNTaGFkb3cgPSB0ZXh0RHJhd2luZ01vZGUoKSA9PSBUZXh0TW9kZUZp bGwKLSAgICAgICAgJiYgZ2V0U2hhZG93KHNoYWRvd09mZnNldCwgc2hhZG93Qmx1ciwgc2hhZG93 Q29sb3IpCisgICAgICAgICYmIGdldFNoYWRvdyhzaGFkb3dPZmZzZXQsIHNoYWRvd0JsdXIsIHNo YWRvd0NvbG9yLCBzaGFkb3dDb2xvclNwYWNlKQogICAgICAgICAmJiBzaGFkb3dDb2xvci5hbHBo YSgpOwogICAgIENPTE9SUkVGIHNoYWRvd1JHQkNvbG9yOwogICAgIEZsb2F0UG9pbnQgdHJTaGFk b3dQb2ludDsK