51270 2010-12-17 12:12:51 -0800 A corrupted counter tree is created when renderers are added to the tree bypassing RenderObject::addChild 2011-01-27 16:14:37 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 carol carol bdakin commit-queue darin eric jamesr oldest_to_newest 323919 0 carol 2010-12-17 12:12:51 -0800 This is a followup for bug 43812. The patch provided for fixing 43812 did not address the real problem in that bug, which is described in the summary of this one: sometimes renderers that can potentially have counters attached are put in the renderer tree by using RenderObjectChildren::insert/appendChild, bypassing RenderObject::addChild. In this case the current code does not update those counters' position in the counter forrest appropriately resulting in a corrupt counter forrest. This corrupt forrest leads to wrong counter values, crashes, etc. 323939 1 76903 carol 2010-12-17 12:48:34 -0800 Created attachment 76903 Proposed Patch 323970 2 76903 commit-queue 2010-12-17 13:39:43 -0800 Comment on attachment 76903 Proposed Patch Clearing flags on attachment: 76903 Committed r74292: <http://trac.webkit.org/changeset/74292> 323971 3 commit-queue 2010-12-17 13:39:48 -0800 All reviewed patches have been landed. Closing bug. 329756 4 carol 2011-01-05 13:32:16 -0800 My previous fix was reverted as it exposed other counter related problems such as the fact that sometimes renderers are moved around in the tree during removal of a renderer, causing a previously deleted counter to be recreated during the remove process. Thus I am reopening this bug in order to provide a more comprehensive fix. 329784 5 78042 carol 2011-01-05 14:14:51 -0800 Created attachment 78042 Proposed Patch This patch restores changes in my previous patch and takes care of the additional case when Renderers are moved in the Render tree from one place to another, especially when this happens inside the RenderObject::remove() call. 330434 6 78164 carol 2011-01-06 14:38:49 -0800 Created attachment 78164 Proposed patch. Fixed contributor name/e-mail in ChangeLog Fixed contributor name/e-mail in ChangeLog 335584 7 79230 carol 2011-01-17 16:59:30 -0800 Created attachment 79230 Proposed Patch - Updated to reflect recent WebCore code restructuring. 340650 8 79230 hyatt 2011-01-26 17:40:10 -0800 Comment on attachment 79230 Proposed Patch - Updated to reflect recent WebCore code restructuring. r=me 341103 9 79230 commit-queue 2011-01-27 16:14:34 -0800 Comment on attachment 79230 Proposed Patch - Updated to reflect recent WebCore code restructuring. Clearing flags on attachment: 79230 Committed r76859: <http://trac.webkit.org/changeset/76859> 341104 10 commit-queue 2011-01-27 16:14:37 -0800 All reviewed patches have been landed. Closing bug. 76903 2010-12-17 12:48:34 -0800 2011-01-05 14:14:51 -0800 Proposed Patch patchFor51270.patch text/plain 4333 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDI4MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMTAtMTItMTcgIENhcm9sIFN6YWJvICA8Y2Fyb2wuc3phYm9Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEEgY29ycnVwdGVkIGNvdW50ZXIgdHJlZSBpcyBjcmVhdGVkIHdoZW4gcmVuZGVyZXJzIGFyZSBh ZGRlZCB0byB0aGUKKyAgICAgICAgdHJlZSBieXBhc3NpbmcgUmVuZGVyT2JqZWN0OjphZGRDaGls ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTEyNzAK KworICAgICAgICBUaGlzIHBhdGNoIHJlcGxhY2VzIHRoZSBoYWNrIGludHJvZHVjZWQgZm9yIGZp eGluZyBidWcgNDM4MTIKKyAgICAgICAgd2l0aCBjb2RlIHRoYXQgYWRkcmVzc2VzIHRoZSB1bmRl cmx5aW5nIHByb2JsZW0gZm9yIHRoYXQgYnVnLgorICAgICAgICBObyBuZXcgbGF5b3V0IHRlc3Rz IHByb3ZpZGVkIGFzIHRoZXJlIGlzIG5vIGlkZW50aWZpZWQgc2NlbmFyaW8gd2hlbgorICAgICAg ICB2aXNpYmxlIGJlaGF2aW9yIHdvdWxkIGJlIGRpZmZlcmVudCwgdGhlIGludGVybmFsIGRhdGFz dHJ1Y3R1cmVzCisgICAgICAgIGFyZSBtYWludGFpbmVkIHByb3Blcmx5IHRocm91Z2ggdGhpcyBm aXggc28gdGhlIHByZXZpb3VzIGhhY2sKKyAgICAgICAgaW50cm9kdWNlZCBmb3IgYnVnIDQzODEy IGlzIG5vdyByZW1vdmVkLiBUaGUgZmFjdCB0aGF0IHRoZSAKKyAgICAgICAgbGF5b3V0IHRlc3Qg aW50cm9kdWNlZCBmb3IgNDM4MTIgY29udGludWVzIHRvIHBhc3MgaXMgcHJvb2YgdGhhdCB0aGUK KyAgICAgICAgY29kZSB3b3Jrcy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJDb3VudGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRQbGFjZUZvckNvdW50ZXIpOgorICAgICAgICAg IFJlbW92ZWQgaGFjay4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6YWRkQ2hpbGQpOgorICAgICAgICAgIE1vdmVk IGNhbGwgdG8gY291bnRlciBub2RlcyB1cGRhdGVyIHRvIGxvd2VyIGxldmVsCisgICAgICAgICAg ZnVuY3Rpb25zIHRvIGF2b2lkIGJ5cGFzcy4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0Q2hpbGRMaXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdENoaWxkTGlz dDo6YXBwZW5kQ2hpbGROb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdENoaWxk TGlzdDo6aW5zZXJ0Q2hpbGROb2RlKToKKyAgICAgICAgICBDaGFuZ2VkIHRvIHVwZGF0ZSB0aGUg dmFsdWVzIG9mIHRoZSBjb3VudGVycyB0aGF0CisgICAgICAgICAgbWF5IGJlIGluc2VydGVkIGlu IHRoZSB0cmVlLgorCiAyMDEwLTEyLTE3ICBXLiBKYW1lcyBNYWNMZWFuICA8d2ptYWNsZWFuQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KSW5kZXg6 IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwCShyZXZpc2lvbiA3NDI0OCkKKysrIFdlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzYsMTEg KzEzNiw2IEBAIHN0YXRpYyBib29sIGZpbmRQbGFjZUZvckNvdW50ZXIoUmVuZGVyT2IKICAgICBS ZW5kZXJPYmplY3QqIGN1cnJlbnRSZW5kZXJlciA9IGNvdW50ZXJPd25lci0+cHJldmlvdXNJblBy ZU9yZGVyKCk7CiAgICAgcHJldmlvdXNTaWJsaW5nID0gMDsKICAgICB3aGlsZSAoY3VycmVudFJl bmRlcmVyKSB7Ci0gICAgICAgIC8vIEEgc2libGluZyB3aXRob3V0IGEgcGFyZW50IG1lYW5zIHRo YXQgdGhlIGNvdW50ZXIgbm9kZSB0cmVlIHdhcyBub3QgY29uc3RydWN0ZWQgY29ycmVjdGx5IHNv IHdlIHN0b3AKLSAgICAgICAgLy8gdHJhdmVyc2luZy4gSW4gdGhlIGZ1dHVyZSBSZW5kZXJDb3Vu dGVyIHNob3VsZCBoYW5kbGUgUmVuZGVyT2JqZWN0cyB0aGF0IGFyZSBub3QgY29ubmVjdGVkIHRv IHRoZQotICAgICAgICAvLyByZW5kZXIgdHJlZSBhdCBjb3VudGVyIG5vZGUgY3JlYXRpb24uIFNl ZSBidWcgNDM4MTIuCi0gICAgICAgIGlmIChwcmV2aW91c1NpYmxpbmcgJiYgIXByZXZpb3VzU2li bGluZy0+cGFyZW50KCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIENvdW50 ZXJOb2RlKiBjdXJyZW50Q291bnRlciA9IG1ha2VDb3VudGVyTm9kZShjdXJyZW50UmVuZGVyZXIs IGlkZW50aWZpZXIsIGZhbHNlKTsKICAgICAgICAgaWYgKHNlYXJjaEVuZFJlbmRlcmVyID09IGN1 cnJlbnRSZW5kZXJlcikgewogICAgICAgICAgICAgLy8gV2UgbWF5IGJlIGF0IHRoZSBlbmQgb2Yg b3VyIHNlYXJjaC4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24g NzQyNDgpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zMTUsNyArMzE1LDYgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmFkZENoaWxkKFJlbmRl ck9iamVjdAogICAgICAgICAvLyBKdXN0IGFkZCBpdC4uLgogICAgICAgICBjaGlsZHJlbi0+aW5z ZXJ0Q2hpbGROb2RlKHRoaXMsIG5ld0NoaWxkLCBiZWZvcmVDaGlsZCk7CiAgICAgfQotICAgIFJl bmRlckNvdW50ZXI6OnJlbmRlcmVyU3VidHJlZUF0dGFjaGVkKG5ld0NoaWxkKTsKICAgICBpZiAo bmV3Q2hpbGQtPmlzVGV4dCgpICYmIG5ld0NoaWxkLT5zdHlsZSgpLT50ZXh0VHJhbnNmb3JtKCkg PT0gQ0FQSVRBTElaRSkgewogICAgICAgICBSZWZQdHI8U3RyaW5nSW1wbD4gdGV4dFRvVHJhbnNm b3JtID0gdG9SZW5kZXJUZXh0KG5ld0NoaWxkKS0+b3JpZ2luYWxUZXh0KCk7CiAgICAgICAgIGlm ICh0ZXh0VG9UcmFuc2Zvcm0pCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3RD aGlsZExpc3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dENoaWxkTGlzdC5jcHAJKHJldmlzaW9uIDc0MjQ4KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyT2JqZWN0Q2hpbGRMaXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc0LDYgKzE3NCw3IEBA IHZvaWQgUmVuZGVyT2JqZWN0Q2hpbGRMaXN0OjphcHBlbmRDaGlsZE4KICAgICAgICAgICAgIG93 bmVyLT5kaXJ0eUxpbmVzRnJvbUNoYW5nZWRDaGlsZChuZXdDaGlsZCk7CiAgICAgfQogCisgICAg UmVuZGVyQ291bnRlcjo6cmVuZGVyZXJTdWJ0cmVlQXR0YWNoZWQobmV3Q2hpbGQpOwogICAgIG5l d0NoaWxkLT5zZXROZWVkc0xheW91dEFuZFByZWZXaWR0aHNSZWNhbGMoKTsgLy8gR29lcyB1cCB0 aGUgY29udGFpbmluZyBibG9jayBoaWVyYXJjaHkuCiAgICAgaWYgKCFvd25lci0+bm9ybWFsQ2hp bGROZWVkc0xheW91dCgpKQogICAgICAgICBvd25lci0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVl KTsgLy8gV2UgbWF5IHN1cHBseSB0aGUgc3RhdGljIHBvc2l0aW9uIGZvciBhbiBhYnNvbHV0ZSBw b3NpdGlvbmVkIGNoaWxkLgpAQCAtMjMzLDYgKzIzNCw3IEBAIHZvaWQgUmVuZGVyT2JqZWN0Q2hp bGRMaXN0OjppbnNlcnRDaGlsZE4KICAgICAgICAgICAgIG93bmVyLT5kaXJ0eUxpbmVzRnJvbUNo YW5nZWRDaGlsZChjaGlsZCk7CiAgICAgfQogCisgICAgUmVuZGVyQ291bnRlcjo6cmVuZGVyZXJT dWJ0cmVlQXR0YWNoZWQoY2hpbGQpOwogICAgIGNoaWxkLT5zZXROZWVkc0xheW91dEFuZFByZWZX aWR0aHNSZWNhbGMoKTsKICAgICBpZiAoIW93bmVyLT5ub3JtYWxDaGlsZE5lZWRzTGF5b3V0KCkp CiAgICAgICAgIG93bmVyLT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUpOyAvLyBXZSBtYXkgc3Vw cGx5IHRoZSBzdGF0aWMgcG9zaXRpb24gZm9yIGFuIGFic29sdXRlIHBvc2l0aW9uZWQgY2hpbGQu Cg== 78042 2011-01-05 14:14:51 -0800 2011-01-06 14:38:49 -0800 Proposed Patch patchFor51270-2.patch text/plain 6695 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NTA5OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzYgQEAKKzIwMTEtMDEtMDUgIEd1ZXN0IEJ1aWxkZXItVGVzdGVyICA8Q2Fyb2wg U3phYm8gPGNhcm9sLnN6YWJvQG5va2lhLmNvbT4+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQSBjb3JydXB0ZWQgY291bnRlciB0cmVlIGlzIGNyZWF0 ZWQgd2hlbiByZW5kZXJlcnMgYXJlIGFkZGVkIHRvIHRoZQorICAgICAgICB0cmVlIGJ5cGFzc2lu ZyBSZW5kZXJPYmplY3Q6OmFkZENoaWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MTI3MAorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBwYXRj aCByZWltcGxlbWVudHMgdGhlIGZpeCBmb3IgYnVncyA0MzgxMiBhbmQKKyAgICAgICAgNTE2Mzcg YW5kIGhlbmNlIGFsbCB0ZXN0cyBhcmUgYWxyZWFkeSB0aGVyZSBhcyBwYXJ0IG9mIHRoZSBvcmln aW5hbAorICAgICAgICBmaXhlcyBmb3IgdGhvc2UgYnVncy4KKworICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJDb3VudGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRQbGFjZUZvckNvdW50 ZXIpOgorICAgICAgICBSZW1vdmVkIG9sZCB3b3JrYXJvdW5kIGFzIHRoaXMgcGF0Y2ggaG9wZWZ1 bGx5IGZpeGVzIHRoZSByZWFsCisgICAgICAgIHByb2JsZW0uCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmFkZENo aWxkKToKKyAgICAgICAgUmVtb3ZlZCBjYWxsIHRvIGNvdW50ZXIgdXBkYXRlciBhcyBpdCB3YXMg bW92ZWQgdG8gYSBsb3dlciBsZXZlbC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6 ZGVzdHJveSk6CisgICAgICAgIE1vdmVkIGF0dGFjaGVkIGNvdW50ZXIgbm9kZXMgZGVzdHJ1Y3Rp b24gdG8gYWZ0ZXIgdGhlIG5vZGUgaXMKKyAgICAgICAgcmVtb3ZlZCBmcm9tIHRoZSB0cmVlLgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3RDaGlsZExpc3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyT2JqZWN0Q2hpbGRMaXN0OjpyZW1vdmVDaGlsZE5vZGUpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Q2hpbGRMaXN0OjphcHBlbmRDaGlsZE5vZGUpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Q2hpbGRMaXN0OjppbnNlcnRDaGlsZE5vZGUpOgor ICAgICAgICBBZGRlZCBub3RpZmljYXRpb25zIHRvIHRoZSBDb3VudGVyIHN5c3RlbSBzdWNoIHRo YXQgdGhlCisgICAgICAgIENvdW50ZXJGb3Jlc3QgcmVmbGVjdHMgdGhlIGNoYW5nZXMgdG8gdGhl IFJlbmRlcmVyVHJlZS4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlcldpZGdldDo6ZGVzdHJveSk6CisgICAgICAgIEFwcGxpZWQg dGhlIHNhbWUgY2hhbmdlcyBhcyBmb3IgUmVuZGVyT2JqZWN0OjpkZXN0cm95KCkKKyAgICAgICAg c2luY2UgUmVuZGVyT2JqZWN0OjpkZXN0cm95KCkgaXMgbm90IGNhbGxlZCBmcm9tIGhlcmUuCisK IDIwMTEtMDEtMDUgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGF2ZSBIeWF0dC4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckNvdW50ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckNv dW50ZXIuY3BwCShyZXZpc2lvbiA3NDg4OCkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckNv dW50ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzYsMTEgKzEzNiw2IEBAIHN0YXRpYyBib29s IGZpbmRQbGFjZUZvckNvdW50ZXIoUmVuZGVyT2IKICAgICBSZW5kZXJPYmplY3QqIGN1cnJlbnRS ZW5kZXJlciA9IGNvdW50ZXJPd25lci0+cHJldmlvdXNJblByZU9yZGVyKCk7CiAgICAgcHJldmlv dXNTaWJsaW5nID0gMDsKICAgICB3aGlsZSAoY3VycmVudFJlbmRlcmVyKSB7Ci0gICAgICAgIC8v IEEgc2libGluZyB3aXRob3V0IGEgcGFyZW50IG1lYW5zIHRoYXQgdGhlIGNvdW50ZXIgbm9kZSB0 cmVlIHdhcyBub3QgY29uc3RydWN0ZWQgY29ycmVjdGx5IHNvIHdlIHN0b3AgCi0gICAgICAgIC8v IHRyYXZlcnNpbmcuIEluIHRoZSBmdXR1cmUgUmVuZGVyQ291bnRlciBzaG91bGQgaGFuZGxlIFJl bmRlck9iamVjdHMgdGhhdCBhcmUgbm90IGNvbm5lY3RlZCB0byB0aGUgCi0gICAgICAgIC8vIHJl bmRlciB0cmVlIGF0IGNvdW50ZXIgbm9kZSBjcmVhdGlvbi4gU2VlIGJ1ZyA0MzgxMi4gCi0gICAg ICAgIGlmIChwcmV2aW91c1NpYmxpbmcgJiYgIXByZXZpb3VzU2libGluZy0+cGFyZW50KCkpCi0g ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIENvdW50ZXJOb2RlKiBjdXJyZW50Q291 bnRlciA9IG1ha2VDb3VudGVyTm9kZShjdXJyZW50UmVuZGVyZXIsIGlkZW50aWZpZXIsIGZhbHNl KTsKICAgICAgICAgaWYgKHNlYXJjaEVuZFJlbmRlcmVyID09IGN1cnJlbnRSZW5kZXJlcikgewog ICAgICAgICAgICAgLy8gV2UgbWF5IGJlIGF0IHRoZSBlbmQgb2Ygb3VyIHNlYXJjaC4KSW5kZXg6 IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24gNzQ4ODgpCisrKyBXZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMTUsNyArMzE1 LDYgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmFkZENoaWxkKFJlbmRlck9iamVjdAogICAgICAgICAv LyBKdXN0IGFkZCBpdC4uLgogICAgICAgICBjaGlsZHJlbi0+aW5zZXJ0Q2hpbGROb2RlKHRoaXMs IG5ld0NoaWxkLCBiZWZvcmVDaGlsZCk7CiAgICAgfQotICAgIFJlbmRlckNvdW50ZXI6OnJlbmRl cmVyU3VidHJlZUF0dGFjaGVkKG5ld0NoaWxkKTsgCiAgICAgaWYgKG5ld0NoaWxkLT5pc1RleHQo KSAmJiBuZXdDaGlsZC0+c3R5bGUoKS0+dGV4dFRyYW5zZm9ybSgpID09IENBUElUQUxJWkUpIHsK ICAgICAgICAgUmVmUHRyPFN0cmluZ0ltcGw+IHRleHRUb1RyYW5zZm9ybSA9IHRvUmVuZGVyVGV4 dChuZXdDaGlsZCktPm9yaWdpbmFsVGV4dCgpOwogICAgICAgICBpZiAodGV4dFRvVHJhbnNmb3Jt KQpAQCAtMjE2OSw5ICsyMTY4LDYgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmRlc3Ryb3koKQogICAg IGlmIChmcmFtZSgpICYmIGZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5hdXRvc2Nyb2xsUmVuZGVy ZXIoKSA9PSB0aGlzKQogICAgICAgICBmcmFtZSgpLT5ldmVudEhhbmRsZXIoKS0+c3RvcEF1dG9z Y3JvbGxUaW1lcih0cnVlKTsKIAotICAgIGlmIChtX2hhc0NvdW50ZXJOb2RlTWFwKQotICAgICAg ICBSZW5kZXJDb3VudGVyOjpkZXN0cm95Q291bnRlck5vZGVzKHRoaXMpOwotCiAgICAgaWYgKEFY T2JqZWN0Q2FjaGU6OmFjY2Vzc2liaWxpdHlFbmFibGVkKCkpIHsKICAgICAgICAgZG9jdW1lbnQo KS0+YXhPYmplY3RDYWNoZSgpLT5jaGlsZHJlbkNoYW5nZWQodGhpcy0+cGFyZW50KCkpOwogICAg ICAgICBkb2N1bWVudCgpLT5heE9iamVjdENhY2hlKCktPnJlbW92ZSh0aGlzKTsKQEAgLTIxODQs NiArMjE4MCwxNCBAQCB2b2lkIFJlbmRlck9iamVjdDo6ZGVzdHJveSgpCiAKICAgICByZW1vdmUo KTsKIAorICAgIC8vIElmIHRoaXMgcmVuZGVyZXIgaGFkIGEgcGFyZW50LCByZW1vdmUgc2hvdWxk IGhhdmUgZGVzdHJveWVkIGFueSBjb3VudGVycworICAgIC8vIGF0dGFjaGVkIHRvIHRoaXMgcmVu ZGVyZXIgYW5kIG1hcmtlZCB0aGUgYWZmZWN0ZWQgb3RoZXIgY291bnRlcnMgZm9yCisgICAgLy8g cmVldmFsdWF0aW9uLiBUaGlzIGFwcGFyZW50bHkgcmVkdW5kYW50IGNoZWNrIGlzIGhlcmUgZm9y IHRoZSBjYXNlIHdoZW4KKyAgICAvLyB0aGlzIHJlbmRlcmVyIGhhZCBubyBwYXJlbnQgYXQgdGhl IHRpbWUgcmVtb3ZlKCkgd2FzIGNhbGxlZC4KKworICAgIGlmIChtX2hhc0NvdW50ZXJOb2RlTWFw KQorICAgICAgICBSZW5kZXJDb3VudGVyOjpkZXN0cm95Q291bnRlck5vZGVzKHRoaXMpOworCiAg ICAgLy8gRklYTUU6IFdvdWxkIGxpa2UgdG8gZG8gdGhpcyBpbiBSZW5kZXJCb3hNb2RlbE9iamVj dCwgYnV0IHRoZSB0aW1pbmcgaXMgc28gY29tcGxpY2F0ZWQgdGhhdCB0aGlzIGNhbid0IGVhc2ls eQogICAgIC8vIGJlIG1vdmVkIGludG8gUmVuZGVyQm94TW9kZWxPYmplY3Q6OmRlc3Ryb3kuCiAg ICAgaWYgKGhhc0xheWVyKCkpIHsKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dENoaWxkTGlzdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0Q2hpbGRMaXN0LmNwcAkocmV2aXNpb24gNzQ4ODgpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJPYmplY3RDaGlsZExpc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjcsNiArMTI3LDkg QEAgUmVuZGVyT2JqZWN0KiBSZW5kZXJPYmplY3RDaGlsZExpc3Q6OnJlbQogICAgIG9sZENoaWxk LT5zZXROZXh0U2libGluZygwKTsKICAgICBvbGRDaGlsZC0+c2V0UGFyZW50KDApOwogCisgICAg aWYgKG9sZENoaWxkLT5tX2hhc0NvdW50ZXJOb2RlTWFwKQorICAgICAgICBSZW5kZXJDb3VudGVy OjpkZXN0cm95Q291bnRlck5vZGVzKG9sZENoaWxkKTsKKyAgICAKICAgICBpZiAoQVhPYmplY3RD YWNoZTo6YWNjZXNzaWJpbGl0eUVuYWJsZWQoKSkKICAgICAgICAgb3duZXItPmRvY3VtZW50KCkt PmF4T2JqZWN0Q2FjaGUoKS0+Y2hpbGRyZW5DaGFuZ2VkKG93bmVyKTsKIApAQCAtMTc0LDYgKzE3 Nyw3IEBAIHZvaWQgUmVuZGVyT2JqZWN0Q2hpbGRMaXN0OjphcHBlbmRDaGlsZE4KICAgICAgICAg ICAgIG93bmVyLT5kaXJ0eUxpbmVzRnJvbUNoYW5nZWRDaGlsZChuZXdDaGlsZCk7CiAgICAgfQog CisgICAgUmVuZGVyQ291bnRlcjo6cmVuZGVyZXJTdWJ0cmVlQXR0YWNoZWQobmV3Q2hpbGQpOwog ICAgIG5ld0NoaWxkLT5zZXROZWVkc0xheW91dEFuZFByZWZXaWR0aHNSZWNhbGMoKTsgLy8gR29l cyB1cCB0aGUgY29udGFpbmluZyBibG9jayBoaWVyYXJjaHkuCiAgICAgaWYgKCFvd25lci0+bm9y bWFsQ2hpbGROZWVkc0xheW91dCgpKQogICAgICAgICBvd25lci0+c2V0Q2hpbGROZWVkc0xheW91 dCh0cnVlKTsgLy8gV2UgbWF5IHN1cHBseSB0aGUgc3RhdGljIHBvc2l0aW9uIGZvciBhbiBhYnNv bHV0ZSBwb3NpdGlvbmVkIGNoaWxkLgpAQCAtMjMzLDYgKzIzNyw3IEBAIHZvaWQgUmVuZGVyT2Jq ZWN0Q2hpbGRMaXN0OjppbnNlcnRDaGlsZE4KICAgICAgICAgICAgIG93bmVyLT5kaXJ0eUxpbmVz RnJvbUNoYW5nZWRDaGlsZChjaGlsZCk7CiAgICAgfQogCisgICAgUmVuZGVyQ291bnRlcjo6cmVu ZGVyZXJTdWJ0cmVlQXR0YWNoZWQoY2hpbGQpOwogICAgIGNoaWxkLT5zZXROZWVkc0xheW91dEFu ZFByZWZXaWR0aHNSZWNhbGMoKTsKICAgICBpZiAoIW93bmVyLT5ub3JtYWxDaGlsZE5lZWRzTGF5 b3V0KCkpCiAgICAgICAgIG93bmVyLT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUpOyAvLyBXZSBt YXkgc3VwcGx5IHRoZSBzdGF0aWMgcG9zaXRpb24gZm9yIGFuIGFic29sdXRlIHBvc2l0aW9uZWQg Y2hpbGQuCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJXaWRnZXQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcldpZGdldC5jcHAJKHJldmlzaW9uIDc0ODg4 KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTIwLDggKzEyMCw2IEBAIHZvaWQgUmVuZGVyV2lkZ2V0OjpkZXN0cm95KCkKICAgICBpZiAo UmVuZGVyVmlldyogdiA9IHZpZXcoKSkKICAgICAgICAgdi0+cmVtb3ZlV2lkZ2V0KHRoaXMpOwog Ci0gICAgaWYgKG1faGFzQ291bnRlck5vZGVNYXApCi0gICAgICAgIFJlbmRlckNvdW50ZXI6OmRl c3Ryb3lDb3VudGVyTm9kZXModGhpcyk7CiAgICAgCiAgICAgaWYgKEFYT2JqZWN0Q2FjaGU6OmFj Y2Vzc2liaWxpdHlFbmFibGVkKCkpIHsKICAgICAgICAgZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNo ZSgpLT5jaGlsZHJlbkNoYW5nZWQodGhpcy0+cGFyZW50KCkpOwpAQCAtMTI5LDYgKzEyNyw5IEBA IHZvaWQgUmVuZGVyV2lkZ2V0OjpkZXN0cm95KCkKICAgICB9CiAgICAgcmVtb3ZlKCk7CiAKKyAg ICBpZiAobV9oYXNDb3VudGVyTm9kZU1hcCkKKyAgICAgICAgUmVuZGVyQ291bnRlcjo6ZGVzdHJv eUNvdW50ZXJOb2Rlcyh0aGlzKTsKKwogICAgIHNldFdpZGdldCgwKTsKIAogICAgIC8vIHJlbW92 ZXMgZnJvbSBvdmVycmlkZSBzaXplIG1hcAo= 78164 2011-01-06 14:38:49 -0800 2011-01-17 16:59:30 -0800 Proposed patch. Fixed contributor name/e-mail in ChangeLog patchFor51270-2.patch text/plain 6671 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NTA5OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzYgQEAKKzIwMTEtMDEtMDUgIENhcm9sIFN6YWJvIDxjYXJvbC5zemFib0Bub2tp YS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QSBjb3JydXB0ZWQgY291bnRlciB0cmVlIGlzIGNyZWF0ZWQgd2hlbiByZW5kZXJlcnMgYXJlIGFk ZGVkIHRvIHRoZQorICAgICAgICB0cmVlIGJ5cGFzc2luZyBSZW5kZXJPYmplY3Q6OmFkZENoaWxk CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTI3MAor CisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBwYXRjaCByZWltcGxlbWVudHMgdGhlIGZpeCBm b3IgYnVncyA0MzgxMiBhbmQKKyAgICAgICAgNTE2MzcgYW5kIGhlbmNlIGFsbCB0ZXN0cyBhcmUg YWxyZWFkeSB0aGVyZSBhcyBwYXJ0IG9mIHRoZSBvcmlnaW5hbAorICAgICAgICBmaXhlcyBmb3Ig dGhvc2UgYnVncy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJDb3VudGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmZpbmRQbGFjZUZvckNvdW50ZXIpOgorICAgICAgICBSZW1vdmVkIG9s ZCB3b3JrYXJvdW5kIGFzIHRoaXMgcGF0Y2ggaG9wZWZ1bGx5IGZpeGVzIHRoZSByZWFsCisgICAg ICAgIHByb2JsZW0uCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmFkZENoaWxkKToKKyAgICAgICAgUmVtb3ZlZCBj YWxsIHRvIGNvdW50ZXIgdXBkYXRlciBhcyBpdCB3YXMgbW92ZWQgdG8gYSBsb3dlciBsZXZlbC4K KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6ZGVzdHJveSk6CisgICAgICAgIE1vdmVk IGF0dGFjaGVkIGNvdW50ZXIgbm9kZXMgZGVzdHJ1Y3Rpb24gdG8gYWZ0ZXIgdGhlIG5vZGUgaXMK KyAgICAgICAgcmVtb3ZlZCBmcm9tIHRoZSB0cmVlLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJPYmplY3RDaGlsZExpc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Q2hp bGRMaXN0OjpyZW1vdmVDaGlsZE5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0 Q2hpbGRMaXN0OjphcHBlbmRDaGlsZE5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2Jq ZWN0Q2hpbGRMaXN0OjppbnNlcnRDaGlsZE5vZGUpOgorICAgICAgICBBZGRlZCBub3RpZmljYXRp b25zIHRvIHRoZSBDb3VudGVyIHN5c3RlbSBzdWNoIHRoYXQgdGhlCisgICAgICAgIENvdW50ZXJG b3Jlc3QgcmVmbGVjdHMgdGhlIGNoYW5nZXMgdG8gdGhlIFJlbmRlcmVyVHJlZS4KKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcldp ZGdldDo6ZGVzdHJveSk6CisgICAgICAgIEFwcGxpZWQgdGhlIHNhbWUgY2hhbmdlcyBhcyBmb3Ig UmVuZGVyT2JqZWN0OjpkZXN0cm95KCkKKyAgICAgICAgc2luY2UgUmVuZGVyT2JqZWN0OjpkZXN0 cm95KCkgaXMgbm90IGNhbGxlZCBmcm9tIGhlcmUuCisKIDIwMTEtMDEtMDUgIFNpbW9uIEZyYXNl ciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2ZSBI eWF0dC4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwCShyZXZpc2lvbiA3NDg4 OCkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xMzYsMTEgKzEzNiw2IEBAIHN0YXRpYyBib29sIGZpbmRQbGFjZUZvckNvdW50ZXIoUmVu ZGVyT2IKICAgICBSZW5kZXJPYmplY3QqIGN1cnJlbnRSZW5kZXJlciA9IGNvdW50ZXJPd25lci0+ cHJldmlvdXNJblByZU9yZGVyKCk7CiAgICAgcHJldmlvdXNTaWJsaW5nID0gMDsKICAgICB3aGls ZSAoY3VycmVudFJlbmRlcmVyKSB7Ci0gICAgICAgIC8vIEEgc2libGluZyB3aXRob3V0IGEgcGFy ZW50IG1lYW5zIHRoYXQgdGhlIGNvdW50ZXIgbm9kZSB0cmVlIHdhcyBub3QgY29uc3RydWN0ZWQg Y29ycmVjdGx5IHNvIHdlIHN0b3AgCi0gICAgICAgIC8vIHRyYXZlcnNpbmcuIEluIHRoZSBmdXR1 cmUgUmVuZGVyQ291bnRlciBzaG91bGQgaGFuZGxlIFJlbmRlck9iamVjdHMgdGhhdCBhcmUgbm90 IGNvbm5lY3RlZCB0byB0aGUgCi0gICAgICAgIC8vIHJlbmRlciB0cmVlIGF0IGNvdW50ZXIgbm9k ZSBjcmVhdGlvbi4gU2VlIGJ1ZyA0MzgxMi4gCi0gICAgICAgIGlmIChwcmV2aW91c1NpYmxpbmcg JiYgIXByZXZpb3VzU2libGluZy0+cGFyZW50KCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgIENvdW50ZXJOb2RlKiBjdXJyZW50Q291bnRlciA9IG1ha2VDb3VudGVyTm9kZShj dXJyZW50UmVuZGVyZXIsIGlkZW50aWZpZXIsIGZhbHNlKTsKICAgICAgICAgaWYgKHNlYXJjaEVu ZFJlbmRlcmVyID09IGN1cnJlbnRSZW5kZXJlcikgewogICAgICAgICAgICAgLy8gV2UgbWF5IGJl IGF0IHRoZSBlbmQgb2Ygb3VyIHNlYXJjaC4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmNwcAkocmV2aXNpb24gNzQ4ODgpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3Qu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMTUsNyArMzE1LDYgQEAgdm9pZCBSZW5kZXJPYmplY3Q6 OmFkZENoaWxkKFJlbmRlck9iamVjdAogICAgICAgICAvLyBKdXN0IGFkZCBpdC4uLgogICAgICAg ICBjaGlsZHJlbi0+aW5zZXJ0Q2hpbGROb2RlKHRoaXMsIG5ld0NoaWxkLCBiZWZvcmVDaGlsZCk7 CiAgICAgfQotICAgIFJlbmRlckNvdW50ZXI6OnJlbmRlcmVyU3VidHJlZUF0dGFjaGVkKG5ld0No aWxkKTsgCiAgICAgaWYgKG5ld0NoaWxkLT5pc1RleHQoKSAmJiBuZXdDaGlsZC0+c3R5bGUoKS0+ dGV4dFRyYW5zZm9ybSgpID09IENBUElUQUxJWkUpIHsKICAgICAgICAgUmVmUHRyPFN0cmluZ0lt cGw+IHRleHRUb1RyYW5zZm9ybSA9IHRvUmVuZGVyVGV4dChuZXdDaGlsZCktPm9yaWdpbmFsVGV4 dCgpOwogICAgICAgICBpZiAodGV4dFRvVHJhbnNmb3JtKQpAQCAtMjE2OSw5ICsyMTY4LDYgQEAg dm9pZCBSZW5kZXJPYmplY3Q6OmRlc3Ryb3koKQogICAgIGlmIChmcmFtZSgpICYmIGZyYW1lKCkt PmV2ZW50SGFuZGxlcigpLT5hdXRvc2Nyb2xsUmVuZGVyZXIoKSA9PSB0aGlzKQogICAgICAgICBm cmFtZSgpLT5ldmVudEhhbmRsZXIoKS0+c3RvcEF1dG9zY3JvbGxUaW1lcih0cnVlKTsKIAotICAg IGlmIChtX2hhc0NvdW50ZXJOb2RlTWFwKQotICAgICAgICBSZW5kZXJDb3VudGVyOjpkZXN0cm95 Q291bnRlck5vZGVzKHRoaXMpOwotCiAgICAgaWYgKEFYT2JqZWN0Q2FjaGU6OmFjY2Vzc2liaWxp dHlFbmFibGVkKCkpIHsKICAgICAgICAgZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNoZSgpLT5jaGls ZHJlbkNoYW5nZWQodGhpcy0+cGFyZW50KCkpOwogICAgICAgICBkb2N1bWVudCgpLT5heE9iamVj dENhY2hlKCktPnJlbW92ZSh0aGlzKTsKQEAgLTIxODQsNiArMjE4MCwxNCBAQCB2b2lkIFJlbmRl ck9iamVjdDo6ZGVzdHJveSgpCiAKICAgICByZW1vdmUoKTsKIAorICAgIC8vIElmIHRoaXMgcmVu ZGVyZXIgaGFkIGEgcGFyZW50LCByZW1vdmUgc2hvdWxkIGhhdmUgZGVzdHJveWVkIGFueSBjb3Vu dGVycworICAgIC8vIGF0dGFjaGVkIHRvIHRoaXMgcmVuZGVyZXIgYW5kIG1hcmtlZCB0aGUgYWZm ZWN0ZWQgb3RoZXIgY291bnRlcnMgZm9yCisgICAgLy8gcmVldmFsdWF0aW9uLiBUaGlzIGFwcGFy ZW50bHkgcmVkdW5kYW50IGNoZWNrIGlzIGhlcmUgZm9yIHRoZSBjYXNlIHdoZW4KKyAgICAvLyB0 aGlzIHJlbmRlcmVyIGhhZCBubyBwYXJlbnQgYXQgdGhlIHRpbWUgcmVtb3ZlKCkgd2FzIGNhbGxl ZC4KKworICAgIGlmIChtX2hhc0NvdW50ZXJOb2RlTWFwKQorICAgICAgICBSZW5kZXJDb3VudGVy OjpkZXN0cm95Q291bnRlck5vZGVzKHRoaXMpOworCiAgICAgLy8gRklYTUU6IFdvdWxkIGxpa2Ug dG8gZG8gdGhpcyBpbiBSZW5kZXJCb3hNb2RlbE9iamVjdCwgYnV0IHRoZSB0aW1pbmcgaXMgc28g Y29tcGxpY2F0ZWQgdGhhdCB0aGlzIGNhbid0IGVhc2lseQogICAgIC8vIGJlIG1vdmVkIGludG8g UmVuZGVyQm94TW9kZWxPYmplY3Q6OmRlc3Ryb3kuCiAgICAgaWYgKGhhc0xheWVyKCkpIHsKSW5k ZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdENoaWxkTGlzdC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0Q2hpbGRMaXN0LmNwcAkocmV2aXNp b24gNzQ4ODgpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3RDaGlsZExpc3QuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMjcsNiArMTI3LDkgQEAgUmVuZGVyT2JqZWN0KiBSZW5kZXJP YmplY3RDaGlsZExpc3Q6OnJlbQogICAgIG9sZENoaWxkLT5zZXROZXh0U2libGluZygwKTsKICAg ICBvbGRDaGlsZC0+c2V0UGFyZW50KDApOwogCisgICAgaWYgKG9sZENoaWxkLT5tX2hhc0NvdW50 ZXJOb2RlTWFwKQorICAgICAgICBSZW5kZXJDb3VudGVyOjpkZXN0cm95Q291bnRlck5vZGVzKG9s ZENoaWxkKTsKKyAgICAKICAgICBpZiAoQVhPYmplY3RDYWNoZTo6YWNjZXNzaWJpbGl0eUVuYWJs ZWQoKSkKICAgICAgICAgb3duZXItPmRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+Y2hpbGRy ZW5DaGFuZ2VkKG93bmVyKTsKIApAQCAtMTc0LDYgKzE3Nyw3IEBAIHZvaWQgUmVuZGVyT2JqZWN0 Q2hpbGRMaXN0OjphcHBlbmRDaGlsZE4KICAgICAgICAgICAgIG93bmVyLT5kaXJ0eUxpbmVzRnJv bUNoYW5nZWRDaGlsZChuZXdDaGlsZCk7CiAgICAgfQogCisgICAgUmVuZGVyQ291bnRlcjo6cmVu ZGVyZXJTdWJ0cmVlQXR0YWNoZWQobmV3Q2hpbGQpOwogICAgIG5ld0NoaWxkLT5zZXROZWVkc0xh eW91dEFuZFByZWZXaWR0aHNSZWNhbGMoKTsgLy8gR29lcyB1cCB0aGUgY29udGFpbmluZyBibG9j ayBoaWVyYXJjaHkuCiAgICAgaWYgKCFvd25lci0+bm9ybWFsQ2hpbGROZWVkc0xheW91dCgpKQog ICAgICAgICBvd25lci0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVlKTsgLy8gV2UgbWF5IHN1cHBs eSB0aGUgc3RhdGljIHBvc2l0aW9uIGZvciBhbiBhYnNvbHV0ZSBwb3NpdGlvbmVkIGNoaWxkLgpA QCAtMjMzLDYgKzIzNyw3IEBAIHZvaWQgUmVuZGVyT2JqZWN0Q2hpbGRMaXN0OjppbnNlcnRDaGls ZE4KICAgICAgICAgICAgIG93bmVyLT5kaXJ0eUxpbmVzRnJvbUNoYW5nZWRDaGlsZChjaGlsZCk7 CiAgICAgfQogCisgICAgUmVuZGVyQ291bnRlcjo6cmVuZGVyZXJTdWJ0cmVlQXR0YWNoZWQoY2hp bGQpOwogICAgIGNoaWxkLT5zZXROZWVkc0xheW91dEFuZFByZWZXaWR0aHNSZWNhbGMoKTsKICAg ICBpZiAoIW93bmVyLT5ub3JtYWxDaGlsZE5lZWRzTGF5b3V0KCkpCiAgICAgICAgIG93bmVyLT5z ZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUpOyAvLyBXZSBtYXkgc3VwcGx5IHRoZSBzdGF0aWMgcG9z aXRpb24gZm9yIGFuIGFic29sdXRlIHBvc2l0aW9uZWQgY2hpbGQuCkluZGV4OiBXZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJXaWRnZXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5n L1JlbmRlcldpZGdldC5jcHAJKHJldmlzaW9uIDc0ODg4KQorKysgV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyV2lkZ2V0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIwLDggKzEyMCw2IEBAIHZvaWQg UmVuZGVyV2lkZ2V0OjpkZXN0cm95KCkKICAgICBpZiAoUmVuZGVyVmlldyogdiA9IHZpZXcoKSkK ICAgICAgICAgdi0+cmVtb3ZlV2lkZ2V0KHRoaXMpOwogCi0gICAgaWYgKG1faGFzQ291bnRlck5v ZGVNYXApCi0gICAgICAgIFJlbmRlckNvdW50ZXI6OmRlc3Ryb3lDb3VudGVyTm9kZXModGhpcyk7 CiAgICAgCiAgICAgaWYgKEFYT2JqZWN0Q2FjaGU6OmFjY2Vzc2liaWxpdHlFbmFibGVkKCkpIHsK ICAgICAgICAgZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNoZSgpLT5jaGlsZHJlbkNoYW5nZWQodGhp cy0+cGFyZW50KCkpOwpAQCAtMTI5LDYgKzEyNyw5IEBAIHZvaWQgUmVuZGVyV2lkZ2V0OjpkZXN0 cm95KCkKICAgICB9CiAgICAgcmVtb3ZlKCk7CiAKKyAgICBpZiAobV9oYXNDb3VudGVyTm9kZU1h cCkKKyAgICAgICAgUmVuZGVyQ291bnRlcjo6ZGVzdHJveUNvdW50ZXJOb2Rlcyh0aGlzKTsKKwog ICAgIHNldFdpZGdldCgwKTsKIAogICAgIC8vIHJlbW92ZXMgZnJvbSBvdmVycmlkZSBzaXplIG1h cAo= 79230 2011-01-17 16:59:30 -0800 2011-01-27 16:14:34 -0800 Proposed Patch - Updated to reflect recent WebCore code restructuring. patchFor51270-3.patch text/plain 6767 carol SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc1OTQ0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDEtMTcgIENhcm9sIFN6 YWJvIDxjYXJvbC5zemFib0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQSBjb3JydXB0ZWQgY291bnRlciB0cmVlIGlzIGNyZWF0ZWQg d2hlbiByZW5kZXJlcnMgYXJlIGFkZGVkIHRvIHRoZQorICAgICAgICB0cmVlIGJ5cGFzc2luZyBS ZW5kZXJPYmplY3Q6OmFkZENoaWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01MTI3MAorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBwYXRjaCBy ZWltcGxlbWVudHMgdGhlIGZpeCBmb3IgYnVncyA0MzgxMiBhbmQKKyAgICAgICAgNTE2MzcgYW5k IGhlbmNlIGFsbCB0ZXN0cyBhcmUgYWxyZWFkeSB0aGVyZSBhcyBwYXJ0IG9mIHRoZSBvcmlnaW5h bAorICAgICAgICBmaXhlcyBmb3IgdGhvc2UgYnVncy4KKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJDb3VudGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRQbGFjZUZvckNvdW50ZXIp OgorICAgICAgICBSZW1vdmVkIG9sZCB3b3JrYXJvdW5kIGFzIHRoaXMgcGF0Y2ggaG9wZWZ1bGx5 IGZpeGVzIHRoZSByZWFsCisgICAgICAgIHByb2JsZW0uCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmFkZENoaWxk KToKKyAgICAgICAgUmVtb3ZlZCBjYWxsIHRvIGNvdW50ZXIgdXBkYXRlciBhcyBpdCB3YXMgbW92 ZWQgdG8gYSBsb3dlciBsZXZlbC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6ZGVz dHJveSk6CisgICAgICAgIE1vdmVkIGF0dGFjaGVkIGNvdW50ZXIgbm9kZXMgZGVzdHJ1Y3Rpb24g dG8gYWZ0ZXIgdGhlIG5vZGUgaXMKKyAgICAgICAgcmVtb3ZlZCBmcm9tIHRoZSB0cmVlLgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3RDaGlsZExpc3QuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyT2JqZWN0Q2hpbGRMaXN0OjpyZW1vdmVDaGlsZE5vZGUpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyT2JqZWN0Q2hpbGRMaXN0OjphcHBlbmRDaGlsZE5vZGUpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Q2hpbGRMaXN0OjppbnNlcnRDaGlsZE5vZGUpOgorICAg ICAgICBBZGRlZCBub3RpZmljYXRpb25zIHRvIHRoZSBDb3VudGVyIHN5c3RlbSBzdWNoIHRoYXQg dGhlCisgICAgICAgIENvdW50ZXJGb3Jlc3QgcmVmbGVjdHMgdGhlIGNoYW5nZXMgdG8gdGhlIFJl bmRlcmVyVHJlZS4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlcldpZGdldDo6ZGVzdHJveSk6CisgICAgICAgIEFwcGxpZWQgdGhl IHNhbWUgY2hhbmdlcyBhcyBmb3IgUmVuZGVyT2JqZWN0OjpkZXN0cm95KCkKKyAgICAgICAgc2lu Y2UgUmVuZGVyT2JqZWN0OjpkZXN0cm95KCkgaXMgbm90IGNhbGxlZCBmcm9tIGhlcmUuCisKIDIw MTEtMDEtMTcgIFlpIFNoZW4gIDx5aS40LnNoZW5Abm9raWEuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEFuZHJlYXMgS2xpbmcuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQ291bnRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckNvdW50ZXIuY3BwCShyZXZpc2lvbiA3NTk0NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJDb3VudGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM2LDExICsxMzYsNiBA QCBzdGF0aWMgYm9vbCBmaW5kUGxhY2VGb3JDb3VudGVyKFJlbmRlck9iCiAgICAgUmVuZGVyT2Jq ZWN0KiBjdXJyZW50UmVuZGVyZXIgPSBjb3VudGVyT3duZXItPnByZXZpb3VzSW5QcmVPcmRlcigp OwogICAgIHByZXZpb3VzU2libGluZyA9IDA7CiAgICAgd2hpbGUgKGN1cnJlbnRSZW5kZXJlcikg ewotICAgICAgICAvLyBBIHNpYmxpbmcgd2l0aG91dCBhIHBhcmVudCBtZWFucyB0aGF0IHRoZSBj b3VudGVyIG5vZGUgdHJlZSB3YXMgbm90IGNvbnN0cnVjdGVkIGNvcnJlY3RseSBzbyB3ZSBzdG9w IAotICAgICAgICAvLyB0cmF2ZXJzaW5nLiBJbiB0aGUgZnV0dXJlIFJlbmRlckNvdW50ZXIgc2hv dWxkIGhhbmRsZSBSZW5kZXJPYmplY3RzIHRoYXQgYXJlIG5vdCBjb25uZWN0ZWQgdG8gdGhlIAot ICAgICAgICAvLyByZW5kZXIgdHJlZSBhdCBjb3VudGVyIG5vZGUgY3JlYXRpb24uIFNlZSBidWcg NDM4MTIuIAotICAgICAgICBpZiAocHJldmlvdXNTaWJsaW5nICYmICFwcmV2aW91c1NpYmxpbmct PnBhcmVudCgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBDb3VudGVyTm9k ZSogY3VycmVudENvdW50ZXIgPSBtYWtlQ291bnRlck5vZGUoY3VycmVudFJlbmRlcmVyLCBpZGVu dGlmaWVyLCBmYWxzZSk7CiAgICAgICAgIGlmIChzZWFyY2hFbmRSZW5kZXJlciA9PSBjdXJyZW50 UmVuZGVyZXIpIHsKICAgICAgICAgICAgIC8vIFdlIG1heSBiZSBhdCB0aGUgZW5kIG9mIG91ciBz ZWFyY2guCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAko cmV2aXNpb24gNzU5NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzE2LDcgKzMxNiw2IEBAIHZvaWQgUmVuZGVyT2JqZWN0 OjphZGRDaGlsZChSZW5kZXJPYmplY3QKICAgICAgICAgLy8gSnVzdCBhZGQgaXQuLi4KICAgICAg ICAgY2hpbGRyZW4tPmluc2VydENoaWxkTm9kZSh0aGlzLCBuZXdDaGlsZCwgYmVmb3JlQ2hpbGQp OwogICAgIH0KLSAgICBSZW5kZXJDb3VudGVyOjpyZW5kZXJlclN1YnRyZWVBdHRhY2hlZChuZXdD aGlsZCk7IAogICAgIGlmIChuZXdDaGlsZC0+aXNUZXh0KCkgJiYgbmV3Q2hpbGQtPnN0eWxlKCkt PnRleHRUcmFuc2Zvcm0oKSA9PSBDQVBJVEFMSVpFKSB7CiAgICAgICAgIFJlZlB0cjxTdHJpbmdJ bXBsPiB0ZXh0VG9UcmFuc2Zvcm0gPSB0b1JlbmRlclRleHQobmV3Q2hpbGQpLT5vcmlnaW5hbFRl eHQoKTsKICAgICAgICAgaWYgKHRleHRUb1RyYW5zZm9ybSkKQEAgLTIxNzAsOSArMjE2OSw2IEBA IHZvaWQgUmVuZGVyT2JqZWN0OjpkZXN0cm95KCkKICAgICBpZiAoZnJhbWUoKSAmJiBmcmFtZSgp LT5ldmVudEhhbmRsZXIoKS0+YXV0b3Njcm9sbFJlbmRlcmVyKCkgPT0gdGhpcykKICAgICAgICAg ZnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPnN0b3BBdXRvc2Nyb2xsVGltZXIodHJ1ZSk7CiAKLSAg ICBpZiAobV9oYXNDb3VudGVyTm9kZU1hcCkKLSAgICAgICAgUmVuZGVyQ291bnRlcjo6ZGVzdHJv eUNvdW50ZXJOb2Rlcyh0aGlzKTsKLQogICAgIGlmIChBWE9iamVjdENhY2hlOjphY2Nlc3NpYmls aXR5RW5hYmxlZCgpKSB7CiAgICAgICAgIGRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+Y2hp bGRyZW5DaGFuZ2VkKHRoaXMtPnBhcmVudCgpKTsKICAgICAgICAgZG9jdW1lbnQoKS0+YXhPYmpl Y3RDYWNoZSgpLT5yZW1vdmUodGhpcyk7CkBAIC0yMTg1LDYgKzIxODEsMTQgQEAgdm9pZCBSZW5k ZXJPYmplY3Q6OmRlc3Ryb3koKQogCiAgICAgcmVtb3ZlKCk7CiAKKyAgICAvLyBJZiB0aGlzIHJl bmRlcmVyIGhhZCBhIHBhcmVudCwgcmVtb3ZlIHNob3VsZCBoYXZlIGRlc3Ryb3llZCBhbnkgY291 bnRlcnMKKyAgICAvLyBhdHRhY2hlZCB0byB0aGlzIHJlbmRlcmVyIGFuZCBtYXJrZWQgdGhlIGFm ZmVjdGVkIG90aGVyIGNvdW50ZXJzIGZvcgorICAgIC8vIHJlZXZhbHVhdGlvbi4gVGhpcyBhcHBh cmVudGx5IHJlZHVuZGFudCBjaGVjayBpcyBoZXJlIGZvciB0aGUgY2FzZSB3aGVuCisgICAgLy8g dGhpcyByZW5kZXJlciBoYWQgbm8gcGFyZW50IGF0IHRoZSB0aW1lIHJlbW92ZSgpIHdhcyBjYWxs ZWQuCisKKyAgICBpZiAobV9oYXNDb3VudGVyTm9kZU1hcCkKKyAgICAgICAgUmVuZGVyQ291bnRl cjo6ZGVzdHJveUNvdW50ZXJOb2Rlcyh0aGlzKTsKKwogICAgIC8vIEZJWE1FOiBXb3VsZCBsaWtl IHRvIGRvIHRoaXMgaW4gUmVuZGVyQm94TW9kZWxPYmplY3QsIGJ1dCB0aGUgdGltaW5nIGlzIHNv IGNvbXBsaWNhdGVkIHRoYXQgdGhpcyBjYW4ndCBlYXNpbHkKICAgICAvLyBiZSBtb3ZlZCBpbnRv IFJlbmRlckJveE1vZGVsT2JqZWN0OjpkZXN0cm95LgogICAgIGlmIChoYXNMYXllcigpKSB7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0Q2hpbGRMaXN0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0Q2hpbGRM aXN0LmNwcAkocmV2aXNpb24gNzU5NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyT2JqZWN0Q2hpbGRMaXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI4LDYgKzEyOCw5IEBA IFJlbmRlck9iamVjdCogUmVuZGVyT2JqZWN0Q2hpbGRMaXN0OjpyZW0KICAgICBvbGRDaGlsZC0+ c2V0TmV4dFNpYmxpbmcoMCk7CiAgICAgb2xkQ2hpbGQtPnNldFBhcmVudCgwKTsKIAorICAgIGlm IChvbGRDaGlsZC0+bV9oYXNDb3VudGVyTm9kZU1hcCkKKyAgICAgICAgUmVuZGVyQ291bnRlcjo6 ZGVzdHJveUNvdW50ZXJOb2RlcyhvbGRDaGlsZCk7CisKICAgICBpZiAoQVhPYmplY3RDYWNoZTo6 YWNjZXNzaWJpbGl0eUVuYWJsZWQoKSkKICAgICAgICAgb3duZXItPmRvY3VtZW50KCktPmF4T2Jq ZWN0Q2FjaGUoKS0+Y2hpbGRyZW5DaGFuZ2VkKG93bmVyKTsKIApAQCAtMTc1LDYgKzE3OCw3IEBA IHZvaWQgUmVuZGVyT2JqZWN0Q2hpbGRMaXN0OjphcHBlbmRDaGlsZE4KICAgICAgICAgICAgIG93 bmVyLT5kaXJ0eUxpbmVzRnJvbUNoYW5nZWRDaGlsZChuZXdDaGlsZCk7CiAgICAgfQogCisgICAg UmVuZGVyQ291bnRlcjo6cmVuZGVyZXJTdWJ0cmVlQXR0YWNoZWQobmV3Q2hpbGQpOwogICAgIG5l d0NoaWxkLT5zZXROZWVkc0xheW91dEFuZFByZWZXaWR0aHNSZWNhbGMoKTsgLy8gR29lcyB1cCB0 aGUgY29udGFpbmluZyBibG9jayBoaWVyYXJjaHkuCiAgICAgaWYgKCFvd25lci0+bm9ybWFsQ2hp bGROZWVkc0xheW91dCgpKQogICAgICAgICBvd25lci0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVl KTsgLy8gV2UgbWF5IHN1cHBseSB0aGUgc3RhdGljIHBvc2l0aW9uIGZvciBhbiBhYnNvbHV0ZSBw b3NpdGlvbmVkIGNoaWxkLgpAQCAtMjM0LDYgKzIzOCw3IEBAIHZvaWQgUmVuZGVyT2JqZWN0Q2hp bGRMaXN0OjppbnNlcnRDaGlsZE4KICAgICAgICAgICAgIG93bmVyLT5kaXJ0eUxpbmVzRnJvbUNo YW5nZWRDaGlsZChjaGlsZCk7CiAgICAgfQogCisgICAgUmVuZGVyQ291bnRlcjo6cmVuZGVyZXJT dWJ0cmVlQXR0YWNoZWQoY2hpbGQpOwogICAgIGNoaWxkLT5zZXROZWVkc0xheW91dEFuZFByZWZX aWR0aHNSZWNhbGMoKTsKICAgICBpZiAoIW93bmVyLT5ub3JtYWxDaGlsZE5lZWRzTGF5b3V0KCkp CiAgICAgICAgIG93bmVyLT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUpOyAvLyBXZSBtYXkgc3Vw cGx5IHRoZSBzdGF0aWMgcG9zaXRpb24gZm9yIGFuIGFic29sdXRlIHBvc2l0aW9uZWQgY2hpbGQu CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcAkocmV2aXNp b24gNzU5NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTIwLDggKzEyMCw2IEBAIHZvaWQgUmVuZGVyV2lkZ2V0OjpkZXN0 cm95KCkKICAgICBpZiAoUmVuZGVyVmlldyogdiA9IHZpZXcoKSkKICAgICAgICAgdi0+cmVtb3Zl V2lkZ2V0KHRoaXMpOwogCi0gICAgaWYgKG1faGFzQ291bnRlck5vZGVNYXApCi0gICAgICAgIFJl bmRlckNvdW50ZXI6OmRlc3Ryb3lDb3VudGVyTm9kZXModGhpcyk7CiAgICAgCiAgICAgaWYgKEFY T2JqZWN0Q2FjaGU6OmFjY2Vzc2liaWxpdHlFbmFibGVkKCkpIHsKICAgICAgICAgZG9jdW1lbnQo KS0+YXhPYmplY3RDYWNoZSgpLT5jaGlsZHJlbkNoYW5nZWQodGhpcy0+cGFyZW50KCkpOwpAQCAt MTI5LDYgKzEyNyw5IEBAIHZvaWQgUmVuZGVyV2lkZ2V0OjpkZXN0cm95KCkKICAgICB9CiAgICAg cmVtb3ZlKCk7CiAKKyAgICBpZiAobV9oYXNDb3VudGVyTm9kZU1hcCkKKyAgICAgICAgUmVuZGVy Q291bnRlcjo6ZGVzdHJveUNvdW50ZXJOb2Rlcyh0aGlzKTsKKwogICAgIHNldFdpZGdldCgwKTsK IAogICAgIC8vIHJlbW92ZXMgZnJvbSBvdmVycmlkZSBzaXplIG1hcAo=