83840 2012-04-12 18:12:00 -0700 [chromium] Consolidate adjustTextRenderMode copypasta into Skia context 2012-04-18 21:51:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 83609 1 enne enne danakj enne jamesr senorblanco webkit.review.bot oldest_to_newest 601695 0 enne 2012-04-12 18:12:00 -0700 [chromium] Consolidate adjustTextRenderMode copypasta into Skia context 601702 1 137009 enne 2012-04-12 18:16:09 -0700 Created attachment 137009 Patch 601810 2 137009 danakj 2012-04-12 21:20:35 -0700 Comment on attachment 137009 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=137009&action=review Nice work, this makes a lot of sense! > Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:663 > +void PlatformContextSkia::adjustTextRenderMode(SkPaint* paint) Can we make this an "SkPaint&" ? 602074 3 137009 senorblanco 2012-04-13 08:16:22 -0700 Comment on attachment 137009 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=137009&action=review >> Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:663 >> +void PlatformContextSkia::adjustTextRenderMode(SkPaint* paint) > > Can we make this an "SkPaint&" ? Although WebKit coding style says use non-const refs for out parameters, it doesn't saying anything about inout params AFAICT. My personal preference is to use pointers, as Enne did here, since it makes it clearer at the call site that the parameter is being modified. 602124 4 137009 danakj 2012-04-13 09:02:23 -0700 Comment on attachment 137009 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=137009&action=review >>> Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:663 >>> +void PlatformContextSkia::adjustTextRenderMode(SkPaint* paint) >> >> Can we make this an "SkPaint&" ? > > Although WebKit coding style says use non-const refs for out parameters, it doesn't saying anything about inout params AFAICT. My personal preference is to use pointers, as Enne did here, since it makes it clearer at the call site that the parameter is being modified. Oh ok! Good to know. 603312 5 enne 2012-04-16 11:48:48 -0700 senorblanco, jamesr: ping for review? 605349 6 137009 jamesr 2012-04-18 21:09:19 -0700 Comment on attachment 137009 Patch Mmmm http://i698.photobucket.com/albums/vv350/FudgeSociety/copypasta.jpg 605363 7 137009 webkit.review.bot 2012-04-18 21:51:37 -0700 Comment on attachment 137009 Patch Clearing flags on attachment: 137009 Committed r114607: <http://trac.webkit.org/changeset/114607> 605364 8 webkit.review.bot 2012-04-18 21:51:42 -0700 All reviewed patches have been landed. Closing bug. 137009 2012-04-12 18:16:09 -0700 2012-04-18 21:51:37 -0700 Patch bug-83840-20120412181608.patch text/plain 10227 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0MDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDAwYTU3ZjQyNTE5NGNi OGI0ZDAyNDc2MTVlOWZjOTUyYWQ1NjFhNi4uZDUwMzBiMTc2Njc4NzkzOTk5YjM1ZTFmYTY5YTA4 OTI5ODA3YjhlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTA0LTEyICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBDb25z b2xpZGF0ZSBhZGp1c3RUZXh0UmVuZGVyTW9kZSBjb3B5cGFzdGEgaW50byBTa2lhIGNvbnRleHQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzODQwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNhbWUg bG9naWMgdG8gZGVjaWRlIHdoZW4gdG8gbWFrZSB0ZXh0IHVzZSBMQ0QgcmVuZGVyaW5nIGlzIGNv cHkKKyAgICAgICAgYW5kIHBhc3RlZCBpbiBhbGwgdGhlIGRpZmZlcmVudCBmb250IGNsYXNzZXMu IEl0IHNlZW1zIGxpa2UgdGhpcworICAgICAgICBzaG91bGQgbGl2ZSBpbiBhIHNpbmdsZSBwbGFj ZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0ZvbnRIYXJmQnV6ei5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpkcmF3R2x5cGhzKToKKyAgICAgICAgKFdlYkNv cmU6OkZvbnQ6OmRyYXdDb21wbGV4VGV4dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9Gb250U2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpkcmF3R2x5cGhzKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Db250ZXh0U2tpYTo6YWRqdXN0VGV4dFJlbmRl ck1vZGUpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNv bnRleHRTa2lhOjpjb3VsZFVzZUxDRFJlbmRlcmVkVGV4dCk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmg6CisgICAgICAgIChQbGF0Zm9ybUNv bnRleHRTa2lhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1NraWFGb250V2lu LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNldHVwUGFpbnRGb3JGb250KToKKwogMjAxMi0wNC0x MiAgRWxpIEZpZGxlciAgPGVmaWRsZXJAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0g U2V0IHVwIGRlZmF1bHQgZm9udHMgZm9yIEJsYWNrQmVycnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0ZvbnRIYXJmQnV6ei5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250SGFyZkJ1enouY3BwCmlu ZGV4IDM0ZWFkYjFlZGFlNmI5NGQ1MTU4NGJlMjM4MTFkZTRmMzM0MjU4OTcuLjkzNzBmNjc2YmIx NzEzYzg1ZTdlYzJhNDUyNmQ3Yzc2NGZiMDkxMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0ZvbnRIYXJmQnV6ei5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovRm9udEhhcmZCdXp6LmNwcApAQCAt NjAsMTYgKzYwLDYgQEAgYm9vbCBGb250OjpjYW5FeHBhbmRBcm91bmRJZGVvZ3JhcGhzSW5Db21w bGV4VGV4dCgpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0aWMgdm9pZCBhZGp1c3RUZXh0 UmVuZGVyTW9kZShTa1BhaW50KiBwYWludCwgUGxhdGZvcm1Db250ZXh0U2tpYSogc2tpYUNvbnRl eHQpCi17Ci0gICAgLy8gT3VyIGxheWVycyBvbmx5IGhhdmUgYSBzaW5nbGUgYWxwaGEgY2hhbm5l bC4gVGhpcyBtZWFucyB0aGF0IHN1YnBpeGVsCi0gICAgLy8gcmVuZGVyZWQgdGV4dCBjYW5ub3Qg YmUgY29tcG9zaXRpZWQgY29ycmVjdGx5IHdoZW4gdGhlIGxheWVyIGlzCi0gICAgLy8gY29sbGFw c2VkLiBUaGVyZWZvcmUsIHN1YnBpeGVsIHRleHQgaXMgZGlzYWJsZWQgd2hlbiB3ZSBhcmUgZHJh d2luZwotICAgIC8vIG9udG8gYSBsYXllciBvciB3aGVuIHRoZSBjb21wb3NpdG9yIGlzIGJlaW5n IHVzZWQuCi0gICAgaWYgKHNraWFDb250ZXh0LT5jYW52YXMoKS0+aXNEcmF3aW5nVG9MYXllcigp IHx8IHNraWFDb250ZXh0LT5pc0RyYXdpbmdUb0ltYWdlQnVmZmVyKCkpCi0gICAgICAgIHBhaW50 LT5zZXRMQ0RSZW5kZXJUZXh0KGZhbHNlKTsKLX0KLQogdm9pZCBGb250OjpkcmF3R2x5cGhzKEdy YXBoaWNzQ29udGV4dCogZ2MsIGNvbnN0IFNpbXBsZUZvbnREYXRhKiBmb250LAogICAgICAgICAg ICAgICAgICAgICAgIGNvbnN0IEdseXBoQnVmZmVyJiBnbHlwaEJ1ZmZlciwgIGludCBmcm9tLCBp bnQgbnVtR2x5cGhzLAogICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEZsb2F0UG9pbnQmIHBv aW50KSBjb25zdCB7CkBAIC0xMTEsNyArMTAxLDcgQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdy YXBoaWNzQ29udGV4dCogZ2MsIGNvbnN0IFNpbXBsZUZvbnREYXRhKiBmb250LAogICAgICAgICBT a1BhaW50IHBhaW50OwogICAgICAgICBnYy0+cGxhdGZvcm1Db250ZXh0KCktPnNldHVwUGFpbnRG b3JGaWxsaW5nKCZwYWludCk7CiAgICAgICAgIGZvbnQtPnBsYXRmb3JtRGF0YSgpLnNldHVwUGFp bnQoJnBhaW50KTsKLSAgICAgICAgYWRqdXN0VGV4dFJlbmRlck1vZGUoJnBhaW50LCBnYy0+cGxh dGZvcm1Db250ZXh0KCkpOworICAgICAgICBnYy0+cGxhdGZvcm1Db250ZXh0KCktPmFkanVzdFRl eHRSZW5kZXJNb2RlKCZwYWludCk7CiAgICAgICAgIHBhaW50LnNldFRleHRFbmNvZGluZyhTa1Bh aW50OjprR2x5cGhJRF9UZXh0RW5jb2RpbmcpOwogCiAgICAgICAgIGlmIChpc1ZlcnRpY2FsKSB7 CkBAIC0xMzMsNyArMTIzLDcgQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4 dCogZ2MsIGNvbnN0IFNpbXBsZUZvbnREYXRhKiBmb250LAogICAgICAgICBTa1BhaW50IHBhaW50 OwogICAgICAgICBnYy0+cGxhdGZvcm1Db250ZXh0KCktPnNldHVwUGFpbnRGb3JTdHJva2luZygm cGFpbnQsIDAsIDApOwogICAgICAgICBmb250LT5wbGF0Zm9ybURhdGEoKS5zZXR1cFBhaW50KCZw YWludCk7Ci0gICAgICAgIGFkanVzdFRleHRSZW5kZXJNb2RlKCZwYWludCwgZ2MtPnBsYXRmb3Jt Q29udGV4dCgpKTsKKyAgICAgICAgZ2MtPnBsYXRmb3JtQ29udGV4dCgpLT5hZGp1c3RUZXh0UmVu ZGVyTW9kZSgmcGFpbnQpOwogICAgICAgICBwYWludC5zZXRUZXh0RW5jb2RpbmcoU2tQYWludDo6 a0dseXBoSURfVGV4dEVuY29kaW5nKTsKIAogICAgICAgICBpZiAodGV4dE1vZGUgJiBUZXh0TW9k ZUZpbGwpIHsKQEAgLTIwMSwxMyArMTkxLDEzIEBAIHZvaWQgRm9udDo6ZHJhd0NvbXBsZXhUZXh0 KEdyYXBoaWNzQ29udGV4dCogZ2MsIGNvbnN0IFRleHRSdW4mIHJ1biwKIAogICAgICAgICBpZiAo ZmlsbCkgewogICAgICAgICAgICAgY29udHJvbGxlci5mb250UGxhdGZvcm1EYXRhRm9yU2NyaXB0 UnVuKCktPnNldHVwUGFpbnQoJmZpbGxQYWludCk7Ci0gICAgICAgICAgICBhZGp1c3RUZXh0UmVu ZGVyTW9kZSgmZmlsbFBhaW50LCBnYy0+cGxhdGZvcm1Db250ZXh0KCkpOworICAgICAgICAgICAg Z2MtPnBsYXRmb3JtQ29udGV4dCgpLT5hZGp1c3RUZXh0UmVuZGVyTW9kZSgmZmlsbFBhaW50KTsK ICAgICAgICAgICAgIGNhbnZhcy0+ZHJhd1Bvc1RleHQoY29udHJvbGxlci5nbHlwaHMoKSArIGZy b21HbHlwaCwgZ2x5cGhMZW5ndGggPDwgMSwgY29udHJvbGxlci5wb3NpdGlvbnMoKSArIGZyb21H bHlwaCwgZmlsbFBhaW50KTsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChzdHJva2UpIHsKICAg ICAgICAgICAgIGNvbnRyb2xsZXIuZm9udFBsYXRmb3JtRGF0YUZvclNjcmlwdFJ1bigpLT5zZXR1 cFBhaW50KCZzdHJva2VQYWludCk7Ci0gICAgICAgICAgICBhZGp1c3RUZXh0UmVuZGVyTW9kZSgm c3Ryb2tlUGFpbnQsIGdjLT5wbGF0Zm9ybUNvbnRleHQoKSk7CisgICAgICAgICAgICBnYy0+cGxh dGZvcm1Db250ZXh0KCktPmFkanVzdFRleHRSZW5kZXJNb2RlKCZzdHJva2VQYWludCk7CiAgICAg ICAgICAgICBjYW52YXMtPmRyYXdQb3NUZXh0KGNvbnRyb2xsZXIuZ2x5cGhzKCkgKyBmcm9tR2x5 cGgsIGdseXBoTGVuZ3RoIDw8IDEsIGNvbnRyb2xsZXIucG9zaXRpb25zKCkgKyBmcm9tR2x5cGgs IHN0cm9rZVBhaW50KTsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvRm9udFNraWEuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Gb250U2tpYS5jcHAKaW5kZXggYjgyMDcwOGYwYjk1ZTE1 NjkzYWYxNTA1MjNlYzQxNmNjYjI0MzgxZi4uYWJkNTU2YzgzMjI4MjU4YmFlYzUwZGJjMDI3MjBi ZTM4N2YwMjczNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9Gb250U2tpYS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9Gb250U2tpYS5jcHAKQEAgLTU0LDE2ICs1NCw2IEBAIGJvb2wgRm9udDo6Y2FuRXhwYW5k QXJvdW5kSWRlb2dyYXBoc0luQ29tcGxleFRleHQoKQogICAgIHJldHVybiB0cnVlOwogfQogCi1z dGF0aWMgdm9pZCBhZGp1c3RUZXh0UmVuZGVyTW9kZShTa1BhaW50KiBwYWludCwgUGxhdGZvcm1D b250ZXh0U2tpYSogc2tpYUNvbnRleHQpCi17Ci0gICAgLy8gT3VyIGxheWVycyBvbmx5IGhhdmUg YSBzaW5nbGUgYWxwaGEgY2hhbm5lbC4gVGhpcyBtZWFucyB0aGF0IHN1YnBpeGVsCi0gICAgLy8g cmVuZGVyZWQgdGV4dCBjYW5ub3QgYmUgY29tcG9zaXRpZWQgY29ycmVjdGx5IHdoZW4gdGhlIGxh eWVyIGlzCi0gICAgLy8gY29sbGFwc2VkLiBUaGVyZWZvcmUsIHN1YnBpeGVsIHRleHQgaXMgZGlz YWJsZWQgd2hlbiB3ZSBhcmUgZHJhd2luZwotICAgIC8vIG9udG8gYSBsYXllciBvciB3aGVuIHRo ZSBjb21wb3NpdG9yIGlzIGJlaW5nIHVzZWQuCi0gICAgaWYgKHNraWFDb250ZXh0LT5jYW52YXMo KS0+aXNEcmF3aW5nVG9MYXllcigpIHx8IHNraWFDb250ZXh0LT5pc0RyYXdpbmdUb0ltYWdlQnVm ZmVyKCkpCi0gICAgICAgIHBhaW50LT5zZXRMQ0RSZW5kZXJUZXh0KGZhbHNlKTsKLX0KLQogc3Rh dGljIHZvaWQgc2V0dXBQYWludChTa1BhaW50KiBwYWludCwgY29uc3QgU2ltcGxlRm9udERhdGEq IGZvbnREYXRhLCBjb25zdCBGb250KiBmb250LCBib29sIHNob3VsZEFudGlhbGlhcywgYm9vbCBz aG91bGRTbW9vdGhGb250cykKIHsKICAgICBjb25zdCBGb250UGxhdGZvcm1EYXRhJiBwbGF0Zm9y bURhdGEgPSBmb250RGF0YS0+cGxhdGZvcm1EYXRhKCk7CkBAIC0xNTAsNyArMTQwLDcgQEAgdm9p ZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogZ2MsIGNvbnN0IFNpbXBsZUZvbnRE YXRhKiBmb250LAogICAgICAgICBTa1BhaW50IHBhaW50OwogICAgICAgICBnYy0+cGxhdGZvcm1D b250ZXh0KCktPnNldHVwUGFpbnRGb3JGaWxsaW5nKCZwYWludCk7CiAgICAgICAgIHNldHVwUGFp bnQoJnBhaW50LCBmb250LCB0aGlzLCBzaG91bGRBbnRpYWxpYXMsIHNob3VsZFNtb290aEZvbnRz KTsKLSAgICAgICAgYWRqdXN0VGV4dFJlbmRlck1vZGUoJnBhaW50LCBnYy0+cGxhdGZvcm1Db250 ZXh0KCkpOworICAgICAgICBnYy0+cGxhdGZvcm1Db250ZXh0KCktPmFkanVzdFRleHRSZW5kZXJN b2RlKCZwYWludCk7CiAgICAgICAgIHBhaW50LnNldFRleHRFbmNvZGluZyhTa1BhaW50OjprR2x5 cGhJRF9UZXh0RW5jb2RpbmcpOwogCiAgICAgICAgIGNhbnZhcy0+ZHJhd1Bvc1RleHQoZ2x5cGhz LCBudW1HbHlwaHMgKiBzaXplb2YodWludDE2X3QpLCBwb3MsIHBhaW50KTsKQEAgLTE2Myw3ICsx NTMsNyBAQCB2b2lkIEZvbnQ6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0KiBnYywgY29uc3Qg U2ltcGxlRm9udERhdGEqIGZvbnQsCiAgICAgICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgICAgIGdj LT5wbGF0Zm9ybUNvbnRleHQoKS0+c2V0dXBQYWludEZvclN0cm9raW5nKCZwYWludCwgMCwgMCk7 CiAgICAgICAgIHNldHVwUGFpbnQoJnBhaW50LCBmb250LCB0aGlzLCBzaG91bGRBbnRpYWxpYXMs IHNob3VsZFNtb290aEZvbnRzKTsKLSAgICAgICAgYWRqdXN0VGV4dFJlbmRlck1vZGUoJnBhaW50 LCBnYy0+cGxhdGZvcm1Db250ZXh0KCkpOworICAgICAgICBnYy0+cGxhdGZvcm1Db250ZXh0KCkt PmFkanVzdFRleHRSZW5kZXJNb2RlKCZwYWludCk7CiAgICAgICAgIHBhaW50LnNldFRleHRFbmNv ZGluZyhTa1BhaW50OjprR2x5cGhJRF9UZXh0RW5jb2RpbmcpOwogCiAgICAgICAgIGlmICh0ZXh0 TW9kZSAmIFRleHRNb2RlRmlsbCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAKaW5kZXggMGNh NzA5Y2Q0ZDgxMTAyMDg1OTVkMzdiMjE0NzIwZDExN2U0MjExMy4uZDg5NjdjMmI0MGZhYWMzZDM0 NGU4OGUwNGJiNmFhODg0YmMyODUwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCkBAIC02 NjAsNCArNjYwLDI2IEBAIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6ZGlkRHJhd0JvdW5kZWQo Y29uc3QgU2tSZWN0JiByZWN0LCBjb25zdCBTa1BhaW50JiBwYWluCiAgICAgICAgIG1fb3BhcXVl UmVnaW9uLmRpZERyYXdCb3VuZGVkKHRoaXMsIG1fb3BhcXVlUmVnaW9uVHJhbnNmb3JtLCByZWN0 LCBwYWludCk7CiB9CiAKK3ZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6YWRqdXN0VGV4dFJlbmRl ck1vZGUoU2tQYWludCogcGFpbnQpCit7CisgICAgaWYgKCFwYWludC0+aXNMQ0RSZW5kZXJUZXh0 KCkpCisgICAgICAgIHJldHVybjsKKworICAgIHBhaW50LT5zZXRMQ0RSZW5kZXJUZXh0KGNvdWxk VXNlTENEUmVuZGVyZWRUZXh0KCkpOworfQorCitib29sIFBsYXRmb3JtQ29udGV4dFNraWE6OmNv dWxkVXNlTENEUmVuZGVyZWRUZXh0KCkKK3sKKyAgICAvLyBPdXIgbGF5ZXJzIG9ubHkgaGF2ZSBh IHNpbmdsZSBhbHBoYSBjaGFubmVsLiBUaGlzIG1lYW5zIHRoYXQgc3VicGl4ZWwKKyAgICAvLyBy ZW5kZXJlZCB0ZXh0IGNhbm5vdCBiZSBjb21wb3NpdGVkIGNvcnJlY3RseSB3aGVuIHRoZSBsYXll ciBpcworICAgIC8vIGNvbGxhcHNlZC4gVGhlcmVmb3JlLCBzdWJwaXhlbCB0ZXh0IGlzIGRpc2Fi bGVkIHdoZW4gd2UgYXJlIGRyYXdpbmcKKyAgICAvLyBvbnRvIGEgbGF5ZXIuCisgICAgaWYgKGNh bnZhcygpLT5pc0RyYXdpbmdUb0xheWVyKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAg IC8vIElmIHRoaXMgdGV4dCBpcyBub3QgaW4gYW4gaW1hZ2UgYnVmZmVyIGFuZCBzbyB3b24ndCBi ZSBleHRlcm5hbGx5CisgICAgLy8gY29tcG9zaXRlZCwgdGhlbiBzdWJwaXhlbCBhbnRpYWxpYXNp bmcgaXMgZmluZS4KKyAgICByZXR1cm4gIWlzRHJhd2luZ1RvSW1hZ2VCdWZmZXIoKTsKK30KKwog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuaAppbmRleCBhZjdkNjlk YzUwY2NmY2YyNDE1NWY4ODJhNjFhM2RlOTU2NmZhN2Q0Li5hOTIxYTMxYTU4Mzg0NmYzYmRiNTRj OWE4M2U1MWRmZjQwYzdlNGQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuaApAQCAtMjA3LDYgKzIw NywxMCBAQCBwdWJsaWM6CiAgICAgLy8gRm9yIGRyYXdpbmcgb3BlcmF0aW9ucyB0aGF0IGRvIG5v dCBmaWxsIHRoZSBlbnRpcmUgcmVjdC4KICAgICB2b2lkIGRpZERyYXdCb3VuZGVkKGNvbnN0IFNr UmVjdCYsIGNvbnN0IFNrUGFpbnQmKTsKIAorICAgIC8vIFR1cm4gb2ZmIExDRCB0ZXh0IGZvciB0 aGUgcGFpbnQgaWYgbm90IHN1cHBvcnRlZCBvbiB0aGlzIGNvbnRleHQuCisgICAgdm9pZCBhZGp1 c3RUZXh0UmVuZGVyTW9kZShTa1BhaW50Kik7CisgICAgYm9vbCBjb3VsZFVzZUxDRFJlbmRlcmVk VGV4dCgpOworCiBwcml2YXRlOgogICAgIC8vIFVzZWQgd2hlbiByZXN0b3JpbmcgYW5kIHRoZSBz dGF0ZSBoYXMgYW4gaW1hZ2UgY2xpcC4gT25seSBzaG93cyB0aGUgcGl4ZWxzIGluCiAgICAgLy8g bV9jYW52YXMgdGhhdCBhcmUgYWxzbyBpbiBpbWFnZUJ1ZmZlci4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2tpYUZvbnRXaW4uY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhRm9udFdpbi5jcHAKaW5kZXggZjVm NWNjM2VjZjZiNzU5YjU1YWM1YzQ3MDUyY2YxYjcwZWM1ODkxYy4uYTZmMzdjZmYwNzRlMmJjMjMw MzliNTM5MzkzNjBjYTdmYjAxYjNkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhRm9udFdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvc2tpYS9Ta2lhRm9udFdpbi5jcHAKQEAgLTEzNywxNyArMTM3LDYgQEAg c3RhdGljIHZvaWQgc2tpYURyYXdUZXh0KFNrQ2FudmFzKiBjYW52YXMsCiAgICAgfQogfQogCi0v LyBsaWZ0ZWQgZnJvbSBGb250U2tpYS5jcHAKLXN0YXRpYyBib29sIGRpc2FibGVUZXh0TENEKFBs YXRmb3JtQ29udGV4dFNraWEqIHNraWFDb250ZXh0KQotewotICAgIC8vIE91ciBsYXllcnMgb25s eSBoYXZlIGEgc2luZ2xlIGFscGhhIGNoYW5uZWwuIFRoaXMgbWVhbnMgdGhhdCBzdWJwaXhlbAot ICAgIC8vIHJlbmRlcmVkIHRleHQgY2Fubm90IGJlIGNvbXBvc2l0aWVkIGNvcnJlY3RseSB3aGVu IHRoZSBsYXllciBpcwotICAgIC8vIGNvbGxhcHNlZC4gVGhlcmVmb3JlLCBzdWJwaXhlbCB0ZXh0 IGlzIGRpc2FibGVkIHdoZW4gd2UgYXJlIGRyYXdpbmcKLSAgICAvLyBvbnRvIGEgbGF5ZXIgb3Ig d2hlbiB0aGUgY29tcG9zaXRvciBpcyBiZWluZyB1c2VkLgotICAgIHJldHVybiBza2lhQ29udGV4 dC0+Y2FudmFzKCktPmlzRHJhd2luZ1RvTGF5ZXIoKQotICAgICAgICAgICB8fCBza2lhQ29udGV4 dC0+aXNEcmF3aW5nVG9JbWFnZUJ1ZmZlcigpOwotfQotCiAvLyBMb29rdXAgdGhlIGN1cnJlbnQg c3lzdGVtIHNldHRpbmdzIGZvciBmb250IHNtb290aGluZy4KIC8vIFdlIGNhY2hlIHRoZXNlIHZh bHVlcyBmb3IgcGVyZm9ybWFuY2UsIGJ1dCBpZiB0aGUgYnJvd3NlciBoYXMgYXdheSB0byBiZQog Ly8gbm90aWZpZWQgd2hlbiB0aGVzZSBjaGFuZ2UsIHdlIGNvdWxkIHJlLXF1ZXJ5IHRoZW0gYXQg dGhhdCB0aW1lLgpAQCAtMTk4LDcgKzE4Nyw3IEBAIHN0YXRpYyB2b2lkIHNldHVwUGFpbnRGb3JG b250KFNrUGFpbnQqIHBhaW50LCBQbGF0Zm9ybUNvbnRleHRTa2lhKiBwY3MsCiAgICAgdGV4dEZs YWdzICY9IGdldERlZmF1bHRHRElUZXh0RmxhZ3MoKTsKIAogICAgIC8vIGRvIHRoaXMgY2hlY2sg YWZ0ZXIgb3VyIHN3aXRjaCBvbiBsZlF1YWxpdHkKLSAgICBpZiAoZGlzYWJsZVRleHRMQ0QocGNz KSkgeworICAgIGlmICghcGNzLT5jb3VsZFVzZUxDRFJlbmRlcmVkVGV4dCgpKSB7CiAgICAgICAg IHRleHRGbGFncyAmPSB+U2tQYWludDo6a0xDRFJlbmRlclRleHRfRmxhZzsKICAgICAgICAgLy8g SWYgd2UgKmp1c3QqIGNsZWFyIG91ciByZXF1ZXN0IGZvciBMQ0QsIHRoZW4gR0RJIHNlZW1zIHRv CiAgICAgICAgIC8vIHNvbWV0aW1lcyBnaXZlIHVzIEFBIHRleHQsIGFuZCBzb21ldGltZXMgZ2l2 ZSB1cyBCVyB0ZXh0LiBTaW5jZSB0aGUK