24131 2009-02-24 12:34:36 -0800 Unfork RefCounting fix-ups 2009-02-24 16:20:25 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dglazkov dglazkov oldest_to_newest 110791 0 dglazkov 2009-02-24 12:34:36 -0800 It is with great dismay that I introduce this change and beg forgiveness. We will fix this right. But not today. 110792 1 27925 dglazkov 2009-02-24 12:36:54 -0800 Created attachment 27925 Fix-up COM/RefCounted dichotomy in Chromium port, v1. WebCore/ChangeLog | 11 +++++++++++ WebCore/page/chromium/AccessibilityObjectWrapper.h | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletions(-) 110849 2 27925 eric 2009-02-24 16:03:37 -0800 Comment on attachment 27925 Fix-up COM/RefCounted dichotomy in Chromium port, v1. Sigh. 110852 3 27925 fishd 2009-02-24 16:08:55 -0800 Comment on attachment 27925 Fix-up COM/RefCounted dichotomy in Chromium port, v1. >diff --git a/WebCore/page/chromium/AccessibilityObjectWrapper.h b/WebCore/page/chromium/AccessibilityObjectWrapper.h >index 9920e4d..af32567 100644 >--- a/WebCore/page/chromium/AccessibilityObjectWrapper.h >+++ b/WebCore/page/chromium/AccessibilityObjectWrapper.h >@@ -39,7 +39,14 @@ namespace WebCore { > > protected: > AccessibilityObjectWrapper(AccessibilityObject* obj) >- : RefCounted<AccessibilityObjectWrapper>(0), m_object(obj) { } >+ : m_object(obj) >+ { >+ // Default refCount is 1, but the webkit-win version of this is not >+ // RefCounted, so this is not properly created using ::create. >+ // FIXME: Once AccessibleBase no longer implements COM interfaces, >+ // make it not RefCounted. This comment is a bit confusing. The PLATFORM(WIN) AccessibilityObjectWrapper class does inherit from IUnknown, so it does do initialized-to-zero reference counting as well. Perhaps the comment can be: // FIXME: Remove this once our immediate subclass no longer uses COM. Otherwise, looks good. -Darin 110853 4 27925 fishd 2009-02-24 16:09:47 -0800 Comment on attachment 27925 Fix-up COM/RefCounted dichotomy in Chromium port, v1. (sorry, didn't mean to remove the r+ from eric) 110858 5 dglazkov 2009-02-24 16:20:25 -0800 Landed as http://trac.webkit.org/changeset/41197. 27925 2009-02-24 12:36:54 -0800 2009-02-24 16:09:47 -0800 Fix-up COM/RefCounted dichotomy in Chromium port, v1. Fix-up-COM-RefCounted-dichotomy-in-Chromium-port-v1..patch text/plain 1623 dglazkov MzcyNjU3NWFjYzhmOGZhN2Q2NTQxZWFkODY3YzNiOTE1YTg4YmE0NApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjYTZlYTE2Li42OWU4NGYw IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDE2IEBACiAyMDA5LTAyLTI0ICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBj aHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTMxCisgICAg ICAgIEZpeC11cCBDT00vUmVmQ291bnRlZCBkaWNob3RvbXkgaW4gQ2hyb21pdW0gcG9ydC4KKwor ICAgICAgICAqIHBhZ2UvY2hyb21pdW0vQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyOjpBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlcik6IEFkZGVkCisgICAgICAgIGV4cGxpY2l0IHNldHRpbmcgb2YgcmVjb3Vu dC4KKworMjAwOS0wMi0yNCAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3Jn PgorCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgogCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDEyOApkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9wYWdlL2Nocm9taXVtL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLmggYi9XZWJDb3JlL3Bh Z2UvY2hyb21pdW0vQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIuaAppbmRleCA5OTIwZTRkLi5h ZjMyNTY3IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvY2hyb21pdW0vQWNjZXNzaWJpbGl0eU9i amVjdFdyYXBwZXIuaAorKysgYi9XZWJDb3JlL3BhZ2UvY2hyb21pdW0vQWNjZXNzaWJpbGl0eU9i amVjdFdyYXBwZXIuaApAQCAtMzksNyArMzksMTQgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAg ICAgcHJvdGVjdGVkOgogICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcihBY2Nlc3Np YmlsaXR5T2JqZWN0KiBvYmopCi0gICAgICAgICAgICA6IFJlZkNvdW50ZWQ8QWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXI+KDApLCBtX29iamVjdChvYmopIHsgfQorICAgICAgICAgICAgOiBtX29i amVjdChvYmopCisgICAgICAgIHsKKyAgICAgICAgICAvLyBEZWZhdWx0IHJlZkNvdW50IGlzIDEs IGJ1dCB0aGUgd2Via2l0LXdpbiB2ZXJzaW9uIG9mIHRoaXMgaXMgbm90CisgICAgICAgICAgLy8g UmVmQ291bnRlZCwgc28gdGhpcyBpcyBub3QgcHJvcGVybHkgY3JlYXRlZCB1c2luZyA6OmNyZWF0 ZS4KKyAgICAgICAgICAvLyBGSVhNRTogT25jZSBBY2Nlc3NpYmxlQmFzZSBubyBsb25nZXIgaW1w bGVtZW50cyBDT00gaW50ZXJmYWNlcywKKyAgICAgICAgICAvLyBtYWtlIGl0IG5vdCBSZWZDb3Vu dGVkLgorICAgICAgICAgIG1fcmVmQ291bnQgPSAwOworICAgICAgICB9CiAgICAgICAgIEFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyKCkgOiBtX29iamVjdCgwKSB7IH0KIAogICAgICAgICBBY2Nl c3NpYmlsaXR5T2JqZWN0KiBtX29iamVjdDsK