112074 2013-03-11 15:56:18 -0700 webdatabase: Fix some FIXMEs in WebDatabaseManagerProxy 2013-03-11 16:38:56 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ap beidson ggaren sam oldest_to_newest 852817 0 mark.lam 2013-03-11 15:56:18 -0700 The WebDatabaseManagerProxy has some FIXMEs in methods that send messages for the purpose of managing origins and instances of WebSQL databases. These methods were broadcasting the messages to all WebProcesses. Instead, it should only send to one. 852818 1 mark.lam 2013-03-11 15:57:51 -0700 ref: <rdar://problem/13395405>. 852833 2 192588 mark.lam 2013-03-11 16:13:54 -0700 Created attachment 192588 the patch. 852860 3 mark.lam 2013-03-11 16:38:56 -0700 Thanks for the review. Landed in r145426: <http://trac.webkit.org/changeset/145426>. 192588 2013-03-11 16:13:54 -0700 2013-03-11 16:31:16 -0700 the patch. bug-112074.patch text/plain 7208 mark.lam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NTQyMSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEzLTAzLTExICBNYXJrIExh bSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggc29tZSBXZWJEYXRhYmFzZU1h bmFnZXJQcm94eSBtZXRob2RzIHRvIG9ubHkgc2VuZCB0byBvbmUgV2ViUHJvY3Nlc3MKKyAgICAg ICAgaW5zdGVhZCBvZiBicm9hZGNhc3RpbmcgdG8gYWxsIFdlYlByb2Nlc3Nlcy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjA3NC4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcmVhc29uIGZvciB0 aGlzIGlzIGJlY2F1c2UgdGhlIGludGVudCBvZiB0aGVzZSBtZXNzYWdlcyBpcyB0byBhY3Qgb24K KyAgICAgICAgdGhlIHRyYWNrZXIgZGF0YWJhc2UgdGhhdCBpcyBzaGFyZWQgYmV0d2VlbiBhbGwg V2ViUHJvY2Vzc2VzLiBJdCBpcworICAgICAgICByZWR1bmRhbnQgYW5kIGluZWZmaWNpZW50IGZv ciBtdWx0aXBsZSBXZWJQcm9jZXNzZXMgdG8gc2VydmljZSB0aGUgc2FtZQorICAgICAgICByZXF1 ZXN0L21lc3NhZ2UuIEFuZCBiZWNhdXNlIG9mIG11bHRpLXByb2Nlc3MgY29udGVudGlvbiBvbiBh Y2Nlc3NpbmcKKyAgICAgICAgdGhlIHRyYWNrZXIgZGF0YWJhc2UsIHRoZSByZXN1bHRzIHJldHVy bmVkIHRvIHRoZSBVSVByb2Nlc3MgbWF5IGFsc28gYmUKKyAgICAgICAgZXJyb25lb3VzLgorCisg ICAgICAgIEZvciBleGFtcGxlLCBpZiBnZXREYXRhYmFzZU9yaWdpbnMoKSBpcyBicm9hZGNhc3Rl ZCB0byBhbGwgV2ViUHJvY2Vzc2VzLAorICAgICAgICB0aGV5IHdpbGwgY29udGVuZCB0byBvcGVu IHRoZSB0cmFja2VyIGRhdGFiYXNlIGF0IHRoZSBzYW1lIHRpbWUuIElmIG9uZQorICAgICAgICBv ZiB0aGVzZSBwcm9jZXNzZXMgZmFpbHMgYmVjYXVzZSB0aGUgZGF0YWJhc2UgaXMgYWxyZWFkeSBp biB1c2UsIHRoZW4KKyAgICAgICAgaXQgbWF5IHJldHVybiB3aXRoIGFuIGVtcHR5IGxpc3Qgd2hl biBpdCBzaG91bGQgbm90IGJlIGVtcHR5LgorCisgICAgICAgIFdpdGggdGhpcyBmaXgsIG9ubHkg b25lIFdlYlByb2Nlc3MgZ2V0cyB0aGUgbWVzc2FnZSBhbmQgd2lsbCBwZXJmb3JtIHRoZQorICAg ICAgICByZXF1ZXN0ZWQgcXVlcnkvYWN0aW9uIG9uIGJlaGFsZiBvZiBhbGwgV2ViUHJvY2Vzc2Vz LgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQuaDoKKyAgICAgICAgKFdlYktpdDo6 V2ViQ29udGV4dDo6c2VuZFRvT25lUHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkRh dGFiYXNlTWFuYWdlclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YWJhc2VNYW5h Z2VyUHJveHk6OmdldERhdGFiYXNlc0J5T3JpZ2luKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0 YWJhc2VNYW5hZ2VyUHJveHk6OmdldERhdGFiYXNlT3JpZ2lucyk6CisgICAgICAgIChXZWJLaXQ6 OldlYkRhdGFiYXNlTWFuYWdlclByb3h5OjpkZWxldGVEYXRhYmFzZVdpdGhOYW1lRm9yT3JpZ2lu KToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YWJhc2VNYW5hZ2VyUHJveHk6OmRlbGV0ZURhdGFi YXNlc0Zvck9yaWdpbik6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFiYXNlTWFuYWdlclByb3h5 OjpkZWxldGVBbGxEYXRhYmFzZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhYmFzZU1hbmFn ZXJQcm94eTo6c2V0UXVvdGFGb3JPcmlnaW4pOgorCiAyMDEzLTAzLTExICBKZWZmcmV5IFBmYXUg IDxqcGZhdUBhcHBsZS5jb20+CiAKICAgICAgICAgTGlzdCBjYWNoZSBwYXJ0aXRpb25zIGFzIHVu aXRzIGluc3RlYWQgb2YgYXMgdGhlaXIgY29udGVudHMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJDb250ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkNvbnRleHQuaAkocmV2aXNpb24gMTQ1MTY3KQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYkNvbnRleHQuaAkod29ya2luZyBjb3B5KQpAQCAtMTMzLDYgKzEzMyw3IEBAIHB1 YmxpYzoKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFU+IHZvaWQgc2VuZFRvQWxsUHJvY2Vzc2Vz KGNvbnN0IFUmIG1lc3NhZ2UpOwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFU+IHZvaWQgc2VuZFRv QWxsUHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVtSWZOZWNlc3NhcnkoY29uc3QgVSYgbWVzc2FnZSk7 CisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVT4gdm9pZCBzZW5kVG9PbmVQcm9jZXNzKGNvbnN0IFUm IG1lc3NhZ2UpOwogCiAgICAgLy8gU2VuZHMgdGhlIG1lc3NhZ2UgdG8gV2ViUHJvY2VzcyBvciBO ZXR3b3JrUHJvY2VzcyBhcyBhcHByb3BvcmlhdGUgZm9yIGN1cnJlbnQgcHJvY2VzcyBtb2RlbC4K ICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBVPiB2b2lkIHNlbmRUb05ldHdvcmtpbmdQcm9jZXNzKGNv bnN0IFUmIG1lc3NhZ2UpOwpAQCAtNTM2LDYgKzUzNywzMCBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBV PiB2b2lkIFdlYkNvbnRleHQ6OnNlCiAgICAgc2VuZFRvQWxsUHJvY2Vzc2VzKG1lc3NhZ2UpOwog fQogCit0ZW1wbGF0ZTx0eXBlbmFtZSBVPiBpbmxpbmUgdm9pZCBXZWJDb250ZXh0OjpzZW5kVG9P bmVQcm9jZXNzKGNvbnN0IFUmIG1lc3NhZ2UpCit7CisgICAgaWYgKG1fcHJvY2Vzc01vZGVsID09 IFByb2Nlc3NNb2RlbFNoYXJlZFNlY29uZGFyeVByb2Nlc3MpCisgICAgICAgIGVuc3VyZVNoYXJl ZFdlYlByb2Nlc3MoKTsKKworICAgIGJvb2wgbWVzc2FnZVNlbnQgPSBmYWxzZTsKKyAgICBzaXpl X3QgcHJvY2Vzc0NvdW50ID0gbV9wcm9jZXNzZXMuc2l6ZSgpOworICAgIGZvciAoc2l6ZV90IGkg PSAwOyBpIDwgcHJvY2Vzc0NvdW50OyArK2kpIHsKKyAgICAgICAgV2ViUHJvY2Vzc1Byb3h5KiBw cm9jZXNzID0gbV9wcm9jZXNzZXNbaV0uZ2V0KCk7CisgICAgICAgIGlmIChwcm9jZXNzLT5jYW5T ZW5kTWVzc2FnZSgpKSB7CisgICAgICAgICAgICBwcm9jZXNzLT5zZW5kKG1lc3NhZ2UsIDApOwor ICAgICAgICAgICAgbWVzc2FnZVNlbnQgPSB0cnVlOworICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIH0KKyAgICB9CisKKyAgICBpZiAoIW1lc3NhZ2VTZW50ICYmIG1fcHJvY2Vzc01vZGVsID09 IFByb2Nlc3NNb2RlbE11bHRpcGxlU2Vjb25kYXJ5UHJvY2Vzc2VzKSB7CisgICAgICAgIHdhcm1J bml0aWFsUHJvY2VzcygpOworICAgICAgICBSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiBwcm9jZXNz ID0gbV9wcm9jZXNzZXMubGFzdCgpOworICAgICAgICBpZiAocHJvY2Vzcy0+Y2FuU2VuZE1lc3Nh Z2UoKSkKKyAgICAgICAgICAgIHByb2Nlc3MtPnNlbmQobWVzc2FnZSwgMCk7CisgICAgfQorfQor CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIFdlYkNvbnRleHRfaApJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkRhdGFiYXNlTWFuYWdlclByb3h5LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRGF0YWJhc2VNYW5hZ2VyUHJv eHkuY3BwCShyZXZpc2lvbiAxNDUxNjcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi RGF0YWJhc2VNYW5hZ2VyUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDUsOCArMTQ1LDcg QEAgdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6Z2V0RGF0YWJhcwogICAgIHVpbnQ2NF90 IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJhY2tJRCgpOwogICAgIG1fYXJyYXlDYWxsYmFj a3Muc2V0KGNhbGxiYWNrSUQsIGNhbGxiYWNrLnJlbGVhc2UoKSk7CiAKLSAgICAvLyBGSVhNRSAo TXVsdGktV2ViUHJvY2Vzcyk6IDxyZGFyOi8vcHJvYmxlbS8xMjIzOTc2NT4gRGF0YWJhc2VzIHNo b3VsZG4ndCBiZSBzdG9yZWQgaW4gdGhlIHdlYiBwcm9jZXNzLgotICAgIGNvbnRleHQoKS0+c2Vu ZFRvQWxsUHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVtSWZOZWNlc3NhcnkoTWVzc2FnZXM6OldlYkRh dGFiYXNlTWFuYWdlcjo6R2V0RGF0YWJhc2VzQnlPcmlnaW4oY2FsbGJhY2tJRCkpOworICAgIGNv bnRleHQoKS0+c2VuZFRvT25lUHJvY2VzcyhNZXNzYWdlczo6V2ViRGF0YWJhc2VNYW5hZ2VyOjpH ZXREYXRhYmFzZXNCeU9yaWdpbihjYWxsYmFja0lEKSk7CiB9CiAKIHZvaWQgV2ViRGF0YWJhc2VN YW5hZ2VyUHJveHk6OmRpZEdldERhdGFiYXNlc0J5T3JpZ2luKGNvbnN0IFZlY3RvcjxPcmlnaW5B bmREYXRhYmFzZXM+JiBvcmlnaW5BbmREYXRhYmFzZXNWZWN0b3IsIHVpbnQ2NF90IGNhbGxiYWNr SUQpCkBAIC0xOTgsOCArMTk3LDcgQEAgdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6Z2V0 RGF0YWJhcwogICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJhY2tJRCgp OwogICAgIG1fYXJyYXlDYWxsYmFja3Muc2V0KGNhbGxiYWNrSUQsIGNhbGxiYWNrLnJlbGVhc2Uo KSk7CiAKLSAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IDxyZGFyOi8vcHJvYmxlbS8x MjIzOTc2NT4gRGF0YWJhc2VzIHNob3VsZG4ndCBiZSBzdG9yZWQgaW4gdGhlIHdlYiBwcm9jZXNz LgotICAgIGNvbnRleHQoKS0+c2VuZFRvQWxsUHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVtSWZOZWNl c3NhcnkoTWVzc2FnZXM6OldlYkRhdGFiYXNlTWFuYWdlcjo6R2V0RGF0YWJhc2VPcmlnaW5zKGNh bGxiYWNrSUQpKTsKKyAgICBjb250ZXh0KCktPnNlbmRUb09uZVByb2Nlc3MoTWVzc2FnZXM6Oldl YkRhdGFiYXNlTWFuYWdlcjo6R2V0RGF0YWJhc2VPcmlnaW5zKGNhbGxiYWNrSUQpKTsKIH0KIAog dm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6ZGlkR2V0RGF0YWJhc2VPcmlnaW5zKGNvbnN0 IFZlY3RvcjxTdHJpbmc+JiBvcmlnaW5JZGVudGlmaWVycywgdWludDY0X3QgY2FsbGJhY2tJRCkK QEAgLTIyMSwyNiArMjE5LDIyIEBAIHZvaWQgV2ViRGF0YWJhc2VNYW5hZ2VyUHJveHk6OmRpZEdl dERhdGEKIAogdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6ZGVsZXRlRGF0YWJhc2VXaXRo TmFtZUZvck9yaWdpbihjb25zdCBTdHJpbmcmIGRhdGFiYXNlSWRlbnRpZmllciwgV2ViU2VjdXJp dHlPcmlnaW4qIG9yaWdpbikKIHsKLSAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IDxy ZGFyOi8vcHJvYmxlbS83ODU1Njk2PiBEYXRhYmFzZXMgc2hvdWxkbid0IGJlIHN0b3JlZCBpbiB0 aGUgd2ViIHByb2Nlc3MuCi0gICAgY29udGV4dCgpLT5zZW5kVG9BbGxQcm9jZXNzZXNSZWxhdW5j aGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViRGF0YWJhc2VNYW5hZ2VyOjpEZWxldGVE YXRhYmFzZVdpdGhOYW1lRm9yT3JpZ2luKGRhdGFiYXNlSWRlbnRpZmllciwgb3JpZ2luLT5kYXRh YmFzZUlkZW50aWZpZXIoKSkpOworICAgIGNvbnRleHQoKS0+c2VuZFRvT25lUHJvY2VzcyhNZXNz YWdlczo6V2ViRGF0YWJhc2VNYW5hZ2VyOjpEZWxldGVEYXRhYmFzZVdpdGhOYW1lRm9yT3JpZ2lu KGRhdGFiYXNlSWRlbnRpZmllciwgb3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIoKSkpOwogfQog CiB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlclByb3h5OjpkZWxldGVEYXRhYmFzZXNGb3JPcmlnaW4o V2ViU2VjdXJpdHlPcmlnaW4qIG9yaWdpbikKIHsKLSAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJv Y2Vzcyk6IDxyZGFyOi8vcHJvYmxlbS83ODU1Njk2PiBEYXRhYmFzZXMgc2hvdWxkbid0IGJlIHN0 b3JlZCBpbiB0aGUgd2ViIHByb2Nlc3MuCi0gICAgY29udGV4dCgpLT5zZW5kVG9BbGxQcm9jZXNz ZXNSZWxhdW5jaGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViRGF0YWJhc2VNYW5hZ2Vy OjpEZWxldGVEYXRhYmFzZXNGb3JPcmlnaW4ob3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIoKSkp OworICAgIGNvbnRleHQoKS0+c2VuZFRvT25lUHJvY2VzcyhNZXNzYWdlczo6V2ViRGF0YWJhc2VN YW5hZ2VyOjpEZWxldGVEYXRhYmFzZXNGb3JPcmlnaW4ob3JpZ2luLT5kYXRhYmFzZUlkZW50aWZp ZXIoKSkpOwogfQogCiB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlclByb3h5OjpkZWxldGVBbGxEYXRh YmFzZXMoKQogewotICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTogPHJkYXI6Ly9wcm9i bGVtLzc4NTU2OTY+IERhdGFiYXNlcyBzaG91bGRuJ3QgYmUgc3RvcmVkIGluIHRoZSB3ZWIgcHJv Y2Vzcy4KLSAgICBjb250ZXh0KCktPnNlbmRUb0FsbFByb2Nlc3Nlc1JlbGF1bmNoaW5nVGhlbUlm TmVjZXNzYXJ5KE1lc3NhZ2VzOjpXZWJEYXRhYmFzZU1hbmFnZXI6OkRlbGV0ZUFsbERhdGFiYXNl cygpKTsKKyAgICBjb250ZXh0KCktPnNlbmRUb09uZVByb2Nlc3MoTWVzc2FnZXM6OldlYkRhdGFi YXNlTWFuYWdlcjo6RGVsZXRlQWxsRGF0YWJhc2VzKCkpOwogfQogCiB2b2lkIFdlYkRhdGFiYXNl TWFuYWdlclByb3h5OjpzZXRRdW90YUZvck9yaWdpbihXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2lu LCB1aW50NjRfdCBxdW90YSkKIHsKLSAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IDxy ZGFyOi8vcHJvYmxlbS83ODU1Njk2PiBEYXRhYmFzZXMgc2hvdWxkbid0IGJlIHN0b3JlZCBpbiB0 aGUgd2ViIHByb2Nlc3MuCi0gICAgY29udGV4dCgpLT5zZW5kVG9BbGxQcm9jZXNzZXNSZWxhdW5j aGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViRGF0YWJhc2VNYW5hZ2VyOjpTZXRRdW90 YUZvck9yaWdpbihvcmlnaW4tPmRhdGFiYXNlSWRlbnRpZmllcigpLCBxdW90YSkpOworICAgIGNv bnRleHQoKS0+c2VuZFRvT25lUHJvY2VzcyhNZXNzYWdlczo6V2ViRGF0YWJhc2VNYW5hZ2VyOjpT ZXRRdW90YUZvck9yaWdpbihvcmlnaW4tPmRhdGFiYXNlSWRlbnRpZmllcigpLCBxdW90YSkpOwog fQogCiB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlclByb3h5OjpkaWRNb2RpZnlPcmlnaW4oY29uc3Qg U3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyKQo=