77649 2012-02-02 09:08:18 -0800 Upstream targetType usage on ResourceRequest for BlackBerry port 2012-02-03 07:00:20 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rwlbuis rwlbuis japhet tonikitoo webkit.review.bot oldest_to_newest 547909 0 rwlbuis 2012-02-02 09:08:18 -0800 We rely on targetType usage, same as chromium port does. 547915 1 125145 rwlbuis 2012-02-02 09:12:44 -0800 Created attachment 125145 Patch 547980 2 125145 tonikitoo 2012-02-02 10:47:57 -0800 Comment on attachment 125145 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125145&action=review > Source/WebCore/platform/network/blackberry/ResourceRequest.h:53 > + enum TargetType { > + TargetIsMainFrame, > + TargetIsSubframe, > + TargetIsSubresource, // Resource is a generic subresource. (Generally a specific type should be specified) > + TargetIsStyleSheet, > + TargetIsScript, > + TargetIsFontResource, > + TargetIsImage, > + TargetIsObject, > + TargetIsMedia, > + TargetIsWorker, > + TargetIsSharedWorker, > + TargetIsPrefetch, > + TargetIsPrerender, > + TargetIsFavicon, > + TargetIsXHR, > + TargetIsTextTrack, > + TargetIsUnspecified, > + }; maybe we should move it to the resourcerequestbase class, and only declare it for chromium and blackberry? 547994 3 rwlbuis 2012-02-02 11:07:55 -0800 (In reply to comment #2) > (From update of attachment 125145 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=125145&action=review > > > Source/WebCore/platform/network/blackberry/ResourceRequest.h:53 > > + enum TargetType { > > + TargetIsMainFrame, > > + TargetIsSubframe, > > + TargetIsSubresource, // Resource is a generic subresource. (Generally a specific type should be specified) > > + TargetIsStyleSheet, > > + TargetIsScript, > > + TargetIsFontResource, > > + TargetIsImage, > > + TargetIsObject, > > + TargetIsMedia, > > + TargetIsWorker, > > + TargetIsSharedWorker, > > + TargetIsPrefetch, > > + TargetIsPrerender, > > + TargetIsFavicon, > > + TargetIsXHR, > > + TargetIsTextTrack, > > + TargetIsUnspecified, > > + }; > > maybe we should move it to the resourcerequestbase class, and only declare it for chromium and blackberry? This is a good idea, but would require feedback from Chromium folks. Note that our ResourceRequest implementation is different, for instance we add setAnchorText to the API, I am sure chromium adds other things. Cheers, Rob. 548686 4 rwlbuis 2012-02-03 07:00:20 -0800 Landed in r106655, closing. 125145 2012-02-02 09:12:44 -0800 2012-02-02 13:05:56 -0800 Patch bug-77649-20120202121506.patch text/plain 5128 rwlbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzM0MWQyMDRlODc2OTBj NTNkM2RiOThmZjQ1ZGMwYzg5NjNiNmZjZC4uOTkyOTM5ZDE4NzQ2ZTRhMGQwMzlhNDU2NzEwOTI5 OTEyNDE1OTMxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTAyLTAyICBSb2Ig QnVpcyAgPHJidWlzQHJpbS5jb20+CisKKyAgICAgICAgVXBzdHJlYW0gdGFyZ2V0VHlwZSB1c2Fn ZSBvbiBSZXNvdXJjZVJlcXVlc3QgZm9yIEJsYWNrQmVycnkgcG9ydAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc2NDkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcHN0cmVhbSBiaXRzIHRoYXQgbWFrZSB1 c2Ugb2YgdGFyZ2V0VHlwZSBlbnVtLgorCisgICAgICAgICogbG9hZGVyL1BpbmdMb2FkZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UGluZ0xvYWRlcjo6bG9hZEltYWdlKToKKyAgICAgICAgKFdl YkNvcmU6OlBpbmdMb2FkZXI6OnNlbmRQaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlBpbmdMb2Fk ZXI6OnJlcG9ydENvbnRlbnRTZWN1cml0eVBvbGljeVZpb2xhdGlvbik6CisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdC5oOgorICAgICAgICAoUmVz b3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6dGFyZ2V0 VHlwZSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OnNldFRhcmdldFR5cGUp OgorICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpY TUxIdHRwUmVxdWVzdDo6Y3JlYXRlUmVxdWVzdCk6CisKIDIwMTItMDItMDIgIFBhdmVsIEZlbGRt YW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGVuYWJs ZSBlZGl0aW5nIG9mIHNlbGVjdGVkIHJvd3Mgb24gc2luZ2xlIGNsaWNrIGluIGVsZW1lbnRzIHBh bmVsLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuY3BwCmluZGV4IGU4ZGE0YWE1MmVkZTYz NjBkMGRkODI3YjIwMjZlYmUzODRiNGIzMDYuLjczMjhmNWI0Zjk0MGRmNzM4MGIzZmVjNGRiMzhh NzgyYmU1NGI1NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9QaW5nTG9hZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAKQEAgLTU2LDcg KzU2LDcgQEAgdm9pZCBQaW5nTG9hZGVyOjpsb2FkSW1hZ2UoRnJhbWUqIGZyYW1lLCBjb25zdCBL VVJMJiB1cmwpCiAgICAgfQogCiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QodXJsKTsKLSNp ZiBQTEFURk9STShDSFJPTUlVTSkKKyNpZiBQTEFURk9STShDSFJPTUlVTSkgfHwgUExBVEZPUk0o QkxBQ0tCRVJSWSkKICAgICByZXF1ZXN0LnNldFRhcmdldFR5cGUoUmVzb3VyY2VSZXF1ZXN0OjpU YXJnZXRJc0ltYWdlKTsKICNlbmRpZgogICAgIHJlcXVlc3Quc2V0SFRUUEhlYWRlckZpZWxkKCJD YWNoZS1Db250cm9sIiwgIm1heC1hZ2U9MCIpOwpAQCAtNzUsNyArNzUsNyBAQCB2b2lkIFBpbmdM b2FkZXI6OmxvYWRJbWFnZShGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHVybCkKIHZvaWQgUGlu Z0xvYWRlcjo6c2VuZFBpbmcoRnJhbWUqIGZyYW1lLCBjb25zdCBLVVJMJiBwaW5nVVJMLCBjb25z dCBLVVJMJiBkZXN0aW5hdGlvblVSTCkKIHsKICAgICBSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdChw aW5nVVJMKTsKLSNpZiBQTEFURk9STShDSFJPTUlVTSkKKyNpZiBQTEFURk9STShDSFJPTUlVTSkg fHwgUExBVEZPUk0oQkxBQ0tCRVJSWSkKICAgICByZXF1ZXN0LnNldFRhcmdldFR5cGUoUmVzb3Vy Y2VSZXF1ZXN0OjpUYXJnZXRJc1N1YnJlc291cmNlKTsKICNlbmRpZgogICAgIHJlcXVlc3Quc2V0 SFRUUE1ldGhvZCgiUE9TVCIpOwpAQCAtMTA2LDcgKzEwNiw3IEBAIHZvaWQgUGluZ0xvYWRlcjo6 c2VuZFBpbmcoRnJhbWUqIGZyYW1lLCBjb25zdCBLVVJMJiBwaW5nVVJMLCBjb25zdCBLVVJMJiBk ZXN0aW5hCiB2b2lkIFBpbmdMb2FkZXI6OnJlcG9ydENvbnRlbnRTZWN1cml0eVBvbGljeVZpb2xh dGlvbihGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHJlcG9ydFVSTCwgUGFzc1JlZlB0cjxGb3Jt RGF0YT4gcmVwb3J0KQogewogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KHJlcG9ydFVSTCk7 Ci0jaWYgUExBVEZPUk0oQ0hST01JVU0pCisjaWYgUExBVEZPUk0oQ0hST01JVU0pIHx8IFBMQVRG T1JNKEJMQUNLQkVSUlkpCiAgICAgcmVxdWVzdC5zZXRUYXJnZXRUeXBlKFJlc291cmNlUmVxdWVz dDo6VGFyZ2V0SXNTdWJyZXNvdXJjZSk7CiAjZW5kaWYKICAgICByZXF1ZXN0LnNldEhUVFBNZXRo b2QoIlBPU1QiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv YmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3QuaAppbmRleCA4YWQ1NDczOTVhNTI5N2Qx YjBiZWE5ZTRhNGFkMDI1YWQ1ZWQzYmE0Li4zZWQzNzY4YWRiODJmN2E2NTgxNmNlNzI5ZDhlNWNi YTQ3ZGY4MTI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Js YWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdC5oCkBAIC0zMSw2ICszMSwyNyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIFJlc291cmNlUmVxdWVzdCA6IHB1YmxpYyBSZXNv dXJjZVJlcXVlc3RCYXNlIHsKIHB1YmxpYzoKKyAgICAgICAgLy8gVGhlIHR5cGUgb2YgdGhpcyBS ZXNvdXJjZVJlcXVlc3QsIGJhc2VkIG9uIGhvdyB0aGUgcmVzb3VyY2Ugd2lsbCBiZSB1c2VkLgor ICAgICAgICBlbnVtIFRhcmdldFR5cGUgeworICAgICAgICAgICAgVGFyZ2V0SXNNYWluRnJhbWUs CisgICAgICAgICAgICBUYXJnZXRJc1N1YmZyYW1lLAorICAgICAgICAgICAgVGFyZ2V0SXNTdWJy ZXNvdXJjZSwgLy8gUmVzb3VyY2UgaXMgYSBnZW5lcmljIHN1YnJlc291cmNlLiAoR2VuZXJhbGx5 IGEgc3BlY2lmaWMgdHlwZSBzaG91bGQgYmUgc3BlY2lmaWVkKQorICAgICAgICAgICAgVGFyZ2V0 SXNTdHlsZVNoZWV0LAorICAgICAgICAgICAgVGFyZ2V0SXNTY3JpcHQsCisgICAgICAgICAgICBU YXJnZXRJc0ZvbnRSZXNvdXJjZSwKKyAgICAgICAgICAgIFRhcmdldElzSW1hZ2UsCisgICAgICAg ICAgICBUYXJnZXRJc09iamVjdCwKKyAgICAgICAgICAgIFRhcmdldElzTWVkaWEsCisgICAgICAg ICAgICBUYXJnZXRJc1dvcmtlciwKKyAgICAgICAgICAgIFRhcmdldElzU2hhcmVkV29ya2VyLAor ICAgICAgICAgICAgVGFyZ2V0SXNQcmVmZXRjaCwKKyAgICAgICAgICAgIFRhcmdldElzUHJlcmVu ZGVyLAorICAgICAgICAgICAgVGFyZ2V0SXNGYXZpY29uLAorICAgICAgICAgICAgVGFyZ2V0SXNY SFIsCisgICAgICAgICAgICBUYXJnZXRJc1RleHRUcmFjaywKKyAgICAgICAgICAgIFRhcmdldElz VW5zcGVjaWZpZWQsCisgICAgICAgIH07CisKICAgICBSZXNvdXJjZVJlcXVlc3QoY29uc3QgU3Ry aW5nJiB1cmwpCiAgICAgICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZShLVVJMKFBhcnNlZFVSTFN0 cmluZywgdXJsKSwgVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKICAgICAgICAgLCBtX2lzWE1MSFRU UFJlcXVlc3QoZmFsc2UpCkBAIC05NCw2ICsxMTUsMTAgQEAgcHVibGljOgogICAgIHZvaWQgc2V0 Rm9yY2VEb3dubG9hZChib29sIGZvcmNlRG93bmxvYWQpIHsgbV9mb3JjZURvd25sb2FkID0gdHJ1 ZTsgfQogICAgIGJvb2wgZm9yY2VEb3dubG9hZCgpIGNvbnN0IHsgcmV0dXJuIG1fZm9yY2VEb3du bG9hZDsgfQogCisgICAgLy8gV2hhdCB0aGlzIHJlcXVlc3QgaXMgZm9yLgorICAgIFRhcmdldFR5 cGUgdGFyZ2V0VHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdGFyZ2V0VHlwZTsgfQorICAgIHZvaWQg c2V0VGFyZ2V0VHlwZShUYXJnZXRUeXBlIHR5cGUpIHsgbV90YXJnZXRUeXBlID0gdHlwZTsgfQor CiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBSZXNvdXJjZVJlcXVlc3RCYXNlOwogCkBAIC0x MDQsNiArMTI5LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fbXVzdEhhbmRsZUludGVybmFsbHk7 CiAgICAgYm9vbCBtX2lzUmVxdWVzdGVkQnlQbHVnaW47CiAgICAgYm9vbCBtX2ZvcmNlRG93bmxv YWQ7CisgICAgVGFyZ2V0VHlwZSBtX3RhcmdldFR5cGU7CiAKICAgICB2b2lkIGRvVXBkYXRlUGxh dGZvcm1SZXF1ZXN0KCkgeyB9CiAgICAgdm9pZCBkb1VwZGF0ZVJlc291cmNlUmVxdWVzdCgpIHsg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKaW5kZXggNmJlNThhYWNmMWQ2Njc1 OThmZWUyNjA1NjBjZGE3ZDU2YTdkMjAwZi4uNDFmMDYyMWVjNjFmNjBhMmQ3MDM4MzBiZDI1YjNi N2UxZGMyMmRlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCkBAIC02Njcs NyArNjY3LDcgQEAgdm9pZCBYTUxIdHRwUmVxdWVzdDo6Y3JlYXRlUmVxdWVzdChFeGNlcHRpb25D b2RlJiBlYykKIAogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KG1fdXJsKTsKICAgICByZXF1 ZXN0LnNldEhUVFBNZXRob2QobV9tZXRob2QpOwotI2lmIFBMQVRGT1JNKENIUk9NSVVNKQorI2lm IFBMQVRGT1JNKENIUk9NSVVNKSB8fCBQTEFURk9STShCTEFDS0JFUlJZKQogICAgIHJlcXVlc3Qu c2V0VGFyZ2V0VHlwZShSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzWEhSKTsKICNlbmRpZgogCg==