27666 2009-07-24 14:08:04 -0700 The patch submitted for bug 26054 has some no-op instructions that need to be removed 2009-07-27 11:09:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 dumi webkit-unassigned dglazkov oldest_to_newest 134656 0 dumi 2009-07-24 14:08:04 -0700 While working on the patch for bug 26054, I had to resolve conflicts in DatabaseTracker.cpp a few times. One of them must have gone bad and some code in DatabaseTracker.cpp was copied to SQLiteFileSystem.cpp instead of being moved there. Fortunately, those instructions are just no-ops, but they need to be removed from DatabaseTracker.cpp. 134661 1 33471 dumi 2009-07-24 14:14:17 -0700 Created attachment 33471 patch 134941 2 33471 dglazkov 2009-07-27 10:42:06 -0700 Comment on attachment 33471 patch ok. 134951 3 dglazkov 2009-07-27 11:09:11 -0700 Landed as http://trac.webkit.org/changeset/46420. 33471 2009-07-24 14:14:17 -0700 2009-07-27 10:42:05 -0700 patch patch text/plain 1692 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjM3MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMDktMDctMjQgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZW1vdmluZyBhIG5vLW9wIGJsb2NrIG9mIGNvZGUgaW4gRGF0YWJhc2VUcmFja2VyLmNwcCB0 aGF0CisgICAgICAgIHNob3VsZCd2ZSBiZWVuIHJlbW92ZWQgaW4gdGhlIHBhdGNoIGZvciBidWcg MjYwNTQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTI3NjY2CisKKyAgICAgICAgQWxsIHRlc3RzIGluIFdlYkNvcmUvc3RvcmFnZSBwYXNzLgorCisg ICAgICAgICogc3RvcmFnZS9EYXRhYmFzZVRyYWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RGF0YWJhc2VUcmFja2VyOjpmdWxsUGF0aEZvckRhdGFiYXNlKTogUmVtb3ZlZCBhIG5vLW9wCisg ICAgICAgIGJsb2NrIG9mIGNvZGUgdGhhdCB3YXMgbW92ZWQgdG8gU1FMaXRlRmlsZVN5c3RlbS5j cHAgYW5kIHNob3VsZAorICAgICAgICBoYXZlIGJlZW4gcmVtb3ZlZCBmcm9tIERhdGFiYXNlVHJh Y2tlci5jcHAKKwogMjAwOS0wNy0yNCAgRGFuaWVsIEJhdGVzICA8ZGJhdGVzQGludHVkYXRhLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogV2ViQ29yZS9zdG9y YWdlL0RhdGFiYXNlVHJhY2tlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdG9yYWdlL0Rh dGFiYXNlVHJhY2tlci5jcHAJKHJldmlzaW9uIDQ2MzcxKQorKysgV2ViQ29yZS9zdG9yYWdlL0Rh dGFiYXNlVHJhY2tlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyNywxMyArMjI3LDYgQEAgU3Ry aW5nIERhdGFiYXNlVHJhY2tlcjo6ZnVsbFBhdGhGb3JEYXRhYgogICAgIH0KICAgICBzdGF0ZW1l bnQuZmluYWxpemUoKTsKICAgICAKLSAgICBTUUxpdGVTdGF0ZW1lbnQgc2VxdWVuY2VTdGF0ZW1l bnQobV9kYXRhYmFzZSwgIlNFTEVDVCBzZXEgRlJPTSBzcWxpdGVfc2VxdWVuY2UgV0hFUkUgbmFt ZT0nRGF0YWJhc2VzJzsiKTsKLQotICAgIC8vIEZJWE1FOiBNb3JlIGluZm9ybWF0aXZlIGVycm9y IGhhbmRsaW5nIGhlcmUsIGV2ZW4gdGhvdWdoIHRoZXNlIHN0ZXBzIHNob3VsZCBuZXZlciBmYWls Ci0gICAgaWYgKHNlcXVlbmNlU3RhdGVtZW50LnByZXBhcmUoKSAhPSBTUUxSZXN1bHRPaykKLSAg ICAgICAgcmV0dXJuIFN0cmluZygpOwotICAgIHJlc3VsdCA9IHNlcXVlbmNlU3RhdGVtZW50LnN0 ZXAoKTsKLQogICAgIFN0cmluZyBmaWxlTmFtZSA9IFNRTGl0ZUZpbGVTeXN0ZW06OmdldEZpbGVO YW1lRm9yTmV3RGF0YWJhc2Uob3JpZ2luUGF0aCwgb3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIo KSwgbmFtZSwgJm1fZGF0YWJhc2UpOwogICAgIGlmICghYWRkRGF0YWJhc2Uob3JpZ2luLCBuYW1l LCBmaWxlTmFtZSkpCiAgICAgICAgIHJldHVybiBTdHJpbmcoKTsK