100300 2012-10-24 15:51:23 -0700 Remove the circular reference between TextTrack and TextTrackCue 2012-10-26 11:51:40 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All Unspecified RESOLVED FIXED P2 Normal --- 1 acolwell acolwell eric.carlson webkit.review.bot oldest_to_newest 750148 0 acolwell 2012-10-24 15:51:23 -0700 Remove the circular reference between TextTrack and TextTrackCue 750152 1 170497 acolwell 2012-10-24 15:55:35 -0700 Created attachment 170497 Patch 750196 2 170509 acolwell 2012-10-24 16:34:25 -0700 Created attachment 170509 Removed fprintf() accidentally left in the previous patch. 752173 3 170509 eric.carlson 2012-10-26 10:43:15 -0700 Comment on attachment 170509 Removed fprintf() accidentally left in the previous patch. View in context: https://bugs.webkit.org/attachment.cgi?id=170509&action=review > Source/WebCore/ChangeLog:8 > + Changed TextTrackCue.m_track to a normal pointer to break the circular reference that was keeping both objects from ever getting deleted. Nit: this would be easier to read if the line was wrapped. > Source/WebCore/html/track/TextTrack.cpp:120 > + for (size_t i = 0; i < m_cues->length(); ++i) > + m_cues->item(i)->setTrack(0); > + > + if (m_client) > + m_client->textTrackRemoveCues(this, m_cues.get()); This should call textTrackRemoveCues before setTrack(0) because the client may need the cue's Track. 752205 4 170965 acolwell 2012-10-26 11:12:27 -0700 Created attachment 170965 Addressed CR comments 752238 5 170965 webkit.review.bot 2012-10-26 11:51:37 -0700 Comment on attachment 170965 Addressed CR comments Clearing flags on attachment: 170965 Committed r132681: <http://trac.webkit.org/changeset/132681> 752239 6 webkit.review.bot 2012-10-26 11:51:40 -0700 All reviewed patches have been landed. Closing bug. 170497 2012-10-24 15:55:35 -0700 2012-10-24 16:34:23 -0700 Patch bug-100300-20121024155409.patch text/plain 3852 acolwell U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjVmOGY2NDA4ZDlmNzY2 NGVlMTM3ZjYyNmYwODkzYjQ1MmExYzcxMy4uNTM3MWJiYWMxZjRlOTliZDdjYTU2ZGRmZTIzNTZk NjExNGE3ZDE3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTEwLTI0ICBBYXJv biBDb2x3ZWxsICA8YWNvbHdlbGxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSB0aGUg Y2lyY3VsYXIgcmVmZXJlbmNlIGJldHdlZW4gVGV4dFRyYWNrIGFuZCBUZXh0VHJhY2tDdWUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDMwMAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZWQgVGV4 dFRyYWNrQ3VlLm1fdHJhY2sgdG8gYSBub3JtYWwgcG9pbnRlciB0byBicmVhayB0aGUgY2lyY3Vs YXIgcmVmZXJlbmNlIHRoYXQgd2FzIGtlZXBpbmcgYm90aCBvYmplY3RzIGZyb20gZXZlciBnZXR0 aW5nIGRlbGV0ZWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIHNpbXBseSBmaXhlcyBh IG1lbW9yeSBsZWFrLgorCisgICAgICAgICogaHRtbC90cmFjay9UZXh0VHJhY2suY3BwOgorICAg ICAgICAoV2ViQ29yZTo6VGV4dFRyYWNrOjp+VGV4dFRyYWNrKToKKyAgICAgICAgKiBodG1sL3Ry YWNrL1RleHRUcmFja0N1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0VHJhY2tDdWU6OlRl eHRUcmFja0N1ZSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0VHJhY2tDdWU6On5UZXh0VHJhY2tD dWUpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFRyYWNrQ3VlOjp0cmFjayk6CisgICAgICAgIChX ZWJDb3JlOjpUZXh0VHJhY2tDdWU6OnNldFRyYWNrKToKKyAgICAgICAgKiBodG1sL3RyYWNrL1Rl eHRUcmFja0N1ZS5oOgorICAgICAgICAoVGV4dFRyYWNrQ3VlKToKKwogMjAxMi0xMC0yNCAgU2Fp bGVzaCBBZ3Jhd2FsICA8c2FpbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgSW5jb3JyZWN0IGtl eWNvZGVzIGZvciBudW1wYWQgLywgLSwgKywgLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC90cmFjay9UZXh0VHJhY2suY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0 VHJhY2suY3BwCmluZGV4IDk4NmEzZjU3Yjk0ZjAzNzI1NzFhYzFiZGQ4ZjhkYmU0NDg4ZDM2MWYu LmMzZThhNzEzM2M0NTZlYWJhOTY0MjVlYzZhNzU3MGY5ZDJkODBhZWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3RyYWNrL1RleHRUcmFjay5jcHAKQEAgLTExMiw4ICsxMTIsMTMgQEAgVGV4dFRyYWNr OjpUZXh0VHJhY2soU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgVGV4dFRyYWNrQ2xp ZW50KiBjbGllbnQsIGMKIAogVGV4dFRyYWNrOjp+VGV4dFRyYWNrKCkKIHsKLSAgICBpZiAobV9j bGllbnQgJiYgbV9jdWVzKQotICAgICAgICBtX2NsaWVudC0+dGV4dFRyYWNrUmVtb3ZlQ3Vlcyh0 aGlzLCBtX2N1ZXMuZ2V0KCkpOworICAgIGlmIChtX2N1ZXMpIHsKKyAgICAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBtX2N1ZXMtPmxlbmd0aCgpOyArK2kpCisgICAgICAgICAgICBtX2N1ZXMt Pml0ZW0oaSktPnNldFRyYWNrKDApOworCisgICAgICAgIGlmIChtX2NsaWVudCkKKyAgICAgICAg ICAgIG1fY2xpZW50LT50ZXh0VHJhY2tSZW1vdmVDdWVzKHRoaXMsIG1fY3Vlcy5nZXQoKSk7Cisg ICAgfQogICAgIGNsZWFyQ2xpZW50KCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2sv VGV4dFRyYWNrQ3VlLmNwcAppbmRleCBiYjczNDQ1ZTU3Mzk5Mjg3YThjZGMyMmQ1NDJmMGZiNGYw ODViMWRmLi43MGI2NDlkYjNjMWQzMjNhNWRjODZkMTQ3ZDE4MzI3ODc0ZmZmOWI2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuY3BwCkBAIC0yMTAsNiArMjEwLDcg QEAgVGV4dFRyYWNrQ3VlOjpUZXh0VHJhY2tDdWUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29u dGV4dCwgZG91YmxlIHN0YXJ0LCBkb3VibGUKICAgICAsIG1fd3JpdGluZ0RpcmVjdGlvbihIb3Jp em9udGFsKQogICAgICwgbV9jdWVBbGlnbm1lbnQoTWlkZGxlKQogICAgICwgbV9kb2N1bWVudEZy YWdtZW50KDApCisgICAgLCBtX3RyYWNrKDApCiAgICAgLCBtX3NjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoY29udGV4dCkKICAgICAsIG1faXNBY3RpdmUoZmFsc2UpCiAgICAgLCBtX3BhdXNlT25FeGl0 KGZhbHNlKQpAQCAtMjM0LDYgKzIzNSw3IEBAIFRleHRUcmFja0N1ZTo6VGV4dFRyYWNrQ3VlKFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIGRvdWJsZSBzdGFydCwgZG91YmxlCiAKIFRl eHRUcmFja0N1ZTo6flRleHRUcmFja0N1ZSgpCiB7CisgICAgZnByaW50ZihzdGRlcnIsICJ+VGV4 dFRyYWNrQ3VlKClcbiIpOwogfQogCiB2b2lkIFRleHRUcmFja0N1ZTo6Y3VlV2lsbENoYW5nZSgp CkBAIC0yNTIsMTAgKzI1NCwxMCBAQCB2b2lkIFRleHRUcmFja0N1ZTo6Y3VlRGlkQ2hhbmdlKCkK IAogVGV4dFRyYWNrKiBUZXh0VHJhY2tDdWU6OnRyYWNrKCkgY29uc3QKIHsKLSAgICByZXR1cm4g bV90cmFjay5nZXQoKTsKKyAgICByZXR1cm4gbV90cmFjazsKIH0KIAotdm9pZCBUZXh0VHJhY2tD dWU6OnNldFRyYWNrKFBhc3NSZWZQdHI8VGV4dFRyYWNrPnRyYWNrKQordm9pZCBUZXh0VHJhY2tD dWU6OnNldFRyYWNrKFRleHRUcmFjayogdHJhY2spCiB7CiAgICAgbV90cmFjayA9IHRyYWNrOwog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuaCBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmgKaW5kZXggM2UyOWQxZTc0 MjU4ZjczMThjMGI3MTFjMDk5ODcwMWQ0ZWRiZjBhNy4uMDFhMGU2NjAzN2E1MGMxNmRiODQ0MTFh ZTJkZDJmMWU0MzMwNjQ1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9U ZXh0VHJhY2tDdWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1 ZS5oCkBAIC04NSw3ICs4NSw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgY29uc3QgQXRvbWljU3Ry aW5nJiBmdXR1cmVOb2Rlc1NoYWRvd1BzZXVkb0lkKCk7CiAKICAgICBUZXh0VHJhY2sqIHRyYWNr KCkgY29uc3Q7Ci0gICAgdm9pZCBzZXRUcmFjayhQYXNzUmVmUHRyPFRleHRUcmFjaz4pOworICAg IHZvaWQgc2V0VHJhY2soVGV4dFRyYWNrKik7CiAKICAgICBjb25zdCBTdHJpbmcmIGlkKCkgY29u c3QgeyByZXR1cm4gbV9pZDsgfQogICAgIHZvaWQgc2V0SWQoY29uc3QgU3RyaW5nJik7CkBAIC0x OTcsNyArMTk3LDcgQEAgcHJpdmF0ZToKICAgICBBbGlnbm1lbnQgbV9jdWVBbGlnbm1lbnQ7CiAK ICAgICBSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gbV9kb2N1bWVudEZyYWdtZW50OwotICAgIFJl ZlB0cjxUZXh0VHJhY2s+IG1fdHJhY2s7CisgICAgVGV4dFRyYWNrKiBtX3RyYWNrOwogCiAgICAg RXZlbnRUYXJnZXREYXRhIG1fZXZlbnRUYXJnZXREYXRhOwogICAgIFNjcmlwdEV4ZWN1dGlvbkNv bnRleHQqIG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dDsK 170509 2012-10-24 16:34:25 -0700 2012-10-26 11:12:25 -0700 Removed fprintf() accidentally left in the previous patch. bug-100300-20121024163300.patch text/plain 3631 acolwell U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjVmOGY2NDA4ZDlmNzY2 NGVlMTM3ZjYyNmYwODkzYjQ1MmExYzcxMy4uNTM3MWJiYWMxZjRlOTliZDdjYTU2ZGRmZTIzNTZk NjExNGE3ZDE3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTEwLTI0ICBBYXJv biBDb2x3ZWxsICA8YWNvbHdlbGxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSB0aGUg Y2lyY3VsYXIgcmVmZXJlbmNlIGJldHdlZW4gVGV4dFRyYWNrIGFuZCBUZXh0VHJhY2tDdWUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDMwMAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZWQgVGV4 dFRyYWNrQ3VlLm1fdHJhY2sgdG8gYSBub3JtYWwgcG9pbnRlciB0byBicmVhayB0aGUgY2lyY3Vs YXIgcmVmZXJlbmNlIHRoYXQgd2FzIGtlZXBpbmcgYm90aCBvYmplY3RzIGZyb20gZXZlciBnZXR0 aW5nIGRlbGV0ZWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIHNpbXBseSBmaXhlcyBh IG1lbW9yeSBsZWFrLgorCisgICAgICAgICogaHRtbC90cmFjay9UZXh0VHJhY2suY3BwOgorICAg ICAgICAoV2ViQ29yZTo6VGV4dFRyYWNrOjp+VGV4dFRyYWNrKToKKyAgICAgICAgKiBodG1sL3Ry YWNrL1RleHRUcmFja0N1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0VHJhY2tDdWU6OlRl eHRUcmFja0N1ZSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0VHJhY2tDdWU6On5UZXh0VHJhY2tD dWUpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFRyYWNrQ3VlOjp0cmFjayk6CisgICAgICAgIChX ZWJDb3JlOjpUZXh0VHJhY2tDdWU6OnNldFRyYWNrKToKKyAgICAgICAgKiBodG1sL3RyYWNrL1Rl eHRUcmFja0N1ZS5oOgorICAgICAgICAoVGV4dFRyYWNrQ3VlKToKKwogMjAxMi0xMC0yNCAgU2Fp bGVzaCBBZ3Jhd2FsICA8c2FpbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgSW5jb3JyZWN0IGtl eWNvZGVzIGZvciBudW1wYWQgLywgLSwgKywgLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC90cmFjay9UZXh0VHJhY2suY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0 VHJhY2suY3BwCmluZGV4IDk4NmEzZjU3Yjk0ZjAzNzI1NzFhYzFiZGQ4ZjhkYmU0NDg4ZDM2MWYu LmMzZThhNzEzM2M0NTZlYWJhOTY0MjVlYzZhNzU3MGY5ZDJkODBhZWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3RyYWNrL1RleHRUcmFjay5jcHAKQEAgLTExMiw4ICsxMTIsMTMgQEAgVGV4dFRyYWNr OjpUZXh0VHJhY2soU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgVGV4dFRyYWNrQ2xp ZW50KiBjbGllbnQsIGMKIAogVGV4dFRyYWNrOjp+VGV4dFRyYWNrKCkKIHsKLSAgICBpZiAobV9j bGllbnQgJiYgbV9jdWVzKQotICAgICAgICBtX2NsaWVudC0+dGV4dFRyYWNrUmVtb3ZlQ3Vlcyh0 aGlzLCBtX2N1ZXMuZ2V0KCkpOworICAgIGlmIChtX2N1ZXMpIHsKKyAgICAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBtX2N1ZXMtPmxlbmd0aCgpOyArK2kpCisgICAgICAgICAgICBtX2N1ZXMt Pml0ZW0oaSktPnNldFRyYWNrKDApOworCisgICAgICAgIGlmIChtX2NsaWVudCkKKyAgICAgICAg ICAgIG1fY2xpZW50LT50ZXh0VHJhY2tSZW1vdmVDdWVzKHRoaXMsIG1fY3Vlcy5nZXQoKSk7Cisg ICAgfQogICAgIGNsZWFyQ2xpZW50KCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2sv VGV4dFRyYWNrQ3VlLmNwcAppbmRleCBiYjczNDQ1ZTU3Mzk5Mjg3YThjZGMyMmQ1NDJmMGZiNGYw ODViMWRmLi5hMDRiMWI4Y2JmODdiNzliN2NmMWNkZTM1YmI5MDdlNGIwMTAxMWZmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuY3BwCkBAIC0yMTAsNiArMjEwLDcg QEAgVGV4dFRyYWNrQ3VlOjpUZXh0VHJhY2tDdWUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29u dGV4dCwgZG91YmxlIHN0YXJ0LCBkb3VibGUKICAgICAsIG1fd3JpdGluZ0RpcmVjdGlvbihIb3Jp em9udGFsKQogICAgICwgbV9jdWVBbGlnbm1lbnQoTWlkZGxlKQogICAgICwgbV9kb2N1bWVudEZy YWdtZW50KDApCisgICAgLCBtX3RyYWNrKDApCiAgICAgLCBtX3NjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoY29udGV4dCkKICAgICAsIG1faXNBY3RpdmUoZmFsc2UpCiAgICAgLCBtX3BhdXNlT25FeGl0 KGZhbHNlKQpAQCAtMjUyLDEwICsyNTMsMTAgQEAgdm9pZCBUZXh0VHJhY2tDdWU6OmN1ZURpZENo YW5nZSgpCiAKIFRleHRUcmFjayogVGV4dFRyYWNrQ3VlOjp0cmFjaygpIGNvbnN0CiB7Ci0gICAg cmV0dXJuIG1fdHJhY2suZ2V0KCk7CisgICAgcmV0dXJuIG1fdHJhY2s7CiB9CiAKLXZvaWQgVGV4 dFRyYWNrQ3VlOjpzZXRUcmFjayhQYXNzUmVmUHRyPFRleHRUcmFjaz50cmFjaykKK3ZvaWQgVGV4 dFRyYWNrQ3VlOjpzZXRUcmFjayhUZXh0VHJhY2sqIHRyYWNrKQogewogICAgIG1fdHJhY2sgPSB0 cmFjazsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNr Q3VlLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5oCmluZGV4IDNl MjlkMWU3NDI1OGY3MzE4YzBiNzExYzA5OTg3MDFkNGVkYmYwYTcuLjAxYTBlNjYwMzdhNTBjMTZk Yjg0NDExYWUyZGQyZjFlNDMzMDY0NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv dHJhY2svVGV4dFRyYWNrQ3VlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0 VHJhY2tDdWUuaApAQCAtODUsNyArODUsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IEF0 b21pY1N0cmluZyYgZnV0dXJlTm9kZXNTaGFkb3dQc2V1ZG9JZCgpOwogCiAgICAgVGV4dFRyYWNr KiB0cmFjaygpIGNvbnN0OwotICAgIHZvaWQgc2V0VHJhY2soUGFzc1JlZlB0cjxUZXh0VHJhY2s+ KTsKKyAgICB2b2lkIHNldFRyYWNrKFRleHRUcmFjayopOwogCiAgICAgY29uc3QgU3RyaW5nJiBp ZCgpIGNvbnN0IHsgcmV0dXJuIG1faWQ7IH0KICAgICB2b2lkIHNldElkKGNvbnN0IFN0cmluZyYp OwpAQCAtMTk3LDcgKzE5Nyw3IEBAIHByaXZhdGU6CiAgICAgQWxpZ25tZW50IG1fY3VlQWxpZ25t ZW50OwogCiAgICAgUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IG1fZG9jdW1lbnRGcmFnbWVudDsK LSAgICBSZWZQdHI8VGV4dFRyYWNrPiBtX3RyYWNrOworICAgIFRleHRUcmFjayogbV90cmFjazsK IAogICAgIEV2ZW50VGFyZ2V0RGF0YSBtX2V2ZW50VGFyZ2V0RGF0YTsKICAgICBTY3JpcHRFeGVj dXRpb25Db250ZXh0KiBtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQ7Cg== 170965 2012-10-26 11:12:27 -0700 2012-10-26 11:51:37 -0700 Addressed CR comments bug-100300-20121026111058.patch text/plain 3647 acolwell U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2IzZDVhZjU1MWYxODY1 MzljNjE1NTQ2NzFlZjVmOTAyOTViYTYxMC4uZmMzNzA0Y2I4YmNmNzFiMTNjZTJhZTQwZWYyN2Fj NTY0Zjc5ZWQyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTEwLTI2ICBBYXJv biBDb2x3ZWxsICA8YWNvbHdlbGxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSB0aGUg Y2lyY3VsYXIgcmVmZXJlbmNlIGJldHdlZW4gVGV4dFRyYWNrIGFuZCBUZXh0VHJhY2tDdWUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDMwMAorCisg ICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBDaGFuZ2VkIFRleHRU cmFja0N1ZS5tX3RyYWNrIHRvIGEgbm9ybWFsIHBvaW50ZXIgdG8gYnJlYWsgdGhlIGNpcmN1bGFy CisgICAgICAgIHJlZmVyZW5jZSB0aGF0IHdhcyBrZWVwaW5nIGJvdGggb2JqZWN0cyBmcm9tIGV2 ZXIgZ2V0dGluZyBkZWxldGVkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBzaW1wbHkg Zml4ZXMgYSBtZW1vcnkgbGVhay4KKworICAgICAgICAqIGh0bWwvdHJhY2svVGV4dFRyYWNrLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFjazo6flRleHRUcmFjayk6CisgICAgICAgICog aHRtbC90cmFjay9UZXh0VHJhY2tDdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFRyYWNr Q3VlOjpUZXh0VHJhY2tDdWUpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFRyYWNrQ3VlOjp+VGV4 dFRyYWNrQ3VlKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFja0N1ZTo6dHJhY2spOgorICAg ICAgICAoV2ViQ29yZTo6VGV4dFRyYWNrQ3VlOjpzZXRUcmFjayk6CisgICAgICAgICogaHRtbC90 cmFjay9UZXh0VHJhY2tDdWUuaDoKKyAgICAgICAgKFRleHRUcmFja0N1ZSk6CisKIDIwMTItMTAt MjYgIFplbm8gQWxiaXNzZXIgIDx6ZW5vQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBNaW5p QnJvd3NlciBzZWdmYXVsdHMgb24gZXhpdCBhZnRlciB1c2luZyBXZWJHTC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvdHJhY2svVGV4dFRyYWNrLmNwcAppbmRleCA5ODZhM2Y1N2I5NGYwMzcyNTcxYWMxYmRk OGY4ZGJlNDQ4OGQzNjFmLi40Zjc2YjhhYmZmOTE2ODQ0YWY4ZTI4YzZmZDBjYWM1OWM4NGM0ZDcz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFjay5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2suY3BwCkBAIC0xMTIsOCArMTEy LDEzIEBAIFRleHRUcmFjazo6VGV4dFRyYWNrKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRl eHQsIFRleHRUcmFja0NsaWVudCogY2xpZW50LCBjCiAKIFRleHRUcmFjazo6flRleHRUcmFjaygp CiB7Ci0gICAgaWYgKG1fY2xpZW50ICYmIG1fY3VlcykKLSAgICAgICAgbV9jbGllbnQtPnRleHRU cmFja1JlbW92ZUN1ZXModGhpcywgbV9jdWVzLmdldCgpKTsKKyAgICBpZiAobV9jdWVzKSB7Cisg ICAgICAgIGlmIChtX2NsaWVudCkKKyAgICAgICAgICAgIG1fY2xpZW50LT50ZXh0VHJhY2tSZW1v dmVDdWVzKHRoaXMsIG1fY3Vlcy5nZXQoKSk7CisKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBtX2N1ZXMtPmxlbmd0aCgpOyArK2kpCisgICAgICAgICAgICBtX2N1ZXMtPml0ZW0oaSkt PnNldFRyYWNrKDApOworICAgIH0KICAgICBjbGVhckNsaWVudCgpOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5jcHAKaW5kZXggYmI3MzQ0NWU1NzM5OTI4N2E4 Y2RjMjJkNTQyZjBmYjRmMDg1YjFkZi4uYTA0YjFiOGNiZjg3Yjc5YjdjZjFjZGUzNWJiOTA3ZTRi MDEwMTFmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tD dWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcApA QCAtMjEwLDYgKzIxMCw3IEBAIFRleHRUcmFja0N1ZTo6VGV4dFRyYWNrQ3VlKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqIGNvbnRleHQsIGRvdWJsZSBzdGFydCwgZG91YmxlCiAgICAgLCBtX3dyaXRp bmdEaXJlY3Rpb24oSG9yaXpvbnRhbCkKICAgICAsIG1fY3VlQWxpZ25tZW50KE1pZGRsZSkKICAg ICAsIG1fZG9jdW1lbnRGcmFnbWVudCgwKQorICAgICwgbV90cmFjaygwKQogICAgICwgbV9zY3Jp cHRFeGVjdXRpb25Db250ZXh0KGNvbnRleHQpCiAgICAgLCBtX2lzQWN0aXZlKGZhbHNlKQogICAg ICwgbV9wYXVzZU9uRXhpdChmYWxzZSkKQEAgLTI1MiwxMCArMjUzLDEwIEBAIHZvaWQgVGV4dFRy YWNrQ3VlOjpjdWVEaWRDaGFuZ2UoKQogCiBUZXh0VHJhY2sqIFRleHRUcmFja0N1ZTo6dHJhY2so KSBjb25zdAogewotICAgIHJldHVybiBtX3RyYWNrLmdldCgpOworICAgIHJldHVybiBtX3RyYWNr OwogfQogCi12b2lkIFRleHRUcmFja0N1ZTo6c2V0VHJhY2soUGFzc1JlZlB0cjxUZXh0VHJhY2s+ dHJhY2spCit2b2lkIFRleHRUcmFja0N1ZTo6c2V0VHJhY2soVGV4dFRyYWNrKiB0cmFjaykKIHsK ICAgICBtX3RyYWNrID0gdHJhY2s7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3RyYWNrL1RleHRUcmFja0N1ZS5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJh Y2tDdWUuaAppbmRleCAzZTI5ZDFlNzQyNThmNzMxOGMwYjcxMWMwOTk4NzAxZDRlZGJmMGE3Li4w MWEwZTY2MDM3YTUwYzE2ZGI4NDQxMWFlMmRkMmYxZTQzMzA2NDU2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmgKQEAgLTg1LDcgKzg1LDcgQEAgcHVibGljOgogICAg IHN0YXRpYyBjb25zdCBBdG9taWNTdHJpbmcmIGZ1dHVyZU5vZGVzU2hhZG93UHNldWRvSWQoKTsK IAogICAgIFRleHRUcmFjayogdHJhY2soKSBjb25zdDsKLSAgICB2b2lkIHNldFRyYWNrKFBhc3NS ZWZQdHI8VGV4dFRyYWNrPik7CisgICAgdm9pZCBzZXRUcmFjayhUZXh0VHJhY2sqKTsKIAogICAg IGNvbnN0IFN0cmluZyYgaWQoKSBjb25zdCB7IHJldHVybiBtX2lkOyB9CiAgICAgdm9pZCBzZXRJ ZChjb25zdCBTdHJpbmcmKTsKQEAgLTE5Nyw3ICsxOTcsNyBAQCBwcml2YXRlOgogICAgIEFsaWdu bWVudCBtX2N1ZUFsaWdubWVudDsKIAogICAgIFJlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBtX2Rv Y3VtZW50RnJhZ21lbnQ7Ci0gICAgUmVmUHRyPFRleHRUcmFjaz4gbV90cmFjazsKKyAgICBUZXh0 VHJhY2sqIG1fdHJhY2s7CiAKICAgICBFdmVudFRhcmdldERhdGEgbV9ldmVudFRhcmdldERhdGE7 CiAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0Owo=