65158 2011-07-25 18:25:55 -0700 [Chromium] Add better WebKit API for chrome.tabs.insertCSS extension API 2011-07-27 11:34:19 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mihaip mihaip dglazkov hyatt oldest_to_newest 442055 0 mihaip 2011-07-25 18:25:55 -0700 [Chromium] Add better WebKit API for chrome.tabs.insertCSS extension API 442058 1 101958 mihaip 2011-07-25 18:31:09 -0700 Created attachment 101958 Patch 442996 2 101958 hyatt 2011-07-27 10:41:39 -0700 Comment on attachment 101958 Patch I don't really understand this patch. Why would you not just use the page group user sheets that are already being passed in? I don't like having yet another redundant user sheets vector. 443001 3 101958 hyatt 2011-07-27 10:50:03 -0700 Comment on attachment 101958 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101958&action=review So basically just change userSheets to documentUserSheets in the CSSStyleSelector code. I think it's ok to use the generic m_userSheets in Document, since it's more clear over there that they are per-document. > Source/WebCore/css/CSSStyleSelector.cpp:432 > + CSSStyleSheet* pageUserSheet, const Vector<RefPtr<CSSStyleSheet> >* pageGroupUserSheets, const Vector<RefPtr<CSSStyleSheet> >* userSheets, Rename userSheets to documentUserSheets here. > Source/WebCore/css/CSSStyleSelector.cpp:489 > + if (userSheets) { Same here. Change userSheets to documentUserSheets. > Source/WebCore/css/CSSStyleSelector.h:93 > + CSSStyleSheet* pageUserSheet, const Vector<RefPtr<CSSStyleSheet> >* pageGroupUserSheets, const Vector<RefPtr<CSSStyleSheet> >* userSheets, Ditto. 443016 4 102157 mihaip 2011-07-27 11:09:37 -0700 Created attachment 102157 Patch 443017 5 mihaip 2011-07-27 11:10:14 -0700 (In reply to comment #3) > So basically just change userSheets to documentUserSheets in the CSSStyleSelector code. I think it's ok to use the generic m_userSheets in Document, since it's more clear over there that they are per-document. Done. 443033 6 102157 hyatt 2011-07-27 11:31:07 -0700 Comment on attachment 102157 Patch r=me 443035 7 mihaip 2011-07-27 11:34:19 -0700 Committed r91860: <http://trac.webkit.org/changeset/91860> 101958 2011-07-25 18:31:09 -0700 2011-07-27 11:09:34 -0700 Patch bug-65158-20110725183108.patch text/plain 10128 mihaip U3VidmVyc2lvbiBSZXZpc2lvbjogOTE2NzMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0NjIzZDYxYmVhY2FkODQ2 ZTEwMjNhMTJjMWIzYmNkYjNlMzI4MTAyLi5kMmZiNmU3OGFmYTliODU4ZDY4YzczYWEyYmE1YmRm NzZhYTFhMDVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDctMjUgIE1paGFp IFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBB ZGQgYmV0dGVyIFdlYktpdCBBUEkgZm9yIGNocm9tZS50YWJzLmluc2VydENTUyBleHRlbnNpb24g QVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTE1 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBw ZXItRG9jdW1lbnQgdXNlciBzdHlsZXNoZWV0cyAoYXMgb3Bwb3NlZCB0byB0aGUgcGFnZSBncm91 cCB1c2VyCisgICAgICAgIHN0eWxlcyBhbmQgdGhlIGdsb2JhbCBwYWdlIHN0eWxlc2hlZXQpLgor CisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q1NTU3R5bGVTZWxlY3Rvcjo6Q1NTU3R5bGVTZWxlY3Rvcik6CisgICAgICAgICogY3NzL0NTU1N0 eWxlU2VsZWN0b3IuaDoKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RG9jdW1lbnQ6On5Eb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6 Y3JlYXRlU3R5bGVTZWxlY3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6YWRkVXNl clNoZWV0KToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDoKKwogMjAxMS0wNy0yNSAgU2hlcmlm ZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjkxNjY1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NT U1N0eWxlU2VsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3Iu Y3BwCmluZGV4IGNkZTA5NzE4NDcwYWViZmUzNDE0OWY0MTExNDgxNWIwMWUxNWM4M2QuLmFkNDkx OWVkMDgxNzUwYmYxNmU2YjMzNDY3NjExMGVjZjI2ZTViNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTU3R5bGVTZWxlY3Rvci5jcHAKQEAgLTQyOSw3ICs0MjksNyBAQCBzdGF0aWMgQ1NTTXV0YWJs ZVN0eWxlRGVjbGFyYXRpb24qIHJpZ2h0VG9MZWZ0RGVjbGFyYXRpb24oKQogfQogCiBDU1NTdHls ZVNlbGVjdG9yOjpDU1NTdHlsZVNlbGVjdG9yKERvY3VtZW50KiBkb2N1bWVudCwgU3R5bGVTaGVl dExpc3QqIHN0eWxlU2hlZXRzLCBDU1NTdHlsZVNoZWV0KiBtYXBwZWRFbGVtZW50U2hlZXQsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENTU1N0eWxlU2hlZXQqIHBhZ2VVc2Vy U2hlZXQsIGNvbnN0IFZlY3RvcjxSZWZQdHI8Q1NTU3R5bGVTaGVldD4gPiogcGFnZUdyb3VwVXNl clNoZWV0cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ1NTU3R5bGVTaGVl dCogcGFnZVVzZXJTaGVldCwgY29uc3QgVmVjdG9yPFJlZlB0cjxDU1NTdHlsZVNoZWV0PiA+KiBw YWdlR3JvdXBVc2VyU2hlZXRzLCBjb25zdCBWZWN0b3I8UmVmUHRyPENTU1N0eWxlU2hlZXQ+ID4q IHVzZXJTaGVldHMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgc3Ry aWN0UGFyc2luZywgYm9vbCBtYXRjaEF1dGhvckFuZFVzZXJTdHlsZXMpCiAgICAgOiBtX2JhY2tn cm91bmREYXRhKEJhY2tncm91bmRGaWxsTGF5ZXIpCiAgICAgLCBtX2NoZWNrZXIoZG9jdW1lbnQs IHN0cmljdFBhcnNpbmcpCkBAIC00ODYsNiArNDg2LDE1IEBAIENTU1N0eWxlU2VsZWN0b3I6OkNT U1N0eWxlU2VsZWN0b3IoRG9jdW1lbnQqIGRvY3VtZW50LCBTdHlsZVNoZWV0TGlzdCogc3R5bGVT aGVlCiAgICAgICAgICAgICAgICAgbV9hdXRob3JTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQocGFn ZUdyb3VwVXNlclNoZWV0cy0+YXQoaSkuZ2V0KCksICptX21lZGl1bSwgdGhpcyk7CiAgICAgICAg IH0KICAgICB9CisgICAgaWYgKHVzZXJTaGVldHMpIHsKKyAgICAgICAgdW5zaWduZWQgbGVuZ3Ro ID0gdXNlclNoZWV0cy0+c2l6ZSgpOworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwg bGVuZ3RoOyBpKyspIHsKKyAgICAgICAgICAgIGlmICh1c2VyU2hlZXRzLT5hdChpKS0+aXNVc2Vy U3R5bGVTaGVldCgpKQorICAgICAgICAgICAgICAgIHRlbXBVc2VyU3R5bGUtPmFkZFJ1bGVzRnJv bVNoZWV0KHVzZXJTaGVldHMtPmF0KGkpLmdldCgpLCAqbV9tZWRpdW0sIHRoaXMpOworICAgICAg ICAgICAgZWxzZQorICAgICAgICAgICAgICAgIG1fYXV0aG9yU3R5bGUtPmFkZFJ1bGVzRnJvbVNo ZWV0KHVzZXJTaGVldHMtPmF0KGkpLmdldCgpLCAqbV9tZWRpdW0sIHRoaXMpOworICAgICAgICB9 CisgICAgfQogCiAgICAgaWYgKHRlbXBVc2VyU3R5bGUtPm1fcnVsZUNvdW50ID4gMCB8fCB0ZW1w VXNlclN0eWxlLT5tX3BhZ2VSdWxlcy5zaXplKCkgPiAwKQogICAgICAgICBtX3VzZXJTdHlsZSA9 IHRlbXBVc2VyU3R5bGUucmVsZWFzZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nz L0NTU1N0eWxlU2VsZWN0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9y LmgKaW5kZXggMzdkNmQzYzllYjM4MTI0NDcxNmFjMzE3MWI3NGFiZDU3YjEwNmNhYS4uNTJjOTYy ZmQzYWI5MjczOTJhYjAzYTE2MmI3ZjJmMDA2YTliNjFiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT U3R5bGVTZWxlY3Rvci5oCkBAIC05MCw3ICs5MCw3IEBAIHB1YmxpYzoKICAgICAgICAgV1RGX01B S0VfTk9OQ09QWUFCTEUoQ1NTU3R5bGVTZWxlY3Rvcik7IFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVE OwogICAgIHB1YmxpYzoKICAgICAgICAgQ1NTU3R5bGVTZWxlY3RvcihEb2N1bWVudCosIFN0eWxl U2hlZXRMaXN0KiBhdXRob3JTaGVldHMsIENTU1N0eWxlU2hlZXQqIG1hcHBlZEVsZW1lbnRTaGVl dCwKLSAgICAgICAgICAgICAgICAgICAgICAgICBDU1NTdHlsZVNoZWV0KiBwYWdlVXNlclNoZWV0 LCBjb25zdCBWZWN0b3I8UmVmUHRyPENTU1N0eWxlU2hlZXQ+ID4qIHBhZ2VHcm91cFVzZXJTaGVl dHMsCisgICAgICAgICAgICAgICAgICAgICAgICAgQ1NTU3R5bGVTaGVldCogcGFnZVVzZXJTaGVl dCwgY29uc3QgVmVjdG9yPFJlZlB0cjxDU1NTdHlsZVNoZWV0PiA+KiBwYWdlR3JvdXBVc2VyU2hl ZXRzLCBjb25zdCBWZWN0b3I8UmVmUHRyPENTU1N0eWxlU2hlZXQ+ID4qIHVzZXJTaGVldHMsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBzdHJpY3RQYXJzaW5nLCBib29sIG1hdGNoQXV0 aG9yQW5kVXNlclN0eWxlcyk7CiAgICAgICAgIH5DU1NTdHlsZVNlbGVjdG9yKCk7CiAgICAgICAg IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggZDJlMDk0NGZlZTdlY2NmMTZiNTQ1OTE3ZGNm NDk1MGE4MGFkOWEzNy4uMzRhMzQ4MWZhZDllYjIxZDFjZTQ3NDI3NDRlYWFhYTY4N2EwZjYxNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC01NDUsNiArNTQ1LDEwIEBAIERvY3VtZW50Ojp+ RG9jdW1lbnQoKQogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fcGFnZUdyb3VwVXNl clNoZWV0cy0+c2l6ZSgpOyArK2kpCiAgICAgICAgICAgICAoKm1fcGFnZUdyb3VwVXNlclNoZWV0 cylbaV0tPmNsZWFyT3duZXJOb2RlKCk7CiAgICAgfQorICAgIGlmIChtX3VzZXJTaGVldHMpIHsK KyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3VzZXJTaGVldHMtPnNpemUoKTsgKytp KQorICAgICAgICAgICAgKCptX3VzZXJTaGVldHMpW2ldLT5jbGVhck93bmVyTm9kZSgpOworICAg IH0KIAogICAgIG1fd2Vha1JlZmVyZW5jZS0+Y2xlYXIoKTsKIApAQCAtMTcyOSw3ICsxNzMzLDcg QEAgdm9pZCBEb2N1bWVudDo6Y3JlYXRlU3R5bGVTZWxlY3RvcigpCiAgICAgYm9vbCBtYXRjaEF1 dGhvckFuZFVzZXJTdHlsZXMgPSB0cnVlOwogICAgIGlmIChTZXR0aW5ncyogZG9jU2V0dGluZ3Mg PSBzZXR0aW5ncygpKQogICAgICAgICBtYXRjaEF1dGhvckFuZFVzZXJTdHlsZXMgPSBkb2NTZXR0 aW5ncy0+YXV0aG9yQW5kVXNlclN0eWxlc0VuYWJsZWQoKTsKLSAgICBtX3N0eWxlU2VsZWN0b3Ig PSBhZG9wdFB0cihuZXcgQ1NTU3R5bGVTZWxlY3Rvcih0aGlzLCBtX3N0eWxlU2hlZXRzLmdldCgp LCBtX21hcHBlZEVsZW1lbnRTaGVldC5nZXQoKSwgcGFnZVVzZXJTaGVldCgpLCBwYWdlR3JvdXBV c2VyU2hlZXRzKCksIAorICAgIG1fc3R5bGVTZWxlY3RvciA9IGFkb3B0UHRyKG5ldyBDU1NTdHls ZVNlbGVjdG9yKHRoaXMsIG1fc3R5bGVTaGVldHMuZ2V0KCksIG1fbWFwcGVkRWxlbWVudFNoZWV0 LmdldCgpLCBwYWdlVXNlclNoZWV0KCksIHBhZ2VHcm91cFVzZXJTaGVldHMoKSwgbV91c2VyU2hl ZXRzLmdldCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICFpblF1aXJrc01vZGUoKSwgbWF0Y2hBdXRob3JBbmRVc2VyU3R5bGVzKSk7CiAgICAg Ly8gRGVsYXkgcmVzZXR0aW5nIHRoZSBmbGFncyB1bnRpbCBhZnRlciBuZXh0IHN0eWxlIHJlY2Fs YyBzaW5jZSB1bmFwcGx5aW5nIHRoZSBzdHlsZSBtYXkgbm90IHdvcmsgd2l0aG91dCB0aGVzZSBz ZXQgKHRoaXMgaXMgdHJ1ZSBhdCBsZWFzdCB3aXRoIGJlZm9yZS9hZnRlcikuCiAgICAgbV91c2Vz U2libGluZ1J1bGVzID0gbV91c2VzU2libGluZ1J1bGVzIHx8IG1fc3R5bGVTZWxlY3Rvci0+dXNl c1NpYmxpbmdSdWxlcygpOwpAQCAtMjQ2Niw2ICsyNDcwLDE0IEBAIHZvaWQgRG9jdW1lbnQ6OnVw ZGF0ZVBhZ2VHcm91cFVzZXJTaGVldHMoKQogICAgICAgICBzdHlsZVNlbGVjdG9yQ2hhbmdlZChS ZWNhbGNTdHlsZUltbWVkaWF0ZWx5KTsKIH0KIAordm9pZCBEb2N1bWVudDo6YWRkVXNlclNoZWV0 KFBhc3NSZWZQdHI8Q1NTU3R5bGVTaGVldD4gdXNlclNoZWV0KQoreworICAgIGlmICghbV91c2Vy U2hlZXRzKQorICAgICAgICBtX3VzZXJTaGVldHMgPSBhZG9wdFB0cihuZXcgVmVjdG9yPFJlZlB0 cjxDU1NTdHlsZVNoZWV0PiA+KTsKKyAgICBtX3VzZXJTaGVldHMtPmFwcGVuZCh1c2VyU2hlZXQp OworICAgIHN0eWxlU2VsZWN0b3JDaGFuZ2VkKFJlY2FsY1N0eWxlSW1tZWRpYXRlbHkpOworfQor CiBDU1NTdHlsZVNoZWV0KiBEb2N1bWVudDo6ZWxlbWVudFNoZWV0KCkKIHsKICAgICBpZiAoIW1f ZWxlbVNoZWV0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmggYi9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAppbmRleCAxMDc1MWI1Mjg4NTg3ZmI1Y2Y0YWQy NjI1NTBjOWVjNWEzMDQ3NjMxLi5lMDBiODY5NWRhMTJhYmQ0NGU5MWFhNmRlNDk1YTdiNjhhMjg4 MTViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaApAQCAtNjE1LDYgKzYxNSw4IEBAIHB1YmxpYzoKICAg ICB2b2lkIGNsZWFyUGFnZUdyb3VwVXNlclNoZWV0cygpOwogICAgIHZvaWQgdXBkYXRlUGFnZUdy b3VwVXNlclNoZWV0cygpOwogCisgICAgdm9pZCBhZGRVc2VyU2hlZXQoUGFzc1JlZlB0cjxDU1NT dHlsZVNoZWV0PiB1c2VyU2hlZXQpOworCiAgICAgQ1NTU3R5bGVTaGVldCogZWxlbWVudFNoZWV0 KCk7CiAgICAgQ1NTU3R5bGVTaGVldCogbWFwcGVkRWxlbWVudFNoZWV0KCk7CiAgICAgCkBAIC0x MTk5LDYgKzEyMDEsNyBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxDU1NTdHlsZVNoZWV0PiBtX21h cHBlZEVsZW1lbnRTaGVldDsKICAgICBSZWZQdHI8Q1NTU3R5bGVTaGVldD4gbV9wYWdlVXNlclNo ZWV0OwogICAgIG11dGFibGUgT3duUHRyPFZlY3RvcjxSZWZQdHI8Q1NTU3R5bGVTaGVldD4gPiA+ IG1fcGFnZUdyb3VwVXNlclNoZWV0czsKKyAgICBPd25QdHI8VmVjdG9yPFJlZlB0cjxDU1NTdHls ZVNoZWV0PiA+ID4gbV91c2VyU2hlZXRzOwogICAgIG11dGFibGUgYm9vbCBtX3BhZ2VHcm91cFVz ZXJTaGVldENhY2hlVmFsaWQ7CiAKICAgICBib29sIG1fcHJpbnRpbmc7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDU0ZDQ0OTM1NTczMDE2MWJhMzM1MjgxMzk2ZDc3NjBkY2M0OTM1M2Qu LmUxNTc3Y2U5NTEzNGI1ODNkM2EzYzE1YjIwNGE5MmQ3YjVlNzE1YzUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDctMjUgIE1paGFpIFBhcnBhcml0 YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBBZGQgYmV0dGVy IFdlYktpdCBBUEkgZm9yIGNocm9tZS50YWJzLmluc2VydENTUyBleHRlbnNpb24gQVBJCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTE1OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBXZWJEb2N1bWVu dDo6aW5zZXJ0VXNlclN0eWxlU2hlZXQgd2hpY2ggaW5zZXJ0cyBhIHVzZXIgc3R5bGVzaGVldCwK KyAgICAgICAgaW5zdGVhZCBvZiBmb3JjaW5nIGV4dGVuc2lvbnMgdG8gdXNlIGluc2VydFN0eWxl VGV4dCB3aGljaCBtYW5pcHVsYXRlcworICAgICAgICB0aGUgRE9NIG9mIHRoZSBwYWdlIGFuZCBy ZXN1bHRzIGluIGNvbXBhdGliaWxpdHkgaXNzdWVzIChzZWUKKyAgICAgICAgaHR0cDovL2NyYnVn LmNvbS84MjIyMCkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViRG9jdW1lbnQuaDoKKyAgICAgICAg KiBzcmMvV2ViRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJEb2N1bWVudDo6aW5z ZXJ0VXNlclN0eWxlU2hlZXQpOgorCiAyMDExLTA3LTIzICBBbG9rIFByaXlhZGFyc2hpICA8YWxv a3BAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFN3aXRjaGluZyBvZmYgYWNjZWxlcmF0aW9uIGZv ciBzbWFsbCBjYW52YXMgYnJva2UgZ3B1IHRlc3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJEb2N1bWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRG9jdW1lbnQuaAppbmRleCA4YjdiYzU1YzU1OTBjM2E3NTBkYWU2ZWQwOWQ2MTY4 MGFjNjM0M2EzLi43NjJmM2QzYmY4YjFkM2ZhNzVmNGFlOTY4YWIwMjQ2ZTQ0ZmM3NzY3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEb2N1bWVudC5oCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRvY3VtZW50LmgKQEAgLTU2LDYgKzU2 LDExIEBAIGNsYXNzIFdlYlVSTDsKIC8vIFByb3ZpZGVzIHJlYWRvbmx5IGFjY2VzcyB0byBzb21l IHByb3BlcnRpZXMgb2YgYSBET00gZG9jdW1lbnQuCiBjbGFzcyBXZWJEb2N1bWVudCA6IHB1Ymxp YyBXZWJOb2RlIHsKIHB1YmxpYzoKKyAgICBlbnVtIFVzZXJTdHlsZUxldmVsIHsKKyAgICAgICAg VXNlclN0eWxlVXNlckxldmVsLAorICAgICAgICBVc2VyU3R5bGVBdXRob3JMZXZlbAorICAgIH07 CisKICAgICBXZWJEb2N1bWVudCgpIHsgfQogICAgIFdlYkRvY3VtZW50KGNvbnN0IFdlYkRvY3Vt ZW50JiBlKSA6IFdlYk5vZGUoZSkgeyB9CiAKQEAgLTk4LDkgKzEwMywxNyBAQCBwdWJsaWM6CiAg ICAgLy8gZG9jdW1lbnQuIHxlbGVtZW50SWR8IGNhbiBiZSBlbXB0eSwgYnV0IGlmIHNwZWNpZmll ZCB0aGVuIGl0IGlzIHVzZWQKICAgICAvLyBhcyB0aGUgaWQgZm9yIHRoZSBuZXdseSBpbnNlcnRl ZCBlbGVtZW50IChyZXBsYWNpbmcgYW4gZXhpc3Rpbmcgb25lCiAgICAgLy8gd2l0aCB0aGUgc2Ft ZSBpZCwgaWYgYW55KS4KKyAgICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMgb25jZSBDaHJvbWl1bSBj YWxsZXJzIGhhdmUgYmVlbiB1cGRhdGVkIHRvIGNhbGwKKyAgICAvLyBpbnNlcnRVc2VyU3R5bGVT aGVldCBpbnN0ZWFkLgogICAgIFdFQktJVF9BUEkgYm9vbCBpbnNlcnRTdHlsZVRleHQoY29uc3Qg V2ViU3RyaW5nJiBzdHlsZVRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBXZWJTdHJpbmcmIGVsZW1lbnRJZCk7CiAKKyAgICAvLyBJbnNlcnRzIHRoZSBnaXZl biBDU1Mgc291cmNlIGNvZGUgYXMgYSB1c2VyIHN0eWxlc2hlZXQgaW4gdGhlIGRvY3VtZW50Lgor ICAgIC8vIE1lYW50IGZvciBwcm9ncmFtYXRpYy9vbmUtb2ZmIGluamVjdGlvbiwgYXMgb3Bwb3Nl ZCB0bworICAgIC8vIFdlYlZpZXc6OmFkZFVzZXJTdHlsZVNoZWV0IHdoaWNoIGluc2VydHMgc3R5 bGVzIGZvciB0aGUgbGlmZXRpbWUgb2YgdGhlCisgICAgLy8gV2ViVmlldy4KKyAgICBXRUJLSVRf QVBJIHZvaWQgaW5zZXJ0VXNlclN0eWxlU2hlZXQoY29uc3QgV2ViU3RyaW5nJiBzb3VyY2VDb2Rl LCBVc2VyU3R5bGVMZXZlbCk7CisKICNpZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04KICAgICBXZWJE b2N1bWVudChjb25zdCBXVEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6RG9jdW1lbnQ+Jik7CiAgICAg V2ViRG9jdW1lbnQmIG9wZXJhdG9yPShjb25zdCBXVEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6RG9j dW1lbnQ+Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEb2N1 bWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEb2N1bWVudC5jcHAKaW5k ZXggYThhZDViNjUwYTA2Yzk1Y2RhOGI1MjIxMTc0MmVhNDk3N2M5NDM4NS4uMDM4MDU2M2U4NjRl YWZlZTQwMjY3N2UwZTJjNjE4ZjFiMTNiODAwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYkRvY3VtZW50LmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIldlYkRvY3Vt ZW50LmgiCiAKICNpbmNsdWRlICJBWE9iamVjdENhY2hlLmgiCisjaW5jbHVkZSAiQ1NTU3R5bGVT aGVldC5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRMb2FkZXIu aCIKICNpbmNsdWRlICJEb2N1bWVudFR5cGUuaCIKQEAgLTIwNyw2ICsyMDgsMTYgQEAgYm9vbCBX ZWJEb2N1bWVudDo6aW5zZXJ0U3R5bGVUZXh0KGNvbnN0IFdlYlN0cmluZyYgc3R5bGVUZXh0LCBj b25zdCBXZWJTdHJpbmcmIGUKICAgICByZXR1cm4gc3VjY2VzczsKIH0KIAordm9pZCBXZWJEb2N1 bWVudDo6aW5zZXJ0VXNlclN0eWxlU2hlZXQoY29uc3QgV2ViU3RyaW5nJiBzb3VyY2VDb2RlLCBV c2VyU3R5bGVMZXZlbCBsZXZlbCkKK3sKKyAgICBSZWZQdHI8RG9jdW1lbnQ+IGRvY3VtZW50ID0g dW53cmFwPERvY3VtZW50PigpOworCisgICAgUmVmUHRyPENTU1N0eWxlU2hlZXQ+IHBhcnNlZFNo ZWV0ID0gQ1NTU3R5bGVTaGVldDo6Y3JlYXRlKGRvY3VtZW50LmdldCgpKTsKKyAgICBwYXJzZWRT aGVldC0+c2V0SXNVc2VyU3R5bGVTaGVldChsZXZlbCA9PSBVc2VyU3R5bGVVc2VyTGV2ZWwpOwor ICAgIHBhcnNlZFNoZWV0LT5wYXJzZVN0cmluZyhzb3VyY2VDb2RlLCAhZG9jdW1lbnQtPmluUXVp cmtzTW9kZSgpKTsKKyAgICBkb2N1bWVudC0+YWRkVXNlclNoZWV0KHBhcnNlZFNoZWV0LnJlbGVh c2UoKSk7Cit9CisKIFdlYkRvY3VtZW50OjpXZWJEb2N1bWVudChjb25zdCBQYXNzUmVmUHRyPERv Y3VtZW50PiYgZWxlbSkKICAgICA6IFdlYk5vZGUoZWxlbSkKIHsK 102157 2011-07-27 11:09:37 -0700 2011-07-27 11:31:07 -0700 Patch bug-65158-20110727110936.patch text/plain 10194 mihaip U3VidmVyc2lvbiBSZXZpc2lvbjogOTE2NzMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0NjIzZDYxYmVhY2FkODQ2 ZTEwMjNhMTJjMWIzYmNkYjNlMzI4MTAyLi4wMmFiZGIzMGRlYzYxMDgwZmM3NGE3OGQzMTRkYzkw MDgwZTVlNDk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDctMjUgIE1paGFp IFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBB ZGQgYmV0dGVyIFdlYktpdCBBUEkgZm9yIGNocm9tZS50YWJzLmluc2VydENTUyBleHRlbnNpb24g QVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTE1 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBw ZXItRG9jdW1lbnQgaW5zdGFuY2UgdXNlciBzdHlsZXNoZWV0cyAoYXMgb3Bwb3NlZCB0byB0aGUg cGFnZSAKKyAgICAgICAgZ3JvdXAgdXNlciBzdHlsZXMgYW5kIHRoZSBnbG9iYWwgcGFnZSBzdHls ZXNoZWV0KS4KKworICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OkNTU1N0eWxlU2VsZWN0b3IpOgorICAgICAgICAq IGNzcy9DU1NTdHlsZVNlbGVjdG9yLmg6CisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp+RG9jdW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnQ6OmNyZWF0ZVN0eWxlU2VsZWN0b3IpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1l bnQ6OmFkZFVzZXJTaGVldCk6CisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisKIDIwMTEtMDct MjUgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI5MTY2NS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHls ZVNlbGVjdG9yLmNwcAppbmRleCBjZGUwOTcxODQ3MGFlYmZlMzQxNDlmNDExMTQ4MTViMDFlMTVj ODNkLi40YmNlMTVjYjJhMWQ0MWRmMDc3OWYzZGU2YzBhNGQ5OTRjOTE0ZTkyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCkBAIC00MjksNyArNDI5LDcgQEAgc3RhdGlj IENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uKiByaWdodFRvTGVmdERlY2xhcmF0aW9uKCkKIH0K IAogQ1NTU3R5bGVTZWxlY3Rvcjo6Q1NTU3R5bGVTZWxlY3RvcihEb2N1bWVudCogZG9jdW1lbnQs IFN0eWxlU2hlZXRMaXN0KiBzdHlsZVNoZWV0cywgQ1NTU3R5bGVTaGVldCogbWFwcGVkRWxlbWVu dFNoZWV0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDU1NTdHlsZVNoZWV0 KiBwYWdlVXNlclNoZWV0LCBjb25zdCBWZWN0b3I8UmVmUHRyPENTU1N0eWxlU2hlZXQ+ID4qIHBh Z2VHcm91cFVzZXJTaGVldHMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENT U1N0eWxlU2hlZXQqIHBhZ2VVc2VyU2hlZXQsIGNvbnN0IFZlY3RvcjxSZWZQdHI8Q1NTU3R5bGVT aGVldD4gPiogcGFnZUdyb3VwVXNlclNoZWV0cywgY29uc3QgVmVjdG9yPFJlZlB0cjxDU1NTdHls ZVNoZWV0PiA+KiBkb2N1bWVudFVzZXJTaGVldHMsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGJvb2wgc3RyaWN0UGFyc2luZywgYm9vbCBtYXRjaEF1dGhvckFuZFVzZXJTdHls ZXMpCiAgICAgOiBtX2JhY2tncm91bmREYXRhKEJhY2tncm91bmRGaWxsTGF5ZXIpCiAgICAgLCBt X2NoZWNrZXIoZG9jdW1lbnQsIHN0cmljdFBhcnNpbmcpCkBAIC00ODYsNiArNDg2LDE1IEBAIENT U1N0eWxlU2VsZWN0b3I6OkNTU1N0eWxlU2VsZWN0b3IoRG9jdW1lbnQqIGRvY3VtZW50LCBTdHls ZVNoZWV0TGlzdCogc3R5bGVTaGVlCiAgICAgICAgICAgICAgICAgbV9hdXRob3JTdHlsZS0+YWRk UnVsZXNGcm9tU2hlZXQocGFnZUdyb3VwVXNlclNoZWV0cy0+YXQoaSkuZ2V0KCksICptX21lZGl1 bSwgdGhpcyk7CiAgICAgICAgIH0KICAgICB9CisgICAgaWYgKGRvY3VtZW50VXNlclNoZWV0cykg eworICAgICAgICB1bnNpZ25lZCBsZW5ndGggPSBkb2N1bWVudFVzZXJTaGVldHMtPnNpemUoKTsK KyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgaSsrKSB7CisgICAgICAg ICAgICBpZiAoZG9jdW1lbnRVc2VyU2hlZXRzLT5hdChpKS0+aXNVc2VyU3R5bGVTaGVldCgpKQor ICAgICAgICAgICAgICAgIHRlbXBVc2VyU3R5bGUtPmFkZFJ1bGVzRnJvbVNoZWV0KGRvY3VtZW50 VXNlclNoZWV0cy0+YXQoaSkuZ2V0KCksICptX21lZGl1bSwgdGhpcyk7CisgICAgICAgICAgICBl bHNlCisgICAgICAgICAgICAgICAgbV9hdXRob3JTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQoZG9j dW1lbnRVc2VyU2hlZXRzLT5hdChpKS5nZXQoKSwgKm1fbWVkaXVtLCB0aGlzKTsKKyAgICAgICAg fQorICAgIH0KIAogICAgIGlmICh0ZW1wVXNlclN0eWxlLT5tX3J1bGVDb3VudCA+IDAgfHwgdGVt cFVzZXJTdHlsZS0+bV9wYWdlUnVsZXMuc2l6ZSgpID4gMCkKICAgICAgICAgbV91c2VyU3R5bGUg PSB0ZW1wVXNlclN0eWxlLnJlbGVhc2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rv ci5oCmluZGV4IDM3ZDZkM2M5ZWIzODEyNDQ3MTZhYzMxNzFiNzRhYmQ1N2IxMDZjYWEuLjAzYzkx NTk3ZmNjZTUxZjFhYzE0Mjc1MmRiNWU0MDI1YjFkZjY2M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U1N0eWxlU2VsZWN0b3IuaApAQCAtOTAsNyArOTAsNyBAQCBwdWJsaWM6CiAgICAgICAgIFdURl9N QUtFX05PTkNPUFlBQkxFKENTU1N0eWxlU2VsZWN0b3IpOyBXVEZfTUFLRV9GQVNUX0FMTE9DQVRF RDsKICAgICBwdWJsaWM6CiAgICAgICAgIENTU1N0eWxlU2VsZWN0b3IoRG9jdW1lbnQqLCBTdHls ZVNoZWV0TGlzdCogYXV0aG9yU2hlZXRzLCBDU1NTdHlsZVNoZWV0KiBtYXBwZWRFbGVtZW50U2hl ZXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgQ1NTU3R5bGVTaGVldCogcGFnZVVzZXJTaGVl dCwgY29uc3QgVmVjdG9yPFJlZlB0cjxDU1NTdHlsZVNoZWV0PiA+KiBwYWdlR3JvdXBVc2VyU2hl ZXRzLAorICAgICAgICAgICAgICAgICAgICAgICAgIENTU1N0eWxlU2hlZXQqIHBhZ2VVc2VyU2hl ZXQsIGNvbnN0IFZlY3RvcjxSZWZQdHI8Q1NTU3R5bGVTaGVldD4gPiogcGFnZUdyb3VwVXNlclNo ZWV0cywgY29uc3QgVmVjdG9yPFJlZlB0cjxDU1NTdHlsZVNoZWV0PiA+KiBkb2N1bWVudFVzZXJT aGVldHMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBzdHJpY3RQYXJzaW5nLCBib29s IG1hdGNoQXV0aG9yQW5kVXNlclN0eWxlcyk7CiAgICAgICAgIH5DU1NTdHlsZVNlbGVjdG9yKCk7 CiAgICAgICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggZDJlMDk0NGZlZTdlY2NmMTZi NTQ1OTE3ZGNmNDk1MGE4MGFkOWEzNy4uMzRhMzQ4MWZhZDllYjIxZDFjZTQ3NDI3NDRlYWFhYTY4 N2EwZjYxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC01NDUsNiArNTQ1LDEwIEBAIERv Y3VtZW50Ojp+RG9jdW1lbnQoKQogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fcGFn ZUdyb3VwVXNlclNoZWV0cy0+c2l6ZSgpOyArK2kpCiAgICAgICAgICAgICAoKm1fcGFnZUdyb3Vw VXNlclNoZWV0cylbaV0tPmNsZWFyT3duZXJOb2RlKCk7CiAgICAgfQorICAgIGlmIChtX3VzZXJT aGVldHMpIHsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3VzZXJTaGVldHMtPnNp emUoKTsgKytpKQorICAgICAgICAgICAgKCptX3VzZXJTaGVldHMpW2ldLT5jbGVhck93bmVyTm9k ZSgpOworICAgIH0KIAogICAgIG1fd2Vha1JlZmVyZW5jZS0+Y2xlYXIoKTsKIApAQCAtMTcyOSw3 ICsxNzMzLDcgQEAgdm9pZCBEb2N1bWVudDo6Y3JlYXRlU3R5bGVTZWxlY3RvcigpCiAgICAgYm9v bCBtYXRjaEF1dGhvckFuZFVzZXJTdHlsZXMgPSB0cnVlOwogICAgIGlmIChTZXR0aW5ncyogZG9j U2V0dGluZ3MgPSBzZXR0aW5ncygpKQogICAgICAgICBtYXRjaEF1dGhvckFuZFVzZXJTdHlsZXMg PSBkb2NTZXR0aW5ncy0+YXV0aG9yQW5kVXNlclN0eWxlc0VuYWJsZWQoKTsKLSAgICBtX3N0eWxl U2VsZWN0b3IgPSBhZG9wdFB0cihuZXcgQ1NTU3R5bGVTZWxlY3Rvcih0aGlzLCBtX3N0eWxlU2hl ZXRzLmdldCgpLCBtX21hcHBlZEVsZW1lbnRTaGVldC5nZXQoKSwgcGFnZVVzZXJTaGVldCgpLCBw YWdlR3JvdXBVc2VyU2hlZXRzKCksIAorICAgIG1fc3R5bGVTZWxlY3RvciA9IGFkb3B0UHRyKG5l dyBDU1NTdHlsZVNlbGVjdG9yKHRoaXMsIG1fc3R5bGVTaGVldHMuZ2V0KCksIG1fbWFwcGVkRWxl bWVudFNoZWV0LmdldCgpLCBwYWdlVXNlclNoZWV0KCksIHBhZ2VHcm91cFVzZXJTaGVldHMoKSwg bV91c2VyU2hlZXRzLmdldCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICFpblF1aXJrc01vZGUoKSwgbWF0Y2hBdXRob3JBbmRVc2VyU3R5bGVz KSk7CiAgICAgLy8gRGVsYXkgcmVzZXR0aW5nIHRoZSBmbGFncyB1bnRpbCBhZnRlciBuZXh0IHN0 eWxlIHJlY2FsYyBzaW5jZSB1bmFwcGx5aW5nIHRoZSBzdHlsZSBtYXkgbm90IHdvcmsgd2l0aG91 dCB0aGVzZSBzZXQgKHRoaXMgaXMgdHJ1ZSBhdCBsZWFzdCB3aXRoIGJlZm9yZS9hZnRlcikuCiAg ICAgbV91c2VzU2libGluZ1J1bGVzID0gbV91c2VzU2libGluZ1J1bGVzIHx8IG1fc3R5bGVTZWxl Y3Rvci0+dXNlc1NpYmxpbmdSdWxlcygpOwpAQCAtMjQ2Niw2ICsyNDcwLDE0IEBAIHZvaWQgRG9j dW1lbnQ6OnVwZGF0ZVBhZ2VHcm91cFVzZXJTaGVldHMoKQogICAgICAgICBzdHlsZVNlbGVjdG9y Q2hhbmdlZChSZWNhbGNTdHlsZUltbWVkaWF0ZWx5KTsKIH0KIAordm9pZCBEb2N1bWVudDo6YWRk VXNlclNoZWV0KFBhc3NSZWZQdHI8Q1NTU3R5bGVTaGVldD4gdXNlclNoZWV0KQoreworICAgIGlm ICghbV91c2VyU2hlZXRzKQorICAgICAgICBtX3VzZXJTaGVldHMgPSBhZG9wdFB0cihuZXcgVmVj dG9yPFJlZlB0cjxDU1NTdHlsZVNoZWV0PiA+KTsKKyAgICBtX3VzZXJTaGVldHMtPmFwcGVuZCh1 c2VyU2hlZXQpOworICAgIHN0eWxlU2VsZWN0b3JDaGFuZ2VkKFJlY2FsY1N0eWxlSW1tZWRpYXRl bHkpOworfQorCiBDU1NTdHlsZVNoZWV0KiBEb2N1bWVudDo6ZWxlbWVudFNoZWV0KCkKIHsKICAg ICBpZiAoIW1fZWxlbVNoZWV0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAppbmRleCAxMDc1MWI1Mjg4NTg3 ZmI1Y2Y0YWQyNjI1NTBjOWVjNWEzMDQ3NjMxLi5lMDBiODY5NWRhMTJhYmQ0NGU5MWFhNmRlNDk1 YTdiNjhhMjg4MTViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaApAQCAtNjE1LDYgKzYxNSw4IEBAIHB1 YmxpYzoKICAgICB2b2lkIGNsZWFyUGFnZUdyb3VwVXNlclNoZWV0cygpOwogICAgIHZvaWQgdXBk YXRlUGFnZUdyb3VwVXNlclNoZWV0cygpOwogCisgICAgdm9pZCBhZGRVc2VyU2hlZXQoUGFzc1Jl ZlB0cjxDU1NTdHlsZVNoZWV0PiB1c2VyU2hlZXQpOworCiAgICAgQ1NTU3R5bGVTaGVldCogZWxl bWVudFNoZWV0KCk7CiAgICAgQ1NTU3R5bGVTaGVldCogbWFwcGVkRWxlbWVudFNoZWV0KCk7CiAg ICAgCkBAIC0xMTk5LDYgKzEyMDEsNyBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxDU1NTdHlsZVNo ZWV0PiBtX21hcHBlZEVsZW1lbnRTaGVldDsKICAgICBSZWZQdHI8Q1NTU3R5bGVTaGVldD4gbV9w YWdlVXNlclNoZWV0OwogICAgIG11dGFibGUgT3duUHRyPFZlY3RvcjxSZWZQdHI8Q1NTU3R5bGVT aGVldD4gPiA+IG1fcGFnZUdyb3VwVXNlclNoZWV0czsKKyAgICBPd25QdHI8VmVjdG9yPFJlZlB0 cjxDU1NTdHlsZVNoZWV0PiA+ID4gbV91c2VyU2hlZXRzOwogICAgIG11dGFibGUgYm9vbCBtX3Bh Z2VHcm91cFVzZXJTaGVldENhY2hlVmFsaWQ7CiAKICAgICBib29sIG1fcHJpbnRpbmc7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDU0ZDQ0OTM1NTczMDE2MWJhMzM1MjgxMzk2ZDc3NjBk Y2M0OTM1M2QuLmUxNTc3Y2U5NTEzNGI1ODNkM2EzYzE1YjIwNGE5MmQ3YjVlNzE1YzUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDctMjUgIE1paGFp IFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBB ZGQgYmV0dGVyIFdlYktpdCBBUEkgZm9yIGNocm9tZS50YWJzLmluc2VydENTUyBleHRlbnNpb24g QVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTE1 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBX ZWJEb2N1bWVudDo6aW5zZXJ0VXNlclN0eWxlU2hlZXQgd2hpY2ggaW5zZXJ0cyBhIHVzZXIgc3R5 bGVzaGVldCwKKyAgICAgICAgaW5zdGVhZCBvZiBmb3JjaW5nIGV4dGVuc2lvbnMgdG8gdXNlIGlu c2VydFN0eWxlVGV4dCB3aGljaCBtYW5pcHVsYXRlcworICAgICAgICB0aGUgRE9NIG9mIHRoZSBw YWdlIGFuZCByZXN1bHRzIGluIGNvbXBhdGliaWxpdHkgaXNzdWVzIChzZWUKKyAgICAgICAgaHR0 cDovL2NyYnVnLmNvbS84MjIyMCkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViRG9jdW1lbnQuaDoK KyAgICAgICAgKiBzcmMvV2ViRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJEb2N1 bWVudDo6aW5zZXJ0VXNlclN0eWxlU2hlZXQpOgorCiAyMDExLTA3LTIzICBBbG9rIFByaXlhZGFy c2hpICA8YWxva3BAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFN3aXRjaGluZyBvZmYgYWNjZWxl cmF0aW9uIGZvciBzbWFsbCBjYW52YXMgYnJva2UgZ3B1IHRlc3RzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEb2N1bWVudC5oIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRG9jdW1lbnQuaAppbmRleCA4YjdiYzU1YzU1OTBjM2E3NTBkYWU2 ZWQwOWQ2MTY4MGFjNjM0M2EzLi43NjJmM2QzYmY4YjFkM2ZhNzVmNGFlOTY4YWIwMjQ2ZTQ0ZmM3 NzY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEb2N1bWVu dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRvY3VtZW50LmgKQEAg LTU2LDYgKzU2LDExIEBAIGNsYXNzIFdlYlVSTDsKIC8vIFByb3ZpZGVzIHJlYWRvbmx5IGFjY2Vz cyB0byBzb21lIHByb3BlcnRpZXMgb2YgYSBET00gZG9jdW1lbnQuCiBjbGFzcyBXZWJEb2N1bWVu dCA6IHB1YmxpYyBXZWJOb2RlIHsKIHB1YmxpYzoKKyAgICBlbnVtIFVzZXJTdHlsZUxldmVsIHsK KyAgICAgICAgVXNlclN0eWxlVXNlckxldmVsLAorICAgICAgICBVc2VyU3R5bGVBdXRob3JMZXZl bAorICAgIH07CisKICAgICBXZWJEb2N1bWVudCgpIHsgfQogICAgIFdlYkRvY3VtZW50KGNvbnN0 IFdlYkRvY3VtZW50JiBlKSA6IFdlYk5vZGUoZSkgeyB9CiAKQEAgLTk4LDkgKzEwMywxNyBAQCBw dWJsaWM6CiAgICAgLy8gZG9jdW1lbnQuIHxlbGVtZW50SWR8IGNhbiBiZSBlbXB0eSwgYnV0IGlm IHNwZWNpZmllZCB0aGVuIGl0IGlzIHVzZWQKICAgICAvLyBhcyB0aGUgaWQgZm9yIHRoZSBuZXds eSBpbnNlcnRlZCBlbGVtZW50IChyZXBsYWNpbmcgYW4gZXhpc3Rpbmcgb25lCiAgICAgLy8gd2l0 aCB0aGUgc2FtZSBpZCwgaWYgYW55KS4KKyAgICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMgb25jZSBD aHJvbWl1bSBjYWxsZXJzIGhhdmUgYmVlbiB1cGRhdGVkIHRvIGNhbGwKKyAgICAvLyBpbnNlcnRV c2VyU3R5bGVTaGVldCBpbnN0ZWFkLgogICAgIFdFQktJVF9BUEkgYm9vbCBpbnNlcnRTdHlsZVRl eHQoY29uc3QgV2ViU3RyaW5nJiBzdHlsZVRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBXZWJTdHJpbmcmIGVsZW1lbnRJZCk7CiAKKyAgICAvLyBJbnNlcnRz IHRoZSBnaXZlbiBDU1Mgc291cmNlIGNvZGUgYXMgYSB1c2VyIHN0eWxlc2hlZXQgaW4gdGhlIGRv Y3VtZW50LgorICAgIC8vIE1lYW50IGZvciBwcm9ncmFtYXRpYy9vbmUtb2ZmIGluamVjdGlvbiwg YXMgb3Bwb3NlZCB0bworICAgIC8vIFdlYlZpZXc6OmFkZFVzZXJTdHlsZVNoZWV0IHdoaWNoIGlu c2VydHMgc3R5bGVzIGZvciB0aGUgbGlmZXRpbWUgb2YgdGhlCisgICAgLy8gV2ViVmlldy4KKyAg ICBXRUJLSVRfQVBJIHZvaWQgaW5zZXJ0VXNlclN0eWxlU2hlZXQoY29uc3QgV2ViU3RyaW5nJiBz b3VyY2VDb2RlLCBVc2VyU3R5bGVMZXZlbCk7CisKICNpZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04K ICAgICBXZWJEb2N1bWVudChjb25zdCBXVEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6RG9jdW1lbnQ+ Jik7CiAgICAgV2ViRG9jdW1lbnQmIG9wZXJhdG9yPShjb25zdCBXVEY6OlBhc3NSZWZQdHI8V2Vi Q29yZTo6RG9jdW1lbnQ+Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJEb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEb2N1bWVu dC5jcHAKaW5kZXggYThhZDViNjUwYTA2Yzk1Y2RhOGI1MjIxMTc0MmVhNDk3N2M5NDM4NS4uMDM4 MDU2M2U4NjRlYWZlZTQwMjY3N2UwZTJjNjE4ZjFiMTNiODAwNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYkRvY3VtZW50LmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUg IldlYkRvY3VtZW50LmgiCiAKICNpbmNsdWRlICJBWE9iamVjdENhY2hlLmgiCisjaW5jbHVkZSAi Q1NTU3R5bGVTaGVldC5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRG9jdW1l bnRMb2FkZXIuaCIKICNpbmNsdWRlICJEb2N1bWVudFR5cGUuaCIKQEAgLTIwNyw2ICsyMDgsMTYg QEAgYm9vbCBXZWJEb2N1bWVudDo6aW5zZXJ0U3R5bGVUZXh0KGNvbnN0IFdlYlN0cmluZyYgc3R5 bGVUZXh0LCBjb25zdCBXZWJTdHJpbmcmIGUKICAgICByZXR1cm4gc3VjY2VzczsKIH0KIAordm9p ZCBXZWJEb2N1bWVudDo6aW5zZXJ0VXNlclN0eWxlU2hlZXQoY29uc3QgV2ViU3RyaW5nJiBzb3Vy Y2VDb2RlLCBVc2VyU3R5bGVMZXZlbCBsZXZlbCkKK3sKKyAgICBSZWZQdHI8RG9jdW1lbnQ+IGRv Y3VtZW50ID0gdW53cmFwPERvY3VtZW50PigpOworCisgICAgUmVmUHRyPENTU1N0eWxlU2hlZXQ+ IHBhcnNlZFNoZWV0ID0gQ1NTU3R5bGVTaGVldDo6Y3JlYXRlKGRvY3VtZW50LmdldCgpKTsKKyAg ICBwYXJzZWRTaGVldC0+c2V0SXNVc2VyU3R5bGVTaGVldChsZXZlbCA9PSBVc2VyU3R5bGVVc2Vy TGV2ZWwpOworICAgIHBhcnNlZFNoZWV0LT5wYXJzZVN0cmluZyhzb3VyY2VDb2RlLCAhZG9jdW1l bnQtPmluUXVpcmtzTW9kZSgpKTsKKyAgICBkb2N1bWVudC0+YWRkVXNlclNoZWV0KHBhcnNlZFNo ZWV0LnJlbGVhc2UoKSk7Cit9CisKIFdlYkRvY3VtZW50OjpXZWJEb2N1bWVudChjb25zdCBQYXNz UmVmUHRyPERvY3VtZW50PiYgZWxlbSkKICAgICA6IFdlYk5vZGUoZWxlbSkKIHsK