125533 2013-12-10 12:41:19 -0800 BackgroundExtendsBeyondPage setting should be switchable per WKView 2013-12-10 13:37:11 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin bdakin andersca bdakin simon.fraser thorton oldest_to_newest 958463 0 bdakin 2013-12-10 12:41:19 -0800 The new BackgroundExtendsBeyondPage setting should be switchable per WKView instead of being a WKPreference. <rdar://problem/15571310> 958467 1 218894 bdakin 2013-12-10 12:46:52 -0800 Created attachment 218894 Patch 958492 2 218902 bdakin 2013-12-10 13:21:30 -0800 Created attachment 218902 Patch 958503 3 bdakin 2013-12-10 13:37:11 -0800 Thank you! http://trac.webkit.org/changeset/160385 218894 2013-12-10 12:46:52 -0800 2013-12-10 13:21:30 -0800 Patch wkpage-api.txt text/plain 9566 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDM4MCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEzLTEyLTEwICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NTMzCisgICAgICAgIEJhY2tncm91bmRFeHRlbmRzQmV5b25k UGFnZSBzZXR0aW5nIHNob3VsZCBiZSBzd2l0Y2hhYmxlIHBlciBXS1ZpZXcKKyAgICAgICAgLWFu ZCBjb3JyZXNwb25kaW5nLQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTU1NzEzMTA+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBy ZW1vdmVzIHRoZSBXS1ByZWZlcmVuY2VzIEFQSSBhbmQgYWRkcyBXS1BhZ2UgQVBJIGluIGl0cyBw bGFjZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAo V0tQYWdlU2V0QmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlKToKKyAgICAgICAgKFdLUGFnZUJh Y2tncm91bmRFeHRlbmRzQmV5b25kUGFnZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dL UGFnZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpXZWJQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldEJh Y2tncm91bmRFeHRlbmRzQmV5b25kUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6YmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRCYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2Up OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKwogMjAxMy0xMi0xMCAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIE1vcmUgVXNlckRhdGEgd29yawpJbmRl eDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDE2 MDM3OCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yOTYsNiArMjk2LDcgQEAgV2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHko UGFnZUNsaWVudCYgcAogICAgICwgbV9ydWJiZXJCYW5kc0F0UmlnaHQodHJ1ZSkKICAgICAsIG1f cnViYmVyQmFuZHNBdFRvcCh0cnVlKQogICAgICwgbV9ydWJiZXJCYW5kc0F0Qm90dG9tKHRydWUp CisgICAgLCBtX2JhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShmYWxzZSkKICAgICAsIG1fbWFp bkZyYW1lSW5WaWV3U291cmNlTW9kZShmYWxzZSkKICAgICAsIG1fcGFnZUNvdW50KDApCiAgICAg LCBtX3JlbmRlclRyZWVTaXplKDApCkBAIC0xNzM4LDYgKzE3MzksMjMgQEAgdm9pZCBXZWJQYWdl UHJveHk6OnNldFJ1YmJlckJhbmRzQXRCb3R0bwogICAgIG1fcnViYmVyQmFuZHNBdEJvdHRvbSA9 IHJ1YmJlckJhbmRzQXRCb3R0b207CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRCYWNrZ3Jv dW5kRXh0ZW5kc0JleW9uZFBhZ2UoYm9vbCBiYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UpCit7 CisgICAgaWYgKGJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZSA9PSBtX2JhY2tncm91bmRFeHRl bmRzQmV5b25kUGFnZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9iYWNrZ3JvdW5kRXh0ZW5k c0JleW9uZFBhZ2UgPSBiYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2U7CisKKyAgICBpZiAoIWlz VmFsaWQoKSkKKyAgICAgICAgcmV0dXJuOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6U2V0QmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlKGJhY2tncm91bmRFeHRlbmRz QmV5b25kUGFnZSksIG1fcGFnZUlEKTsKK30KKworYm9vbCBXZWJQYWdlUHJveHk6OmJhY2tncm91 bmRFeHRlbmRzQmV5b25kUGFnZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fYmFja2dyb3VuZEV4 dGVuZHNCZXlvbmRQYWdlOworfQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0UGFnaW5hdGlvbk1v ZGUoV2ViQ29yZTo6UGFnaW5hdGlvbjo6TW9kZSBtb2RlKQogewogICAgIGlmIChtb2RlID09IG1f cGFnaW5hdGlvbk1vZGUpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oCShyZXZpc2lvbiAxNjAzNzgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTU4NCw2ICs1ODQsOSBAQCBwdWJsaWM6CiAgICAg Ym9vbCBydWJiZXJCYW5kc0F0Qm90dG9tKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRSdWJiZXJCYW5k c0F0Qm90dG9tKGJvb2wpOwogCisgICAgdm9pZCBzZXRCYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBh Z2UoYm9vbCk7CisgICAgYm9vbCBiYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UoKSBjb25zdDsK KwogICAgIHZvaWQgc2V0UGFnaW5hdGlvbk1vZGUoV2ViQ29yZTo6UGFnaW5hdGlvbjo6TW9kZSk7 CiAgICAgV2ViQ29yZTo6UGFnaW5hdGlvbjo6TW9kZSBwYWdpbmF0aW9uTW9kZSgpIGNvbnN0IHsg cmV0dXJuIG1fcGFnaW5hdGlvbk1vZGU7IH0KICAgICB2b2lkIHNldFBhZ2luYXRpb25CZWhhdmVz TGlrZUNvbHVtbnMoYm9vbCk7CkBAIC0xMzI2LDYgKzEzMjksOCBAQCBwcml2YXRlOgogICAgIGJv b2wgbV9ydWJiZXJCYW5kc0F0VG9wOwogICAgIGJvb2wgbV9ydWJiZXJCYW5kc0F0Qm90dG9tOwog CisgICAgYm9vbCBtX2JhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZTsKKwogICAgIGJvb2wgbV9t YWluRnJhbWVJblZpZXdTb3VyY2VNb2RlOwogICAgICAgICAKICAgICB1bnNpZ25lZCBtX3BhZ2VD b3VudDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCShy ZXZpc2lvbiAxNjAzNzgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDk1LDYgKzQ5NSwxNiBAQCB2b2lkIFdLUGFnZVNldFJ1 YmJlckJhbmRzQXRCb3R0b20oV0tQYWdlCiAgICAgdG9JbXBsKHBhZ2VSZWYpLT5zZXRSdWJiZXJC YW5kc0F0Qm90dG9tKHJ1YmJlckJhbmRzQXRCb3R0b20pOwogfQogCit2b2lkIFdLUGFnZVNldEJh Y2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShXS1BhZ2VSZWYgcGFnZVJlZiwgYm9vbCBiYWNrZ3Jv dW5kRXh0ZW5kc0JleW9uZFBhZ2UpCit7CisgICAgdG9JbXBsKHBhZ2VSZWYpLT5zZXRCYWNrZ3Jv dW5kRXh0ZW5kc0JleW9uZFBhZ2UoYmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlKTsKK30KKwor Ym9vbCBXS1BhZ2VCYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UoV0tQYWdlUmVmIHBhZ2VSZWYp Cit7CisgICAgcmV0dXJuIHRvSW1wbChwYWdlUmVmKS0+YmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQ YWdlKCk7Cit9CisKIHZvaWQgV0tQYWdlU2V0UGFnaW5hdGlvbk1vZGUoV0tQYWdlUmVmIHBhZ2VS ZWYsIFdLUGFnaW5hdGlvbk1vZGUgcGFnaW5hdGlvbk1vZGUpCiB7CiAgICAgUGFnaW5hdGlvbjo6 TW9kZSBtb2RlOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAko cmV2aXNpb24gMTYwMzc4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzYsNiArMTc2LDkgQEAgV0tfRVhQT1JUIHZvaWQgV0tQ YWdlU2V0UnViYmVyQmFuZHNBdFRvcAogV0tfRVhQT1JUIGJvb2wgV0tQYWdlUnViYmVyQmFuZHNB dEJvdHRvbShXS1BhZ2VSZWYpOwogV0tfRVhQT1JUIHZvaWQgV0tQYWdlU2V0UnViYmVyQmFuZHNB dEJvdHRvbShXS1BhZ2VSZWYsIGJvb2wgcnViYmVyQmFuZHNBdEJvdHRvbSk7CiAKK1dLX0VYUE9S VCB2b2lkIFdLUGFnZVNldEJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShXS1BhZ2VSZWYsIGJv b2wgYmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlKTsKK1dLX0VYUE9SVCBib29sIFdLUGFnZUJh Y2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShXS1BhZ2VSZWYpOworCiBXS19FWFBPUlQgYm9vbCBX S1BhZ2VDYW5EZWxldGUoV0tQYWdlUmVmIHBhZ2UpOwogV0tfRVhQT1JUIGJvb2wgV0tQYWdlSGFz U2VsZWN0ZWRSYW5nZShXS1BhZ2VSZWYgcGFnZSk7CiBXS19FWFBPUlQgYm9vbCBXS1BhZ2VJc0Nv bnRlbnRFZGl0YWJsZShXS1BhZ2VSZWYgcGFnZSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCShyZXZpc2lvbiAxNjAzNzgpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEyMDYsMTYgKzEyMDYsNiBAQCBib29sIFdLUHJlZmVyZW5jZXNHZXRTaW1w bGVMaW5lTGF5b3V0RGViCiAgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNpbXBs ZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkKCk7CiB9CiAKLXZvaWQgV0tQcmVmZXJlbmNl c1NldEJhY2tncm91bmRTaG91bGRFeHRlbmRCZXlvbmRQYWdlKFdLUHJlZmVyZW5jZXNSZWYgcHJl ZmVyZW5jZXNSZWYsIGJvb2wgZmxhZykKLXsKLSAgICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5z ZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZShmbGFnKTsKLX0KLQotYm9vbCBXS1By ZWZlcmVuY2VzR2V0QmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9uZFBhZ2UoV0tQcmVmZXJlbmNl c1JlZiBwcmVmZXJlbmNlc1JlZikKLXsKLSAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVm KS0+YmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9uZFBhZ2UoKTsKLX0KLQogdm9pZCBXS1ByZWZl cmVuY2VzU2V0TWVkaWFTdHJlYW1FbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNS ZWYsIGJvb2wgZW5hYmxlZCkKIHsKICAgICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRNZWRp YVN0cmVhbUVuYWJsZWQoZW5hYmxlZCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAkocmV2aXNpb24gMTYwMzc4 KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRl LmgJKHdvcmtpbmcgY29weSkKQEAgLTMwNCwxMCArMzA0LDYgQEAgV0tfRVhQT1JUIGJvb2wgV0tQ cmVmZXJlbmNlc0dldFNpbXBsZUxpbgogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldFNp bXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYsIGJvb2wp OwogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFNpbXBsZUxpbmVMYXlvdXREZWJ1Z0Jv cmRlcnNFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpOwogCi0vLyBEZWZhdWx0cyB0byBmYWxzZS4K LVdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5 b25kUGFnZShXS1ByZWZlcmVuY2VzUmVmLCBib29sKTsKLVdLX0VYUE9SVCBib29sIFdLUHJlZmVy ZW5jZXNHZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZShXS1ByZWZlcmVuY2VzUmVm KTsKLQogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1Jlc2V0VGVzdFJ1bm5lck92ZXJyaWRl cyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKTsKIAogLy8gRGVmYXVsdHMgdG8gZmFs c2UuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCShyZXZpc2lvbiAxNjAzNzgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMTksNiArMTMxOSwxMiBAQCB2b2lk IFdlYlBhZ2U6OnNldFN1cHByZXNzU2Nyb2xsYmFyQW5pbWF0CiAgICAgbV9wYWdlLT5zZXRTaG91 bGRTdXBwcmVzc1Njcm9sbGJhckFuaW1hdGlvbnMoc3VwcHJlc3NBbmltYXRpb25zKTsKIH0KIAor dm9pZCBXZWJQYWdlOjpzZXRCYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UoYm9vbCBiYWNrZ3Jv dW5kRXh0ZW5kc0JleW9uZFBhZ2UpCit7CisgICAgaWYgKG1fcGFnZS0+c2V0dGluZ3MoKS5iYWNr Z3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZSgpICE9IGJhY2tncm91bmRFeHRlbmRzQmV5b25k UGFnZSkKKyAgICAgICAgbV9wYWdlLT5zZXR0aW5ncygpLnNldEJhY2tncm91bmRTaG91bGRFeHRl bmRCZXlvbmRQYWdlKGJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZSk7Cit9CisKIHZvaWQgV2Vi UGFnZTo6c2V0UGFnaW5hdGlvbk1vZGUodWludDMyX3QgbW9kZSkKIHsKICAgICBQYWdpbmF0aW9u IHBhZ2luYXRpb24gPSBtX3BhZ2UtPnBhZ2luYXRpb24oKTsKQEAgLTI1MjQsNyArMjUzMCw2IEBA IHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2UKICAgICBzZXR0aW5ncy5z ZXRMb3dQb3dlclZpZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVG b3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6Omxvd1Bvd2VyVmlkZW9BdWRpb0J1ZmZlclNpemVFbmFi bGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRTaW1wbGVMaW5lTGF5b3V0RW5hYmxlZChzdG9y ZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnNpbXBsZUxpbmVMYXlvdXRF bmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRTaW1wbGVMaW5lTGF5b3V0RGVidWdCb3Jk ZXJzRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnNp bXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkS2V5KCkpKTsKLSAgICBzZXR0aW5ncy5z ZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZShzdG9yZS5nZXRCb29sVmFsdWVGb3JL ZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmJhY2tncm91bmRTaG91bGRFeHRlbmRCZXlvbmRQYWdlS2V5 KCkpKTsKIAogICAgIHNldHRpbmdzLnNldFVzZUxlZ2FjeVRleHRBbGlnblBvc2l0aW9uZWRFbGVt ZW50QmVoYXZpb3Ioc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5Ojp1 c2VMZWdhY3lUZXh0QWxpZ25Qb3NpdGlvbmVkRWxlbWVudEJlaGF2aW9yS2V5KCkpKTsKIApJbmRl eDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZpc2lv biAxNjAzNzgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5o CSh3b3JraW5nIGNvcHkpCkBAIC0zMTgsNiArMzE4LDggQEAgcHVibGljOgogCiAgICAgdm9pZCBz ZXRTdXBwcmVzc1Njcm9sbGJhckFuaW1hdGlvbnMoYm9vbCk7CiAKKyAgICB2b2lkIHNldEJhY2tn cm91bmRFeHRlbmRzQmV5b25kUGFnZShib29sKTsKKwogICAgIHZvaWQgc2V0UGFnaW5hdGlvbk1v ZGUodWludDMyX3QgLyogV2ViQ29yZTo6UGFnaW5hdGlvbjo6TW9kZSAqLyk7CiAgICAgdm9pZCBz ZXRQYWdpbmF0aW9uQmVoYXZlc0xpa2VDb2x1bW5zKGJvb2wpOwogICAgIHZvaWQgc2V0UGFnZUxl bmd0aChkb3VibGUpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJldmlzaW9uIDE2MDM3OCkKKysrIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCSh3b3JraW5n IGNvcHkpCkBAIC0xNDgsNiArMTQ4LDggQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNl aXZlciB7CiAgICAgTGlzdGVuRm9yTGF5b3V0TWlsZXN0b25lcyh1aW50MzJfdCBtaWxlc3RvbmVz KQogICAgIFNldFN1cHByZXNzU2Nyb2xsYmFyQW5pbWF0aW9ucyhib29sIHN1cHByZXNzQW5pbWF0 aW9ucykKIAorICAgIFNldEJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShib29sIGJhY2tncm91 bmRFeHRlbmRzQmV5b25kUGFnZSkKKwogICAgIFNldFBhZ2luYXRpb25Nb2RlKHVpbnQzMl90IG1v ZGUpCiAgICAgU2V0UGFnaW5hdGlvbkJlaGF2ZXNMaWtlQ29sdW1ucyhib29sIGJlaGF2ZXNMaWtl Q29sdW1ucykKICAgICBTZXRQYWdlTGVuZ3RoKGRvdWJsZSBwYWdlTGVuZ3RoKQo= 218902 2013-12-10 13:21:30 -0800 2013-12-10 13:23:58 -0800 Patch wkpage-api-2.txt text/plain 12251 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDM4MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDEzLTEyLTEwICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NTMzCisgICAgICAgIEJhY2tncm91bmRFeHRlbmRzQmV5b25k UGFnZSBzZXR0aW5nIHNob3VsZCBiZSBzd2l0Y2hhYmxlIHBlciBXS1ZpZXcKKyAgICAgICAgLWFu ZCBjb3JyZXNwb25kaW5nLQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTU1NzEzMTA+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBy ZW1vdmVzIHRoZSBXS1ByZWZlcmVuY2VzIEFQSSBhbmQgYWRkcyBXS1BhZ2UgQVBJIGluIGl0cyBw bGFjZS4gVG8gCisgICAgICAgIGVuc3VyZSB0aGF0IHRoZSBzZXR0aW5nIHN0aWNrcyBhZnRlciBh IGNyYXNoLCBpdCBpcyBhbHNvIG5vdyBhIGNyZWF0aW9uIHBhcmFtZXRlci4KKworICAgICAgICAq IFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2Uu Y3BwOgorICAgICAgICAoV0tQYWdlU2V0QmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlKToKKyAg ICAgICAgKFdLUGFnZUJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9DL1dLUGFnZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1ByZWZl cmVuY2VzLmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZh dGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OnNldEJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZSk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6YmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlKToKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5Ojppbml0aWFsaXplQ3JlYXRpb25QYXJhbWV0ZXJzKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpXZWJQYWdlKToK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0QmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdl KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMpOgorICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46CisKIDIwMTMtMTItMTAgIE5pY2sgRGllZ28gWWFt YW5lICA8bmljay55YW1hbmVAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBbRUZMXSBGaXggV0sy IGJ1aWxkIGFmdGVyIHIxNjAzNDEKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9uIDE2MDM3OCkKKysrIFNv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNTksNiArNTksNyBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6 OmVuY29kZShDCiAgICAgZW5jb2RlciA8PCBtaW5pbXVtTGF5b3V0U2l6ZTsKICAgICBlbmNvZGVy IDw8IGF1dG9TaXppbmdTaG91bGRFeHBhbmRUb1ZpZXdIZWlnaHQ7CiAgICAgZW5jb2Rlci5lbmNv ZGVFbnVtKHNjcm9sbFBpbm5pbmdCZWhhdmlvcik7CisgICAgZW5jb2RlciA8PCBiYWNrZ3JvdW5k RXh0ZW5kc0JleW9uZFBhZ2U7CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgZW5jb2Rlci5lbmNv ZGVFbnVtKGxheWVySG9zdGluZ01vZGUpOwpAQCAtMTIwLDYgKzEyMSw4IEBAIGJvb2wgV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKEMKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IGlmICghZGVjb2Rlci5kZWNvZGVFbnVtKHBhcmFtZXRlcnMuc2Nyb2xsUGlubmluZ0JlaGF2aW9y KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1l dGVycy5iYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIGlmICghZGVjb2Rlci5kZWNvZGVFbnVtKHBh cmFtZXRlcnMubGF5ZXJIb3N0aW5nTW9kZSkpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHJldmlzaW9uIDE2MDM3OCkKKysr IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHdvcmtp bmcgY29weSkKQEAgLTk3LDYgKzk3LDggQEAgc3RydWN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnMgewogICAgIAogICAgIFdlYkNvcmU6OlNjcm9sbFBpbm5pbmdCZWhhdmlvciBzY3JvbGxQaW5u aW5nQmVoYXZpb3I7CiAKKyAgICBib29sIGJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZTsKKwog I2lmIFBMQVRGT1JNKE1BQykKICAgICBMYXllckhvc3RpbmdNb2RlIGxheWVySG9zdGluZ01vZGU7 CiAgICAgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFjZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAxNjAzNzgpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjk2LDYg KzI5Niw3IEBAIFdlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5KFBhZ2VDbGllbnQmIHAKICAgICAs IG1fcnViYmVyQmFuZHNBdFJpZ2h0KHRydWUpCiAgICAgLCBtX3J1YmJlckJhbmRzQXRUb3AodHJ1 ZSkKICAgICAsIG1fcnViYmVyQmFuZHNBdEJvdHRvbSh0cnVlKQorICAgICwgbV9iYWNrZ3JvdW5k RXh0ZW5kc0JleW9uZFBhZ2UoZmFsc2UpCiAgICAgLCBtX21haW5GcmFtZUluVmlld1NvdXJjZU1v ZGUoZmFsc2UpCiAgICAgLCBtX3BhZ2VDb3VudCgwKQogICAgICwgbV9yZW5kZXJUcmVlU2l6ZSgw KQpAQCAtMTczOCw2ICsxNzM5LDIzIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRSdWJiZXJCYW5k c0F0Qm90dG8KICAgICBtX3J1YmJlckJhbmRzQXRCb3R0b20gPSBydWJiZXJCYW5kc0F0Qm90dG9t OwogfQogCit2b2lkIFdlYlBhZ2VQcm94eTo6c2V0QmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdl KGJvb2wgYmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlKQoreworICAgIGlmIChiYWNrZ3JvdW5k RXh0ZW5kc0JleW9uZFBhZ2UgPT0gbV9iYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UpCisgICAg ICAgIHJldHVybjsKKworICAgIG1fYmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlID0gYmFja2dy b3VuZEV4dGVuZHNCZXlvbmRQYWdlOworCisgICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgICAgIHJl dHVybjsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldEJhY2tncm91 bmRFeHRlbmRzQmV5b25kUGFnZShiYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UpLCBtX3BhZ2VJ RCk7Cit9CisKK2Jvb2wgV2ViUGFnZVByb3h5OjpiYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2Uo KSBjb25zdAoreworICAgIHJldHVybiBtX2JhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZTsKK30K Kwogdm9pZCBXZWJQYWdlUHJveHk6OnNldFBhZ2luYXRpb25Nb2RlKFdlYkNvcmU6OlBhZ2luYXRp b246Ok1vZGUgbW9kZSkKIHsKICAgICBpZiAobW9kZSA9PSBtX3BhZ2luYXRpb25Nb2RlKQpAQCAt MzgyNSw2ICszODQzLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVDcmVhdGlvblBh cgogICAgIG1fY3JlYXRpb25QYXJhbWV0ZXJzLm1pbmltdW1MYXlvdXRTaXplID0gbV9taW5pbXVt TGF5b3V0U2l6ZTsKICAgICBtX2NyZWF0aW9uUGFyYW1ldGVycy5hdXRvU2l6aW5nU2hvdWxkRXhw YW5kVG9WaWV3SGVpZ2h0ID0gbV9hdXRvU2l6aW5nU2hvdWxkRXhwYW5kVG9WaWV3SGVpZ2h0Owog ICAgIG1fY3JlYXRpb25QYXJhbWV0ZXJzLnNjcm9sbFBpbm5pbmdCZWhhdmlvciA9IG1fc2Nyb2xs UGlubmluZ0JlaGF2aW9yOworICAgIG1fY3JlYXRpb25QYXJhbWV0ZXJzLmJhY2tncm91bmRFeHRl bmRzQmV5b25kUGFnZSA9IG1fYmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlOwogCiAjaWYgUExB VEZPUk0oTUFDKQogICAgIG1fY3JlYXRpb25QYXJhbWV0ZXJzLmxheWVySG9zdGluZ01vZGUgPSBt X2xheWVySG9zdGluZ01vZGU7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oCShyZXZpc2lvbiAxNjAzNzgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTU4NCw2ICs1ODQsOSBAQCBwdWJsaWM6CiAg ICAgYm9vbCBydWJiZXJCYW5kc0F0Qm90dG9tKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRSdWJiZXJC YW5kc0F0Qm90dG9tKGJvb2wpOwogCisgICAgdm9pZCBzZXRCYWNrZ3JvdW5kRXh0ZW5kc0JleW9u ZFBhZ2UoYm9vbCk7CisgICAgYm9vbCBiYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UoKSBjb25z dDsKKwogICAgIHZvaWQgc2V0UGFnaW5hdGlvbk1vZGUoV2ViQ29yZTo6UGFnaW5hdGlvbjo6TW9k ZSk7CiAgICAgV2ViQ29yZTo6UGFnaW5hdGlvbjo6TW9kZSBwYWdpbmF0aW9uTW9kZSgpIGNvbnN0 IHsgcmV0dXJuIG1fcGFnaW5hdGlvbk1vZGU7IH0KICAgICB2b2lkIHNldFBhZ2luYXRpb25CZWhh dmVzTGlrZUNvbHVtbnMoYm9vbCk7CkBAIC0xMzI2LDYgKzEzMjksOCBAQCBwcml2YXRlOgogICAg IGJvb2wgbV9ydWJiZXJCYW5kc0F0VG9wOwogICAgIGJvb2wgbV9ydWJiZXJCYW5kc0F0Qm90dG9t OwogCisgICAgYm9vbCBtX2JhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZTsKKwogICAgIGJvb2wg bV9tYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlOwogICAgICAgICAKICAgICB1bnNpZ25lZCBtX3Bh Z2VDb3VudDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3Bw CShyZXZpc2lvbiAxNjAzNzgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQ YWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDk1LDYgKzQ5NSwxNiBAQCB2b2lkIFdLUGFnZVNl dFJ1YmJlckJhbmRzQXRCb3R0b20oV0tQYWdlCiAgICAgdG9JbXBsKHBhZ2VSZWYpLT5zZXRSdWJi ZXJCYW5kc0F0Qm90dG9tKHJ1YmJlckJhbmRzQXRCb3R0b20pOwogfQogCit2b2lkIFdLUGFnZVNl dEJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShXS1BhZ2VSZWYgcGFnZVJlZiwgYm9vbCBiYWNr Z3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UpCit7CisgICAgdG9JbXBsKHBhZ2VSZWYpLT5zZXRCYWNr Z3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UoYmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlKTsKK30K KworYm9vbCBXS1BhZ2VCYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UoV0tQYWdlUmVmIHBhZ2VS ZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChwYWdlUmVmKS0+YmFja2dyb3VuZEV4dGVuZHNCZXlv bmRQYWdlKCk7Cit9CisKIHZvaWQgV0tQYWdlU2V0UGFnaW5hdGlvbk1vZGUoV0tQYWdlUmVmIHBh Z2VSZWYsIFdLUGFnaW5hdGlvbk1vZGUgcGFnaW5hdGlvbk1vZGUpCiB7CiAgICAgUGFnaW5hdGlv bjo6TW9kZSBtb2RlOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2Uu aAkocmV2aXNpb24gMTYwMzc4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dL UGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzYsNiArMTc2LDkgQEAgV0tfRVhQT1JUIHZvaWQg V0tQYWdlU2V0UnViYmVyQmFuZHNBdFRvcAogV0tfRVhQT1JUIGJvb2wgV0tQYWdlUnViYmVyQmFu ZHNBdEJvdHRvbShXS1BhZ2VSZWYpOwogV0tfRVhQT1JUIHZvaWQgV0tQYWdlU2V0UnViYmVyQmFu ZHNBdEJvdHRvbShXS1BhZ2VSZWYsIGJvb2wgcnViYmVyQmFuZHNBdEJvdHRvbSk7CiAKK1dLX0VY UE9SVCB2b2lkIFdLUGFnZVNldEJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShXS1BhZ2VSZWYs IGJvb2wgYmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlKTsKK1dLX0VYUE9SVCBib29sIFdLUGFn ZUJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShXS1BhZ2VSZWYpOworCiBXS19FWFBPUlQgYm9v bCBXS1BhZ2VDYW5EZWxldGUoV0tQYWdlUmVmIHBhZ2UpOwogV0tfRVhQT1JUIGJvb2wgV0tQYWdl SGFzU2VsZWN0ZWRSYW5nZShXS1BhZ2VSZWYgcGFnZSk7CiBXS19FWFBPUlQgYm9vbCBXS1BhZ2VJ c0NvbnRlbnRFZGl0YWJsZShXS1BhZ2VSZWYgcGFnZSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCShyZXZpc2lvbiAxNjAzNzgp CisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEyMDYsMTYgKzEyMDYsNiBAQCBib29sIFdLUHJlZmVyZW5jZXNHZXRT aW1wbGVMaW5lTGF5b3V0RGViCiAgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNp bXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkKCk7CiB9CiAKLXZvaWQgV0tQcmVmZXJl bmNlc1NldEJhY2tncm91bmRTaG91bGRFeHRlbmRCZXlvbmRQYWdlKFdLUHJlZmVyZW5jZXNSZWYg cHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZykKLXsKLSAgICB0b0ltcGwocHJlZmVyZW5jZXNSZWYp LT5zZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZShmbGFnKTsKLX0KLQotYm9vbCBX S1ByZWZlcmVuY2VzR2V0QmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9uZFBhZ2UoV0tQcmVmZXJl bmNlc1JlZiBwcmVmZXJlbmNlc1JlZikKLXsKLSAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2Vz UmVmKS0+YmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9uZFBhZ2UoKTsKLX0KLQogdm9pZCBXS1By ZWZlcmVuY2VzU2V0TWVkaWFTdHJlYW1FbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5j ZXNSZWYsIGJvb2wgZW5hYmxlZCkKIHsKICAgICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRN ZWRpYVN0cmVhbUVuYWJsZWQoZW5hYmxlZCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaAkocmV2aXNpb24gMTYw Mzc4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2 YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMwNCwxMCArMzA0LDYgQEAgV0tfRVhQT1JUIGJvb2wg V0tQcmVmZXJlbmNlc0dldFNpbXBsZUxpbgogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1Nl dFNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYsIGJv b2wpOwogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFNpbXBsZUxpbmVMYXlvdXREZWJ1 Z0JvcmRlcnNFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpOwogCi0vLyBEZWZhdWx0cyB0byBmYWxz ZS4KLVdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5k QmV5b25kUGFnZShXS1ByZWZlcmVuY2VzUmVmLCBib29sKTsKLVdLX0VYUE9SVCBib29sIFdLUHJl ZmVyZW5jZXNHZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZShXS1ByZWZlcmVuY2Vz UmVmKTsKLQogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1Jlc2V0VGVzdFJ1bm5lck92ZXJy aWRlcyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKTsKIAogLy8gRGVmYXVsdHMgdG8g ZmFsc2UuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwCShyZXZpc2lvbiAxNjAzNzgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4OSw2ICszODksNyBAQCBXZWJQ YWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgCiAgICAgc2V0QXV0b1NpemluZ1No b3VsZEV4cGFuZFRvVmlld0hlaWdodChwYXJhbWV0ZXJzLmF1dG9TaXppbmdTaG91bGRFeHBhbmRU b1ZpZXdIZWlnaHQpOwogICAgIAogICAgIHNldFNjcm9sbFBpbm5pbmdCZWhhdmlvcihwYXJhbWV0 ZXJzLnNjcm9sbFBpbm5pbmdCZWhhdmlvcik7CisgICAgc2V0QmFja2dyb3VuZEV4dGVuZHNCZXlv bmRQYWdlKHBhcmFtZXRlcnMuYmFja2dyb3VuZEV4dGVuZHNCZXlvbmRQYWdlKTsKIAogICAgIG1f dXNlckFnZW50ID0gcGFyYW1ldGVycy51c2VyQWdlbnQ7CiAKQEAgLTEzMTksNiArMTMyMCwxMiBA QCB2b2lkIFdlYlBhZ2U6OnNldFN1cHByZXNzU2Nyb2xsYmFyQW5pbWF0CiAgICAgbV9wYWdlLT5z ZXRTaG91bGRTdXBwcmVzc1Njcm9sbGJhckFuaW1hdGlvbnMoc3VwcHJlc3NBbmltYXRpb25zKTsK IH0KIAordm9pZCBXZWJQYWdlOjpzZXRCYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UoYm9vbCBi YWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UpCit7CisgICAgaWYgKG1fcGFnZS0+c2V0dGluZ3Mo KS5iYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZSgpICE9IGJhY2tncm91bmRFeHRlbmRz QmV5b25kUGFnZSkKKyAgICAgICAgbV9wYWdlLT5zZXR0aW5ncygpLnNldEJhY2tncm91bmRTaG91 bGRFeHRlbmRCZXlvbmRQYWdlKGJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZSk7Cit9CisKIHZv aWQgV2ViUGFnZTo6c2V0UGFnaW5hdGlvbk1vZGUodWludDMyX3QgbW9kZSkKIHsKICAgICBQYWdp bmF0aW9uIHBhZ2luYXRpb24gPSBtX3BhZ2UtPnBhZ2luYXRpb24oKTsKQEAgLTI1MjQsNyArMjUz MSw2IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2UKICAgICBzZXR0 aW5ncy5zZXRMb3dQb3dlclZpZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxlZChzdG9yZS5nZXRCb29s VmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6Omxvd1Bvd2VyVmlkZW9BdWRpb0J1ZmZlclNp emVFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRTaW1wbGVMaW5lTGF5b3V0RW5hYmxl ZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnNpbXBsZUxpbmVM YXlvdXRFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRTaW1wbGVMaW5lTGF5b3V0RGVi dWdCb3JkZXJzRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNL ZXk6OnNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkS2V5KCkpKTsKLSAgICBzZXR0 aW5ncy5zZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZShzdG9yZS5nZXRCb29sVmFs dWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmJhY2tncm91bmRTaG91bGRFeHRlbmRCZXlvbmRQ YWdlS2V5KCkpKTsKIAogICAgIHNldHRpbmdzLnNldFVzZUxlZ2FjeVRleHRBbGlnblBvc2l0aW9u ZWRFbGVtZW50QmVoYXZpb3Ioc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2Vz S2V5Ojp1c2VMZWdhY3lUZXh0QWxpZ25Qb3NpdGlvbmVkRWxlbWVudEJlaGF2aW9yS2V5KCkpKTsK IApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShy ZXZpc2lvbiAxNjAzNzgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMTgsNiArMzE4LDggQEAgcHVibGljOgogCiAgICAg dm9pZCBzZXRTdXBwcmVzc1Njcm9sbGJhckFuaW1hdGlvbnMoYm9vbCk7CiAKKyAgICB2b2lkIHNl dEJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShib29sKTsKKwogICAgIHZvaWQgc2V0UGFnaW5h dGlvbk1vZGUodWludDMyX3QgLyogV2ViQ29yZTo6UGFnaW5hdGlvbjo6TW9kZSAqLyk7CiAgICAg dm9pZCBzZXRQYWdpbmF0aW9uQmVoYXZlc0xpa2VDb2x1bW5zKGJvb2wpOwogICAgIHZvaWQgc2V0 UGFnZUxlbmd0aChkb3VibGUpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJldmlzaW9uIDE2MDM3OCkKKysr IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCSh3 b3JraW5nIGNvcHkpCkBAIC0xNDgsNiArMTQ4LDggQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSBMZWdh Y3lSZWNlaXZlciB7CiAgICAgTGlzdGVuRm9yTGF5b3V0TWlsZXN0b25lcyh1aW50MzJfdCBtaWxl c3RvbmVzKQogICAgIFNldFN1cHByZXNzU2Nyb2xsYmFyQW5pbWF0aW9ucyhib29sIHN1cHByZXNz QW5pbWF0aW9ucykKIAorICAgIFNldEJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShib29sIGJh Y2tncm91bmRFeHRlbmRzQmV5b25kUGFnZSkKKwogICAgIFNldFBhZ2luYXRpb25Nb2RlKHVpbnQz Ml90IG1vZGUpCiAgICAgU2V0UGFnaW5hdGlvbkJlaGF2ZXNMaWtlQ29sdW1ucyhib29sIGJlaGF2 ZXNMaWtlQ29sdW1ucykKICAgICBTZXRQYWdlTGVuZ3RoKGRvdWJsZSBwYWdlTGVuZ3RoKQo=