32873 2009-12-22 08:39:49 -0800 [Android] ResourceHandleInternal is missing the pointer to ResourceLoaderAndroid 2009-12-28 22:50:15 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Android Android RESOLVED FIXED P2 Normal --- 0 andreip webkit-unassigned android-webkit-unforking commit-queue webkit.review.bot oldest_to_newest 174275 0 andreip 2009-12-22 08:39:49 -0800 On Android, ResourceHandle instances make use of a pointer to a ResourceLoaderAndroid pointer. This needs to be stored in order to later cancel the load, if necessary. Since this pointer is an internal implementation details of ResourceHandle on Android, it needs to be stored in the ResourceHandleInternal class. 174276 1 45387 andreip 2009-12-22 08:49:40 -0800 Created attachment 45387 Add the the pointer to ResourceLoaderAndroid to ResourceHandleInternal class. 174277 2 webkit.review.bot 2009-12-22 08:50:34 -0800 style-queue ran check-webkit-style on attachment 45387 without any errors. 174278 3 45388 andreip 2009-12-22 08:54:13 -0800 Created attachment 45388 Add the the pointer to ResourceLoaderAndroid to ResourceHandleInternal class. Used #defined(ANDROID) instead of PLATFORM(ANDROID) in the previous patch. Fixed. 174279 4 webkit.review.bot 2009-12-22 08:55:57 -0800 style-queue ran check-webkit-style on attachment 45388 without any errors. 174639 5 45388 dimich 2009-12-23 13:00:35 -0800 Comment on attachment 45388 Add the the pointer to ResourceLoaderAndroid to ResourceHandleInternal class. r=me 175427 6 45388 commit-queue 2009-12-28 22:50:09 -0800 Comment on attachment 45388 Add the the pointer to ResourceLoaderAndroid to ResourceHandleInternal class. Clearing flags on attachment: 45388 Committed r52610: <http://trac.webkit.org/changeset/52610> 175428 7 commit-queue 2009-12-28 22:50:15 -0800 All reviewed patches have been landed. Closing bug. 45387 2009-12-22 08:49:40 -0800 2009-12-22 08:54:13 -0800 Add the the pointer to ResourceLoaderAndroid to ResourceHandleInternal class. 32873.patch text/plain 2607 andreip SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjQ4NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDktMTItMjIgIEFuZHJlaSBQb3Blc2N1ICA8YW5kcmVpcEBnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE9uIEFuZHJvaWQsIFJlc291cmNlSGFuZGxlIGluc3RhbmNlcyBtYWtlIHVzZSBvZiBhIHBvaW50 ZXIgdG8gYQorICAgICAgICBSZXNvdXJjZUxvYWRlckFuZHJvaWQgcG9pbnRlci4gVGhpcyBuZWVk cyB0byBiZSBzdG9yZWQgaW4gb3JkZXIgdG8gbGF0ZXIgY2FuY2VsCisgICAgICAgIHRoZSBsb2Fk LCBpZiBuZWNlc3NhcnkuIFNpbmNlIHRoaXMgcG9pbnRlciBpcyBhbiBpbnRlcm5hbCBpbXBsZW1l bnRhdGlvbgorICAgICAgICBkZXRhaWxzIG9mIFJlc291cmNlSGFuZGxlIG9uIEFuZHJvaWQsIGl0 IG5lZWRzIHRvIGJlIHN0b3JlZCBpbiB0aGUKKyAgICAgICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5h bCBjbGFzcy4gVGhpcyBwYXRjaCBhZGRzIHRoaXMgcG9pbnRlci4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyODczCisKKyAgICAgICAgTm8gbmV3IHRl c3RzIG5lZWRlZCwgdGhpcyBpcyBwbGF0Zm9ybS1zcGVjaWZpYyBjb2RlLgorCisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZS5oOgorICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VIYW5kbGVJbnRlcm5hbDo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbCk6CisKIDIwMDktMTItMjEg IFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jl c291cmNlSGFuZGxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jl c291cmNlSGFuZGxlLmgJKHJldmlzaW9uIDUyNDg2KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL1Jlc291cmNlSGFuZGxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3MCw3ICsxNzAsNyBAQCBw dWJsaWM6CiAgICAgZnJpZW5kIExSRVNVTFQgX19zdGRjYWxsIFJlc291cmNlSGFuZGxlV25kUHJv YyhIV05ELCB1bnNpZ25lZCBtZXNzYWdlLCBXUEFSQU0sIExQQVJBTSk7CiAjZW5kaWYKIAotI2lm IFBMQVRGT1JNKFFUKSB8fCBVU0UoQ1VSTCkgfHwgVVNFKFNPVVApCisjaWYgUExBVEZPUk0oUVQp IHx8IFVTRShDVVJMKSB8fCBVU0UoU09VUCkgfHwgZGVmaW5lZChBTkRST0lEKQogICAgIFJlc291 cmNlSGFuZGxlSW50ZXJuYWwqIGdldEludGVybmFsKCkgeyByZXR1cm4gZC5nZXQoKTsgfQogI2Vu ZGlmCiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVy bmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFu ZGxlSW50ZXJuYWwuaAkocmV2aXNpb24gNTI0ODYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC02OCw2ICs2OCwx MCBAQCBjbGFzcyBOU1VSTENvbm5lY3Rpb247CiAjZW5kaWYKICNlbmRpZgogCisjaWYgUExBVEZP Uk0oQU5EUk9JRCkKKyNpbmNsdWRlICJSZXNvdXJjZUxvYWRlckFuZHJvaWQuaCIKKyNlbmRpZgor CiAvLyBUaGUgYWxsb2NhdGlvbnMgYW5kIHJlbGVhc2VzIGluIFJlc291cmNlSGFuZGxlSW50ZXJu YWwgYXJlCiAvLyBDb2NvYS1leGNlcHRpb24tZnJlZSAoZWl0aGVyIHNpbXBsZSBGb3VuZGF0aW9u IGNsYXNzZXMgb3IKIC8vIFdlYkNvcmVSZXNvdXJjZUxvYWRlckltcCB3aGljaCBhdm9pZHMgZG9p bmcgd29yayBpbiBkZWFsbG9jKS4KQEAgLTIxMSw2ICsyMTUsOSBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIC8vIEl0IGlzIGFsbW9zdCBpZGVudGljYWwgdG8gbV9jdXJyZW50V2ViQ2hh bGxlbmdlLm5zVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoKSwgYnV0IGhhcyBhIGRpZmZlcmVu dCBzZW5kZXIuCiAgICAgICAgIE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKm1fY3VycmVu dE1hY0NoYWxsZW5nZTsKICNlbmRpZgorI2lmIFBMQVRGT1JNKEFORFJPSUQpCisgICAgICAgIFJl ZlB0cjxSZXNvdXJjZUxvYWRlckFuZHJvaWQ+IG1fbG9hZGVyOworI2VuZGlmCiAgICAgICAgIEF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlIG1fY3VycmVudFdlYkNoYWxsZW5nZTsKIAogICAgICAgICBS ZXNvdXJjZUhhbmRsZTo6RmFpbHVyZVR5cGUgbV9mYWlsdXJlVHlwZTsK 45388 2009-12-22 08:54:13 -0800 2009-12-28 22:50:08 -0800 Add the the pointer to ResourceLoaderAndroid to ResourceHandleInternal class. 32873.patch text/plain 2608 andreip SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjQ4NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDktMTItMjIgIEFuZHJlaSBQb3Blc2N1ICA8YW5kcmVpcEBnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE9uIEFuZHJvaWQsIFJlc291cmNlSGFuZGxlIGluc3RhbmNlcyBtYWtlIHVzZSBvZiBhIHBvaW50 ZXIgdG8gYQorICAgICAgICBSZXNvdXJjZUxvYWRlckFuZHJvaWQgcG9pbnRlci4gVGhpcyBuZWVk cyB0byBiZSBzdG9yZWQgaW4gb3JkZXIgdG8gbGF0ZXIgY2FuY2VsCisgICAgICAgIHRoZSBsb2Fk LCBpZiBuZWNlc3NhcnkuIFNpbmNlIHRoaXMgcG9pbnRlciBpcyBhbiBpbnRlcm5hbCBpbXBsZW1l bnRhdGlvbgorICAgICAgICBkZXRhaWxzIG9mIFJlc291cmNlSGFuZGxlIG9uIEFuZHJvaWQsIGl0 IG5lZWRzIHRvIGJlIHN0b3JlZCBpbiB0aGUKKyAgICAgICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5h bCBjbGFzcy4gVGhpcyBwYXRjaCBhZGRzIHRoaXMgcG9pbnRlci4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyODczCisKKyAgICAgICAgTm8gbmV3IHRl c3RzIG5lZWRlZCwgdGhpcyBpcyBwbGF0Zm9ybS1zcGVjaWZpYyBjb2RlLgorCisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZS5oOgorICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VIYW5kbGVJbnRlcm5hbDo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbCk6CisKIDIwMDktMTItMjEg IFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jl c291cmNlSGFuZGxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jl c291cmNlSGFuZGxlLmgJKHJldmlzaW9uIDUyNDg2KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL1Jlc291cmNlSGFuZGxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3MCw3ICsxNzAsNyBAQCBw dWJsaWM6CiAgICAgZnJpZW5kIExSRVNVTFQgX19zdGRjYWxsIFJlc291cmNlSGFuZGxlV25kUHJv YyhIV05ELCB1bnNpZ25lZCBtZXNzYWdlLCBXUEFSQU0sIExQQVJBTSk7CiAjZW5kaWYKIAotI2lm IFBMQVRGT1JNKFFUKSB8fCBVU0UoQ1VSTCkgfHwgVVNFKFNPVVApCisjaWYgUExBVEZPUk0oUVQp IHx8IFVTRShDVVJMKSB8fCBVU0UoU09VUCkgfHwgUExBVEZPUk0oQU5EUk9JRCkKICAgICBSZXNv dXJjZUhhbmRsZUludGVybmFsKiBnZXRJbnRlcm5hbCgpIHsgcmV0dXJuIGQuZ2V0KCk7IH0KICNl bmRpZgogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRl cm5hbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhh bmRsZUludGVybmFsLmgJKHJldmlzaW9uIDUyNDg2KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL1Jlc291cmNlSGFuZGxlSW50ZXJuYWwuaAkod29ya2luZyBjb3B5KQpAQCAtNjgsNiArNjgs MTAgQEAgY2xhc3MgTlNVUkxDb25uZWN0aW9uOwogI2VuZGlmCiAjZW5kaWYKIAorI2lmIFBMQVRG T1JNKEFORFJPSUQpCisjaW5jbHVkZSAiUmVzb3VyY2VMb2FkZXJBbmRyb2lkLmgiCisjZW5kaWYK KwogLy8gVGhlIGFsbG9jYXRpb25zIGFuZCByZWxlYXNlcyBpbiBSZXNvdXJjZUhhbmRsZUludGVy bmFsIGFyZQogLy8gQ29jb2EtZXhjZXB0aW9uLWZyZWUgKGVpdGhlciBzaW1wbGUgRm91bmRhdGlv biBjbGFzc2VzIG9yCiAvLyBXZWJDb3JlUmVzb3VyY2VMb2FkZXJJbXAgd2hpY2ggYXZvaWRzIGRv aW5nIHdvcmsgaW4gZGVhbGxvYykuCkBAIC0yMTEsNiArMjE1LDkgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgICAgICAvLyBJdCBpcyBhbG1vc3QgaWRlbnRpY2FsIHRvIG1fY3VycmVudFdlYkNo YWxsZW5nZS5uc1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKCksIGJ1dCBoYXMgYSBkaWZmZXJl bnQgc2VuZGVyLgogICAgICAgICBOU1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlICptX2N1cnJl bnRNYWNDaGFsbGVuZ2U7CiAjZW5kaWYKKyNpZiBQTEFURk9STShBTkRST0lEKQorICAgICAgICBS ZWZQdHI8UmVzb3VyY2VMb2FkZXJBbmRyb2lkPiBtX2xvYWRlcjsKKyNlbmRpZgogICAgICAgICBB dXRoZW50aWNhdGlvbkNoYWxsZW5nZSBtX2N1cnJlbnRXZWJDaGFsbGVuZ2U7CiAKICAgICAgICAg UmVzb3VyY2VIYW5kbGU6OkZhaWx1cmVUeXBlIG1fZmFpbHVyZVR5cGU7Cg==