50971 2010-12-13 14:08:21 -0800 Combine setShadowRoot and clearShadowRoot into a simpler API 2010-12-28 10:56:04 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 44907 1 dglazkov webkit-unassigned commit-queue oldest_to_newest 321396 0 dglazkov 2010-12-13 14:08:21 -0800 There's no need to have clearShadowHost, setShadowHost(0) should just do it, since it always needs to clean up previous value anyway. 321453 1 76446 dglazkov 2010-12-13 14:57:52 -0800 Created attachment 76446 Patch 321680 2 76446 darin 2010-12-13 22:12:01 -0800 Comment on attachment 76446 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=76446&action=review > WebCore/ChangeLog:5 > + Combine setShadowHost and clearShadowHost into a simpler API You mean setShadowRoot and clearShadowRoot, right? > WebCore/dom/Element.cpp:1093 > + } else if (!newRoot) I think this else is wrong. > WebCore/dom/Element.cpp:1097 > + newRoot->setShadowHost(this); If hasRareData was true and newRoot is a null pointer, then we’ll dereference the null pointer here. > WebCore/dom/Node.h:220 > + Element* shadowHost() const; > + void setShadowHost(Element*); Why are you making these member functions public? Seems unrelated to the rest of the patch? 322053 3 76446 dglazkov 2010-12-14 11:08:40 -0800 Comment on attachment 76446 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=76446&action=review Thanks for the review! New patch coming up. >> WebCore/dom/Element.cpp:1093 >> + } else if (!newRoot) > > I think this else is wrong. You're right! I don't know what I've been drinking last night. >> WebCore/dom/Element.cpp:1097 >> + newRoot->setShadowHost(this); > > If hasRareData was true and newRoot is a null pointer, then we’ll dereference the null pointer here. Yup. My "else" above was enabling this to happen. >> WebCore/dom/Node.h:220 >> + void setShadowHost(Element*); > > Why are you making these member functions public? Seems unrelated to the rest of the patch? Because I need to use setShadowHost() from Element::setShadowRoot() and thought I might as well bring shadowHost() out with it. 322054 4 76548 dglazkov 2010-12-14 11:11:57 -0800 Created attachment 76548 Now with less confusion. 322857 5 76548 eric 2010-12-15 15:22:48 -0800 Comment on attachment 76548 Now with less confusion. View in context: https://bugs.webkit.org/attachment.cgi?id=76548&action=review > WebCore/dom/Element.cpp:1093 > + if (RefPtr<Node> oldRoot = rareData()->m_shadowRoot.release()) { > + document()->removeFocusedNodeOfSubtree(oldRoot.get()); > + oldRoot->setShadowHost(0); > + if (oldRoot->inDocument()) > + oldRoot->removedFromDocument(); > + else > + oldRoot->removedFromTree(true); This feels like a helper method. 323224 6 76776 dglazkov 2010-12-16 09:39:05 -0800 Created attachment 76776 With more clarity in code. 326634 7 76776 eric 2010-12-24 09:05:48 -0800 Comment on attachment 76776 With more clarity in code. View in context: https://bugs.webkit.org/attachment.cgi?id=76776&action=review Seems OK to me. > WebCore/dom/Element.cpp:1087 > + // FIXME: Because today this is never called from script directly, we don't have to worry > + // about compromising DOM tree integrity (eg. node being a parent of this). However, > + // once we implement XBL2, we will have to add integrity checks here. Can we ASSERT here instead of just a FIXME? I'm not sure what we'd ASSERT though... > WebCore/dom/Element.cpp:1089 > + RefPtr<Node> newRoot = node; I'm not sure why you use the newRoot here. We don't really need the extra ref. Maybe Darin asked you to use a local RefPtr? > WebCore/dom/Element.cpp:1093 > + ensureRareData()->m_shadowRoot = newRoot; You could just assign it here w/o the check, no? > WebCore/dom/Element.cpp:1094 > + newRoot->setShadowHost(this); Then you would check ensureRareData()->m_shadowRoot before calling ensureRareData()->m_shadowRoot->setShadowHost(this)? Donno. Your current setup is fine too. 327244 8 76776 dglazkov 2010-12-28 09:06:30 -0800 Comment on attachment 76776 With more clarity in code. View in context: https://bugs.webkit.org/attachment.cgi?id=76776&action=review Cq to the resQUE! :) >> WebCore/dom/Element.cpp:1089 >> + RefPtr<Node> newRoot = node; > > I'm not sure why you use the newRoot here. We don't really need the extra ref. Maybe Darin asked you to use a local RefPtr? Yeah, I could've danced around this with just using node.get() when assigning m_shadowRoot to avoid PassRefPtr derefing. But I generally don't like using PassRefPtrs for doing anything other than passing :) >> WebCore/dom/Element.cpp:1093 >> + ensureRareData()->m_shadowRoot = newRoot; > > You could just assign it here w/o the check, no? No, because ensureRareData always creates a new ElementRareData, which is not necessary if newRoot is 0. 327264 9 commit-queue 2010-12-28 10:54:30 -0800 The commit-queue encountered the following flaky tests while processing attachment 76776: fast/workers/storage/use-same-database-in-page-and-workers.html bug 50995 (author: dumi@chromium.org) The commit-queue is continuing to process your patch. 327265 10 76776 commit-queue 2010-12-28 10:55:57 -0800 Comment on attachment 76776 With more clarity in code. Clearing flags on attachment: 76776 Committed r74715: <http://trac.webkit.org/changeset/74715> 327266 11 commit-queue 2010-12-28 10:56:04 -0800 All reviewed patches have been landed. Closing bug. 76446 2010-12-13 14:57:52 -0800 2010-12-14 11:11:54 -0800 Patch bug-50971-20101213145750.patch text/plain 3750 dglazkov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTlhNTU0OTQ1ZGQ3ZWFlODRhNGM5ZmM1NGRjODU1ZGQyNThkMzk0Yi4uNzI3NjUxYzU0NGU0MDdj YjU0YzYxM2NjYWNkNjYwY2I2MjI3ZDkxMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0xMi0xMyAgRGlt aXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbWJpbmUgc2V0U2hhZG93SG9zdCBhbmQg Y2xlYXJTaGFkb3dIb3N0IGludG8gYSBzaW1wbGVyIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA5NzEKKworICAgICAgICBObyBjaGFuZ2UgaW4g YmVoYXZpb3IsIGFuZCBBUEkgaXMgbm90IHVzZWQgeWV0LgorCisgICAgICAgICogZG9tL0VsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6c2V0U2hhZG93Um9vdCk6IENvbWJp bmVkIGNsZWFyaW5nIGFuZCBzZXR0aW5nIG9mCisgICAgICAgICAgICB0aGUgc2hhZG93Um9vdCwg YWxzbyBob29rZWQgdXAgd2l0aCBzZXR0aW5nIGFuZCBjbGVhcmluZyBvZiB0aGUKKyAgICAgICAg ICAgIGNvcnJlc3BvbmRpbmcgc2hhZG93SG9zdCB2YWx1ZXMuCisgICAgICAgICogZG9tL0VsZW1l bnQuaDogcmVtb3ZlZCBjbGVhclNoYWRvd1Jvb3QgZGVmLgorICAgICAgICAqIGRvbS9Ob2RlLmg6 IE1hZGUgc2hhZG93IGhvc3QtcmVsYXRlZCBmdW5jdGlvbnMgcHVibGljLgorCiAyMDEwLTEyLTEz ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmll d2VkIGJ1aWxkIGZpeCBhZnRlciByNzM4NDAuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9FbGVt ZW50LmNwcCBiL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IDhlNjMzYWE1ZTQ0YWQzYzky MzE1MDE5MjBkMmU5Y2ZiZTc0OGYxMmIuLmIyNjhkM2E3ZWM0MDgyNTc0ZWNiMmE5YmNjZGM5YWY0 NDk0ZTU3ZGYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1dlYkNv cmUvZG9tL0VsZW1lbnQuY3BwCkBAIC0xMDgwLDI0ICsxMDgwLDIxIEBAIE5vZGUqIEVsZW1lbnQ6 OnNoYWRvd1Jvb3QoKQogCiB2b2lkIEVsZW1lbnQ6OnNldFNoYWRvd1Jvb3QoUGFzc1JlZlB0cjxO b2RlPiBub2RlKQogewotICAgIEFTU0VSVChub2RlKTsKLQotICAgIC8vIEZJWE1FOiBPbmNlIGFs bCBpbnN0YW5jZXMgb2Ygc2hhZG93IERPTSBhcmUgY29udmVydGVkIHRvIHVzZSB0aGlzIGNvZGUs IGFkZCBzZXR0aW5nIG9mIHNoYWRvdyBob3N0IChzaGFkb3dQYXJlbnQpIG9uIG5vZGUuCi0gICAg ZW5zdXJlUmFyZURhdGEoKS0+bV9zaGFkb3dSb290ID0gbm9kZTsKLX0KLQotdm9pZCBFbGVtZW50 OjpjbGVhclNoYWRvd1Jvb3QoKQotewotICAgIGlmICghaGFzUmFyZURhdGEoKSkKKyAgICBSZWZQ dHI8Tm9kZT4gbmV3Um9vdCA9IG5vZGU7CisgICAgaWYgKGhhc1JhcmVEYXRhKCkpIHsKKyAgICAg ICAgaWYgKFJlZlB0cjxOb2RlPiBvbGRSb290ID0gcmFyZURhdGEoKS0+bV9zaGFkb3dSb290LnJl bGVhc2UoKSkgeworICAgICAgICAgICAgZG9jdW1lbnQoKS0+cmVtb3ZlRm9jdXNlZE5vZGVPZlN1 YnRyZWUob2xkUm9vdC5nZXQoKSk7CisgICAgICAgICAgICBvbGRSb290LT5zZXRTaGFkb3dIb3N0 KDApOworICAgICAgICAgICAgaWYgKG9sZFJvb3QtPmluRG9jdW1lbnQoKSkKKyAgICAgICAgICAg ICAgICBvbGRSb290LT5yZW1vdmVkRnJvbURvY3VtZW50KCk7CisgICAgICAgICAgICBlbHNlCisg ICAgICAgICAgICAgICAgb2xkUm9vdC0+cmVtb3ZlZEZyb21UcmVlKHRydWUpOworICAgICAgICB9 CisgICAgfSBlbHNlIGlmICghbmV3Um9vdCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgUmVmUHRy PE5vZGU+IHNoYWRvd1Jvb3QgPSByYXJlRGF0YSgpLT5tX3NoYWRvd1Jvb3QucmVsZWFzZSgpOwot ICAgIGRvY3VtZW50KCktPnJlbW92ZUZvY3VzZWROb2RlT2ZTdWJ0cmVlKHNoYWRvd1Jvb3QuZ2V0 KCkpOwotICAgIC8vIEZJWE1FOiBPbmNlIGFsbCBpbnN0YW5jZXMgb2Ygc2hhZG93IERPTSBhcmUg Y29udmVydGVkIHRvIHVzZSB0aGlzIGNvZGUsIGFkZCBjbGVhcmluZyBvZiBzaGFkb3cgaG9zdCAo c2hhZG93UGFyZW50KS4KLSAgICBpZiAoc2hhZG93Um9vdC0+aW5Eb2N1bWVudCgpKQotICAgICAg ICBzaGFkb3dSb290LT5yZW1vdmVkRnJvbURvY3VtZW50KCk7Ci0gICAgZWxzZQotICAgICAgICBz aGFkb3dSb290LT5yZW1vdmVkRnJvbVRyZWUodHJ1ZSk7CisgICAgZW5zdXJlUmFyZURhdGEoKS0+ bV9zaGFkb3dSb290ID0gbmV3Um9vdDsKKyAgICBuZXdSb290LT5zZXRTaGFkb3dIb3N0KHRoaXMp OwogfQogCiBib29sIEVsZW1lbnQ6OmNoaWxkVHlwZUFsbG93ZWQoTm9kZVR5cGUgdHlwZSkKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvZG9tL0VsZW1lbnQuaCBiL1dlYkNvcmUvZG9tL0VsZW1lbnQuaApp bmRleCA4NDMyZjgyNWViN2ZmZTJkMWZlYmViMDU1YTUxMzYyZmFiOTZhZDMxLi44Njg4NWJmODVm MWFlYjYwOTIxZjg2OTE0ZjQzMWI5NzZlZmQ1YzgzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9F bGVtZW50LmgKKysrIGIvV2ViQ29yZS9kb20vRWxlbWVudC5oCkBAIC0yMjcsNyArMjI3LDYgQEAg cHVibGljOgogCiAgICAgTm9kZSogc2hhZG93Um9vdCgpOwogICAgIHZvaWQgc2V0U2hhZG93Um9v dChQYXNzUmVmUHRyPE5vZGU+KTsKLSAgICB2b2lkIGNsZWFyU2hhZG93Um9vdCgpOwogCiAgICAg UmVuZGVyU3R5bGUqIGNvbXB1dGVkU3R5bGUoUHNldWRvSWQgPSBOT1BTRVVETyk7CiAKZGlmZiAt LWdpdCBhL1dlYkNvcmUvZG9tL05vZGUuaCBiL1dlYkNvcmUvZG9tL05vZGUuaAppbmRleCAwODgx ZjA4MDYwMjk5MGIzNjljY2EyNzg2ZjkzNWQyZDM1N2QwNDUxLi42ODhlYjNkOTBkMTllNjU0NTU3 NTQ2MDVlZmY5MWFiOWM5YWFhY2FlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9Ob2RlLmgKKysr IGIvV2ViQ29yZS9kb20vTm9kZS5oCkBAIC0yMTYsNiArMjE2LDkgQEAgcHVibGljOgogICAgIC8v IFVzZSB3aGVuIGl0J3MgZ3VhcmFudGVlZCB0byB0aGF0IHNoYWRvd1BhcmVudE5vZGUgaXMgMC4K ICAgICBDb250YWluZXJOb2RlKiBwYXJlbnROb2RlR3VhcmFudGVlZEhvc3RGcmVlKCkgY29uc3Q7 CiAKKyAgICBFbGVtZW50KiBzaGFkb3dIb3N0KCkgY29uc3Q7CisgICAgdm9pZCBzZXRTaGFkb3dI b3N0KEVsZW1lbnQqKTsKKwogICAgIC8vIFJldHVybnMgdGhlIGVuY2xvc2luZyBldmVudCBwYXJl bnQgbm9kZSAob3Igc2VsZikgdGhhdCwgd2hlbiBjbGlja2VkLCB3b3VsZCB0cmlnZ2VyIGEgbmF2 aWdhdGlvbi4KICAgICBOb2RlKiBlbmNsb3NpbmdMaW5rRXZlbnRQYXJlbnRPclNlbGYoKTsKIApA QCAtNjM4LDkgKzY0MSw2IEBAIHByb3RlY3RlZDoKICAgICBOb2RlUmFyZURhdGEqIHJhcmVEYXRh KCkgY29uc3Q7CiAgICAgTm9kZVJhcmVEYXRhKiBlbnN1cmVSYXJlRGF0YSgpOwogCi0gICAgRWxl bWVudCogc2hhZG93SG9zdCgpIGNvbnN0OwotICAgIHZvaWQgc2V0U2hhZG93SG9zdChFbGVtZW50 Kik7Ci0KIHByaXZhdGU6CiAjaWYgVVNFKEpTQykKICAgICB2b2lkIG1hcmtDYWNoZWROb2RlTGlz dHNTbG93KEpTQzo6TWFya1N0YWNrJiwgSlNDOjpKU0dsb2JhbERhdGEmKTsK 76548 2010-12-14 11:11:57 -0800 2010-12-16 09:39:02 -0800 Now with less confusion. bug-50971-20101214111156.patch text/plain 3749 dglazkov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NGQ3OTkyODQwYTI1MjdhNzE5ODg2M2U3ZWNkYWQwMzdhZWJkZmNiZi4uMmVhMzI5N2Y5ZjY0NmUx NWUyM2VjODY2NjU2MDVmNTgxZDMwZGU3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0xMi0xMyAgRGlt aXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbWJpbmUgc2V0U2hhZG93Um9vdCBhbmQg Y2xlYXJTaGFkb3dSb290IGludG8gYSBzaW1wbGVyIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA5NzEKKworICAgICAgICBObyBjaGFuZ2UgaW4g YmVoYXZpb3IsIGFuZCBBUEkgaXMgbm90IHVzZWQgeWV0LgorCisgICAgICAgICogZG9tL0VsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6c2V0U2hhZG93Um9vdCk6IENvbWJp bmVkIGNsZWFyaW5nIGFuZCBzZXR0aW5nIG9mCisgICAgICAgICAgICB0aGUgc2hhZG93Um9vdCwg YWxzbyBob29rZWQgdXAgd2l0aCBzZXR0aW5nIGFuZCBjbGVhcmluZyBvZiB0aGUKKyAgICAgICAg ICAgIGNvcnJlc3BvbmRpbmcgc2hhZG93SG9zdCB2YWx1ZXMuCisgICAgICAgICogZG9tL0VsZW1l bnQuaDogcmVtb3ZlZCBjbGVhclNoYWRvd1Jvb3QgZGVmLgorICAgICAgICAqIGRvbS9Ob2RlLmg6 IE1hZGUgc2hhZG93IGhvc3QtcmVsYXRlZCBmdW5jdGlvbnMgcHVibGljLgorCiAyMDEwLTEyLTE0 ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL0VsZW1l bnQuY3BwIGIvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggMDcwN2M5NjQyZjVlNmJkNjRi MmY1ODljYjAyYzg3N2I3MjQ0Yzk5Yy4uOTA5ZDgzZGE4OGZkZmM1YzAwODEzOWQ5NjgwODYzNzRl NTVlZjE3NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKKysrIGIvV2ViQ29y ZS9kb20vRWxlbWVudC5jcHAKQEAgLTEwODIsMjQgKzEwODIsMjMgQEAgTm9kZSogRWxlbWVudDo6 c2hhZG93Um9vdCgpCiAKIHZvaWQgRWxlbWVudDo6c2V0U2hhZG93Um9vdChQYXNzUmVmUHRyPE5v ZGU+IG5vZGUpCiB7Ci0gICAgQVNTRVJUKG5vZGUpOwotCi0gICAgLy8gRklYTUU6IE9uY2UgYWxs IGluc3RhbmNlcyBvZiBzaGFkb3cgRE9NIGFyZSBjb252ZXJ0ZWQgdG8gdXNlIHRoaXMgY29kZSwg YWRkIHNldHRpbmcgb2Ygc2hhZG93IGhvc3QgKHNoYWRvd1BhcmVudCkgb24gbm9kZS4KLSAgICBl bnN1cmVSYXJlRGF0YSgpLT5tX3NoYWRvd1Jvb3QgPSBub2RlOwotfQorICAgIFJlZlB0cjxOb2Rl PiBuZXdSb290ID0gbm9kZTsKKyAgICBpZiAoaGFzUmFyZURhdGEoKSkgeworICAgICAgICBpZiAo UmVmUHRyPE5vZGU+IG9sZFJvb3QgPSByYXJlRGF0YSgpLT5tX3NoYWRvd1Jvb3QucmVsZWFzZSgp KSB7CisgICAgICAgICAgICBkb2N1bWVudCgpLT5yZW1vdmVGb2N1c2VkTm9kZU9mU3VidHJlZShv bGRSb290LmdldCgpKTsKKyAgICAgICAgICAgIG9sZFJvb3QtPnNldFNoYWRvd0hvc3QoMCk7Cisg ICAgICAgICAgICBpZiAob2xkUm9vdC0+aW5Eb2N1bWVudCgpKQorICAgICAgICAgICAgICAgIG9s ZFJvb3QtPnJlbW92ZWRGcm9tRG9jdW1lbnQoKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAg ICAgICAgICBvbGRSb290LT5yZW1vdmVkRnJvbVRyZWUodHJ1ZSk7CisgICAgICAgIH0KKyAgICB9 CiAKLXZvaWQgRWxlbWVudDo6Y2xlYXJTaGFkb3dSb290KCkKLXsKLSAgICBpZiAoIWhhc1JhcmVE YXRhKCkpCisgICAgaWYgKCFuZXdSb290KQogICAgICAgICByZXR1cm47CiAKLSAgICBSZWZQdHI8 Tm9kZT4gc2hhZG93Um9vdCA9IHJhcmVEYXRhKCktPm1fc2hhZG93Um9vdC5yZWxlYXNlKCk7Ci0g ICAgZG9jdW1lbnQoKS0+cmVtb3ZlRm9jdXNlZE5vZGVPZlN1YnRyZWUoc2hhZG93Um9vdC5nZXQo KSk7Ci0gICAgLy8gRklYTUU6IE9uY2UgYWxsIGluc3RhbmNlcyBvZiBzaGFkb3cgRE9NIGFyZSBj b252ZXJ0ZWQgdG8gdXNlIHRoaXMgY29kZSwgYWRkIGNsZWFyaW5nIG9mIHNoYWRvdyBob3N0IChz aGFkb3dQYXJlbnQpLgotICAgIGlmIChzaGFkb3dSb290LT5pbkRvY3VtZW50KCkpCi0gICAgICAg IHNoYWRvd1Jvb3QtPnJlbW92ZWRGcm9tRG9jdW1lbnQoKTsKLSAgICBlbHNlCi0gICAgICAgIHNo YWRvd1Jvb3QtPnJlbW92ZWRGcm9tVHJlZSh0cnVlKTsKKyAgICBlbnN1cmVSYXJlRGF0YSgpLT5t X3NoYWRvd1Jvb3QgPSBuZXdSb290OworICAgIG5ld1Jvb3QtPnNldFNoYWRvd0hvc3QodGhpcyk7 CiB9CiAKIGJvb2wgRWxlbWVudDo6Y2hpbGRUeXBlQWxsb3dlZChOb2RlVHlwZSB0eXBlKQpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9kb20vRWxlbWVudC5oIGIvV2ViQ29yZS9kb20vRWxlbWVudC5oCmlu ZGV4IDg0MzJmODI1ZWI3ZmZlMmQxZmViZWIwNTVhNTEzNjJmYWI5NmFkMzEuLjg2ODg1YmY4NWYx YWViNjA5MjFmODY5MTRmNDMxYjk3NmVmZDVjODMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL0Vs ZW1lbnQuaAorKysgYi9XZWJDb3JlL2RvbS9FbGVtZW50LmgKQEAgLTIyNyw3ICsyMjcsNiBAQCBw dWJsaWM6CiAKICAgICBOb2RlKiBzaGFkb3dSb290KCk7CiAgICAgdm9pZCBzZXRTaGFkb3dSb290 KFBhc3NSZWZQdHI8Tm9kZT4pOwotICAgIHZvaWQgY2xlYXJTaGFkb3dSb290KCk7CiAKICAgICBS ZW5kZXJTdHlsZSogY29tcHV0ZWRTdHlsZShQc2V1ZG9JZCA9IE5PUFNFVURPKTsKIApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9kb20vTm9kZS5oIGIvV2ViQ29yZS9kb20vTm9kZS5oCmluZGV4IDA4ODFm MDgwNjAyOTkwYjM2OWNjYTI3ODZmOTM1ZDJkMzU3ZDA0NTEuLjY4OGViM2Q5MGQxOWU2NTQ1NTc1 NDYwNWVmZjkxYWI5YzlhYWFjYWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL05vZGUuaAorKysg Yi9XZWJDb3JlL2RvbS9Ob2RlLmgKQEAgLTIxNiw2ICsyMTYsOSBAQCBwdWJsaWM6CiAgICAgLy8g VXNlIHdoZW4gaXQncyBndWFyYW50ZWVkIHRvIHRoYXQgc2hhZG93UGFyZW50Tm9kZSBpcyAwLgog ICAgIENvbnRhaW5lck5vZGUqIHBhcmVudE5vZGVHdWFyYW50ZWVkSG9zdEZyZWUoKSBjb25zdDsK IAorICAgIEVsZW1lbnQqIHNoYWRvd0hvc3QoKSBjb25zdDsKKyAgICB2b2lkIHNldFNoYWRvd0hv c3QoRWxlbWVudCopOworCiAgICAgLy8gUmV0dXJucyB0aGUgZW5jbG9zaW5nIGV2ZW50IHBhcmVu dCBub2RlIChvciBzZWxmKSB0aGF0LCB3aGVuIGNsaWNrZWQsIHdvdWxkIHRyaWdnZXIgYSBuYXZp Z2F0aW9uLgogICAgIE5vZGUqIGVuY2xvc2luZ0xpbmtFdmVudFBhcmVudE9yU2VsZigpOwogCkBA IC02MzgsOSArNjQxLDYgQEAgcHJvdGVjdGVkOgogICAgIE5vZGVSYXJlRGF0YSogcmFyZURhdGEo KSBjb25zdDsKICAgICBOb2RlUmFyZURhdGEqIGVuc3VyZVJhcmVEYXRhKCk7CiAKLSAgICBFbGVt ZW50KiBzaGFkb3dIb3N0KCkgY29uc3Q7Ci0gICAgdm9pZCBzZXRTaGFkb3dIb3N0KEVsZW1lbnQq KTsKLQogcHJpdmF0ZToKICNpZiBVU0UoSlNDKQogICAgIHZvaWQgbWFya0NhY2hlZE5vZGVMaXN0 c1Nsb3coSlNDOjpNYXJrU3RhY2smLCBKU0M6OkpTR2xvYmFsRGF0YSYpOwo= 76776 2010-12-16 09:39:05 -0800 2010-12-28 10:55:57 -0800 With more clarity in code. bug-50971-20101216093903.patch text/plain 4451 dglazkov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTU5ODNhMzdmYjVlMGFhMzc2MDA0MjAxMmFiNDc0MTQxZTM4MzEwOS4uZjI3NjNjNWFlMzdiMWFl ODdiNTlkYjkzZmE4ZjJmNWJkNWI2YzFhMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0xMi0xNiAgRGlt aXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbWJpbmUgc2V0U2hhZG93Um9vdCBhbmQg Y2xlYXJTaGFkb3dSb290IGludG8gYSBzaW1wbGVyIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA5NzEKKworICAgICAgICBObyBjaGFuZ2UgaW4g YmVoYXZpb3IsIGFuZCBBUEkgaXMgbm90IHVzZWQgeWV0LgorCisgICAgICAgICogZG9tL0VsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6c2V0U2hhZG93Um9vdCk6IENvbWJp bmVkIGNsZWFyaW5nIGFuZCBzZXR0aW5nIG9mCisgICAgICAgICAgICB0aGUgc2hhZG93Um9vdCwg YWxzbyBob29rZWQgdXAgd2l0aCBzZXR0aW5nIGFuZCBjbGVhcmluZyBvZiB0aGUKKyAgICAgICAg ICAgIGNvcnJlc3BvbmRpbmcgc2hhZG93SG9zdCB2YWx1ZXMuCisgICAgICAgICogZG9tL0VsZW1l bnQuaDogcmVuYW1lZCBjbGVhclNoYWRvd1Jvb3QgdG8gcmVtb3ZlU2hhZG93Um9vdCBhbmQgbWFk ZSBpdAorICAgICAgICAgICAgcHJpdmF0ZS4KKyAgICAgICAgKiBkb20vTm9kZS5oOiBNYWRlIHNo YWRvdyBob3N0LXJlbGF0ZWQgZnVuY3Rpb25zIHB1YmxpYyBzbyB0aGF0CisgICAgICAgICAgICBF bGVtZW50OjpzZXRTaGFkb3dSb290IGNhbiBhY2Nlc3Mgc2V0U2hhZG93SG9zdC4gSXQgc2VlbXMg bG9naWNhbAorICAgICAgICAgICAgdG8gbWFrZSBzaGFkb3dIb3N0IHB1YmxpYyBhcyB3ZWxsIHRv IGtlZXAgdGhlIGRlZnMgdG9nZXRoZXIuCisKIDIwMTAtMTItMTYgIFl1cnkgU2VtaWtoYXRza3kg IDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1h bi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvV2ViQ29yZS9kb20vRWxl bWVudC5jcHAKaW5kZXggMDcwN2M5NjQyZjVlNmJkNjRiMmY1ODljYjAyYzg3N2I3MjQ0Yzk5Yy4u YTdjZDdiYTg2NGMyZGI2M2NhNjMwZWIyY2VkZmIyNGI1ZjgyNzNlOCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9kb20vRWxlbWVudC5jcHAKKysrIGIvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTEw ODIsMjQgKzEwODIsMzEgQEAgTm9kZSogRWxlbWVudDo6c2hhZG93Um9vdCgpCiAKIHZvaWQgRWxl bWVudDo6c2V0U2hhZG93Um9vdChQYXNzUmVmUHRyPE5vZGU+IG5vZGUpCiB7Ci0gICAgQVNTRVJU KG5vZGUpOworICAgIC8vIEZJWE1FOiBCZWNhdXNlIHRvZGF5IHRoaXMgaXMgbmV2ZXIgY2FsbGVk IGZyb20gc2NyaXB0IGRpcmVjdGx5LCB3ZSBkb24ndCBoYXZlIHRvIHdvcnJ5CisgICAgLy8gYWJv dXQgY29tcHJvbWlzaW5nIERPTSB0cmVlIGludGVncml0eSAoZWcuIG5vZGUgYmVpbmcgYSBwYXJl bnQgb2YgdGhpcykuIEhvd2V2ZXIsCisgICAgLy8gb25jZSB3ZSBpbXBsZW1lbnQgWEJMMiwgd2Ug d2lsbCBoYXZlIHRvIGFkZCBpbnRlZ3JpdHkgY2hlY2tzIGhlcmUuCisgICAgcmVtb3ZlU2hhZG93 Um9vdCgpOworICAgIFJlZlB0cjxOb2RlPiBuZXdSb290ID0gbm9kZTsKKyAgICBpZiAoIW5ld1Jv b3QpCisgICAgICAgIHJldHVybjsKIAotICAgIC8vIEZJWE1FOiBPbmNlIGFsbCBpbnN0YW5jZXMg b2Ygc2hhZG93IERPTSBhcmUgY29udmVydGVkIHRvIHVzZSB0aGlzIGNvZGUsIGFkZCBzZXR0aW5n IG9mIHNoYWRvdyBob3N0IChzaGFkb3dQYXJlbnQpIG9uIG5vZGUuCi0gICAgZW5zdXJlUmFyZURh dGEoKS0+bV9zaGFkb3dSb290ID0gbm9kZTsKKyAgICBlbnN1cmVSYXJlRGF0YSgpLT5tX3NoYWRv d1Jvb3QgPSBuZXdSb290OworICAgIG5ld1Jvb3QtPnNldFNoYWRvd0hvc3QodGhpcyk7CiB9CiAK LXZvaWQgRWxlbWVudDo6Y2xlYXJTaGFkb3dSb290KCkKK3ZvaWQgRWxlbWVudDo6cmVtb3ZlU2hh ZG93Um9vdCgpCiB7CiAgICAgaWYgKCFoYXNSYXJlRGF0YSgpKQogICAgICAgICByZXR1cm47CiAK LSAgICBSZWZQdHI8Tm9kZT4gc2hhZG93Um9vdCA9IHJhcmVEYXRhKCktPm1fc2hhZG93Um9vdC5y ZWxlYXNlKCk7Ci0gICAgZG9jdW1lbnQoKS0+cmVtb3ZlRm9jdXNlZE5vZGVPZlN1YnRyZWUoc2hh ZG93Um9vdC5nZXQoKSk7Ci0gICAgLy8gRklYTUU6IE9uY2UgYWxsIGluc3RhbmNlcyBvZiBzaGFk b3cgRE9NIGFyZSBjb252ZXJ0ZWQgdG8gdXNlIHRoaXMgY29kZSwgYWRkIGNsZWFyaW5nIG9mIHNo YWRvdyBob3N0IChzaGFkb3dQYXJlbnQpLgotICAgIGlmIChzaGFkb3dSb290LT5pbkRvY3VtZW50 KCkpCi0gICAgICAgIHNoYWRvd1Jvb3QtPnJlbW92ZWRGcm9tRG9jdW1lbnQoKTsKLSAgICBlbHNl Ci0gICAgICAgIHNoYWRvd1Jvb3QtPnJlbW92ZWRGcm9tVHJlZSh0cnVlKTsKKyAgICBpZiAoUmVm UHRyPE5vZGU+IG9sZFJvb3QgPSByYXJlRGF0YSgpLT5tX3NoYWRvd1Jvb3QucmVsZWFzZSgpKSB7 CisgICAgICAgIGRvY3VtZW50KCktPnJlbW92ZUZvY3VzZWROb2RlT2ZTdWJ0cmVlKG9sZFJvb3Qu Z2V0KCkpOworICAgICAgICBvbGRSb290LT5zZXRTaGFkb3dIb3N0KDApOworICAgICAgICBpZiAo b2xkUm9vdC0+aW5Eb2N1bWVudCgpKQorICAgICAgICAgICAgb2xkUm9vdC0+cmVtb3ZlZEZyb21E b2N1bWVudCgpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBvbGRSb290LT5yZW1vdmVkRnJv bVRyZWUodHJ1ZSk7CisgICAgfQogfQogCiBib29sIEVsZW1lbnQ6OmNoaWxkVHlwZUFsbG93ZWQo Tm9kZVR5cGUgdHlwZSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL0VsZW1lbnQuaCBiL1dlYkNv cmUvZG9tL0VsZW1lbnQuaAppbmRleCA4NDMyZjgyNWViN2ZmZTJkMWZlYmViMDU1YTUxMzYyZmFi OTZhZDMxLi40YWY5OWUyMzY1NGE4ZmIyODQ4ZDBlMGEwMzgwYzYzNDUwZGExMzQxIDEwMDY0NAot LS0gYS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKKysrIGIvV2ViQ29yZS9kb20vRWxlbWVudC5oCkBA IC0yMjcsNyArMjI3LDYgQEAgcHVibGljOgogCiAgICAgTm9kZSogc2hhZG93Um9vdCgpOwogICAg IHZvaWQgc2V0U2hhZG93Um9vdChQYXNzUmVmUHRyPE5vZGU+KTsKLSAgICB2b2lkIGNsZWFyU2hh ZG93Um9vdCgpOwogCiAgICAgUmVuZGVyU3R5bGUqIGNvbXB1dGVkU3R5bGUoUHNldWRvSWQgPSBO T1BTRVVETyk7CiAKQEAgLTM5Miw2ICszOTEsNyBAQCBwcml2YXRlOgogICAgIEVsZW1lbnRSYXJl RGF0YSogZW5zdXJlUmFyZURhdGEoKTsKIAogICAgIFNwZWxsY2hlY2tBdHRyaWJ1dGVTdGF0ZSBz cGVsbGNoZWNrQXR0cmlidXRlU3RhdGUoKSBjb25zdDsKKyAgICB2b2lkIHJlbW92ZVNoYWRvd1Jv b3QoKTsKIAogcHJpdmF0ZToKICAgICBtdXRhYmxlIFJlZlB0cjxOYW1lZE5vZGVNYXA+IG1fYXR0 cmlidXRlTWFwOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vTm9kZS5oIGIvV2ViQ29yZS9kb20v Tm9kZS5oCmluZGV4IDA4ODFmMDgwNjAyOTkwYjM2OWNjYTI3ODZmOTM1ZDJkMzU3ZDA0NTEuLjY4 OGViM2Q5MGQxOWU2NTQ1NTc1NDYwNWVmZjkxYWI5YzlhYWFjYWUgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvZG9tL05vZGUuaAorKysgYi9XZWJDb3JlL2RvbS9Ob2RlLmgKQEAgLTIxNiw2ICsyMTYsOSBA QCBwdWJsaWM6CiAgICAgLy8gVXNlIHdoZW4gaXQncyBndWFyYW50ZWVkIHRvIHRoYXQgc2hhZG93 UGFyZW50Tm9kZSBpcyAwLgogICAgIENvbnRhaW5lck5vZGUqIHBhcmVudE5vZGVHdWFyYW50ZWVk SG9zdEZyZWUoKSBjb25zdDsKIAorICAgIEVsZW1lbnQqIHNoYWRvd0hvc3QoKSBjb25zdDsKKyAg ICB2b2lkIHNldFNoYWRvd0hvc3QoRWxlbWVudCopOworCiAgICAgLy8gUmV0dXJucyB0aGUgZW5j bG9zaW5nIGV2ZW50IHBhcmVudCBub2RlIChvciBzZWxmKSB0aGF0LCB3aGVuIGNsaWNrZWQsIHdv dWxkIHRyaWdnZXIgYSBuYXZpZ2F0aW9uLgogICAgIE5vZGUqIGVuY2xvc2luZ0xpbmtFdmVudFBh cmVudE9yU2VsZigpOwogCkBAIC02MzgsOSArNjQxLDYgQEAgcHJvdGVjdGVkOgogICAgIE5vZGVS YXJlRGF0YSogcmFyZURhdGEoKSBjb25zdDsKICAgICBOb2RlUmFyZURhdGEqIGVuc3VyZVJhcmVE YXRhKCk7CiAKLSAgICBFbGVtZW50KiBzaGFkb3dIb3N0KCkgY29uc3Q7Ci0gICAgdm9pZCBzZXRT aGFkb3dIb3N0KEVsZW1lbnQqKTsKLQogcHJpdmF0ZToKICNpZiBVU0UoSlNDKQogICAgIHZvaWQg bWFya0NhY2hlZE5vZGVMaXN0c1Nsb3coSlNDOjpNYXJrU3RhY2smLCBKU0M6OkpTR2xvYmFsRGF0 YSYpOwo=