41994 2010-07-09 14:45:48 -0700 Handle setting of drawing and event models 2010-07-09 15:08:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 249295 0 andersca 2010-07-09 14:45:48 -0700 Handle setting of drawing and event models 249300 1 61103 andersca 2010-07-09 14:48:17 -0700 Created attachment 61103 Patch 249302 2 webkit.review.bot 2010-07-09 14:49:11 -0700 Attachment 61103 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.cpp:42: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.cpp:64: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.cpp:130: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:226: NPN_SetValue is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:230: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Total errors found: 5 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 249311 3 andersca 2010-07-09 15:08:44 -0700 Committed r63000: <http://trac.webkit.org/changeset/63000> 61103 2010-07-09 14:48:17 -0700 2010-07-09 15:05:10 -0700 Patch bug-41994-20100709144815.patch text/plain 8685 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg YjViNTUwNmQwNjljNWRmYThmNmJhOGIyMTIwMzY5N2ZkODQwYzRlNy4uYTFmOTZiYmMxMzdkZTRm NzNhN2MzNDY1OGNlNmQ5NTNjOTYxYThjZCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzNyBAQAogMjAxMC0wNy0wOSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhbmRsZSBzZXR0aW5nIG9mIGRyYXdpbmcgYW5k IGV2ZW50IG1vZGVscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NDE5OTQKKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRz Y2FwZUJyb3dzZXJGdW5jcy5jcHA6CisgICAgICAgIEhhbmRsZSBOUFBWcGx1Z2luRHJhd2luZ01v ZGVsIGFuZCBOUFBWcGx1Z2luRXZlbnRNb2RlbC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1 Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNj YXBlUGx1Z2luOjpOZXRzY2FwZVBsdWdpbik6CisgICAgICAgIEluaXRpYWxpemUgbV9pbk5QUE5l dy4KKworICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6fk5ldHNjYXBlUGx1Z2luKToK KyAgICAgICAgQXNzZXJ0IHRoYXQgd2UgYXJlbid0IHN0aWxsIHJ1bm5pbmcuCisKKyAgICAgICAg KFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OmZyb21OUFApOgorICAgICAgICBOZXcgZnVuY3Rpb24g dGhhdCByZXR1cm5zIGEgTmV0c2NhcGVQbHVnaW4gb2JqZWN0IGdpdmVuIGEgTlBQIHBvaW50ZXIu CisKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OmluaXRpYWxpemUpOgorICAgICAg ICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2NhcGVQbHVnaW5NYWMuY3Bw OgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6c2V0RHJhd2luZ01vZGVsKToKKyAg ICAgICAgU2V0IHRoZSBkcmF3aW5nIG1vZGVsLgorCisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBl UGx1Z2luOjpzZXRFdmVudE1vZGVsKToKKyAgICAgICAgU2V0IHRoZSBldmVudCBtb2RlbC4KKwor ICAgICAgICAoV2ViS2l0Ojppbml0aWFsaXplRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpOZXRz Y2FwZVBsdWdpbjo6cGxhdGZvcm1QYWludCk6CisgICAgICAgIE9ubHkgc2VuZCB0aGUgQ29jb2Eg ZXZlbnQgd2hlbiB1c2luZyB0aGUgQ29jb2EgZXZlbnQgbW9kZWwuCisKKzIwMTAtMDctMDkgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBi eSBTYW0gV2VpbmlnLgogCiAgICAgICAgIFZlcmlmeSBkcmF3aW5nIGNvb3JkaW5hdGVzLCBhZGQg Y3J1ZGUgcGFpbnRpbmcgc3VwcG9ydApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwIGIvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwCmluZGV4IGNlYTY3 ZDdhNzYxYWUzZTE1NTlhY2Y3ZWZmMWU3OWZhMWViMWFkYzcuLjA5ZGQ2ODQzOWIxNjY4ZTIzNjkz NjdhNzk5ZjY0N2FkYmFiNzA5NDUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcAorKysgYi9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAKQEAgLTI1LDYg KzI1LDcgQEAKIAogI2luY2x1ZGUgIk5ldHNjYXBlQnJvd3NlckZ1bmNzLmgiCiAKKyNpbmNsdWRl ICJOZXRzY2FwZVBsdWdpbi5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCiAKIG5hbWVz cGFjZSBXZWJLaXQgewpAQCAtMjIyLDEwICsyMjMsMzEgQEAgTlBFcnJvciBOUE5fR2V0VmFsdWUo TlBQIGluc3RhbmNlLCBOUE5WYXJpYWJsZSB2YXJpYWJsZSwgdm9pZCAqdmFsdWUpCiAgICAgcmV0 dXJuIE5QRVJSX05PX0VSUk9SOwogfQogCi1OUEVycm9yIE5QTl9TZXRWYWx1ZShOUFAgaW5zdGFu Y2UsIE5QUFZhcmlhYmxlIHZhcmlhYmxlLCB2b2lkICp2YWx1ZSkKK05QRXJyb3IgTlBOX1NldFZh bHVlKE5QUCBucHAsIE5QUFZhcmlhYmxlIHZhcmlhYmxlLCB2b2lkICp2YWx1ZSkKIHsKLSAgICBu b3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBOUEVSUl9HRU5FUklDX0VSUk9SOworICAgIHN3 aXRjaCAodmFyaWFibGUpIHsKKyNpZiBQTEFURk9STShNQUMpCisgICAgICAgIGNhc2UgTlBQVnBs dWdpbkRyYXdpbmdNb2RlbDogeworICAgICAgICAgICAgUmVmUHRyPE5ldHNjYXBlUGx1Z2luPiBw bHVnaW4gPSBOZXRzY2FwZVBsdWdpbjo6ZnJvbU5QUChucHApOworICAgICAgICAgICAgCisgICAg ICAgICAgICBOUERyYXdpbmdNb2RlbCBkcmF3aW5nTW9kZWwgPSBzdGF0aWNfY2FzdDxOUERyYXdp bmdNb2RlbD4ocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KHZhbHVlKSk7CisgICAgICAgICAg ICByZXR1cm4gcGx1Z2luLT5zZXREcmF3aW5nTW9kZWwoZHJhd2luZ01vZGVsKTsKKyAgICAgICAg fQorCisgICAgICAgIGNhc2UgTlBQVnBsdWdpbkV2ZW50TW9kZWw6IHsKKyAgICAgICAgICAgIFJl ZlB0cjxOZXRzY2FwZVBsdWdpbj4gcGx1Z2luID0gTmV0c2NhcGVQbHVnaW46OmZyb21OUFAobnBw KTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgTlBFdmVudE1vZGVsIGV2ZW50TW9kZWwgPSBz dGF0aWNfY2FzdDxOUEV2ZW50TW9kZWw+KHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pih2YWx1 ZSkpOworICAgICAgICAgICAgcmV0dXJuIHBsdWdpbi0+c2V0RXZlbnRNb2RlbChldmVudE1vZGVs KTsKKyAgICAgICAgfQorI2VuZGlmCisKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIG5v dEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICByZXR1cm4gTlBFUlJfR0VORVJJQ19FUlJPUjsK KyAgICB9CisgICAgCisgICAgcmV0dXJuIE5QRVJSX05PX0VSUk9SOwogfQogCiB2b2lkIE5QTl9J bnZhbGlkYXRlUmVjdChOUFAgaW5zdGFuY2UsIE5QUmVjdCAqaW52YWxpZFJlY3QpCmRpZmYgLS1n aXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5j cHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5j cHAKaW5kZXggNDk4NTcwMGVlOGRkNWMwMWJlODc5NzUwNGVjMzkyYmM3NGMxZmZkNS4uMWFlYTIz NDE4NjFkNTU5YzZjOWNmNGEyNDFlMGE0ODYwMDczODQwMCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCisrKyBiL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcApAQCAtMzYs NiArMzYsNyBAQCBOZXRzY2FwZVBsdWdpbjo6TmV0c2NhcGVQbHVnaW4oUGFzc1JlZlB0cjxOZXRz Y2FwZVBsdWdpbk1vZHVsZT4gcGx1Z2luTW9kdWxlKQogICAgIDogbV9wbHVnaW5Nb2R1bGUocGx1 Z2luTW9kdWxlKQogICAgICwgbV9ucFdpbmRvdygpCiAgICAgLCBtX2lzU3RhcnRlZChmYWxzZSkK KyAgICAsIG1faW5OUFBOZXcoZmFsc2UpCiAjaWYgUExBVEZPUk0oTUFDKQogICAgICwgbV9kcmF3 aW5nTW9kZWwoc3RhdGljX2Nhc3Q8TlBEcmF3aW5nTW9kZWw+KC0xKSkKICAgICAsIG1fZXZlbnRN b2RlbChzdGF0aWNfY2FzdDxOUEV2ZW50TW9kZWw+KC0xKSkKQEAgLTQ3LDYgKzQ4LDIxIEBAIE5l dHNjYXBlUGx1Z2luOjpOZXRzY2FwZVBsdWdpbihQYXNzUmVmUHRyPE5ldHNjYXBlUGx1Z2luTW9k dWxlPiBwbHVnaW5Nb2R1bGUpCiAKIE5ldHNjYXBlUGx1Z2luOjp+TmV0c2NhcGVQbHVnaW4oKQog eworICAgIEFTU0VSVCghbV9pc1N0YXJ0ZWQpOworfQorCitQYXNzUmVmUHRyPE5ldHNjYXBlUGx1 Z2luPiBOZXRzY2FwZVBsdWdpbjo6ZnJvbU5QUChOUFAgbnBwKQoreworICAgIGlmIChucHApIHsK KyAgICAgICAgTmV0c2NhcGVQbHVnaW4qIHBsdWdpbiA9IHN0YXRpY19jYXN0PE5ldHNjYXBlUGx1 Z2luKj4obnBwLT5uZGF0YSk7CisgICAgICAgIEFTU0VSVChucHAgPT0gJnBsdWdpbi0+bV9ucHAp OworICAgICAgICAKKyAgICAgICAgcmV0dXJuIHBsdWdpbjsKKyAgICB9CisKKyAgICAvLyBGSVhN RTogUmV0dXJuIHRoZSBjdXJyZW50IE5ldHNjYXBlUGx1Z2luIGhlcmUuCisgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIDA7CiB9CiAKIHZvaWQgTmV0c2NhcGVQbHVnaW46OmNh bGxTZXRXaW5kb3coKQpAQCAtNjcsOCArODMsMTMgQEAgYm9vbCBOZXRzY2FwZVBsdWdpbjo6aW5p dGlhbGl6ZShjb25zdCBLVVJMJiwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIGMK IHsKICAgICB1aW50MTZfdCBtb2RlID0gbG9hZE1hbnVhbGx5ID8gTlBfRlVMTCA6IE5QX0VNQkVE OwogICAgIAorICAgIG1faW5OUFBOZXcgPSB0cnVlOworCiAgICAgLy8gRklYTUU6IFBhc3MgYXJn dW1lbnRzIHRvIE5QUF9OZXcuCiAgICAgTlBFcnJvciBlcnJvciA9IG1fcGx1Z2luTW9kdWxlLT5w bHVnaW5GdW5jcygpLm5ld3AoMCwgJm1fbnBwLCBtb2RlLCAwLCAwLCAwLCAwKTsKKworICAgIG1f aW5OUFBOZXcgPSBmYWxzZTsKKwogICAgIGlmIChlcnJvciAhPSBOUEVSUl9OT19FUlJPUikKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAppbmRleCBjMzQzY2IxYTkzOGI0MDZlNGM4ZDEw ZWMyZTRhZmVjMGE3ZWRhNDIzLi44NTM5YjM2MDA4MTZmNzc0MGUyNTFjZTE3Zjg2YzBmODljODQ4 OWMyIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRz Y2FwZVBsdWdpbi5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05l dHNjYXBlUGx1Z2luLmgKQEAgLTQwLDYgKzQwLDEzIEBAIHB1YmxpYzoKICAgICB9CiAgICAgdmly dHVhbCB+TmV0c2NhcGVQbHVnaW4oKTsKIAorICAgIHN0YXRpYyBQYXNzUmVmUHRyPE5ldHNjYXBl UGx1Z2luPiBmcm9tTlBQKE5QUCk7CisKKyNpZiBQTEFURk9STShNQUMpCisgICAgTlBFcnJvciBz ZXREcmF3aW5nTW9kZWwoTlBEcmF3aW5nTW9kZWwpOworICAgIE5QRXJyb3Igc2V0RXZlbnRNb2Rl bChOUEV2ZW50TW9kZWwpOworI2VuZGlmCisKIHByaXZhdGU6CiAgICAgTmV0c2NhcGVQbHVnaW4o UGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdpbk1vZHVsZT4gcGx1Z2luTW9kdWxlKTsKIApAQCAtNjIs NiArNjksNyBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OkludFJlY3QgbV9jbGlwUmVjdDsKICAg ICAKICAgICBib29sIG1faXNTdGFydGVkOworICAgIGJvb2wgbV9pbk5QUE5ldzsKIAogI2lmIFBM QVRGT1JNKE1BQykKICAgICBOUERyYXdpbmdNb2RlbCBtX2RyYXdpbmdNb2RlbDsKZGlmZiAtLWdp dCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL21hYy9OZXRzY2FwZVBsdWdp bk1hYy5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2Nh cGVQbHVnaW5NYWMuY3BwCmluZGV4IGIwNTczNjg4ZTcyN2FiYTNiYTliN2M2M2E3ZmVmZjgyN2Nk Nzc2MzAuLjlmOTU0NTMxYzczOWMzODA4ZWExOTY4MWI1YjQxZjcxZDc1MGQ1YzYgMTAwNjQ0Ci0t LSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL21hYy9OZXRzY2FwZVBsdWdp bk1hYy5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05l dHNjYXBlUGx1Z2luTWFjLmNwcApAQCAtMzEsNiArMzEsNDkgQEAgdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitOUEVycm9yIE5ldHNjYXBlUGx1Z2luOjpz ZXREcmF3aW5nTW9kZWwoTlBEcmF3aW5nTW9kZWwgZHJhd2luZ01vZGVsKQoreworICAgIC8vIFRo ZSBkcmF3aW5nIG1vZGVsIGNhbiBvbmx5IGJlIHNldCBmcm9tIE5QUF9OZXcuCisgICAgaWYgKCFt X2luTlBQTmV3KQorICAgICAgICByZXR1cm4gTlBFUlJfR0VORVJJQ19FUlJPUjsKKworICAgIHN3 aXRjaCAoZHJhd2luZ01vZGVsKSB7CisjaWZuZGVmIE5QX05PX1FVSUNLRFJBVworICAgICAgICBj YXNlIE5QRHJhd2luZ01vZGVsUXVpY2tEcmF3OgorI2VuZGlmCisgICAgICAgIGNhc2UgTlBEcmF3 aW5nTW9kZWxDb3JlR3JhcGhpY3M6CisgICAgICAgIGNhc2UgTlBEcmF3aW5nTW9kZWxDb3JlQW5p bWF0aW9uOgorICAgICAgICAgICAgbV9kcmF3aW5nTW9kZWwgPSBkcmF3aW5nTW9kZWw7CisgICAg ICAgICAgICBicmVhazsKKworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgcmV0dXJuIE5Q RVJSX0dFTkVSSUNfRVJST1I7CisgICAgfQorCisgICAgcmV0dXJuIE5QRVJSX05PX0VSUk9SOwor fQorICAgIAorTlBFcnJvciBOZXRzY2FwZVBsdWdpbjo6c2V0RXZlbnRNb2RlbChOUEV2ZW50TW9k ZWwgZXZlbnRNb2RlbCkKK3sKKyAgICAvLyBUaGUgZXZlbnQgbW9kZWwgY2FuIG9ubHkgYmUgc2V0 IGZyb20gTlBQX05ldy4KKyAgICBpZiAoIW1faW5OUFBOZXcpCisgICAgICAgIHJldHVybiBOUEVS Ul9HRU5FUklDX0VSUk9SOworCisgICAgc3dpdGNoIChldmVudE1vZGVsKSB7CisjaWZuZGVmIE5Q X05PX0NBUkJPTgorICAgICAgICBjYXNlIE5QRXZlbnRNb2RlbENhcmJvbjoKKyNlbmRpZgorICAg ICAgICBjYXNlIE5QRXZlbnRNb2RlbENvY29hOgorICAgICAgICAgICAgbV9ldmVudE1vZGVsID0g ZXZlbnRNb2RlbDsKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGRlZmF1bHQ6CisgICAg ICAgICAgICByZXR1cm4gTlBFUlJfR0VORVJJQ19FUlJPUjsKKyAgICB9CisgICAgCisgICAgcmV0 dXJuIE5QRVJSX05PX0VSUk9SOworfQorCiBib29sIE5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybVBv c3RJbml0aWFsaXplKCkKIHsKICAgICBpZiAobV9kcmF3aW5nTW9kZWwgPT0gc3RhdGljX2Nhc3Q8 TlBEcmF3aW5nTW9kZWw+KC0xKSkgewpAQCAtNzEsMTggKzExNCwzNSBAQCBib29sIE5ldHNjYXBl UGx1Z2luOjpwbGF0Zm9ybVBvc3RJbml0aWFsaXplKCkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAot dm9pZCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1QYWludChHcmFwaGljc0NvbnRleHQqIGNvbnRl eHQsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCkKK3N0YXRpYyBpbmxpbmUgTlBDb2NvYUV2ZW50 IGluaXRpYWxpemVFdmVudChOUENvY29hRXZlbnRUeXBlIHR5cGUpCiB7CiAgICAgTlBDb2NvYUV2 ZW50IGV2ZW50OwotICAgIGV2ZW50LnR5cGUgPSBOUENvY29hRXZlbnREcmF3UmVjdDsKKyAgICAK KyAgICBldmVudC50eXBlID0gdHlwZTsKICAgICBldmVudC52ZXJzaW9uID0gMDsKLSAgICBldmVu dC5kYXRhLmRyYXcuY29udGV4dCA9IGNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpOwotICAgIGV2 ZW50LmRhdGEuZHJhdy54ID0gZGlydHlSZWN0LngoKSAtIG1fZnJhbWVSZWN0LngoKTsKLSAgICBl dmVudC5kYXRhLmRyYXcueSA9IGRpcnR5UmVjdC55KCkgLSBtX2ZyYW1lUmVjdC55KCk7Ci0gICAg ZXZlbnQuZGF0YS5kcmF3LndpZHRoID0gZGlydHlSZWN0LndpZHRoKCk7Ci0gICAgZXZlbnQuZGF0 YS5kcmF3LmhlaWdodCA9IGRpcnR5UmVjdC5oZWlnaHQoKTsKKyAgICAKKyAgICByZXR1cm4gZXZl bnQ7Cit9CisKK3ZvaWQgTmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtUGFpbnQoR3JhcGhpY3NDb250 ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpCit7CisgICAgc3dpdGNoICht X2V2ZW50TW9kZWwpIHsKKyAgICAgICAgY2FzZSBOUEV2ZW50TW9kZWxDb2NvYTogeworICAgICAg ICAgICAgTlBDb2NvYUV2ZW50IGV2ZW50ID0gaW5pdGlhbGl6ZUV2ZW50KE5QQ29jb2FFdmVudERy YXdSZWN0KTsKIAotICAgIG1fcGx1Z2luTW9kdWxlLT5wbHVnaW5GdW5jcygpLmV2ZW50KCZtX25w cCwgJmV2ZW50KTsKKyAgICAgICAgICAgIGV2ZW50LmRhdGEuZHJhdy5jb250ZXh0ID0gY29udGV4 dC0+cGxhdGZvcm1Db250ZXh0KCk7CisgICAgICAgICAgICBldmVudC5kYXRhLmRyYXcueCA9IGRp cnR5UmVjdC54KCkgLSBtX2ZyYW1lUmVjdC54KCk7CisgICAgICAgICAgICBldmVudC5kYXRhLmRy YXcueSA9IGRpcnR5UmVjdC55KCkgLSBtX2ZyYW1lUmVjdC55KCk7CisgICAgICAgICAgICBldmVu dC5kYXRhLmRyYXcud2lkdGggPSBkaXJ0eVJlY3Qud2lkdGgoKTsKKyAgICAgICAgICAgIGV2ZW50 LmRhdGEuZHJhdy5oZWlnaHQgPSBkaXJ0eVJlY3QuaGVpZ2h0KCk7CisgICAgICAgICAgICAKKyAg ICAgICAgICAgIG1fcGx1Z2luTW9kdWxlLT5wbHVnaW5GdW5jcygpLmV2ZW50KCZtX25wcCwgJmV2 ZW50KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICBk ZWZhdWx0OgorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgfQogfQogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQK