143050 2015-03-25 08:29:21 -0700 [New Block-Inside-Inline Model] Add a preference to enable the new block-inside-inline model 2015-03-25 09:29:25 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt oldest_to_newest 1079952 0 hyatt 2015-03-25 08:29:21 -0700 Add a pref that will let us land the code that gets rid of continuations in the render tree in favor of a new model for blocks inside inlines. 1079953 1 249403 hyatt 2015-03-25 08:32:12 -0700 Created attachment 249403 Patch 1079954 2 249404 hyatt 2015-03-25 08:32:59 -0700 Created attachment 249404 Patch 1079955 3 249405 hyatt 2015-03-25 08:34:54 -0700 Created attachment 249405 Patch 1079961 4 hyatt 2015-03-25 09:29:25 -0700 Fixed in r181959. 249403 2015-03-25 08:32:12 -0700 2015-03-25 08:32:59 -0700 Patch patch.txt text/plain 10113 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTM5MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE1LTAzLTExICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBPcHRpbWl6ZSBvZmZzZXRXaWR0aCBh bmQgb2Zmc2V0SGVpZ2h0IHRvIGF2b2lkIGRvaW5nIGxheW91dHMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDI1NDQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudDo6dXBkYXRlTGF5b3V0SWZEaW1lbnNpb25zT3V0T2ZEYXRl KToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDoKKyAgICAgICAgQWRkZWQgYSBuZXcgbWV0aG9k IHRoYXQgb25seSB1cGRhdGVzIGxheW91dCBpZiBpdCBkZXRlcm1pbmVzIHRoYXQgdGhlIGRlc2ly ZWQgZGltZW5zaW9ucyBhcmUgb3V0CisgICAgICAgIG9mIGRhdGUuCisKKyAgICAgICAgKiBkb20v RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpvZmZzZXRXaWR0aCk6Cisg ICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpvZmZzZXRIZWlnaHQpOgorICAgICAgICBQYXRjaCBv ZmZzZXRXaWR0aCBhbmQgb2Zmc2V0SGVpZ2h0IHRvIGNhbGwgdGhlIG5ldyBtZXRob2QgcmF0aGVy IHRoYW4gdXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzLgorCiAyMDE1LTAzLTEx ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJl dmlld2VkLCByb2xsaW5nIG91dCByMTgxMzY3LgpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw CShyZXZpc2lvbiAxODEzMjkpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xODkyLDYgKzE4OTIsMTAzIEBAIFJlZjxSZW5kZXJTdHlsZT4gRG9j dW1lbnQ6OnN0eWxlRm9yRWxlbWUKICAgICByZXR1cm4gZW5zdXJlU3R5bGVSZXNvbHZlcigpLnN0 eWxlRm9yRWxlbWVudChlbGVtZW50LCBlbGVtZW50LT5wYXJlbnROb2RlKCkgPyBlbGVtZW50LT5w YXJlbnROb2RlKCktPmNvbXB1dGVkU3R5bGUoKSA6IG51bGxwdHIpOwogfQogCitib29sIERvY3Vt ZW50Ojp1cGRhdGVMYXlvdXRJZkRpbWVuc2lvbnNPdXRPZkRhdGUoRWxlbWVudCogZWxlbWVudCwg RGltZW5zaW9uc0NoZWNrIGRpbWVuc2lvbnNDaGVjaykKK3sKKyAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOworICAgIAorICAgIC8vIElmIHRoZSBzdHlsZXNoZWV0cyBoYXZlbid0IGxvYWRlZCwg anVzdCBnaXZlIHVwIGFuZCBkbyBhIGZ1bGwgbGF5b3V0IGlnbm9yaW5nIHBlbmRpbmcgc3R5bGVz aGVldHMuCisgICAgaWYgKCFoYXZlU3R5bGVzaGVldHNMb2FkZWQoKSkgeworICAgICAgICB1cGRh dGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKKyAgICAgICAgcmV0dXJuIHRydWU7 CisgICAgfQorICAgIAorICAgIC8vIENoZWNrIGZvciByZS1lbnRyYW5jeSBhbmQgYXNzZXJ0IChz YW1lIGNvZGUgdGhhdCBpcyBpbiB1cGRhdGVMYXlvdXQoKSkuCisgICAgRnJhbWVWaWV3KiBmcmFt ZVZpZXcgPSB2aWV3KCk7CisgICAgaWYgKGZyYW1lVmlldyAmJiBmcmFtZVZpZXctPmlzSW5MYXlv dXQoKSkgeworICAgICAgICAvLyBWaWV3IGxheW91dCBzaG91bGQgbm90IGJlIHJlLWVudHJhbnQu CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICB9CisgICAgCisgICAgUmVuZGVyVmlldzo6UmVwYWludFJlZ2lvbkFjY3VtdWxhdG9yIHJlcGFp bnRSZWdpb25BY2N1bXVsYXRvcihyZW5kZXJWaWV3KCkpOworICAgIAorICAgIC8vIE1pbWljIHRo ZSBzdHJ1Y3R1cmUgb2YgdXBkYXRlTGF5b3V0KCksIGJ1dCBhdCBlYWNoIHN0ZXAsIHNlZSBpZiB3 ZSBoYXZlIGJlZW4gZm9yY2VkIGludG8gZG9pbmcgYSBmdWxsCisgICAgLy8gbGF5b3V0LgorICAg IGJvb2wgcmVxdWlyZUZ1bGxMYXlvdXQgPSBmYWxzZTsKKyAgICBpZiAoSFRNTEZyYW1lT3duZXJF bGVtZW50KiBvd25lciA9IG93bmVyRWxlbWVudCgpKSB7CisgICAgICAgIGlmIChvd25lci0+ZG9j dW1lbnQoKS51cGRhdGVMYXlvdXRJZkRpbWVuc2lvbnNPdXRPZkRhdGUob3duZXIpKQorICAgICAg ICAgICAgcmVxdWlyZUZ1bGxMYXlvdXQgPSB0cnVlOworICAgIH0KKyAgICAKKyAgICB1cGRhdGVT dHlsZUlmTmVlZGVkKCk7CisgICAgCisgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IGVsZW1l bnQtPnJlbmRlcmVyKCk7CisgICAgaWYgKCFyZW5kZXJlciB8fCByZW5kZXJlci0+bmVlZHNMYXlv dXQoKSkKKyAgICAgICAgcmVxdWlyZUZ1bGxMYXlvdXQgPSB0cnVlOworCisgICAgYm9vbCBpc1Zl cnRpY2FsID0gcmVuZGVyZXIgJiYgIXJlbmRlcmVyLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgp OworICAgIGJvb2wgY2hlY2tpbmdMb2dpY2FsV2lkdGggPSAoKGRpbWVuc2lvbnNDaGVjayAmIFdp ZHRoRGltZW5zaW9uc0NoZWNrKSAmJiAhaXNWZXJ0aWNhbCkgfHwgKChkaW1lbnNpb25zQ2hlY2sg JiBIZWlnaHREaW1lbnNpb25zQ2hlY2spICYmIGlzVmVydGljYWwpOworICAgIGJvb2wgY2hlY2tp bmdMb2dpY2FsSGVpZ2h0ID0gKChkaW1lbnNpb25zQ2hlY2sgJiBIZWlnaHREaW1lbnNpb25zQ2hl Y2spICYmICFpc1ZlcnRpY2FsKSB8fCAoKGRpbWVuc2lvbnNDaGVjayAmIFdpZHRoRGltZW5zaW9u c0NoZWNrKSAmJiAhaXNWZXJ0aWNhbCk7CisgICAgYm9vbCBoYXNTcGVjaWZpZWRMb2dpY2FsSGVp Z2h0ID0gcmVuZGVyZXIgJiYgcmVuZGVyZXItPnN0eWxlKCkubG9naWNhbE1pbkhlaWdodCgpID09 IExlbmd0aCgwLCBGaXhlZCkgJiYgcmVuZGVyZXItPnN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlz Rml4ZWQoKSAmJiByZW5kZXJlci0+c3R5bGUoKS5sb2dpY2FsTWF4SGVpZ2h0KCkuaXNBdXRvKCk7 CisgICAgCisgICAgaWYgKCFyZXF1aXJlRnVsbExheW91dCkgeworICAgICAgICBSZW5kZXJCb3gq IHByZXZpb3VzQm94ID0gbnVsbHB0cjsKKyAgICAgICAgUmVuZGVyQm94KiBjdXJyZW50Qm94ID0g bnVsbHB0cjsKKyAgICAgICAgCisgICAgICAgIC8vIENoZWNrIG91ciBjb250YWluaW5nIGJsb2Nr IGNoYWluLiBJZiBhbnl0aGluZyBpbiB0aGUgY2hhaW4gbmVlZHMgYSBsYXlvdXQsIHRoZW4gcmVx dWlyZSBhIGZ1bGwgbGF5b3V0LgorICAgICAgICBmb3IgKFJlbmRlck9iamVjdCogY3VyclJlbmRl cmVyID0gZWxlbWVudC0+cmVuZGVyZXIoKTsgY3VyclJlbmRlcmVyICYmICFjdXJyUmVuZGVyZXIt PmlzUmVuZGVyVmlldygpOyBjdXJyUmVuZGVyZXIgPSBjdXJyUmVuZGVyZXItPmNvbnRhaW5lcigp KSB7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIC8vIFJlcXVpcmUgdGhlIGVudGlyZSBjb250 YWluZXIgY2hhaW4gdG8gYmUgYm94ZXMuCisgICAgICAgICAgICBpZiAoIWlzPFJlbmRlckJveD4o Y3VyclJlbmRlcmVyKSkgeworICAgICAgICAgICAgICAgIHJlcXVpcmVGdWxsTGF5b3V0ID0gdHJ1 ZTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIAor ICAgICAgICAgICAgcHJldmlvdXNCb3ggPSBjdXJyZW50Qm94OworICAgICAgICAgICAgY3VycmVu dEJveCA9IGRvd25jYXN0PFJlbmRlckJveD4oY3VyclJlbmRlcmVyKTsKKyAgICAgICAgICAgIAor ICAgICAgICAgICAgLy8gSWYgYSBib3ggbmVlZHMgbGF5b3V0IGZvciBpdHNlbGYgb3IgaWYgYSBi b3ggaGFzIGNoYW5nZWQgY2hpbGRyZW4gYW5kIHNpemVzIGl0cyB3aWR0aCB0bworICAgICAgICAg ICAgLy8gaXRzIGNvbnRlbnQsIHRoZW4gcmVxdWlyZSBhIGZ1bGwgbGF5b3V0LgorICAgICAgICAg ICAgaWYgKGN1cnJlbnRCb3gtPnNlbGZOZWVkc0xheW91dCgpIHx8CisgICAgICAgICAgICAgICAg KGNoZWNraW5nTG9naWNhbFdpZHRoICYmIGN1cnJSZW5kZXJlci0+bmVlZHNMYXlvdXQoKSAmJiBj dXJyZW50Qm94LT5zaXplc0xvZ2ljYWxXaWR0aFRvRml0Q29udGVudChNYWluT3JQcmVmZXJyZWRT aXplKSkpIHsKKyAgICAgICAgICAgICAgICByZXF1aXJlRnVsbExheW91dCA9IHRydWU7CisgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAKKyAgICAgICAg ICAgIC8vIElmIGEgYmxvY2sgY29udGFpbnMgZmxvYXRzIGFuZCB0aGUgY2hpbGQncyBoZWlnaHQg aXNuJ3Qgc3BlY2lmaWVkLCB0aGVuCisgICAgICAgICAgICAvLyBnaXZlIHVwIGFsc28sIHNpbmNl IG91ciBoZWlnaHQgY291bGQgZW5kIHVwIGJlaW5nIGluZmx1ZW5jZWQgYnkgdGhlIGZsb2F0cy4K KyAgICAgICAgICAgIGlmIChjaGVja2luZ0xvZ2ljYWxIZWlnaHQgJiYgIWhhc1NwZWNpZmllZExv Z2ljYWxIZWlnaHQgJiYgY3VycmVudEJveC0+aXNSZW5kZXJCbG9ja0Zsb3coKSkgeworICAgICAg ICAgICAgICAgIFJlbmRlckJsb2NrRmxvdyogY3VycmVudEJsb2NrRmxvdyA9IGRvd25jYXN0PFJl bmRlckJsb2NrRmxvdz4oY3VycmVudEJveCk7CisgICAgICAgICAgICAgICAgaWYgKGN1cnJlbnRC bG9ja0Zsb3ctPmNvbnRhaW5zRmxvYXRzKCkgJiYgcHJldmlvdXNCb3ggJiYgIXByZXZpb3VzQm94 LT5pc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkpIHsKKyAgICAgICAgICAgICAgICAg ICAgcmVxdWlyZUZ1bGxMYXlvdXQgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgICAgICAKKyAgICAgICAg ICAgIGlmICghY3VycmVudEJveC0+aXNSZW5kZXJCbG9ja0Zsb3coKSB8fCBjdXJyZW50Qm94LT5p c0lubGluZSgpIHx8IGN1cnJlbnRCb3gtPmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8IGN1cnJl bnRCb3gtPmZsb3dUaHJlYWRDb250YWluaW5nQmxvY2soKSB8fCBjdXJyZW50Qm94LT5pc1dyaXRp bmdNb2RlUm9vdCgpKSB7CisgICAgICAgICAgICAgICAgLy8gRklYTUU6IEZvciBub3cgcmVxdWly ZSBvbmx5IGJsb2NrLWxldmVsIG5vbi1wb3NpdGlvbmVkCisgICAgICAgICAgICAgICAgLy8gYmxv Y2sgZmxvd3MgYWxsIHRoZSB3YXkgYmFjayB0byB0aGUgcm9vdC4gVGhpcyBsaW1pdHMgdGhlIG9w dGltaXphdGlvbgorICAgICAgICAgICAgICAgIC8vIGZvciBub3csIGFuZCB3ZSdsbCBleHBhbmQg aXQgaW4gZnV0dXJlIHBhdGNoZXMgdG8gYXBwbHkgdG8gbW9yZSBhbmQgbW9yZSBzY2VuYXJpb3Mu CisgICAgICAgICAgICAgICAgLy8gRGlzYWxsb3cgcmVnaW9ucy9jb2x1bW5zIGZyb20gaGF2aW5n IHRoZSBvcHRpbWl6YXRpb24uCisgICAgICAgICAgICAgICAgLy8gR2l2ZSB1cCBpZiB0aGUgd3Jp dGluZyBtb2RlIGNoYW5nZXMgYXQgYWxsIGluIHRoZSBjb250YWluaW5nIGJsb2NrIGNoYWluLgor ICAgICAgICAgICAgICAgIHJlcXVpcmVGdWxsTGF5b3V0ID0gdHJ1ZTsKKyAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIAorICAgICAgICAgICAgaWYgKGN1 cnJSZW5kZXJlciA9PSBmcmFtZVZpZXctPmxheW91dFJvb3QoKSkKKyAgICAgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgfQorICAgIH0KKyAgICAKKyAgICBTdGFja1N0YXRzOjpMYXlvdXRDaGVj a1BvaW50IGxheW91dENoZWNrUG9pbnQ7CisKKyAgICAvLyBPbmx5IGRvIGEgbGF5b3V0IGlmIGNo YW5nZXMgaGF2ZSBvY2N1cnJlZCB0aGF0IG1ha2UgaXQgbmVjZXNzYXJ5LiAgICAgIAorICAgIGlm IChyZXF1aXJlRnVsbExheW91dCAmJiBmcmFtZVZpZXcgJiYgcmVuZGVyVmlldygpICYmIChmcmFt ZVZpZXctPmxheW91dFBlbmRpbmcoKSB8fCByZW5kZXJWaWV3KCktPm5lZWRzTGF5b3V0KCkpKQor ICAgICAgICBmcmFtZVZpZXctPmxheW91dCgpOworICAgIAorICAgIHJldHVybiByZXF1aXJlRnVs bExheW91dDsKK30KKwogYm9vbCBEb2N1bWVudDo6aXNQYWdlQm94VmlzaWJsZShpbnQgcGFnZUlu ZGV4KQogewogICAgIFJlZjxSZW5kZXJTdHlsZT4gcGFnZVN0eWxlKGVuc3VyZVN0eWxlUmVzb2x2 ZXIoKS5zdHlsZUZvclBhZ2UocGFnZUluZGV4KSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAko cmV2aXNpb24gMTgxMzI5KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgJKHdvcmtp bmcgY29weSkKQEAgLTI1OCw2ICsyNTgsOCBAQCBlbnVtIGNsYXNzIERvY3VtZW50Q29tcGF0aWJp bGl0eU1vZGUgOiB1CiAgICAgTGltaXRlZFF1aXJrc01vZGUgPSAxIDw8IDIKIH07CiAKK2VudW0g RGltZW5zaW9uc0NoZWNrIHsgV2lkdGhEaW1lbnNpb25zQ2hlY2sgPSAweDEsIEhlaWdodERpbWVu c2lvbnNDaGVjayA9IDB4MiwgQWxsRGltZW5zaW9uc0NoZWNrID0gMHgzIH07CisKIGNsYXNzIERv Y3VtZW50IDogcHVibGljIENvbnRhaW5lck5vZGUsIHB1YmxpYyBUcmVlU2NvcGUsIHB1YmxpYyBT Y3JpcHRFeGVjdXRpb25Db250ZXh0LCBwdWJsaWMgRm9udFNlbGVjdG9yQ2xpZW50IHsKIHB1Ymxp YzoKICAgICBzdGF0aWMgUmVmPERvY3VtZW50PiBjcmVhdGUoRnJhbWUqIGZyYW1lLCBjb25zdCBV UkwmIHVybCkKQEAgLTU2NCw3ICs1NjYsOSBAQCBwdWJsaWM6CiAKICAgICBib29sIHJlbmRlclRy ZWVCZWluZ0Rlc3Ryb3llZCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVuZGVyVHJlZUJlaW5nRGVzdHJv eWVkOyB9CiAgICAgYm9vbCBoYXNMaXZpbmdSZW5kZXJUcmVlKCkgY29uc3QgeyByZXR1cm4gcmVu ZGVyVmlldygpICYmICFyZW5kZXJUcmVlQmVpbmdEZXN0cm95ZWQoKTsgfQotCisgICAgCisgICAg Ym9vbCB1cGRhdGVMYXlvdXRJZkRpbWVuc2lvbnNPdXRPZkRhdGUoRWxlbWVudCosIERpbWVuc2lv bnNDaGVjayA9IEFsbERpbWVuc2lvbnNDaGVjayk7CisgICAgCiAgICAgQVhPYmplY3RDYWNoZSog ZXhpc3RpbmdBWE9iamVjdENhY2hlKCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgQVhPYmpl Y3RDYWNoZSogYXhPYmplY3RDYWNoZSgpIGNvbnN0OwogICAgIHZvaWQgY2xlYXJBWE9iamVjdENh Y2hlKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCShyZXZpc2lvbiAxODEzMjkpCisrKyBT b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyMyw3ICs3 MjMsNyBAQCBkb3VibGUgRWxlbWVudDo6b2Zmc2V0VG9wKCkKIAogZG91YmxlIEVsZW1lbnQ6Om9m ZnNldFdpZHRoKCkKIHsKLSAgICBkb2N1bWVudCgpLnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdT dHlsZXNoZWV0cygpOworICAgIGRvY3VtZW50KCkudXBkYXRlTGF5b3V0SWZEaW1lbnNpb25zT3V0 T2ZEYXRlKHRoaXMsIFdpZHRoRGltZW5zaW9uc0NoZWNrKTsKICAgICBpZiAoUmVuZGVyQm94TW9k ZWxPYmplY3QqIHJlbmRlcmVyID0gcmVuZGVyQm94TW9kZWxPYmplY3QoKSkgewogICAgICAgICBM YXlvdXRVbml0IG9mZnNldFdpZHRoID0gc3VicGl4ZWxNZXRyaWNzRW5hYmxlZChyZW5kZXJlci0+ ZG9jdW1lbnQoKSkgPyByZW5kZXJlci0+b2Zmc2V0V2lkdGgoKSA6IExheW91dFVuaXQocmVuZGVy ZXItPnBpeGVsU25hcHBlZE9mZnNldFdpZHRoKCkpOwogICAgICAgICByZXR1cm4gY29udmVydFRv Tm9uU3VicGl4ZWxWYWx1ZUlmTmVlZGVkKGFkanVzdExheW91dFVuaXRGb3JBYnNvbHV0ZVpvb20o b2Zmc2V0V2lkdGgsICpyZW5kZXJlcikudG9Eb3VibGUoKSwgcmVuZGVyZXItPmRvY3VtZW50KCkp OwpAQCAtNzMzLDcgKzczMyw3IEBAIGRvdWJsZSBFbGVtZW50OjpvZmZzZXRXaWR0aCgpCiAKIGRv dWJsZSBFbGVtZW50OjpvZmZzZXRIZWlnaHQoKQogewotICAgIGRvY3VtZW50KCkudXBkYXRlTGF5 b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7CisgICAgZG9jdW1lbnQoKS51cGRhdGVMYXlv dXRJZkRpbWVuc2lvbnNPdXRPZkRhdGUodGhpcywgSGVpZ2h0RGltZW5zaW9uc0NoZWNrKTsKICAg ICBpZiAoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlbmRlcmVyID0gcmVuZGVyQm94TW9kZWxPYmpl Y3QoKSkgewogICAgICAgICBMYXlvdXRVbml0IG9mZnNldEhlaWdodCA9IHN1YnBpeGVsTWV0cmlj c0VuYWJsZWQocmVuZGVyZXItPmRvY3VtZW50KCkpID8gcmVuZGVyZXItPm9mZnNldEhlaWdodCgp IDogTGF5b3V0VW5pdChyZW5kZXJlci0+cGl4ZWxTbmFwcGVkT2Zmc2V0SGVpZ2h0KCkpOwogICAg ICAgICByZXR1cm4gY29udmVydFRvTm9uU3VicGl4ZWxWYWx1ZUlmTmVlZGVkKGFkanVzdExheW91 dFVuaXRGb3JBYnNvbHV0ZVpvb20ob2Zmc2V0SGVpZ2h0LCAqcmVuZGVyZXIpLnRvRG91YmxlKCks IHJlbmRlcmVyLT5kb2N1bWVudCgpKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTM5MSkKKysrIExh eW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE1 LTAzLTExICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBPcHRpbWl6 ZSBvZmZzZXRXaWR0aCBhbmQgb2Zmc2V0SGVpZ2h0IHRvIGF2b2lkIGRvaW5nIGxheW91dHMuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDI1NDQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvaW1h Z2VzL3JlcGFpbnQtc3VicmVjdC1ncmlkLmh0bWw6CisgICAgICAgIFBhdGNoIHRoaXMgdGVzdCB0 byB1c2UgdGhlIHdpbmRvdy5pbnRlcm5hbHMgdXBkYXRlIGxheW91dCBtZXRob2QgcmF0aGVyIHRo YW4KKyAgICAgICAgcmVseWluZyBvbiBkb2N1bWVudC5ib2R5Lm9mZnNldFdpZHRoLgorCiAyMDE1 LTAzLTExICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAg ICAgW1dpbl0gVGVzdCBnYXJkZW5pbmcgYWZ0ZXIgcjE4MTI2MApJbmRleDogTGF5b3V0VGVzdHMv ZmFzdC9pbWFnZXMvcmVwYWludC1zdWJyZWN0LWdyaWQuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9mYXN0L2ltYWdlcy9yZXBhaW50LXN1YnJlY3QtZ3JpZC5odG1sCShyZXZpc2lvbiAx ODEzMjkpCisrKyBMYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy9yZXBhaW50LXN1YnJlY3QtZ3JpZC5o dG1sCSh3b3JraW5nIGNvcHkpCkBAIC00MCw4ICs0MCw5IEBACiAgICAgICAgICAgICArK2N1cnJl bnRQb3M7CiAKICAgICAgICAgICAgIC8vIEZvcmNlIGEgc3R5bGUgcmVjYWxjLgotICAgICAgICAg ICAgZG9jdW1lbnQuYm9keS5vZmZzZXRXaWR0aDsKLQorICAgICAgICAgICAgaWYgKGludGVybmFs cykKKyAgICAgICAgICAgICAgICBpbnRlcm5hbHMudXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0 eWxlc2hlZXRzQW5kUnVuUG9zdExheW91dFRhc2tzKCk7CisgICAgICAgICAgICAgICAgCiAgICAg ICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCiAgICAgICAgICAgICAgICAgcmVwYWludFRl c3QoKTsKICAgICAgICAgICAgIGVsc2UK 249404 2015-03-25 08:32:59 -0700 2015-03-25 08:34:54 -0700 Patch patch.txt text/plain 5640 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTk1OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDE1LTAzLTI1ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBwcmVmIHRvIGVuYWJsZSB0 aGUgbmV3IGJsb2NrLWluc2lkZS1pbmxpbmUgbW9kZWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzA1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5pbjoKKwogMjAxNS0wMy0y NSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIGlPUyBTaW11bGF0 b3IgYnVpbGQgZml4LgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCShyZXZpc2lvbiAxODE4 NTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCSh3b3JraW5nIGNvcHkpCkBA IC0yMzcsMyArMjM3LDYgQEAgaWdub3JlVmlld3BvcnRTY2FsaW5nQ29uc3RyYWludHMgaW5pdGlh bAogYXBwbGVNYWlsUGFnaW5hdGlvblF1aXJrRW5hYmxlZCBpbml0aWFsPWZhbHNlCiAKIGF0dGFj aG1lbnRFbGVtZW50RW5hYmxlZCBpbml0aWFsPXRydWUsIGNvbmRpdGlvbmFsPUFUVEFDSE1FTlRf RUxFTUVOVAorCituZXdCbG9ja0luc2lkZUlubGluZU1vZGVsRW5hYmxlZCBpbml0aWFsPWZhbHNl LCBzZXROZWVkc1N0eWxlUmVjYWxjSW5BbGxGcmFtZXM9MQorCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZp c2lvbiAxODE5NTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxOCBAQAorMjAxNS0wMy0yNSAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5j b20+CisKKyAgICAgICAgQWRkIGEgcHJlZiB0byBlbmFibGUgdGhlIG5ldyBibG9jay1pbnNpZGUt aW5saW5lIG1vZGVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDMwNTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFNoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmg6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV0tQcmVmZXJlbmNlc1Nl dE5ld0Jsb2NrSW5zaWRlSW5saW5lTW9kZWxFbmFibGVkKToKKyAgICAgICAgKFdLUHJlZmVyZW5j ZXNHZXROZXdCbG9ja0luc2lkZUlubGluZU1vZGVsRW5hYmxlZCk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWZQcml2YXRlLmg6CisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVQ cmVmZXJlbmNlcyk6CisKIDIwMTUtMDMtMjUgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtXSzJdIFdlYlVzZXJNZWRpYUNsaWVudDo6cGFnZURlc3Ryb3ll ZCgpIHZpcnR1YWwgbWV0aG9kIHNob3VsZCBiZSBtYXJrZWQgYXMgb3ZlcnJpZGUKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaAko cmV2aXNpb24gMTgxODU0KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2Vz RGVmaW5pdGlvbnMuaAkod29ya2luZyBjb3B5KQpAQCAtMTk0LDYgKzE5NCw3IEBACiAgICAgbWFj cm8oU2VydmljZUNvbnRyb2xzRW5hYmxlZCwgc2VydmljZUNvbnRyb2xzRW5hYmxlZCwgQm9vbCwg Ym9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhHYW1lcGFkc0VuYWJsZWQsIGdhbWVwYWRzRW5hYmxl ZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhMb25nTW91c2VQcmVzc0VuYWJsZWQs IGxvbmdNb3VzZVByZXNzRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKKyAgICBtYWNybyhO ZXdCbG9ja0luc2lkZUlubGluZU1vZGVsRW5hYmxlZCwgbmV3QmxvY2tJbnNpZGVJbmxpbmVNb2Rl bEVuYWJsZWQsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAKICNkZWZpbmUgRk9SX0VBQ0hfV0VCS0lU X0RPVUJMRV9QUkVGRVJFTkNFKG1hY3JvKSBcCiAgICAgbWFjcm8oSW5jcmVtZW50YWxSZW5kZXJp bmdTdXBwcmVzc2lvblRpbWVvdXQsIGluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1l b3V0LCBEb3VibGUsIGRvdWJsZSwgNSkgXApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAkocmV2aXNpb24gMTgxODU0KQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMTg3LDYgKzExODcsMTYgQEAgYm9vbCBXS1ByZWZlcmVuY2VzR2V0U2ltcGxlTGlu ZUxheW91dERlYgogICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zaW1wbGVMaW5l TGF5b3V0RGVidWdCb3JkZXJzRW5hYmxlZCgpOwogfQogCit2b2lkIFdLUHJlZmVyZW5jZXNTZXRO ZXdCbG9ja0luc2lkZUlubGluZU1vZGVsRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVu Y2VzUmVmLCBib29sIGZsYWcpCit7CisgICAgdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+c2V0TmV3 QmxvY2tJbnNpZGVJbmxpbmVNb2RlbEVuYWJsZWQoZmxhZyk7Cit9CisKK2Jvb2wgV0tQcmVmZXJl bmNlc0dldE5ld0Jsb2NrSW5zaWRlSW5saW5lTW9kZWxFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYg cHJlZmVyZW5jZXNSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPm5l d0Jsb2NrSW5zaWRlSW5saW5lTW9kZWxFbmFibGVkKCk7Cit9CisKIHZvaWQgV0tQcmVmZXJlbmNl c1NldFN1YnBpeGVsQ1NTT01FbGVtZW50TWV0cmljc0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBw cmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKQogewogICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZikt PnNldFN1YnBpeGVsQ1NTT01FbGVtZW50TWV0cmljc0VuYWJsZWQoZmxhZyk7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZlByaXZhdGUuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1Jl ZlByaXZhdGUuaAkocmV2aXNpb24gMTgxODU0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXNSZWZQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMwNCw2 ICszMDQsMTAgQEAgV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldFNpbXBsZUxpbgogV0tf RVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNF bmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpOwogCiAvLyBEZWZhdWx0cyB0byBmYWxzZS4KK1dLX0VY UE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXROZXdCbG9ja0luc2lkZUlubGluZU1vZGVsRW5hYmxl ZChXS1ByZWZlcmVuY2VzUmVmLCBib29sKTsKK1dLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNH ZXROZXdCbG9ja0luc2lkZUlubGluZU1vZGVsRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmKTsKKwor Ly8gRGVmYXVsdHMgdG8gZmFsc2UuCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0U3Vi cGl4ZWxDU1NPTUVsZW1lbnRNZXRyaWNzRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmLCBib29sKTsK IFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRTdWJwaXhlbENTU09NRWxlbWVudE1ldHJp Y3NFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAxODE4NTQpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI4MDksNyArMjgwOSw5IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29u c3QgV2UKICAgICBzZXR0aW5ncy5zZXRMb3dQb3dlclZpZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxl ZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6Omxvd1Bvd2VyVmlk ZW9BdWRpb0J1ZmZlclNpemVFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRTaW1wbGVM aW5lTGF5b3V0RW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNL ZXk6OnNpbXBsZUxpbmVMYXlvdXRFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRTaW1w bGVMaW5lTGF5b3V0RGVidWdCb3JkZXJzRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXko V2ViUHJlZmVyZW5jZXNLZXk6OnNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkS2V5 KCkpKTsKLQorICAgIAorICAgIHNldHRpbmdzLnNldE5ld0Jsb2NrSW5zaWRlSW5saW5lTW9kZWxF bmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6bmV3Qmxv Y2tJbnNpZGVJbmxpbmVNb2RlbEVuYWJsZWRLZXkoKSkpOworICAgIAogICAgIHNldHRpbmdzLnNl dFN1YnBpeGVsQ1NTT01FbGVtZW50TWV0cmljc0VuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9y S2V5KFdlYlByZWZlcmVuY2VzS2V5OjpzdWJwaXhlbENTU09NRWxlbWVudE1ldHJpY3NFbmFibGVk S2V5KCkpKTsKIAogICAgIHNldHRpbmdzLnNldFVzZUxlZ2FjeVRleHRBbGlnblBvc2l0aW9uZWRF bGVtZW50QmVoYXZpb3Ioc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5 Ojp1c2VMZWdhY3lUZXh0QWxpZ25Qb3NpdGlvbmVkRWxlbWVudEJlaGF2aW9yS2V5KCkpKTsK 249405 2015-03-25 08:34:54 -0700 2015-03-25 09:13:52 -0700 Patch patch.txt text/plain 5640 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTk1OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDE1LTAzLTI1ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBwcmVmIHRvIGVuYWJsZSB0 aGUgbmV3IGJsb2NrLWluc2lkZS1pbmxpbmUgbW9kZWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzA1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5pbjoKKwogMjAxNS0wMy0y NSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIGlPUyBTaW11bGF0 b3IgYnVpbGQgZml4LgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCShyZXZpc2lvbiAxODE5 NTgpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCSh3b3JraW5nIGNvcHkpCkBA IC0yMzcsMyArMjM3LDYgQEAgaWdub3JlVmlld3BvcnRTY2FsaW5nQ29uc3RyYWludHMgaW5pdGlh bAogYXBwbGVNYWlsUGFnaW5hdGlvblF1aXJrRW5hYmxlZCBpbml0aWFsPWZhbHNlCiAKIGF0dGFj aG1lbnRFbGVtZW50RW5hYmxlZCBpbml0aWFsPXRydWUsIGNvbmRpdGlvbmFsPUFUVEFDSE1FTlRf RUxFTUVOVAorCituZXdCbG9ja0luc2lkZUlubGluZU1vZGVsRW5hYmxlZCBpbml0aWFsPWZhbHNl LCBzZXROZWVkc1N0eWxlUmVjYWxjSW5BbGxGcmFtZXM9MQorCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZp c2lvbiAxODE5NTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxOCBAQAorMjAxNS0wMy0yNSAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5j b20+CisKKyAgICAgICAgQWRkIGEgcHJlZiB0byBlbmFibGUgdGhlIG5ldyBibG9jay1pbnNpZGUt aW5saW5lIG1vZGVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDMwNTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFNoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmg6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV0tQcmVmZXJlbmNlc1Nl dE5ld0Jsb2NrSW5zaWRlSW5saW5lTW9kZWxFbmFibGVkKToKKyAgICAgICAgKFdLUHJlZmVyZW5j ZXNHZXROZXdCbG9ja0luc2lkZUlubGluZU1vZGVsRW5hYmxlZCk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWZQcml2YXRlLmg6CisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVQ cmVmZXJlbmNlcyk6CisKIDIwMTUtMDMtMjUgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtXSzJdIFdlYlVzZXJNZWRpYUNsaWVudDo6cGFnZURlc3Ryb3ll ZCgpIHZpcnR1YWwgbWV0aG9kIHNob3VsZCBiZSBtYXJrZWQgYXMgb3ZlcnJpZGUKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaAko cmV2aXNpb24gMTgxOTU4KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2Vz RGVmaW5pdGlvbnMuaAkod29ya2luZyBjb3B5KQpAQCAtMTk0LDYgKzE5NCw3IEBACiAgICAgbWFj cm8oU2VydmljZUNvbnRyb2xzRW5hYmxlZCwgc2VydmljZUNvbnRyb2xzRW5hYmxlZCwgQm9vbCwg Ym9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhHYW1lcGFkc0VuYWJsZWQsIGdhbWVwYWRzRW5hYmxl ZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhMb25nTW91c2VQcmVzc0VuYWJsZWQs IGxvbmdNb3VzZVByZXNzRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKKyAgICBtYWNybyhO ZXdCbG9ja0luc2lkZUlubGluZU1vZGVsRW5hYmxlZCwgbmV3QmxvY2tJbnNpZGVJbmxpbmVNb2Rl bEVuYWJsZWQsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAKICNkZWZpbmUgRk9SX0VBQ0hfV0VCS0lU X0RPVUJMRV9QUkVGRVJFTkNFKG1hY3JvKSBcCiAgICAgbWFjcm8oSW5jcmVtZW50YWxSZW5kZXJp bmdTdXBwcmVzc2lvblRpbWVvdXQsIGluY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1l b3V0LCBEb3VibGUsIGRvdWJsZSwgNSkgXApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAkocmV2aXNpb24gMTgxOTU4KQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMTg3LDYgKzExODcsMTYgQEAgYm9vbCBXS1ByZWZlcmVuY2VzR2V0U2ltcGxlTGlu ZUxheW91dERlYgogICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zaW1wbGVMaW5l TGF5b3V0RGVidWdCb3JkZXJzRW5hYmxlZCgpOwogfQogCit2b2lkIFdLUHJlZmVyZW5jZXNTZXRO ZXdCbG9ja0luc2lkZUlubGluZU1vZGVsRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVu Y2VzUmVmLCBib29sIGZsYWcpCit7CisgICAgdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+c2V0TmV3 QmxvY2tJbnNpZGVJbmxpbmVNb2RlbEVuYWJsZWQoZmxhZyk7Cit9CisKK2Jvb2wgV0tQcmVmZXJl bmNlc0dldE5ld0Jsb2NrSW5zaWRlSW5saW5lTW9kZWxFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYg cHJlZmVyZW5jZXNSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPm5l d0Jsb2NrSW5zaWRlSW5saW5lTW9kZWxFbmFibGVkKCk7Cit9CisKIHZvaWQgV0tQcmVmZXJlbmNl c1NldFN1YnBpeGVsQ1NTT01FbGVtZW50TWV0cmljc0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBw cmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKQogewogICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZikt PnNldFN1YnBpeGVsQ1NTT01FbGVtZW50TWV0cmljc0VuYWJsZWQoZmxhZyk7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZlByaXZhdGUuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1Jl ZlByaXZhdGUuaAkocmV2aXNpb24gMTgxOTU4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXNSZWZQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMwNCw2 ICszMDQsMTAgQEAgV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldFNpbXBsZUxpbgogV0tf RVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNF bmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpOwogCiAvLyBEZWZhdWx0cyB0byBmYWxzZS4KK1dLX0VY UE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXROZXdCbG9ja0luc2lkZUlubGluZU1vZGVsRW5hYmxl ZChXS1ByZWZlcmVuY2VzUmVmLCBib29sKTsKK1dLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNH ZXROZXdCbG9ja0luc2lkZUlubGluZU1vZGVsRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmKTsKKwor Ly8gRGVmYXVsdHMgdG8gZmFsc2UuCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0U3Vi cGl4ZWxDU1NPTUVsZW1lbnRNZXRyaWNzRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmLCBib29sKTsK IFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRTdWJwaXhlbENTU09NRWxlbWVudE1ldHJp Y3NFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAxODE5NTgpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI4MTIsNyArMjgxMiw5IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29u c3QgV2UKICAgICBzZXR0aW5ncy5zZXRMb3dQb3dlclZpZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxl ZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6Omxvd1Bvd2VyVmlk ZW9BdWRpb0J1ZmZlclNpemVFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRTaW1wbGVM aW5lTGF5b3V0RW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNL ZXk6OnNpbXBsZUxpbmVMYXlvdXRFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRTaW1w bGVMaW5lTGF5b3V0RGVidWdCb3JkZXJzRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXko V2ViUHJlZmVyZW5jZXNLZXk6OnNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkS2V5 KCkpKTsKLQorICAgIAorICAgIHNldHRpbmdzLnNldE5ld0Jsb2NrSW5zaWRlSW5saW5lTW9kZWxF bmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6bmV3Qmxv Y2tJbnNpZGVJbmxpbmVNb2RlbEVuYWJsZWRLZXkoKSkpOworICAgIAogICAgIHNldHRpbmdzLnNl dFN1YnBpeGVsQ1NTT01FbGVtZW50TWV0cmljc0VuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9y S2V5KFdlYlByZWZlcmVuY2VzS2V5OjpzdWJwaXhlbENTU09NRWxlbWVudE1ldHJpY3NFbmFibGVk S2V5KCkpKTsKIAogICAgIHNldHRpbmdzLnNldFVzZUxlZ2FjeVRleHRBbGlnblBvc2l0aW9uZWRF bGVtZW50QmVoYXZpb3Ioc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5 Ojp1c2VMZWdhY3lUZXh0QWxpZ25Qb3NpdGlvbmVkRWxlbWVudEJlaGF2aW9yS2V5KCkpKTsK