47129 2010-10-04 16:04:25 -0700 PluginDocumentParser::pluginWidgetFromDocument should look for "embed" element rather than just use the first child 2010-10-06 18:43:16 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 sanjeevr webkit-unassigned aestes commit-queue fishd mitz oldest_to_newest 289254 0 sanjeevr 2010-10-04 16:04:25 -0700 PluginDocumentParser::pluginWidgetFromDocument assumes that the "embed" element is the first child of the body. However, for Chromium, an extension can modify the DOM to add other elements before the "embed" element. The method should search for the "embed" element rather than use the first child. Working on a fix for this. This causes the Chromium bug (http://crbug.com/51342). 289297 1 69719 sanjeevr 2010-10-04 16:44:35 -0700 Created attachment 69719 Patch for the fix 289311 2 69719 fishd 2010-10-04 17:04:09 -0700 Comment on attachment 69719 Patch for the fix View in context: https://bugs.webkit.org/attachment.cgi?id=69719&action=review > WebCore/html/PluginDocument.cpp:-87 > -#if ENABLE(OFFLINE_WEB_APPLICATIONS) oops 289326 3 69726 sanjeevr 2010-10-04 17:28:46 -0700 Created attachment 69726 Updated patch with unrelated changes removed. 289341 4 69727 sanjeevr 2010-10-04 18:30:58 -0700 Created attachment 69727 Fixed spaces. 289499 5 69727 commit-queue 2010-10-05 01:43:00 -0700 Comment on attachment 69727 Fixed spaces. Clearing flags on attachment: 69727 Committed r69097: <http://trac.webkit.org/changeset/69097> 289500 6 commit-queue 2010-10-05 01:43:05 -0700 All reviewed patches have been landed. Closing bug. 289782 7 ap 2010-10-05 11:42:29 -0700 There is a discussion of this change on webkit-changes mailing list. 289942 8 69856 sanjeevr 2010-10-05 15:51:32 -0700 Created attachment 69856 New implementation that relies on PluginDocument remembering the plugin node. 289946 9 sanjeevr 2010-10-05 15:55:05 -0700 Uploaded new implementation as per discussion on webkit-changes. 289949 10 69856 fishd 2010-10-05 15:59:57 -0700 Comment on attachment 69856 New implementation that relies on PluginDocument remembering the plugin node. This does seem much better. Thanks! 289956 11 69856 mitz 2010-10-05 16:07:26 -0700 Comment on attachment 69856 New implementation that relies on PluginDocument remembering the plugin node. View in context: https://bugs.webkit.org/attachment.cgi?id=69856&action=review > WebCore/html/PluginDocument.h:60 > + RefPtr<Node> m_pluginNode; Is it okay for a Document to hold a reference to a node like this? Won’t it create a ref cycle and cause a leak? 289960 12 69856 commit-queue 2010-10-05 16:15:21 -0700 Comment on attachment 69856 New implementation that relies on PluginDocument remembering the plugin node. Clearing flags on attachment: 69856 Committed r69159: <http://trac.webkit.org/changeset/69159> 289961 13 commit-queue 2010-10-05 16:15:27 -0700 All reviewed patches have been landed. Closing bug. 289990 14 69856 sanjeevr 2010-10-05 17:33:05 -0700 Comment on attachment 69856 New implementation that relies on PluginDocument remembering the plugin node. View in context: https://bugs.webkit.org/attachment.cgi?id=69856&action=review >> WebCore/html/PluginDocument.h:60 >> + RefPtr<Node> m_pluginNode; > > Is it okay for a Document to hold a reference to a node like this? Won’t it create a ref cycle and cause a leak? Yeah I was concerned about that too. But I was also afraid of holding on to a pointer that was no longer valid. I did some debugging and found that it does indeed cause a ref cycle. I can change it to Node* but I am not sure when to clear this variable. Any suggestions? 289995 15 mitz 2010-10-05 17:36:47 -0700 (In reply to comment #14) > (From update of attachment 69856 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=69856&action=review > > >> WebCore/html/PluginDocument.h:60 > >> + RefPtr<Node> m_pluginNode; > > > > Is it okay for a Document to hold a reference to a node like this? Won’t it create a ref cycle and cause a leak? > > Yeah I was concerned about that too. But I was also afraid of holding on to a pointer that was no longer valid. I did some debugging and found that it does indeed cause a ref cycle. I can change it to Node* but I am not sure when to clear this variable. Any suggestions? I asked and was told that this does not cause a leak. 290004 16 69856 sanjeevr 2010-10-05 17:54:46 -0700 Comment on attachment 69856 New implementation that relies on PluginDocument remembering the plugin node. View in context: https://bugs.webkit.org/attachment.cgi?id=69856&action=review >>>> WebCore/html/PluginDocument.h:60 >>>> + RefPtr<Node> m_pluginNode; >>> >>> Is it okay for a Document to hold a reference to a node like this? Won’t it create a ref cycle and cause a leak? >> >> Yeah I was concerned about that too. But I was also afraid of holding on to a pointer that was no longer valid. I did some debugging and found that it does indeed cause a ref cycle. I can change it to Node* but I am not sure when to clear this variable. Any suggestions? > > I asked and was told that this does not cause a leak. Hmm, I did some debugging on Windows Chromium and it did seem to cause a leak. Maybe I missed something. I will debug some more and update this bug. Thanks for the help. 290698 17 70014 sanjeevr 2010-10-06 17:03:24 -0700 Created attachment 70014 Fixed memory leak caused by circular ref count 290699 18 sanjeevr 2010-10-06 17:03:45 -0700 Last patch had a memory leak. Fixed that. 290701 19 70014 fishd 2010-10-06 17:06:46 -0700 Comment on attachment 70014 Fixed memory leak caused by circular ref count R=me, thanks Sanjeev! 290752 20 70014 commit-queue 2010-10-06 18:43:10 -0700 Comment on attachment 70014 Fixed memory leak caused by circular ref count Clearing flags on attachment: 70014 Committed r69268: <http://trac.webkit.org/changeset/69268> 290753 21 commit-queue 2010-10-06 18:43:16 -0700 All reviewed patches have been landed. Closing bug. 69719 2010-10-04 16:44:35 -0700 2010-10-05 15:51:32 -0700 Patch for the fix plugin_doc_fix text/plain 2241 sanjeevr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTA1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMDQgIFNhbmplZXYgUmFkaGFrcmlzaG5hbiAgPHNhbmpl ZXZyQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBGaXhlZCBpbXBsZW1lbnRhdGlvbiBvZiBwbHVnaW5XaWRnZXRGcm9tRG9jdW1l bnQgdG8gc2VhcmNoIGZvciB0aGUgImVtYmVkIiBlbGVtZW50IHJhdGhlciB0aGFuIGp1c3QgdXNl IHRoZSBmaXJzdCBjaGlsZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQ3MTI5CisKKyAgICAgICAgKiBodG1sL1BsdWdpbkRvY3VtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlBsdWdpbkRvY3VtZW50UGFyc2VyOjpwbHVnaW5XaWRnZXRGcm9tRG9j dW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luRG9jdW1lbnRQYXJzZXI6OmNyZWF0ZURv Y3VtZW50U3RydWN0dXJlKToKKwogMjAxMC0xMC0wNCAgSmVyZW15IE9ybG93ICA8am9ybG93QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOYXRlIENoYXBpbi4KSW5kZXg6IFdl YkNvcmUvaHRtbC9QbHVnaW5Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1s L1BsdWdpbkRvY3VtZW50LmNwcAkocmV2aXNpb24gNjkwMzIpCisrKyBXZWJDb3JlL2h0bWwvUGx1 Z2luRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw5ICsyOSw5IEBACiAjaW5jbHVk ZSAiRnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgIkhU TUxFbWJlZEVsZW1lbnQuaCIKLSNpbmNsdWRlICJIVE1MSHRtbEVsZW1lbnQuaCIKICNpbmNsdWRl ICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJNYWluUmVzb3VyY2VMb2FkZXIuaCIKKyNpbmNsdWRl ICJOb2RlTGlzdC5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJSYXdEYXRhRG9jdW1l bnRQYXJzZXIuaCIKICNpbmNsdWRlICJSZW5kZXJFbWJlZGRlZE9iamVjdC5oIgpAQCAtNzAsNyAr NzAsOSBAQCBXaWRnZXQqIFBsdWdpbkRvY3VtZW50UGFyc2VyOjpwbHVnaW5XaWRnCiAgICAgQVNT RVJUKGRvYyk7CiAgICAgUmVmUHRyPEVsZW1lbnQ+IGJvZHkgPSBkb2MtPmJvZHkoKTsKICAgICBp ZiAoYm9keSkgewotICAgICAgICBSZWZQdHI8Tm9kZT4gbm9kZSA9IGJvZHktPmZpcnN0Q2hpbGQo KTsKKyAgICAgICAgUmVmUHRyPE5vZGVMaXN0PiBlbWJlZE5vZGVzID0gYm9keS0+Z2V0RWxlbWVu dHNCeVRhZ05hbWUoImVtYmVkIik7CisgICAgICAgIEFTU0VSVChlbWJlZE5vZGVzICYmIGVtYmVk Tm9kZXMtPmxlbmd0aCgpKTsKKyAgICAgICAgTm9kZSogbm9kZSA9IGVtYmVkTm9kZXMtPml0ZW0o MCk7CiAgICAgICAgIGlmIChub2RlICYmIG5vZGUtPnJlbmRlcmVyKCkpIHsKICAgICAgICAgICAg IEFTU0VSVChub2RlLT5yZW5kZXJlcigpLT5pc0VtYmVkZGVkT2JqZWN0KCkpOwogICAgICAgICAg ICAgcmV0dXJuIHRvUmVuZGVyRW1iZWRkZWRPYmplY3Qobm9kZS0+cmVuZGVyZXIoKSktPndpZGdl dCgpOwpAQCAtODQsOSArODYsNiBAQCB2b2lkIFBsdWdpbkRvY3VtZW50UGFyc2VyOjpjcmVhdGVE b2N1bWVuCiAgICAgRXhjZXB0aW9uQ29kZSBlYzsKICAgICBSZWZQdHI8RWxlbWVudD4gcm9vdEVs ZW1lbnQgPSBkb2N1bWVudCgpLT5jcmVhdGVFbGVtZW50KGh0bWxUYWcsIGZhbHNlKTsKICAgICBk b2N1bWVudCgpLT5hcHBlbmRDaGlsZChyb290RWxlbWVudCwgZWMpOwotI2lmIEVOQUJMRShPRkZM SU5FX1dFQl9BUFBMSUNBVElPTlMpCi0gICAgc3RhdGljX2Nhc3Q8SFRNTEh0bWxFbGVtZW50Kj4o cm9vdEVsZW1lbnQuZ2V0KCkpLT5pbnNlcnRlZEJ5UGFyc2VyKCk7Ci0jZW5kaWYKIAogICAgIGlm IChkb2N1bWVudCgpLT5mcmFtZSgpICYmIGRvY3VtZW50KCktPmZyYW1lKCktPmxvYWRlcigpKQog ICAgICAgICBkb2N1bWVudCgpLT5mcmFtZSgpLT5sb2FkZXIoKS0+ZGlzcGF0Y2hEb2N1bWVudEVs ZW1lbnRBdmFpbGFibGUoKTsK 69726 2010-10-04 17:28:46 -0700 2010-10-04 18:32:08 -0700 Updated patch with unrelated changes removed. plugin_doc_fix text/plain 1668 sanjeevr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTA1MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMTAtMDQgIFNhbmplZXYgUmFkaGFrcmlzaG5hbiAgPHNhbmpl ZXZyQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBGaXhlZCBpbXBsZW1lbnRhdGlvbiBvZiBwbHVnaW5XaWRnZXRGcm9tRG9jdW1l bnQgdG8gc2VhcmNoIGZvciB0aGUgImVtYmVkIiBlbGVtZW50IHJhdGhlciB0aGFuIGp1c3QgdXNl IHRoZSBmaXJzdCBjaGlsZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQ3MTI5CisKKyAgICAgICAgKiBodG1sL1BsdWdpbkRvY3VtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlBsdWdpbkRvY3VtZW50UGFyc2VyOjpwbHVnaW5XaWRnZXRGcm9tRG9j dW1lbnQpOgorCiAyMDEwLTEwLTA0ICBDaHJpcyBNYXJyaW4gIDxjbWFycmluQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KSW5kZXg6IFdlYkNvcmUvaHRt bC9QbHVnaW5Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL1BsdWdpbkRv Y3VtZW50LmNwcAkocmV2aXNpb24gNjkwNTMpCisrKyBXZWJDb3JlL2h0bWwvUGx1Z2luRG9jdW1l bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiSFRNTEh0 bWxFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiTWFpblJlc291 cmNlTG9hZGVyLmgiCisjaW5jbHVkZSAiTm9kZUxpc3QuaCIKICNpbmNsdWRlICJQYWdlLmgiCiAj aW5jbHVkZSAiUmF3RGF0YURvY3VtZW50UGFyc2VyLmgiCiAjaW5jbHVkZSAiUmVuZGVyRW1iZWRk ZWRPYmplY3QuaCIKQEAgLTcwLDggKzcxLDEwIEBAIFdpZGdldCogUGx1Z2luRG9jdW1lbnRQYXJz ZXI6OnBsdWdpbldpZGcKICAgICBBU1NFUlQoZG9jKTsKICAgICBSZWZQdHI8RWxlbWVudD4gYm9k eSA9IGRvYy0+Ym9keSgpOwogICAgIGlmIChib2R5KSB7Ci0gICAgICAgIFJlZlB0cjxOb2RlPiBu b2RlID0gYm9keS0+Zmlyc3RDaGlsZCgpOwotICAgICAgICBpZiAobm9kZSAmJiBub2RlLT5yZW5k ZXJlcigpKSB7CisgICAgICBSZWZQdHI8Tm9kZUxpc3Q+IGVtYmVkTm9kZXMgPSBib2R5LT5nZXRF bGVtZW50c0J5VGFnTmFtZSgiZW1iZWQiKTsKKyAgICAgIEFTU0VSVChlbWJlZE5vZGVzICYmIGVt YmVkTm9kZXMtPmxlbmd0aCgpKTsKKyAgICAgIE5vZGUqIG5vZGUgPSBlbWJlZE5vZGVzLT5pdGVt KDApOworICAgICAgaWYgKG5vZGUgJiYgbm9kZS0+cmVuZGVyZXIoKSkgewogICAgICAgICAgICAg QVNTRVJUKG5vZGUtPnJlbmRlcmVyKCktPmlzRW1iZWRkZWRPYmplY3QoKSk7CiAgICAgICAgICAg ICByZXR1cm4gdG9SZW5kZXJFbWJlZGRlZE9iamVjdChub2RlLT5yZW5kZXJlcigpKS0+d2lkZ2V0 KCk7CiAgICAgICAgIH0K 69727 2010-10-04 18:30:58 -0700 2010-10-05 15:51:32 -0700 Fixed spaces. plugin_doc_fix text/plain 1625 sanjeevr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTA1NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMTAtMDQgIFNhbmplZXYgUmFkaGFrcmlzaG5hbiAgPHNhbmpl ZXZyQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBGaXhlZCBpbXBsZW1lbnRhdGlvbiBvZiBwbHVnaW5XaWRnZXRGcm9tRG9jdW1l bnQgdG8gc2VhcmNoIGZvciB0aGUgImVtYmVkIiBlbGVtZW50IHJhdGhlciB0aGFuIGp1c3QgdXNl IHRoZSBmaXJzdCBjaGlsZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQ3MTI5CisKKyAgICAgICAgKiBodG1sL1BsdWdpbkRvY3VtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlBsdWdpbkRvY3VtZW50UGFyc2VyOjpwbHVnaW5XaWRnZXRGcm9tRG9j dW1lbnQpOgorCiAyMDEwLTEwLTA0ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViQ29yZS9o dG1sL1BsdWdpbkRvY3VtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvUGx1Z2lu RG9jdW1lbnQuY3BwCShyZXZpc2lvbiA2OTA1MykKKysrIFdlYkNvcmUvaHRtbC9QbHVnaW5Eb2N1 bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRlICJIVE1M SHRtbEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJNYWluUmVz b3VyY2VMb2FkZXIuaCIKKyNpbmNsdWRlICJOb2RlTGlzdC5oIgogI2luY2x1ZGUgIlBhZ2UuaCIK ICNpbmNsdWRlICJSYXdEYXRhRG9jdW1lbnRQYXJzZXIuaCIKICNpbmNsdWRlICJSZW5kZXJFbWJl ZGRlZE9iamVjdC5oIgpAQCAtNzAsNyArNzEsOSBAQCBXaWRnZXQqIFBsdWdpbkRvY3VtZW50UGFy c2VyOjpwbHVnaW5XaWRnCiAgICAgQVNTRVJUKGRvYyk7CiAgICAgUmVmUHRyPEVsZW1lbnQ+IGJv ZHkgPSBkb2MtPmJvZHkoKTsKICAgICBpZiAoYm9keSkgewotICAgICAgICBSZWZQdHI8Tm9kZT4g bm9kZSA9IGJvZHktPmZpcnN0Q2hpbGQoKTsKKyAgICAgICAgUmVmUHRyPE5vZGVMaXN0PiBlbWJl ZE5vZGVzID0gYm9keS0+Z2V0RWxlbWVudHNCeVRhZ05hbWUoImVtYmVkIik7CisgICAgICAgIEFT U0VSVChlbWJlZE5vZGVzICYmIGVtYmVkTm9kZXMtPmxlbmd0aCgpKTsKKyAgICAgICAgTm9kZSog bm9kZSA9IGVtYmVkTm9kZXMtPml0ZW0oMCk7CiAgICAgICAgIGlmIChub2RlICYmIG5vZGUtPnJl bmRlcmVyKCkpIHsKICAgICAgICAgICAgIEFTU0VSVChub2RlLT5yZW5kZXJlcigpLT5pc0VtYmVk ZGVkT2JqZWN0KCkpOwogICAgICAgICAgICAgcmV0dXJuIHRvUmVuZGVyRW1iZWRkZWRPYmplY3Qo bm9kZS0+cmVuZGVyZXIoKSktPndpZGdldCgpOwo= 69856 2010-10-05 15:51:32 -0700 2010-10-05 17:54:46 -0700 New implementation that relies on PluginDocument remembering the plugin node. plugin_doc_fix text/plain 3787 sanjeevr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTE1MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMTAtMDUgIFNhbmplZXYgUmFkaGFrcmlzaG5hbiAgPHNhbmpl ZXZyQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBQbHVnaW5Eb2N1bWVudCBub3cgaG9sZHMgb24gdG8gdGhlIGNyZWF0ZWQgcGx1 Z2luIG5vZGUgc28gdGhhdCB0aGUgcGx1Z2luTm9kZSgpIGFuZCBwbHVnaW5XaWRnZXQoKSBtZXRo b2RzIGNhbiByZXR1cm4gdGhlIGNvcnJlY3Qgbm9kZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3MTI5CisKKyAgICAgICAgKiBodG1sL1BsdWdpbkRv Y3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkRvY3VtZW50UGFyc2VyOjpjcmVh dGVEb2N1bWVudFN0cnVjdHVyZSk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5Eb2N1bWVudDo6 cGx1Z2luV2lkZ2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkRvY3VtZW50OjpwbHVnaW5O b2RlKToKKyAgICAgICAgKiBodG1sL1BsdWdpbkRvY3VtZW50Lmg6CisgICAgICAgIChXZWJDb3Jl OjpQbHVnaW5Eb2N1bWVudDo6c2V0UGx1Z2luTm9kZSk6CisKIDIwMTAtMTAtMDUgIEFuZHJlYXMg S2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRvciBBcm5l IFZlc3Riw7guCkluZGV4OiBXZWJDb3JlL2h0bWwvUGx1Z2luRG9jdW1lbnQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvaHRtbC9QbHVnaW5Eb2N1bWVudC5jcHAJKHJldmlzaW9uIDY5MTUyKQor KysgV2ViQ29yZS9odG1sL1BsdWdpbkRvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTAs OCArNTAsNiBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUGx1Z2luRG9j dW1lbnRQYXJzZXIoZG9jdW1lbnQpKTsKICAgICB9CiAKLSAgICBzdGF0aWMgV2lkZ2V0KiBwbHVn aW5XaWRnZXRGcm9tRG9jdW1lbnQoRG9jdW1lbnQqKTsKLSAgICAKIHByaXZhdGU6CiAgICAgUGx1 Z2luRG9jdW1lbnRQYXJzZXIoRG9jdW1lbnQqIGRvY3VtZW50KQogICAgICAgICA6IFJhd0RhdGFE b2N1bWVudFBhcnNlcihkb2N1bWVudCkKQEAgLTY2LDIyICs2NCw2IEBAIHByaXZhdGU6CiAgICAg SFRNTEVtYmVkRWxlbWVudCogbV9lbWJlZEVsZW1lbnQ7CiB9OwogCi1XaWRnZXQqIFBsdWdpbkRv Y3VtZW50UGFyc2VyOjpwbHVnaW5XaWRnZXRGcm9tRG9jdW1lbnQoRG9jdW1lbnQqIGRvYykKLXsK LSAgICBBU1NFUlQoZG9jKTsKLSAgICBSZWZQdHI8RWxlbWVudD4gYm9keSA9IGRvYy0+Ym9keSgp OwotICAgIGlmIChib2R5KSB7Ci0gICAgICAgIFJlZlB0cjxOb2RlTGlzdD4gZW1iZWROb2RlcyA9 IGJvZHktPmdldEVsZW1lbnRzQnlUYWdOYW1lKCJlbWJlZCIpOwotICAgICAgICBBU1NFUlQoZW1i ZWROb2RlcyAmJiBlbWJlZE5vZGVzLT5sZW5ndGgoKSk7Ci0gICAgICAgIE5vZGUqIG5vZGUgPSBl bWJlZE5vZGVzLT5pdGVtKDApOwotICAgICAgICBpZiAobm9kZSAmJiBub2RlLT5yZW5kZXJlcigp KSB7Ci0gICAgICAgICAgICBBU1NFUlQobm9kZS0+cmVuZGVyZXIoKS0+aXNFbWJlZGRlZE9iamVj dCgpKTsKLSAgICAgICAgICAgIHJldHVybiB0b1JlbmRlckVtYmVkZGVkT2JqZWN0KG5vZGUtPnJl bmRlcmVyKCkpLT53aWRnZXQoKTsKLSAgICAgICAgfQotICAgIH0KLSAgICByZXR1cm4gMDsKLX0K LQogdm9pZCBQbHVnaW5Eb2N1bWVudFBhcnNlcjo6Y3JlYXRlRG9jdW1lbnRTdHJ1Y3R1cmUoKQog ewogICAgIEV4Y2VwdGlvbkNvZGUgZWM7CkBAIC0xMTAsNyArOTIsOSBAQCB2b2lkIFBsdWdpbkRv Y3VtZW50UGFyc2VyOjpjcmVhdGVEb2N1bWVuCiAgICAgbV9lbWJlZEVsZW1lbnQtPnNldEF0dHJp YnV0ZShuYW1lQXR0ciwgInBsdWdpbiIpOwogICAgIG1fZW1iZWRFbGVtZW50LT5zZXRBdHRyaWJ1 dGUoc3JjQXR0ciwgZG9jdW1lbnQoKS0+dXJsKCkuc3RyaW5nKCkpOwogICAgIG1fZW1iZWRFbGVt ZW50LT5zZXRBdHRyaWJ1dGUodHlwZUF0dHIsIGRvY3VtZW50KCktPmZyYW1lKCktPmxvYWRlcigp LT53cml0ZXIoKS0+bWltZVR5cGUoKSk7Ci0gICAgCisKKyAgICBzdGF0aWNfY2FzdDxQbHVnaW5E b2N1bWVudCo+KGRvY3VtZW50KCkpLT5zZXRQbHVnaW5Ob2RlKG1fZW1iZWRFbGVtZW50KTsKKwog ICAgIGJvZHktPmFwcGVuZENoaWxkKGVtYmVkRWxlbWVudCwgZWMpOyAgICAKIH0KIApAQCAtMTU5 LDE2ICsxNDMsMTYgQEAgUGFzc1JlZlB0cjxEb2N1bWVudFBhcnNlcj4gUGx1Z2luRG9jdW1lbgog CiBXaWRnZXQqIFBsdWdpbkRvY3VtZW50OjpwbHVnaW5XaWRnZXQoKQogewotICAgIHJldHVybiBQ bHVnaW5Eb2N1bWVudFBhcnNlcjo6cGx1Z2luV2lkZ2V0RnJvbURvY3VtZW50KHRoaXMpOworICAg IGlmIChtX3BsdWdpbk5vZGUgJiYgbV9wbHVnaW5Ob2RlLT5yZW5kZXJlcigpKSB7CisgICAgICAg IEFTU0VSVChtX3BsdWdpbk5vZGUtPnJlbmRlcmVyKCktPmlzRW1iZWRkZWRPYmplY3QoKSk7Cisg ICAgICAgIHJldHVybiB0b1JlbmRlckVtYmVkZGVkT2JqZWN0KG1fcGx1Z2luTm9kZS0+cmVuZGVy ZXIoKSktPndpZGdldCgpOworICAgIH0KKyAgICByZXR1cm4gMDsKIH0KIAogTm9kZSogUGx1Z2lu RG9jdW1lbnQ6OnBsdWdpbk5vZGUoKQogewotICAgIFJlZlB0cjxFbGVtZW50PiBib2R5X2VsZW1l bnQgPSBib2R5KCk7Ci0gICAgaWYgKGJvZHlfZWxlbWVudCkKLSAgICAgICAgcmV0dXJuIGJvZHlf ZWxlbWVudC0+Zmlyc3RDaGlsZCgpOwotCi0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG1fcGx1 Z2luTm9kZS5nZXQoKTsKIH0KIAogdm9pZCBQbHVnaW5Eb2N1bWVudDo6Y2FuY2VsTWFudWFsUGx1 Z2luTG9hZCgpCkluZGV4OiBXZWJDb3JlL2h0bWwvUGx1Z2luRG9jdW1lbnQuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL2h0bWwvUGx1Z2luRG9jdW1lbnQuaAkocmV2aXNpb24gNjkxNTIpCisrKyBX ZWJDb3JlL2h0bWwvUGx1Z2luRG9jdW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMzgsNiArMzgs OCBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUGx1Z2luRG9jdW1lbnQo ZnJhbWUsIHVybCkpOwogICAgIH0KIAorICAgIHZvaWQgc2V0UGx1Z2luTm9kZShOb2RlKiBwbHVn aW5Ob2RlKSB7IG1fcGx1Z2luTm9kZSA9IHBsdWdpbk5vZGU7IH0KKwogICAgIFdpZGdldCogcGx1 Z2luV2lkZ2V0KCk7CiAgICAgTm9kZSogcGx1Z2luTm9kZSgpOwogCkBAIC01NSw2ICs1Nyw3IEBA IHByaXZhdGU6CiAgICAgdm9pZCBzZXRTaG91bGRMb2FkUGx1Z2luTWFudWFsbHkoYm9vbCBsb2Fk TWFudWFsbHkpIHsgbV9zaG91bGRMb2FkUGx1Z2luTWFudWFsbHkgPSBsb2FkTWFudWFsbHk7IH0K IAogICAgIGJvb2wgbV9zaG91bGRMb2FkUGx1Z2luTWFudWFsbHk7CisgICAgUmVmUHRyPE5vZGU+ IG1fcGx1Z2luTm9kZTsKIH07CiAKIGlubGluZSBQbHVnaW5Eb2N1bWVudCogdG9QbHVnaW5Eb2N1 bWVudChEb2N1bWVudCogZG9jdW1lbnQpCg== 70014 2010-10-06 17:03:24 -0700 2010-10-06 18:43:10 -0700 Fixed memory leak caused by circular ref count leak_fix text/plain 1693 sanjeevr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTI1NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMDYgIFNhbmplZXYgUmFkaGFrcmlzaG5hbiAgPHNhbmpl ZXZyQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSZWxlYXNlZCB0aGUgcGx1Z2luTm9kZSBpbiBQbHVnaW5Eb2N1bWVudDo6ZGV0 YWNoKCkgYW5kIHByZXZlbnRzIGEgbWVtb3J5IGxlYWsuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzEyOQorCisgICAgICAgICogaHRtbC9QbHVnaW5E b2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5Eb2N1bWVudDo6ZGV0YWNoKToK KyAgICAgICAgKiBodG1sL1BsdWdpbkRvY3VtZW50Lmg6CisKIDIwMTAtMTAtMDYgIFBldGVyIEth c3RpbmcgIDxwa2FzdGluZ0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEphbWVz IFJvYmluc29uCkluZGV4OiBXZWJDb3JlL2h0bWwvUGx1Z2luRG9jdW1lbnQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvaHRtbC9QbHVnaW5Eb2N1bWVudC5jcHAJKHJldmlzaW9uIDY5MjU0KQor KysgV2ViQ29yZS9odG1sL1BsdWdpbkRvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU1 LDYgKzE1NSwxMyBAQCBOb2RlKiBQbHVnaW5Eb2N1bWVudDo6cGx1Z2luTm9kZSgpCiAgICAgcmV0 dXJuIG1fcGx1Z2luTm9kZS5nZXQoKTsKIH0KIAordm9pZCBQbHVnaW5Eb2N1bWVudDo6ZGV0YWNo KCkKK3sKKyAgICAvLyBSZWxlYXNlIHRoZSBwbHVnaW4gbm9kZSBzbyB0aGF0IHdlIGRvbid0IGhh dmUgYSBjaXJjdWxhciByZWZlcmVuY2UuCisgICAgbV9wbHVnaW5Ob2RlID0gMDsKKyAgICBIVE1M RG9jdW1lbnQ6OmRldGFjaCgpOworfQorCiB2b2lkIFBsdWdpbkRvY3VtZW50OjpjYW5jZWxNYW51 YWxQbHVnaW5Mb2FkKCkKIHsKICAgICAvLyBQbHVnaW5Eb2N1bWVudDo6Y2FuY2VsTWFudWFsUGx1 Z2luTG9hZCBzaG91bGQgb25seSBiZSBjYWxsZWQgb25jZSwgYnV0IHRoZXJlIGFyZSBpc3N1ZXMK SW5kZXg6IFdlYkNvcmUvaHRtbC9QbHVnaW5Eb2N1bWVudC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvaHRtbC9QbHVnaW5Eb2N1bWVudC5oCShyZXZpc2lvbiA2OTI1NCkKKysrIFdlYkNvcmUvaHRt bC9QbHVnaW5Eb2N1bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC00NSw2ICs0NSw4IEBAIHB1Ymxp YzoKIAogICAgIHZpcnR1YWwgYm9vbCBpc1BsdWdpbkRvY3VtZW50KCkgY29uc3QgeyByZXR1cm4g dHJ1ZTsgfQogCisgICAgdmlydHVhbCB2b2lkIGRldGFjaCgpOworCiAgICAgdm9pZCBjYW5jZWxN YW51YWxQbHVnaW5Mb2FkKCk7CiAKICAgICBib29sIHNob3VsZExvYWRQbHVnaW5NYW51YWxseSgp IHsgcmV0dXJuIG1fc2hvdWxkTG9hZFBsdWdpbk1hbnVhbGx5OyB9Cg==