59361 2011-04-25 15:42:25 -0700 Fix strict OwnPtr violations in Render*.cpp 2011-04-25 15:54:20 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jamesr jamesr oldest_to_newest 391952 0 jamesr 2011-04-25 15:42:25 -0700 Fix strict OwnPtr violations in Render*.cpp 391953 1 90966 jamesr 2011-04-25 15:43:04 -0700 Created attachment 90966 Patch 391955 2 jamesr 2011-04-25 15:43:26 -0700 RenderStyle.cpp still doesn't compile in strict mode with this patch, but that issue seems more involved. 391957 3 90966 abarth 2011-04-25 15:44:28 -0700 Comment on attachment 90966 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90966&action=review > Source/WebCore/rendering/RenderBlock.cpp:1092 > - OwnPtr<DelayedUpdateScrollInfoSet> infoSet(gDelayedUpdateScrollInfoSet); > + OwnPtr<DelayedUpdateScrollInfoSet> infoSet(adoptPtr(gDelayedUpdateScrollInfoSet)); Wah? 391975 4 jamesr 2011-04-25 15:54:20 -0700 Committed r84815: <http://trac.webkit.org/changeset/84815> 90966 2011-04-25 15:43:04 -0700 2011-04-25 15:44:28 -0700 Patch bug-59361-20110425154302.patch text/plain 12021 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogODQ4MDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2YjA2NzUyMTE5ZGViZmQ2 NzJmZDdlOWY0NjQ3MzBhOWE1NzBlOTc0Li41ZDQxMjU4M2M1NWJlZWIzNzEyOWVlOWUxOTk3N2U4 MWEzNWU1MzVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzkgQEAKIDIwMTEtMDQtMjUgIEphbWVz IFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggc3RyaWN0IE93blB0ciB2aW9sYXRpb25zIGlu IFJlbmRlciouY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01OTM2MQorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpSZW5kZXJCbG9jayk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9jazo6ZmluaXNoRGVsYXlVcGRhdGVTY3JvbGxJbmZvKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6YWRk TGF5b3V0T3ZlcmZsb3cpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjphZGRWaXN1YWxP dmVyZmxvdyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJ1dHRvbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCdXR0b246OnN0eWxlRGlkQ2hhbmdlKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVw ZGF0ZVRyYW5zZm9ybSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cGFpbnRDaGls ZExheWVySW50b0NvbHVtbnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmhpdFRl c3RDaGlsZExheWVyQ29sdW1ucyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6ZW5z dXJlQmFja2luZyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlOjpzdHlsZURpZENoYW5nZSk6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlclZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6Y29t cG9zaXRvcik6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjphZGRDYWNoZWRQc2V1ZG9TdHlsZSk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6YWNjZXNzQ291bnRlckRpcmVjdGl2ZXMpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmFjY2Vzc0FuaW1hdGlvbnMpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyU3R5bGU6OmFjY2Vzc1RyYW5zaXRpb25zKToKKyAgICAgICAgKiByZW5k ZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclNWR1Jlc291cmNlRmlsdGVyOjphcHBseVJlc291cmNlKToKKyAgICAgICAgKiByZW5k ZXJpbmcvc3ZnL1NWR1Jlc291cmNlcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdSZXNvdXJj ZXM6OlNWR1Jlc291cmNlcyk6CisKKzIwMTEtMDQtMjUgIEphbWVzIFJvYmluc29uICA8amFtZXNy QGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KIAogICAg ICAgICBGaXggc3RyaWN0IE93blB0ciB2aW9sYXRpb25zIGluIExpc3RIYXNoU2V0IGFuZCBSZW5k ZXJMYXllckNvbXBvc2l0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw CmluZGV4IGYxODc3ZDgwNDlhYjQ1OTNlOTNjODcyMWEyNmVhMDgzNDhmMTkxNzkuLmRiMzJiNTU4 MWZkZTUxOTM0OGVhZDhlYzhhZmYyZTQ4NmIzOTAxZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMTEyLDkgKzExMiw2IEBAIFJlbmRlckJsb2NrOjpNYXJn aW5JbmZvOjpNYXJnaW5JbmZvKFJlbmRlckJsb2NrKiBibG9jaywgaW50IGJlZm9yZUJvcmRlclBh ZGRpbmcsCiAKIFJlbmRlckJsb2NrOjpSZW5kZXJCbG9jayhOb2RlKiBub2RlKQogICAgICAgOiBS ZW5kZXJCb3gobm9kZSkKLSAgICAgICwgbV9mbG9hdGluZ09iamVjdHMoMCkKLSAgICAgICwgbV9w b3NpdGlvbmVkT2JqZWN0cygwKQotICAgICAgLCBtX3JhcmVEYXRhKDApCiAgICAgICAsIG1fbGlu ZUhlaWdodCgtMSkKICAgICAgICwgbV9iZWluZ0Rlc3Ryb3llZChmYWxzZSkKIHsKQEAgLTEwOTIs NyArMTA4OSw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmZpbmlzaERlbGF5VXBkYXRlU2Nyb2xsSW5m bygpCiAgICAgaWYgKGdEZWxheVVwZGF0ZVNjcm9sbEluZm8gPT0gMCkgewogICAgICAgICBBU1NF UlQoZ0RlbGF5ZWRVcGRhdGVTY3JvbGxJbmZvU2V0KTsKIAotICAgICAgICBPd25QdHI8RGVsYXll ZFVwZGF0ZVNjcm9sbEluZm9TZXQ+IGluZm9TZXQoZ0RlbGF5ZWRVcGRhdGVTY3JvbGxJbmZvU2V0 KTsKKyAgICAgICAgT3duUHRyPERlbGF5ZWRVcGRhdGVTY3JvbGxJbmZvU2V0PiBpbmZvU2V0KGFk b3B0UHRyKGdEZWxheWVkVXBkYXRlU2Nyb2xsSW5mb1NldCkpOwogICAgICAgICBnRGVsYXllZFVw ZGF0ZVNjcm9sbEluZm9TZXQgPSAwOwogCiAgICAgICAgIGZvciAoRGVsYXllZFVwZGF0ZVNjcm9s bEluZm9TZXQ6Oml0ZXJhdG9yIGl0ID0gaW5mb1NldC0+YmVnaW4oKTsgaXQgIT0gaW5mb1NldC0+ ZW5kKCk7ICsraXQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXgg ZTIzYzU0ZThiMWJlYWVhYmVjNTMwOGUzZTJkNzljODY2YWZmNGQ0MC4uMTRkMjc5ZWEwMDkzZmI5 ODdlZDRjYjZmNzljNGU5OTUxYThiNDVjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAKQEAgLTMyNjksNyArMzI2OSw3IEBAIHZvaWQgUmVuZGVyQm94OjphZGRMYXlvdXRP dmVyZmxvdyhjb25zdCBJbnRSZWN0JiByZWN0KQogICAgIH0KIAogICAgIGlmICghbV9vdmVyZmxv dykKLSAgICAgICAgbV9vdmVyZmxvdy5zZXQobmV3IFJlbmRlck92ZXJmbG93KGNsaWVudEJveCwg Ym9yZGVyQm94UmVjdCgpKSk7CisgICAgICAgIG1fb3ZlcmZsb3cgPSBhZG9wdFB0cihuZXcgUmVu ZGVyT3ZlcmZsb3coY2xpZW50Qm94LCBib3JkZXJCb3hSZWN0KCkpKTsKICAgICAKICAgICBtX292 ZXJmbG93LT5hZGRMYXlvdXRPdmVyZmxvdyhvdmVyZmxvd1JlY3QpOwogfQpAQCAtMzI4MSw3ICsz MjgxLDcgQEAgdm9pZCBSZW5kZXJCb3g6OmFkZFZpc3VhbE92ZXJmbG93KGNvbnN0IEludFJlY3Qm IHJlY3QpCiAgICAgICAgIHJldHVybjsKICAgICAgICAgCiAgICAgaWYgKCFtX292ZXJmbG93KQot ICAgICAgICBtX292ZXJmbG93LnNldChuZXcgUmVuZGVyT3ZlcmZsb3coY2xpZW50Qm94UmVjdCgp LCBib3JkZXJCb3gpKTsKKyAgICAgICAgbV9vdmVyZmxvdyA9IGFkb3B0UHRyKG5ldyBSZW5kZXJP dmVyZmxvdyhjbGllbnRCb3hSZWN0KCksIGJvcmRlckJveCkpOwogICAgIAogICAgIG1fb3ZlcmZs b3ctPmFkZFZpc3VhbE92ZXJmbG93KHJlY3QpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJ1dHRvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQnV0dG9uLmNwcAppbmRleCA0YmY3YzE5ZDE3YjRmNDc5NDgzNGRlNTc3ODU5ZDk2NDVk YzY0NjA3Li44NGY1MjZkOTFmYjMyZjJhYTdkY2NmYTU1NDU2YTMxYjBiNWUyNWE1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcApAQCAtOTUsNyArOTUsNyBAQCB2 b2lkIFJlbmRlckJ1dHRvbjo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNv bnN0IFJlbmRlclN0eWxlKiBvbGRTdAogCiAgICAgaWYgKCFtX2RlZmF1bHQgJiYgdGhlbWUoKS0+ aXNEZWZhdWx0KHRoaXMpKSB7CiAgICAgICAgIGlmICghbV90aW1lcikKLSAgICAgICAgICAgIG1f dGltZXIuc2V0KG5ldyBUaW1lcjxSZW5kZXJCdXR0b24+KHRoaXMsICZSZW5kZXJCdXR0b246OnRp bWVyRmlyZWQpKTsKKyAgICAgICAgICAgIG1fdGltZXIgPSBhZG9wdFB0cihuZXcgVGltZXI8UmVu ZGVyQnV0dG9uPih0aGlzLCAmUmVuZGVyQnV0dG9uOjp0aW1lckZpcmVkKSk7CiAgICAgICAgIG1f dGltZXItPnN0YXJ0UmVwZWF0aW5nKDAuMDMpOwogICAgICAgICBtX2RlZmF1bHQgPSB0cnVlOwog ICAgIH0gZWxzZSBpZiAobV9kZWZhdWx0ICYmICF0aGVtZSgpLT5pc0RlZmF1bHQodGhpcykpIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDU3ZjMwNWNiNWVi ZmNiNTI4YjlmZTc2MDg1MzNjZDVlYWZmYzA1NjQuLjhiNjJmOTJkMjk2YTE2ZWI1YTdhZjllYTk3 NzU5Y2NmNGE1MDRmMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cApAQCAtNDI2LDcgKzQyNiw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZVRyYW5zZm9ybSgp CiAgICAgYm9vbCBoYWRUcmFuc2Zvcm0gPSBtX3RyYW5zZm9ybTsKICAgICBpZiAoaGFzVHJhbnNm b3JtICE9IGhhZFRyYW5zZm9ybSkgewogICAgICAgICBpZiAoaGFzVHJhbnNmb3JtKQotICAgICAg ICAgICAgbV90cmFuc2Zvcm0uc2V0KG5ldyBUcmFuc2Zvcm1hdGlvbk1hdHJpeCk7CisgICAgICAg ICAgICBtX3RyYW5zZm9ybSA9IGFkb3B0UHRyKG5ldyBUcmFuc2Zvcm1hdGlvbk1hdHJpeCk7CiAg ICAgICAgIGVsc2UKICAgICAgICAgICAgIG1fdHJhbnNmb3JtLmNsZWFyKCk7CiAgICAgfQpAQCAt Mjc2NCwxMCArMjc2NCwxMCBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludENoaWxkTGF5ZXJJbnRv Q29sdW1ucyhSZW5kZXJMYXllciogY2hpbGRMYXllciwgUmVuZGVyTGF5ZQogICAgICAgICAgICAg ICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IG5ld1RyYW5zZm9ybShvbGRUcmFuc2Zvcm0pOwogICAg ICAgICAgICAgICAgIG5ld1RyYW5zZm9ybS50cmFuc2xhdGVSaWdodChvZmZzZXQud2lkdGgoKSwg b2Zmc2V0LmhlaWdodCgpKTsKICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBjaGls ZExheWVyLT5tX3RyYW5zZm9ybS5zZXQobmV3IFRyYW5zZm9ybWF0aW9uTWF0cml4KG5ld1RyYW5z Zm9ybSkpOworICAgICAgICAgICAgICAgIGNoaWxkTGF5ZXItPm1fdHJhbnNmb3JtID0gYWRvcHRQ dHIobmV3IFRyYW5zZm9ybWF0aW9uTWF0cml4KG5ld1RyYW5zZm9ybSkpOwogICAgICAgICAgICAg ICAgIGNoaWxkTGF5ZXItPnBhaW50TGF5ZXIocm9vdExheWVyLCBjb250ZXh0LCBsb2NhbERpcnR5 UmVjdCwgcGFpbnRCZWhhdmlvciwgcGFpbnRpbmdSb290LCBvdmVybGFwVGVzdFJlcXVlc3RzLCBw YWludEZsYWdzKTsKICAgICAgICAgICAgICAgICBpZiAob2xkSGFzVHJhbnNmb3JtKQotICAgICAg ICAgICAgICAgICAgICBjaGlsZExheWVyLT5tX3RyYW5zZm9ybS5zZXQobmV3IFRyYW5zZm9ybWF0 aW9uTWF0cml4KG9sZFRyYW5zZm9ybSkpOworICAgICAgICAgICAgICAgICAgICBjaGlsZExheWVy LT5tX3RyYW5zZm9ybSA9IGFkb3B0UHRyKG5ldyBUcmFuc2Zvcm1hdGlvbk1hdHJpeChvbGRUcmFu c2Zvcm0pKTsKICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIGNoaWxk TGF5ZXItPm1fdHJhbnNmb3JtLmNsZWFyKCk7CiAgICAgICAgICAgICB9IGVsc2UgewpAQCAtMzI0 OCwxMCArMzI0OCwxMCBAQCBSZW5kZXJMYXllciogUmVuZGVyTGF5ZXI6OmhpdFRlc3RDaGlsZExh eWVyQ29sdW1ucyhSZW5kZXJMYXllciogY2hpbGRMYXllciwgUmVuZAogICAgICAgICAgICAgICAg IFRyYW5zZm9ybWF0aW9uTWF0cml4IG5ld1RyYW5zZm9ybShvbGRUcmFuc2Zvcm0pOwogICAgICAg ICAgICAgICAgIG5ld1RyYW5zZm9ybS50cmFuc2xhdGVSaWdodChvZmZzZXQud2lkdGgoKSwgb2Zm c2V0LmhlaWdodCgpKTsKICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBjaGlsZExh eWVyLT5tX3RyYW5zZm9ybS5zZXQobmV3IFRyYW5zZm9ybWF0aW9uTWF0cml4KG5ld1RyYW5zZm9y bSkpOworICAgICAgICAgICAgICAgIGNoaWxkTGF5ZXItPm1fdHJhbnNmb3JtID0gYWRvcHRQdHIo bmV3IFRyYW5zZm9ybWF0aW9uTWF0cml4KG5ld1RyYW5zZm9ybSkpOwogICAgICAgICAgICAgICAg IGhpdExheWVyID0gY2hpbGRMYXllci0+aGl0VGVzdExheWVyKHJvb3RMYXllciwgY29sdW1uTGF5 ZXJzWzBdLCByZXF1ZXN0LCByZXN1bHQsIGxvY2FsQ2xpcFJlY3QsIGhpdFRlc3RQb2ludCwgZmFs c2UsIHRyYW5zZm9ybVN0YXRlLCB6T2Zmc2V0KTsKICAgICAgICAgICAgICAgICBpZiAob2xkSGFz VHJhbnNmb3JtKQotICAgICAgICAgICAgICAgICAgICBjaGlsZExheWVyLT5tX3RyYW5zZm9ybS5z ZXQobmV3IFRyYW5zZm9ybWF0aW9uTWF0cml4KG9sZFRyYW5zZm9ybSkpOworICAgICAgICAgICAg ICAgICAgICBjaGlsZExheWVyLT5tX3RyYW5zZm9ybSA9IGFkb3B0UHRyKG5ldyBUcmFuc2Zvcm1h dGlvbk1hdHJpeChvbGRUcmFuc2Zvcm0pKTsKICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAg ICAgICAgICAgICAgIGNoaWxkTGF5ZXItPm1fdHJhbnNmb3JtLmNsZWFyKCk7CiAgICAgICAgICAg ICB9IGVsc2UgewpAQCAtMzYwOSw3ICszNjA5LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6Y2xlYXJD bGlwUmVjdHMoKQogUmVuZGVyTGF5ZXJCYWNraW5nKiBSZW5kZXJMYXllcjo6ZW5zdXJlQmFja2lu ZygpCiB7CiAgICAgaWYgKCFtX2JhY2tpbmcpCi0gICAgICAgIG1fYmFja2luZy5zZXQobmV3IFJl bmRlckxheWVyQmFja2luZyh0aGlzKSk7CisgICAgICAgIG1fYmFja2luZyA9IGFkb3B0UHRyKG5l dyBSZW5kZXJMYXllckJhY2tpbmcodGhpcykpOwogICAgIHJldHVybiBtX2JhY2tpbmcuZ2V0KCk7 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCmluZGV4IDAxMGI5 YzFhMDliYzI2ZGZjMzU3YTg0NzUwZWZmYzFmMzgzNjBjYzUuLjQ3Y2Q0NTM4ZTE2ZWIzOTliNDE5 MDYwMGVjNGY0ZWIxNTY3OTFiOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUYWJsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRh YmxlLmNwcApAQCAtODUsOSArODUsOSBAQCB2b2lkIFJlbmRlclRhYmxlOjpzdHlsZURpZENoYW5n ZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eQogICAgICAg ICAvLyBBY2NvcmRpbmcgdG8gdGhlIENTUzIgc3BlYywgeW91IG9ubHkgdXNlIGZpeGVkIHRhYmxl IGxheW91dCBpZiBhbgogICAgICAgICAvLyBleHBsaWNpdCB3aWR0aCBpcyBzcGVjaWZpZWQgb24g dGhlIHRhYmxlLiAgQXV0byB3aWR0aCBpbXBsaWVzIGF1dG8gdGFibGUgbGF5b3V0LgogICAgICAg ICBpZiAoc3R5bGUoKS0+dGFibGVMYXlvdXQoKSA9PSBURklYRUQgJiYgIXN0eWxlKCktPmxvZ2lj YWxXaWR0aCgpLmlzQXV0bygpKQotICAgICAgICAgICAgbV90YWJsZUxheW91dC5zZXQobmV3IEZp eGVkVGFibGVMYXlvdXQodGhpcykpOworICAgICAgICAgICAgbV90YWJsZUxheW91dCA9IGFkb3B0 UHRyKG5ldyBGaXhlZFRhYmxlTGF5b3V0KHRoaXMpKTsKICAgICAgICAgZWxzZQotICAgICAgICAg ICAgbV90YWJsZUxheW91dC5zZXQobmV3IEF1dG9UYWJsZUxheW91dCh0aGlzKSk7CisgICAgICAg ICAgICBtX3RhYmxlTGF5b3V0ID0gYWRvcHRQdHIobmV3IEF1dG9UYWJsZUxheW91dCh0aGlzKSk7 CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Vmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKaW5kZXgg ZWQyMjFhNThjOTgyZjI2MjFkODZlNDEwOGVmOWM1MDEwODBlZmJkMy4uMGNjMGVlZDYyYzcwYmMz MDMzNGYwMTg0YTgwNTJlY2Q2YjYyOWI4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJWaWV3LmNwcApAQCAtNzgyLDcgKzc4Miw3IEBAIGJvb2wgUmVuZGVyVmlldzo6dXNlc0NvbXBv c2l0aW5nKCkgY29uc3QKIFJlbmRlckxheWVyQ29tcG9zaXRvciogUmVuZGVyVmlldzo6Y29tcG9z aXRvcigpCiB7CiAgICAgaWYgKCFtX2NvbXBvc2l0b3IpCi0gICAgICAgIG1fY29tcG9zaXRvci5z ZXQobmV3IFJlbmRlckxheWVyQ29tcG9zaXRvcih0aGlzKSk7CisgICAgICAgIG1fY29tcG9zaXRv ciA9IGFkb3B0UHRyKG5ldyBSZW5kZXJMYXllckNvbXBvc2l0b3IodGhpcykpOwogCiAgICAgcmV0 dXJuIG1fY29tcG9zaXRvci5nZXQoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuY3BwCmluZGV4IDYwNTE4ZjdiNjY2MzQ2YjZkNjNjZmJhNDI0MWFl MmM1ZDQ4NzM5Y2UuLjZlNGM3ODhmMGVlMmRjM2M1ZDA1MTM0Mjk3NTcwNjA4MWM3MDRiNDggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcApAQCAt MjUwLDcgKzI1MCw3IEBAIFJlbmRlclN0eWxlKiBSZW5kZXJTdHlsZTo6YWRkQ2FjaGVkUHNldWRv U3R5bGUoUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gcHNldWRvKQogICAgIFJlbmRlclN0eWxlKiBy ZXN1bHQgPSBwc2V1ZG8uZ2V0KCk7CiAKICAgICBpZiAoIW1fY2FjaGVkUHNldWRvU3R5bGVzKQot ICAgICAgICBtX2NhY2hlZFBzZXVkb1N0eWxlcy5zZXQobmV3IFBzZXVkb1N0eWxlQ2FjaGUpOwor ICAgICAgICBtX2NhY2hlZFBzZXVkb1N0eWxlcyA9IGFkb3B0UHRyKG5ldyBQc2V1ZG9TdHlsZUNh Y2hlKTsKIAogICAgIG1fY2FjaGVkUHNldWRvU3R5bGVzLT5hcHBlbmQocHNldWRvKTsKIApAQCAt ODQ5LDggKzg0OSw4IEBAIENvdW50ZXJEaXJlY3RpdmVNYXAmIFJlbmRlclN0eWxlOjphY2Nlc3ND b3VudGVyRGlyZWN0aXZlcygpCiB7CiAgICAgT3duUHRyPENvdW50ZXJEaXJlY3RpdmVNYXA+JiBt YXAgPSByYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9jb3VudGVyRGlyZWN0aXZlczsK ICAgICBpZiAoIW1hcCkKLSAgICAgICAgbWFwLnNldChuZXcgQ291bnRlckRpcmVjdGl2ZU1hcCk7 Ci0gICAgcmV0dXJuICptYXAuZ2V0KCk7CisgICAgICAgIG1hcCA9IGFkb3B0UHRyKG5ldyBDb3Vu dGVyRGlyZWN0aXZlTWFwKTsKKyAgICByZXR1cm4gKm1hcDsKIH0KIAogY29uc3QgQXRvbWljU3Ry aW5nJiBSZW5kZXJTdHlsZTo6aHlwaGVuU3RyaW5nKCkgY29uc3QKQEAgLTk5NiwxNCArOTk2LDE0 IEBAIHZvaWQgUmVuZGVyU3R5bGU6OmFkanVzdFRyYW5zaXRpb25zKCkKIEFuaW1hdGlvbkxpc3Qq IFJlbmRlclN0eWxlOjphY2Nlc3NBbmltYXRpb25zKCkKIHsKICAgICBpZiAoIXJhcmVOb25Jbmhl cml0ZWREYXRhLmFjY2VzcygpLT5tX2FuaW1hdGlvbnMpCi0gICAgICAgIHJhcmVOb25Jbmhlcml0 ZWREYXRhLmFjY2VzcygpLT5tX2FuaW1hdGlvbnMuc2V0KG5ldyBBbmltYXRpb25MaXN0KCkpOwor ICAgICAgICByYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9hbmltYXRpb25zID0gYWRv cHRQdHIobmV3IEFuaW1hdGlvbkxpc3QoKSk7CiAgICAgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWRE YXRhLT5tX2FuaW1hdGlvbnMuZ2V0KCk7CiB9CiAKIEFuaW1hdGlvbkxpc3QqIFJlbmRlclN0eWxl OjphY2Nlc3NUcmFuc2l0aW9ucygpCiB7CiAgICAgaWYgKCFyYXJlTm9uSW5oZXJpdGVkRGF0YS5h Y2Nlc3MoKS0+bV90cmFuc2l0aW9ucykKLSAgICAgICAgcmFyZU5vbkluaGVyaXRlZERhdGEuYWNj ZXNzKCktPm1fdHJhbnNpdGlvbnMuc2V0KG5ldyBBbmltYXRpb25MaXN0KCkpOworICAgICAgICBy YXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV90cmFuc2l0aW9ucyA9IGFkb3B0UHRyKG5l dyBBbmltYXRpb25MaXN0KCkpOwogICAgIHJldHVybiByYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV90 cmFuc2l0aW9ucy5nZXQoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUZpbHRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmNwcAppbmRleCAwOTE5NWY1N2M2NGFm ODMyYzVlYmFlNTczODE3OTkzZTU0NDM4NjFiLi4xZDA3NjZjZWEwZmUxZmU2ZmJlZWNmMmU0M2Fm NWE5YjcwZjNlMWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1Jlc291cmNlRmlsdGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmNwcApAQCAtMTUzLDcgKzE1Myw3IEBAIGJvb2wg UmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXI6OmFwcGx5UmVzb3VyY2UoUmVuZGVyT2JqZWN0KiBvYmpl Y3QsIFJlbmRlclN0eWxlKiwKICAgICAgICAgZGVsZXRlIG1fZmlsdGVyLnRha2Uob2JqZWN0KTsg Ly8gT29wcywgaGF2ZSB0byByZWJ1aWxkLCBnbyB0aHJvdWdoIG5vcm1hbCBjb2RlIHBhdGgKICAg ICB9CiAKLSAgICBPd25QdHI8RmlsdGVyRGF0YT4gZmlsdGVyRGF0YShuZXcgRmlsdGVyRGF0YSk7 CisgICAgT3duUHRyPEZpbHRlckRhdGE+IGZpbHRlckRhdGEoYWRvcHRQdHIobmV3IEZpbHRlckRh dGEpKTsKICAgICBGbG9hdFJlY3QgdGFyZ2V0Qm91bmRpbmdCb3ggPSBvYmplY3QtPm9iamVjdEJv dW5kaW5nQm94KCk7CiAKICAgICBTVkdGaWx0ZXJFbGVtZW50KiBmaWx0ZXJFbGVtZW50ID0gc3Rh dGljX2Nhc3Q8U1ZHRmlsdGVyRWxlbWVudCo+KG5vZGUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1Jlc291cmNlcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3ZnL1NWR1Jlc291cmNlcy5jcHAKaW5kZXggZDNjZDE4NGI3YTgxMGQ2ODlmM2Q4 ZjdkNTZhMjAzYmFiNTM4Y2UzMS4uMjcwNDQ0M2EyYzAxNGQ1NGI0YWZiODFhNDI3YmIyM2RkOTAy YjE4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdSZXNvdXJj ZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVzb3VyY2VzLmNw cApAQCAtMzYsMTAgKzM2LDcgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogU1ZHUmVzb3VyY2Vz OjpTVkdSZXNvdXJjZXMoKQotICAgIDogbV9jbGlwcGVyRmlsdGVyTWFza2VyRGF0YSgwKQotICAg ICwgbV9tYXJrZXJEYXRhKDApCi0gICAgLCBtX2ZpbGxTdHJva2VEYXRhKDApCi0gICAgLCBtX2xp bmtlZFJlc291cmNlKDApCisgICAgOiBtX2xpbmtlZFJlc291cmNlKDApCiB7CiB9CiAK