37833 2010-04-19 17:19:16 -0700 Revert r57492 and move that logic to DOMWindow.cpp 2010-04-19 21:00:18 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dumi dumi darin oldest_to_newest 214360 0 dumi 2010-04-19 17:19:16 -0700 The logic added to the JSC and V8 bindings in r57492 should be moved to DOMWindow.cpp. The details of the WebSQLDatabases spec should not be exposed to the JS engines, and we should not have to maintain the same code in two different locations. 214436 1 53761 dumi 2010-04-19 18:49:03 -0700 Created attachment 53761 patch 214448 2 53761 ggaren 2010-04-19 19:19:44 -0700 Comment on attachment 53761 patch r=me 214464 3 dumi 2010-04-19 21:00:18 -0700 Landed as r57865. 53761 2010-04-19 18:49:03 -0700 2010-04-19 19:19:44 -0700 patch patch text/plain 3447 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1Nzg2MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDQtMTkgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBCaW5kaW5ncyBjbGVhbi11cC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM3ODMzCisKKyAgICAgICAgTW92ZSBzb21lIFdlYlNRTERhdGFiYXNlcyBs b2dpYyBvdXQgb2YgdGhlIGJpbmRpbmdzIGludG8KKyAgICAgICAgRE9NV2luZG93LmNwcCB3aGVy ZSBpdCBzaG91bGQgYmUuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3Rv bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0RPTVdpbmRvdzo6b3BlbkRhdGFiYXNlKToKKyAg ICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6VjhET01XaW5kb3c6Om9wZW5EYXRhYmFzZUNhbGxiYWNrKToKKyAgICAgICAg KiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5kb3c6Om9wZW5E YXRhYmFzZSk6CisKIDIwMTAtMDQtMTkgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hA YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAocm9sbGluZyBvdXQgcjU3 ODI5KS4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dDdXN0b20uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dDdXN0b20uY3BwCShy ZXZpc2lvbiA1Nzg1NykKKysrIFdlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dDdXN0b20u Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NzcsOCArOTc3LDYgQEAgSlNWYWx1ZSBKU0RPTVdpbmRv dzo6b3BlbkRhdGFiYXNlKEV4ZWNTdAogICAgICAgICBjcmVhdGlvbkNhbGxiYWNrID0gSlNEYXRh YmFzZUNhbGxiYWNrOjpjcmVhdGUoYXNPYmplY3QoYXJncy5hdCg0KSksIGdsb2JhbE9iamVjdCgp KTsKIAogICAgIEpTVmFsdWUgcmVzdWx0ID0gdG9KUyhleGVjLCBnbG9iYWxPYmplY3QoKSwgV1RG OjpnZXRQdHIoaW1wbCgpLT5vcGVuRGF0YWJhc2UodXN0cmluZ1RvU3RyaW5nKG5hbWUpLCB1c3Ry aW5nVG9TdHJpbmcodmVyc2lvbiksIHVzdHJpbmdUb1N0cmluZyhkaXNwbGF5TmFtZSksIGVzdGlt YXRlZFNpemUsIGNyZWF0aW9uQ2FsbGJhY2sucmVsZWFzZSgpLCBlYykpKTsKLSAgICBpZiAoIWVj ICYmIHJlc3VsdC5pc051bGwoKSkKLSAgICAgICAgZWMgPSBTRUNVUklUWV9FUlI7CiAKICAgICBz ZXRET01FeGNlcHRpb24oZXhlYywgZWMpOwogICAgIHJldHVybiByZXN1bHQ7CkluZGV4OiBXZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVdpbmRvd0N1c3RvbS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwCShyZXZp c2lvbiA1Nzg1NykKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3Vz dG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzM1LDggKzczNSw2IEBAIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiBWOERPTVdpbmRvdzo6b3BlbkQKICAgICAgICAgY3JlYXRpb25DYWxsYmFjayA9IFY4 RGF0YWJhc2VDYWxsYmFjazo6Y3JlYXRlKGFyZ3NbNF0sIGltcC0+ZnJhbWUoKSk7CiAKICAgICB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gcmVzdWx0ID0gdG9WOChpbXAtPm9wZW5EYXRhYmFzZShuYW1l LCB2ZXJzaW9uLCBkaXNwbGF5TmFtZSwgZXN0aW1hdGVkU2l6ZSwgY3JlYXRpb25DYWxsYmFjay5y ZWxlYXNlKCksIGVjKSk7Ci0gICAgaWYgKCFlYyAmJiByZXN1bHQuSXNFbXB0eSgpKQotICAgICAg ICBlYyA9IFNFQ1VSSVRZX0VSUjsKIAogICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7 CiAgICAgcmV0dXJuIHJlc3VsdDsKSW5kZXg6IFdlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCShyZXZpc2lvbiA1Nzg1NykK KysrIFdlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTk5LDE5 ICsxMTk5LDE0IEBAIGRvdWJsZSBET01XaW5kb3c6OmRldmljZVBpeGVsUmF0aW8oKSBjb24KICNp ZiBFTkFCTEUoREFUQUJBU0UpCiBQYXNzUmVmUHRyPERhdGFiYXNlPiBET01XaW5kb3c6Om9wZW5E YXRhYmFzZShjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmVyc2lvbiwgY29uc3Qg U3RyaW5nJiBkaXNwbGF5TmFtZSwgdW5zaWduZWQgbG9uZyBlc3RpbWF0ZWRTaXplLCBQYXNzUmVm UHRyPERhdGFiYXNlQ2FsbGJhY2s+IGNyZWF0aW9uQ2FsbGJhY2ssIEV4Y2VwdGlvbkNvZGUmIGVj KQogewotICAgIGlmICghbV9mcmFtZSkKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBpZiAoIURh dGFiYXNlOjppc0F2YWlsYWJsZSgpKQotICAgICAgICByZXR1cm4gMDsKKyAgICBSZWZQdHI8RGF0 YWJhc2U+IGRhdGFiYXNlID0gMDsKKyAgICBpZiAobV9mcmFtZSAmJiBEYXRhYmFzZTo6aXNBdmFp bGFibGUoKSAmJiBtX2ZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLT5jYW5BY2Nl c3NEYXRhYmFzZSgpKQorICAgICAgICBkYXRhYmFzZSA9IERhdGFiYXNlOjpvcGVuRGF0YWJhc2Uo bV9mcmFtZS0+ZG9jdW1lbnQoKSwgbmFtZSwgdmVyc2lvbiwgZGlzcGxheU5hbWUsIGVzdGltYXRl ZFNpemUsIGNyZWF0aW9uQ2FsbGJhY2ssIGVjKTsKIAotICAgIERvY3VtZW50KiBkb2N1bWVudCA9 IG1fZnJhbWUtPmRvY3VtZW50KCk7Ci0gICAgaWYgKCFkb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4o KS0+Y2FuQWNjZXNzRGF0YWJhc2UoKSkgeworICAgIGlmICghZGF0YWJhc2UgJiYgIWVjKQogICAg ICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgfQogCi0gICAg cmV0dXJuIERhdGFiYXNlOjpvcGVuRGF0YWJhc2UoZG9jdW1lbnQsIG5hbWUsIHZlcnNpb24sIGRp c3BsYXlOYW1lLCBlc3RpbWF0ZWRTaXplLCBjcmVhdGlvbkNhbGxiYWNrLCBlYyk7CisgICAgcmV0 dXJuIGRhdGFiYXNlOwogfQogI2VuZGlmCiAK