116009 2013-05-12 22:39:36 -0700 [Mac] Move writeRange/PlainText/URL from ClipboardMac to PasteboardMac 2013-05-13 08:28:56 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 115980 1 darin darin commit-queue esprehn+autocc oldest_to_newest 888102 0 darin 2013-05-12 22:39:36 -0700 [Mac] Move writeRange/PlainText/URL from ClipboardMac to PasteboardMac 888103 1 201529 darin 2013-05-12 22:47:57 -0700 Created attachment 201529 Patch 888263 2 201529 kling 2013-05-13 07:43:41 -0700 Comment on attachment 201529 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201529&action=review r=me > Source/WebCore/dom/Clipboard.cpp:321 > +void Clipboard::writeRange(Range* range, Frame* frame) > +{ > + ASSERT(range); > + ASSERT(frame); I'm starting to wonder why we bother with things like this instead of passing things by reference where they are always supposed to be non-null. > Source/WebCore/dom/Clipboard.cpp:322 > + // FIXME: This is design mistake, a layering violation that should be fixed. a* design mistake > Source/WebCore/dom/Clipboard.cpp:336 > + // FIXME: This is design mistake, a layering violation that should be fixed. *a design mistake 888266 3 201529 darin 2013-05-13 07:53:34 -0700 Comment on attachment 201529 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201529&action=review >> Source/WebCore/dom/Clipboard.cpp:321 >> + ASSERT(frame); > > I'm starting to wonder why we bother with things like this instead of passing things by reference where they are always supposed to be non-null. I agree, but it’s a bit of a deep subject since it’s about idiom, not just null-ness. 888287 4 darin 2013-05-13 08:28:56 -0700 Committed r150016: <http://trac.webkit.org/changeset/150016> 201529 2013-05-12 22:47:57 -0700 2013-05-13 07:53:34 -0700 Patch bug-116009-20130512224656.patch text/plain 5819 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5OTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzM4MjViNzM5MTBiMDE4 ZWI0MDM1NWMyYmZmNWE4NjcwZTk4OGE5OS4uZjJkYTNjMTQ3ZDgxZjBlNzUxZmMzMmI5NDAwZjdh Mjc2ZTNjNDI0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEzLTA1LTEyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAorICAgICAgICBbTWFjXSBNb3ZlIHdyaXRlUmFu Z2UvUGxhaW5UZXh0L1VSTCBmcm9tIENsaXBib2FyZE1hYyB0byBQYXN0ZWJvYXJkTWFjCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYwMDkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGRvbS9DbGlwYm9h cmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2xpcGJvYXJkOjp3cml0ZVJhbmdlKTogQWRkZWQu IE1vdmVkIGZyb20gQ2xpcGJvYXJkTWFjLAorICAgICAgICBidXQgYWRkZWQgc29tZSBGSVhNRXMu CisgICAgICAgIChXZWJDb3JlOjpDbGlwYm9hcmQ6OndyaXRlUGxhaW5UZXh0KTogRGl0dG8uCisg ICAgICAgIChXZWJDb3JlOjpDbGlwYm9hcmQ6OndyaXRlVVJMKTogRGl0dG8uCisKKyAgICAgICAg KiBkb20vQ2xpcGJvYXJkLmg6IE1hZGUgd3JpdGVVUkwsIHdyaXRlUmFuZ2UsIGFuZCB3cml0ZVBs YWluVGV4dAorICAgICAgICBub24tdmlydHVhbCBpbiBub24tbGVnYWN5IGNsaXBib2FyZCBpbXBs ZW1lbnRhdGlvbnMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLmg6IFJl bW92ZWQgd3JpdGVSYW5nZSwgd3JpdGVVUkwsIGFuZAorICAgICAgICB3cml0ZVBsYWluVGV4dC4K KyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLm1tOiBEaXR0by4KKworMjAxMy0w NS0xMiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKICAgICAgICAgW01hY10gTW92 ZWQgZmlsZXMgZnVuY3Rpb24gZnJvbSBDbGlwYm9hcmRNYWMgdG8gUGFzdGVib2FyZE1hYwogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MDA4CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlwYm9hcmQuY3BwIGIvU291cmNlL1dlYkNv cmUvZG9tL0NsaXBib2FyZC5jcHAKaW5kZXggOWJmYjJlMGZhYjQ3MWYwZDI3NDFhNDEzZmExMzI5 ZGY3MjEwODIzNS4uMWIyYTkzZjY5NWYwMjA2NTRmNDlhYTM5MDJiMjJhZjE1NGMzZjE3MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0NsaXBib2FyZC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvZG9tL0NsaXBib2FyZC5jcHAKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNsdWRlICJjb25m aWcuaCIKICNpbmNsdWRlICJDbGlwYm9hcmQuaCIKIAorI2luY2x1ZGUgIkVkaXRvci5oIgogI2lu Y2x1ZGUgIkZpbGVMaXN0LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZUxv YWRlci5oIgpAQCAtMzE0LDYgKzMxNSwyOSBAQCBQYXNzUmVmUHRyPEZpbGVMaXN0PiBDbGlwYm9h cmQ6OmZpbGVzKCkgY29uc3QKICAgICByZXR1cm4gZmlsZUxpc3QucmVsZWFzZSgpOwogfQogCit2 b2lkIENsaXBib2FyZDo6d3JpdGVSYW5nZShSYW5nZSogcmFuZ2UsIEZyYW1lKiBmcmFtZSkKK3sK KyAgICBBU1NFUlQocmFuZ2UpOworICAgIEFTU0VSVChmcmFtZSk7CisgICAgLy8gRklYTUU6IFRo aXMgaXMgZGVzaWduIG1pc3Rha2UsIGEgbGF5ZXJpbmcgdmlvbGF0aW9uIHRoYXQgc2hvdWxkIGJl IGZpeGVkLgorICAgIC8vIFRoZSBjb2RlIHRvIHdyaXRlIHRoZSByYW5nZSB0byBhIHBhc3RlYm9h cmQgc2hvdWxkIGJlIGFuIEVkaXRvciBmdW5jdGlvbiB0aGF0IHRha2VzIGEgcGFzdGVib2FyZCBh cmd1bWVudC4KKyAgICAvLyBGSVhNRTogVGhlIGZyYW1lIGFyZ3VtZW50IHNlZW1zIHJlZHVuZGFu dCwgc2luY2UgYSBSYW5nZSBpcyBpbiBhIHBhcnRpY3VsYXIgZG9jdW1lbnQsIHdoaWNoIGhhcyBh IGNvcnJlc3BvbmRpbmcgZnJhbWUuCisgICAgbV9wYXN0ZWJvYXJkLT53cml0ZVNlbGVjdGlvbihy YW5nZSwgZnJhbWUtPmVkaXRvcigpLT5zbWFydEluc2VydERlbGV0ZUVuYWJsZWQoKSAmJiBmcmFt ZS0+c2VsZWN0aW9uKCktPmdyYW51bGFyaXR5KCkgPT0gV29yZEdyYW51bGFyaXR5LCBmcmFtZSwg SW5jbHVkZUltYWdlQWx0VGV4dEZvckNsaXBib2FyZCk7Cit9CisKK3ZvaWQgQ2xpcGJvYXJkOjp3 cml0ZVBsYWluVGV4dChjb25zdCBTdHJpbmcmIHRleHQpCit7CisgICAgbV9wYXN0ZWJvYXJkLT53 cml0ZVBsYWluVGV4dCh0ZXh0LCBQYXN0ZWJvYXJkOjpDYW5ub3RTbWFydFJlcGxhY2UpOworfQor Cit2b2lkIENsaXBib2FyZDo6d3JpdGVVUkwoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcm IHRpdGxlLCBGcmFtZSogZnJhbWUpCit7CisgICAgQVNTRVJUKGZyYW1lKTsKKyAgICAvLyBGSVhN RTogVGhpcyBpcyBkZXNpZ24gbWlzdGFrZSwgYSBsYXllcmluZyB2aW9sYXRpb24gdGhhdCBzaG91 bGQgYmUgZml4ZWQuCisgICAgLy8gVGhlIHBhc3RlYm9hcmQgd3JpdGVVUkwgZnVuY3Rpb24gc2hv dWxkIG5vdCB0YWtlIGEgZnJhbWUgYXJndW1lbnQsIG5vciBkb2VzIHRoaXMgZnVuY3Rpb24gbmVl ZCBhIGZyYW1lLgorICAgIG1fcGFzdGVib2FyZC0+d3JpdGVVUkwodXJsLCB0aXRsZSwgZnJhbWUp OworfQorCiAjZW5kaWYKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL0NsaXBib2FyZC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0NsaXBib2Fy ZC5oCmluZGV4IDdkNzZjZjhjZGI2YTc5NzQ4NTYyYjEyYjhlZjZiMmI0Y2U0MGI0OGMuLjZlODMx Yzk4ZDcwNjE2OWI2NTEyMzYxZTM2OGY2MzMyZjVlMTcxMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9DbGlwYm9hcmQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vQ2xpcGJvYXJk LmgKQEAgLTk3LDkgKzk3LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogI2lmIEVOQUJMRShEUkFH X1NVUFBPUlQpCiAgICAgICAgIHZpcnR1YWwgdm9pZCBkZWNsYXJlQW5kV3JpdGVEcmFnSW1hZ2Uo RWxlbWVudCosIGNvbnN0IEtVUkwmLCBjb25zdCBTdHJpbmcmIHRpdGxlLCBGcmFtZSopID0gMDsK ICNlbmRpZgotICAgICAgICB2aXJ0dWFsIHZvaWQgd3JpdGVVUkwoY29uc3QgS1VSTCYsIGNvbnN0 IFN0cmluZyYsIEZyYW1lKikgPSAwOwotICAgICAgICB2aXJ0dWFsIHZvaWQgd3JpdGVSYW5nZShS YW5nZSosIEZyYW1lKikgPSAwOwotICAgICAgICB2aXJ0dWFsIHZvaWQgd3JpdGVQbGFpblRleHQo Y29uc3QgU3RyaW5nJikgPSAwOworICAgICAgICBMRUdBQ1lfVklSVFVBTCB2b2lkIHdyaXRlVVJM KGNvbnN0IEtVUkwmLCBjb25zdCBTdHJpbmcmLCBGcmFtZSopIExFR0FDWV9QVVJFOworICAgICAg ICBMRUdBQ1lfVklSVFVBTCB2b2lkIHdyaXRlUmFuZ2UoUmFuZ2UqLCBGcmFtZSopIExFR0FDWV9Q VVJFOworICAgICAgICBMRUdBQ1lfVklSVFVBTCB2b2lkIHdyaXRlUGxhaW5UZXh0KGNvbnN0IFN0 cmluZyYpIExFR0FDWV9QVVJFOwogCiAgICAgICAgIExFR0FDWV9WSVJUVUFMIGJvb2wgaGFzRGF0 YSgpIExFR0FDWV9QVVJFOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t YWMvQ2xpcGJvYXJkTWFjLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ2xpcGJvYXJk TWFjLmgKaW5kZXggMjg0MTY2YzBlNWJlNzJhZDAxMjU0OTc5NjRiMTk0YjMzZTdkNDAwOS4uNGJi OWNhZGIyZTQ4ZDQ5NDg0NGEwNjEzYmIyNjEwNmVkYWMyZDIyMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMuaApAQCAtNjAsOSArNjAsNiBAQCBwdWJsaWM6CiAj aWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKICAgICB2aXJ0dWFsIHZvaWQgZGVjbGFyZUFuZFdyaXRl RHJhZ0ltYWdlKEVsZW1lbnQqLCBjb25zdCBLVVJMJiwgY29uc3QgU3RyaW5nJiB0aXRsZSwgRnJh bWUqKTsKICNlbmRpZgotICAgIHZpcnR1YWwgdm9pZCB3cml0ZVJhbmdlKFJhbmdlKiwgRnJhbWUq IGZyYW1lKTsKLSAgICB2aXJ0dWFsIHZvaWQgd3JpdGVVUkwoY29uc3QgS1VSTCYsIGNvbnN0IFN0 cmluZyYsIEZyYW1lKiBmcmFtZSk7Ci0gICAgdmlydHVhbCB2b2lkIHdyaXRlUGxhaW5UZXh0KGNv bnN0IFN0cmluZyYpOwogICAgIAogICAgIC8vIE1ldGhvZHMgZm9yIGdldHRpbmcgaW5mbyBpbiBD b2NvYSdzIHR5cGUgc3lzdGVtCiAgICAgTlNJbWFnZSAqZHJhZ05TSW1hZ2UoTlNQb2ludCYpIGNv bnN0OyAvLyBsb2MgY29udmVydGVkIGZyb20gZHJhZ0xvYywgYmFzZWQgb24gd2hvbGUgaW1hZ2Ug c2l6ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1h Yy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMubW0KaW5kZXgg Y2MwNTgxMGNlMThjMWIyMTc3ZDA3Mzc3M2MzYWRlMzNkOWIwYzNkYi4uZWVjZGQ3N2ZiYjU0NDkx NTU4NDQ1Y2IzMzgyMmQwODJiOTk2ZGJiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL0NsaXBib2FyZE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t YWMvQ2xpcGJvYXJkTWFjLm1tCkBAIC0xMTUsMjggKzExNSw2IEBAIHZvaWQgQ2xpcGJvYXJkTWFj OjpzZXREcmFnSW1hZ2UoQ2FjaGVkSW1hZ2UqIGltYWdlLCBOb2RlICpub2RlLCBjb25zdCBJbnRQ b2ludCAmCiAgICAgfQogfQogICAgIAotdm9pZCBDbGlwYm9hcmRNYWM6OndyaXRlUmFuZ2UoUmFu Z2UqIHJhbmdlLCBGcmFtZSogZnJhbWUpCi17Ci0gICAgQVNTRVJUKHJhbmdlKTsKLSAgICBBU1NF UlQoZnJhbWUpOwotICAgIFBhc3RlYm9hcmQgcGFzdGVib2FyZChtX3Bhc3RlYm9hcmROYW1lKTsK LSAgICBwYXN0ZWJvYXJkLndyaXRlU2VsZWN0aW9uKHJhbmdlLCBmcmFtZS0+ZWRpdG9yKCktPnNt YXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZCgpICYmIGZyYW1lLT5zZWxlY3Rpb24oKS0+Z3JhbnVsYXJp dHkoKSA9PSBXb3JkR3JhbnVsYXJpdHksIGZyYW1lLCBJbmNsdWRlSW1hZ2VBbHRUZXh0Rm9yQ2xp cGJvYXJkKTsKLX0KLQotdm9pZCBDbGlwYm9hcmRNYWM6OndyaXRlUGxhaW5UZXh0KGNvbnN0IFN0 cmluZyYgdGV4dCkKLXsKLSAgICBQYXN0ZWJvYXJkIHBhc3RlYm9hcmQobV9wYXN0ZWJvYXJkTmFt ZSk7Ci0gICAgcGFzdGVib2FyZC53cml0ZVBsYWluVGV4dCh0ZXh0LCBQYXN0ZWJvYXJkOjpDYW5u b3RTbWFydFJlcGxhY2UpOwotfQotCi12b2lkIENsaXBib2FyZE1hYzo6d3JpdGVVUkwoY29uc3Qg S1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHRpdGxlLCBGcmFtZSogZnJhbWUpCi17ICAgCi0gICAg QVNTRVJUKGZyYW1lKTsKLSAgICBBU1NFUlQobV9wYXN0ZWJvYXJkTmFtZSk7Ci0gICAgUGFzdGVi b2FyZCBwYXN0ZWJvYXJkKG1fcGFzdGVib2FyZE5hbWUpOwotICAgIHBhc3RlYm9hcmQud3JpdGVV UkwodXJsLCB0aXRsZSwgZnJhbWUpOwotfQotICAgIAogI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQp CiB2b2lkIENsaXBib2FyZE1hYzo6ZGVjbGFyZUFuZFdyaXRlRHJhZ0ltYWdlKEVsZW1lbnQqIGVs ZW1lbnQsIGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiB0aXRsZSwgRnJhbWUqIGZyYW1l KQogewo=