41956 2010-07-09 06:05:38 -0700 [WIN] Correct DeleteObject usage in PasteboardWin 2010-07-22 19:15:24 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 0 paroga webkit-unassigned aroben commit-queue oldest_to_newest 248947 0 paroga 2010-07-09 06:05:38 -0700 see patch 248948 1 61038 paroga 2010-07-09 06:09:57 -0700 Created attachment 61038 Patch 254941 2 61038 aroben 2010-07-22 13:13:19 -0700 Comment on attachment 61038 Patch > if (::OpenClipboard(m_owner)) { > ::SetClipboardData(CF_BITMAP, resultBitmap); > ::CloseClipboard(); > - } > + } else > + ::DeleteObject(resultBitmap); > } If you put resultBitmap into an OwnPtr, and then pass it to SetClipboardData using leakPtr, you won't have to remember this extra DeleteObject call (as OwnPtr will do it for you). I think that would be a bit nicer. Otherwise, this looks great! I'm surprised this hasn't caused any (known) problems for us so far. 254948 3 62331 paroga 2010-07-22 13:26:47 -0700 Created attachment 62331 Patch (with OwnPtr) 254960 4 62331 aroben 2010-07-22 13:43:09 -0700 Comment on attachment 62331 Patch (with OwnPtr) r=me 255159 5 62331 commit-queue 2010-07-22 19:15:20 -0700 Comment on attachment 62331 Patch (with OwnPtr) Clearing flags on attachment: 62331 Committed r63940: <http://trac.webkit.org/changeset/63940> 255160 6 commit-queue 2010-07-22 19:15:24 -0700 All reviewed patches have been landed. Closing bug. 61038 2010-07-09 06:09:57 -0700 2010-07-22 13:26:47 -0700 Patch bug-41956.patch text/plain 2388 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDYyOTQ0KQ0KKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp DQpAQCAtMSwzICsxLDE2IEBADQorMjAxMC0wNy0wOSAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJv Z2FAcGFyb2dhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbV0lOXSBDb3JyZWN0IERlbGV0ZU9iamVjdCB1c2FnZSBpbiBQYXN0ZWJvYXJkV2lu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTk1Ngor CisgICAgICAgIENhbGwgRGVsZXRlT2JqZWN0KCkgaWYgT3BlbkNsaXBib2FyZCgpIGZhaWxzIGFu ZCBkb24ndAorICAgICAgICBjYWxsIERlbGV0ZU9iamVjdCgpIG9uIG9iamVjdHMgcmV0dXJuZWQg ZnJvbSBTZWxlY3RPYmplY3QoKS4KKworICAgICAgICAqIHBsYXRmb3JtL3dpbi9QYXN0ZWJvYXJk V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhc3RlYm9hcmQ6OndyaXRlSW1hZ2UpOgorCiAy MDEwLTA3LTA5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAog ICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNjI5MzcuCkluZGV4OiBXZWJDb3JlL3Bs YXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vd2luL1Bhc3RlYm9hcmRXaW4uY3BwCShyZXZpc2lvbiA2MjU0NykNCisrKyBXZWJDb3Jl L3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTIxNywz MiArMjE3LDMxIEBADQogICAgIEhEQyBjb21wYXRpYmxlREMgPSBDcmVhdGVDb21wYXRpYmxlREMo MCk7CiAgICAgSERDIHNvdXJjZURDID0gQ3JlYXRlQ29tcGF0aWJsZURDKDApOwogICAgIEhCSVRN QVAgcmVzdWx0Qml0bWFwID0gQ3JlYXRlQ29tcGF0aWJsZUJpdG1hcChkYywgaW1hZ2UtPndpZHRo KCksIGltYWdlLT5oZWlnaHQoKSk7Ci0gICAgSEJJVE1BUCBvbGRCaXRtYXAgPSAoSEJJVE1BUClT ZWxlY3RPYmplY3QoY29tcGF0aWJsZURDLCByZXN1bHRCaXRtYXApOworICAgIEhHRElPQkogb2xk Qml0bWFwID0gU2VsZWN0T2JqZWN0KGNvbXBhdGlibGVEQywgcmVzdWx0Qml0bWFwKTsKIAogICAg IEJpdG1hcEluZm8gYm1JbmZvID0gQml0bWFwSW5mbzo6Y3JlYXRlKGltYWdlLT5zaXplKCkpOwog CiAgICAgSEJJVE1BUCBjb3JlQml0bWFwID0gQ3JlYXRlRElCU2VjdGlvbihkYywgJmJtSW5mbywg RElCX1JHQl9DT0xPUlMsIDAsIDAsIDApOwotICAgIEhCSVRNQVAgb2xkU291cmNlID0gKEhCSVRN QVApU2VsZWN0T2JqZWN0KHNvdXJjZURDLCBjb3JlQml0bWFwKTsKKyAgICBIR0RJT0JKIG9sZFNv dXJjZSA9IFNlbGVjdE9iamVjdChzb3VyY2VEQywgY29yZUJpdG1hcCk7CiAgICAgaW1hZ2UtPmdl dEhCSVRNQVAoY29yZUJpdG1hcCk7CiAKICAgICBCTEVOREZVTkNUSU9OIGJmID0ge0FDX1NSQ19P VkVSLCAwLCAyNTUsIEFDX1NSQ19BTFBIQX07CiAgICAgQWxwaGFCbGVuZChjb21wYXRpYmxlREMs IDAsIDAsIGltYWdlLT53aWR0aCgpLCBpbWFnZS0+aGVpZ2h0KCksCiAgICAgICAgIHNvdXJjZURD LCAwLCAwLCBpbWFnZS0+d2lkdGgoKSwgaW1hZ2UtPmhlaWdodCgpLCBiZik7CiAKLSAgICBTZWxl Y3RPYmplY3QoY29tcGF0aWJsZURDLCBvbGRCaXRtYXApOwogICAgIFNlbGVjdE9iamVjdChzb3Vy Y2VEQywgb2xkU291cmNlKTsKLQotICAgIERlbGV0ZU9iamVjdChvbGRCaXRtYXApOwotICAgIERl bGV0ZU9iamVjdChvbGRTb3VyY2UpOwogICAgIERlbGV0ZU9iamVjdChjb3JlQml0bWFwKTsKLSAg ICBSZWxlYXNlREMoMCwgZGMpOwotICAgIERlbGV0ZURDKGNvbXBhdGlibGVEQyk7CisKKyAgICBT ZWxlY3RPYmplY3QoY29tcGF0aWJsZURDLCBvbGRCaXRtYXApOwogICAgIERlbGV0ZURDKHNvdXJj ZURDKTsKKyAgICBEZWxldGVEQyhjb21wYXRpYmxlREMpOworICAgIFJlbGVhc2VEQygwLCBkYyk7 CiAKICAgICBpZiAoOjpPcGVuQ2xpcGJvYXJkKG1fb3duZXIpKSB7CiAgICAgICAgIDo6U2V0Q2xp cGJvYXJkRGF0YShDRl9CSVRNQVAsIHJlc3VsdEJpdG1hcCk7CiAgICAgICAgIDo6Q2xvc2VDbGlw Ym9hcmQoKTsKLSAgICB9CisgICAgfSBlbHNlCisgICAgICAgIDo6RGVsZXRlT2JqZWN0KHJlc3Vs dEJpdG1hcCk7CiB9CiAKIGJvb2wgUGFzdGVib2FyZDo6Y2FuU21hcnRSZXBsYWNlKCkK 62331 2010-07-22 13:26:47 -0700 2010-07-22 19:15:20 -0700 Patch (with OwnPtr) bug-41956.patch text/plain 2528 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDYyOTQ0KQ0KKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp DQpAQCAtMSwzICsxLDE2IEBADQorMjAxMC0wNy0wOSAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJv Z2FAcGFyb2dhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbV0lOXSBDb3JyZWN0IERlbGV0ZU9iamVjdCB1c2FnZSBpbiBQYXN0ZWJvYXJkV2lu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTk1Ngor CisgICAgICAgIENhbGwgRGVsZXRlT2JqZWN0KCkgaWYgT3BlbkNsaXBib2FyZCgpIGZhaWxzIGFu ZCBkb24ndAorICAgICAgICBjYWxsIERlbGV0ZU9iamVjdCgpIG9uIG9iamVjdHMgcmV0dXJuZWQg ZnJvbSBTZWxlY3RPYmplY3QoKS4KKworICAgICAgICAqIHBsYXRmb3JtL3dpbi9QYXN0ZWJvYXJk V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhc3RlYm9hcmQ6OndyaXRlSW1hZ2UpOgorCiAy MDEwLTA3LTA5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAog ICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNjI5MzcuCkluZGV4OiBXZWJDb3JlL3Bs YXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vd2luL1Bhc3RlYm9hcmRXaW4uY3BwCShyZXZpc2lvbiA2MjU0NykNCisrKyBXZWJDb3Jl L3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTIxNiwz MSArMjE2LDI5IEBADQogICAgIEhEQyBkYyA9IEdldERDKDApOw0KICAgICBIREMgY29tcGF0aWJs ZURDID0gQ3JlYXRlQ29tcGF0aWJsZURDKDApOw0KICAgICBIREMgc291cmNlREMgPSBDcmVhdGVD b21wYXRpYmxlREMoMCk7DQotICAgIEhCSVRNQVAgcmVzdWx0Qml0bWFwID0gQ3JlYXRlQ29tcGF0 aWJsZUJpdG1hcChkYywgaW1hZ2UtPndpZHRoKCksIGltYWdlLT5oZWlnaHQoKSk7DQotICAgIEhC SVRNQVAgb2xkQml0bWFwID0gKEhCSVRNQVApU2VsZWN0T2JqZWN0KGNvbXBhdGlibGVEQywgcmVz dWx0Qml0bWFwKTsNCisgICAgT3duUHRyPEhCSVRNQVA+IHJlc3VsdEJpdG1hcChDcmVhdGVDb21w YXRpYmxlQml0bWFwKGRjLCBpbWFnZS0+d2lkdGgoKSwgaW1hZ2UtPmhlaWdodCgpKSk7DQorICAg IEhHRElPQkogb2xkQml0bWFwID0gU2VsZWN0T2JqZWN0KGNvbXBhdGlibGVEQywgcmVzdWx0Qml0 bWFwLmdldCgpKTsNCiANCiAgICAgQml0bWFwSW5mbyBibUluZm8gPSBCaXRtYXBJbmZvOjpjcmVh dGUoaW1hZ2UtPnNpemUoKSk7DQogDQogICAgIEhCSVRNQVAgY29yZUJpdG1hcCA9IENyZWF0ZURJ QlNlY3Rpb24oZGMsICZibUluZm8sIERJQl9SR0JfQ09MT1JTLCAwLCAwLCAwKTsNCi0gICAgSEJJ VE1BUCBvbGRTb3VyY2UgPSAoSEJJVE1BUClTZWxlY3RPYmplY3Qoc291cmNlREMsIGNvcmVCaXRt YXApOw0KKyAgICBIR0RJT0JKIG9sZFNvdXJjZSA9IFNlbGVjdE9iamVjdChzb3VyY2VEQywgY29y ZUJpdG1hcCk7DQogICAgIGltYWdlLT5nZXRIQklUTUFQKGNvcmVCaXRtYXApOw0KIA0KICAgICBC TEVOREZVTkNUSU9OIGJmID0ge0FDX1NSQ19PVkVSLCAwLCAyNTUsIEFDX1NSQ19BTFBIQX07DQog ICAgIEFscGhhQmxlbmQoY29tcGF0aWJsZURDLCAwLCAwLCBpbWFnZS0+d2lkdGgoKSwgaW1hZ2Ut PmhlaWdodCgpLA0KICAgICAgICAgc291cmNlREMsIDAsIDAsIGltYWdlLT53aWR0aCgpLCBpbWFn ZS0+aGVpZ2h0KCksIGJmKTsNCiANCi0gICAgU2VsZWN0T2JqZWN0KGNvbXBhdGlibGVEQywgb2xk Qml0bWFwKTsNCiAgICAgU2VsZWN0T2JqZWN0KHNvdXJjZURDLCBvbGRTb3VyY2UpOw0KLQ0KLSAg ICBEZWxldGVPYmplY3Qob2xkQml0bWFwKTsNCi0gICAgRGVsZXRlT2JqZWN0KG9sZFNvdXJjZSk7 DQogICAgIERlbGV0ZU9iamVjdChjb3JlQml0bWFwKTsNCi0gICAgUmVsZWFzZURDKDAsIGRjKTsN Ci0gICAgRGVsZXRlREMoY29tcGF0aWJsZURDKTsNCisNCisgICAgU2VsZWN0T2JqZWN0KGNvbXBh dGlibGVEQywgb2xkQml0bWFwKTsNCiAgICAgRGVsZXRlREMoc291cmNlREMpOw0KKyAgICBEZWxl dGVEQyhjb21wYXRpYmxlREMpOw0KKyAgICBSZWxlYXNlREMoMCwgZGMpOw0KIA0KICAgICBpZiAo OjpPcGVuQ2xpcGJvYXJkKG1fb3duZXIpKSB7DQotICAgICAgICA6OlNldENsaXBib2FyZERhdGEo Q0ZfQklUTUFQLCByZXN1bHRCaXRtYXApOw0KKyAgICAgICAgOjpTZXRDbGlwYm9hcmREYXRhKENG X0JJVE1BUCwgcmVzdWx0Qml0bWFwLmxlYWtQdHIoKSk7DQogICAgICAgICA6OkNsb3NlQ2xpcGJv YXJkKCk7DQogICAgIH0NCiB9IAo=