99361 2012-10-15 13:57:16 -0700 Re-order CachedRawResource::data() to set m_data earlier 2012-10-16 09:56:23 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 49246 1 japhet japhet abarth webkit.review.bot oldest_to_newest 742387 0 japhet 2012-10-15 13:57:16 -0700 Currently, we calculate the diff between the data parameter and m_data, call dataReceived(), then set m_data to data. If something inside dataReceived() tries to access m_data via CachedResource::resourceBuffer(), it will see the old data instead of the new data, which seems inconsistent. To the best of my knowledge, this isn't needed currently, but it's necessary for caching main resources, as much more work will be done on main resource dataReceived() callbacks. 742402 1 168775 japhet 2012-10-15 14:04:54 -0700 Created attachment 168775 patch 743222 2 168775 abarth 2012-10-16 09:51:20 -0700 Comment on attachment 168775 patch ok 743228 3 168775 webkit.review.bot 2012-10-16 09:56:20 -0700 Comment on attachment 168775 patch Clearing flags on attachment: 168775 Committed r131467: <http://trac.webkit.org/changeset/131467> 743229 4 webkit.review.bot 2012-10-16 09:56:23 -0700 All reviewed patches have been landed. Closing bug. 168775 2012-10-15 14:04:54 -0700 2012-10-16 09:56:20 -0700 patch crr_data.txt text/plain 3033 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMTM1MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTEwLTE1ICBOYXRlIENo YXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmUtb3JkZXIgQ2FjaGVkUmF3 UmVzb3VyY2U6OmRhdGEoKSB0byBzZXQgbV9kYXRhIGVhcmxpZXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5MzYxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5LCB3ZSBjYWxjdWxhdGUgdGhl IGRpZmYgYmV0d2VlbiB0aGUgZGF0YSBwYXJhbWV0ZXIgYW5kIG1fZGF0YSwgY2FsbAorICAgICAg ICBkYXRhUmVjZWl2ZWQoKSwgdGhlbiBzZXQgbV9kYXRhIHRvIGRhdGEuIElmIHNvbWV0aGluZyBp bnNpZGUgZGF0YVJlY2VpdmVkKCkKKyAgICAgICAgdHJpZXMgdG8gYWNjZXNzIG1fZGF0YSB2aWEg Q2FjaGVkUmVzb3VyY2U6OnJlc291cmNlQnVmZmVyKCksIGl0IHdpbGwgc2VlIHRoZQorICAgICAg ICBvbGQgZGF0YSBpbnN0ZWFkIG9mIHRoZSBuZXcgZGF0YSwgd2hpY2ggc2VlbXMgaW5jb25zaXN0 ZW50LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYXMgbm8gb25lIGFwcGVhcnMgdG8gdHJ5IHRv IGFjY2VzcyBtX2RhdGEgd2l0aGluIGRhdGFSZWNlaXZlZCgpIGN1cnJlbnRseS4KKworICAgICAg ICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSYXdSZXNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDYWNoZWRSYXdSZXNvdXJjZTo6ZGF0YSk6CisKIDIwMTItMTAtMTUgIEV1bm1pIExlZSAgPGV1 bm1pMTUubGVlQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdW1dLMl0gUmVmYWN0b3Jpbmcg aW5pdGlhbGl6YXRpb24gYW5kIHNodXRkb3duIGNvZGVzIG9mIEVGTCBsaWJyYXJpZXMuCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmF3UmVzb3VyY2UuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSYXdSZXNvdXJjZS5j cHAJKHJldmlzaW9uIDEzMTM0MCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNo ZWRSYXdSZXNvdXJjZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDIwICs0NSwxNiBAQAogdm9p ZCBDYWNoZWRSYXdSZXNvdXJjZTo6ZGF0YShQYXNzUmVmUHRyPFJlc291cmNlQnVmZmVyPiBkYXRh LCBib29sIGFsbERhdGFSZWNlaXZlZCkKIHsKICAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNo ZWRSYXdSZXNvdXJjZT4gcHJvdGVjdCh0aGlzKTsKKyAgICBjb25zdCBjaGFyKiBpbmNyZW1lbnRh bERhdGEgPSAwOworICAgIHNpemVfdCBpbmNyZW1lbnRhbERhdGFMZW5ndGggPSAwOwogICAgIGlm IChkYXRhKSB7CiAgICAgICAgIC8vIElmIHdlIGFyZSBidWZmZXJpbmcgZGF0YSwgdGhlbiB3ZSBh cmUgc2F2aW5nIHRoZSBidWZmZXIgaW4gbV9kYXRhIGFuZCBuZWVkIHRvIG1hbnVhbGx5CiAgICAg ICAgIC8vIGNhbGN1bGF0ZSB0aGUgaW5jcmVtZW50YWwgZGF0YS4gSWYgd2UgYXJlIG5vdCBidWZm ZXJpbmcsIHRoZW4gbV9kYXRhIHdpbGwgYmUgbnVsbCBhbmQKICAgICAgICAgLy8gdGhlIGJ1ZmZl ciBjb250YWlucyBvbmx5IHRoZSBpbmNyZW1lbnRhbCBkYXRhLgogICAgICAgICBzaXplX3QgcHJl dmlvdXNEYXRhTGVuZ3RoID0gKG1fb3B0aW9ucy5zaG91bGRCdWZmZXJEYXRhID09IEJ1ZmZlckRh dGEpID8gZW5jb2RlZFNpemUoKSA6IDA7CiAgICAgICAgIEFTU0VSVChkYXRhLT5zaXplKCkgPj0g cHJldmlvdXNEYXRhTGVuZ3RoKTsKLSAgICAgICAgY29uc3QgY2hhciogaW5jcmVtZW50YWxEYXRh ID0gZGF0YS0+ZGF0YSgpICsgcHJldmlvdXNEYXRhTGVuZ3RoOwotICAgICAgICBzaXplX3QgaW5j cmVtZW50YWxEYXRhTGVuZ3RoID0gZGF0YS0+c2l6ZSgpIC0gcHJldmlvdXNEYXRhTGVuZ3RoOwot Ci0gICAgICAgIGlmIChpbmNyZW1lbnRhbERhdGFMZW5ndGgpIHsKLSAgICAgICAgICAgIENhY2hl ZFJlc291cmNlQ2xpZW50V2Fsa2VyPENhY2hlZFJhd1Jlc291cmNlQ2xpZW50PiB3KG1fY2xpZW50 cyk7Ci0gICAgICAgICAgICB3aGlsZSAoQ2FjaGVkUmF3UmVzb3VyY2VDbGllbnQqIGMgPSB3Lm5l eHQoKSkKLSAgICAgICAgICAgICAgICBjLT5kYXRhUmVjZWl2ZWQodGhpcywgaW5jcmVtZW50YWxE YXRhLCBpbmNyZW1lbnRhbERhdGFMZW5ndGgpOwotICAgICAgICB9CisgICAgICAgIGluY3JlbWVu dGFsRGF0YSA9IGRhdGEtPmRhdGEoKSArIHByZXZpb3VzRGF0YUxlbmd0aDsKKyAgICAgICAgaW5j cmVtZW50YWxEYXRhTGVuZ3RoID0gZGF0YS0+c2l6ZSgpIC0gcHJldmlvdXNEYXRhTGVuZ3RoOwog ICAgIH0KICAgICAKICAgICBpZiAobV9vcHRpb25zLnNob3VsZEJ1ZmZlckRhdGEgPT0gQnVmZmVy RGF0YSkgewpAQCAtNjYsNiArNjIsMTIgQEAKICAgICAgICAgICAgIHNldEVuY29kZWRTaXplKGRh dGEtPnNpemUoKSk7CiAgICAgICAgIG1fZGF0YSA9IGRhdGE7CiAgICAgfQorICAgIAorICAgIGlm IChpbmNyZW1lbnRhbERhdGFMZW5ndGgpIHsKKyAgICAgICAgQ2FjaGVkUmVzb3VyY2VDbGllbnRX YWxrZXI8Q2FjaGVkUmF3UmVzb3VyY2VDbGllbnQ+IHcobV9jbGllbnRzKTsKKyAgICAgICAgd2hp bGUgKENhY2hlZFJhd1Jlc291cmNlQ2xpZW50KiBjID0gdy5uZXh0KCkpCisgICAgICAgICAgICBj LT5kYXRhUmVjZWl2ZWQodGhpcywgaW5jcmVtZW50YWxEYXRhLCBpbmNyZW1lbnRhbERhdGFMZW5n dGgpOworICAgIH0KICAgICBDYWNoZWRSZXNvdXJjZTo6ZGF0YShtX2RhdGEsIGFsbERhdGFSZWNl aXZlZCk7CiB9CiAK