70053 2011-10-13 14:04:05 -0700 [Qt][WK2] WebErrorsQt.cpp duplicates code from WKError.h and WebError.h 2011-10-13 14:20:11 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 jesus jesus kenneth oldest_to_newest 483465 0 jesus 2011-10-13 14:04:05 -0700 We should use the shared error codes enum from Source/WebKit2/Shared/API/c/WKError.h instead of our custom "WebKitError*" codes to keep it aligned with all WebKit2 ports. We should also use WebError::webkitErrorDomain() instead of using a "WebKit" as the error domain for these errors. 483467 1 kenneth 2011-10-13 14:06:15 -0700 Sounds good if this is possible 483468 2 110904 jesus 2011-10-13 14:08:32 -0700 Created attachment 110904 Patch 483481 3 110904 jesus 2011-10-13 14:20:04 -0700 Comment on attachment 110904 Patch Clearing flags on attachment: 110904 Committed r97399: <http://trac.webkit.org/changeset/97399> 483482 4 jesus 2011-10-13 14:20:11 -0700 All reviewed patches have been landed. Closing bug. 110904 2011-10-13 14:08:32 -0700 2011-10-13 14:20:04 -0700 Patch bug-70053-20111013180813.patch text/plain 4823 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogOTczODcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA0YWFlOTVlZGM3MDllMjRi NDI4MDYzMTJiZTM1ZWI5ZGYwYzkwZmQ2Li5hM2E1NjhhMDIzNWI0MTUzYmU4MTI5OGNjMDk2MzZl YmFiZjM3M2I3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMTAtMTMgIEplc3Vz IFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9zc2Eub3JnPgorCisgICAg ICAgIFtRdF1bV0syXSBXZWJFcnJvcnNRdC5jcHAgZHVwbGljYXRlcyBjb2RlIGZyb20gV0tFcnJv ci5oIGFuZCBXZWJFcnJvci5oCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03MDA1MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5vdyB3ZSB3aWxsIGJlIGFsaWduZWQgd2l0aCBXS0Vycm9yLmggYW5kIFdlYkVy cm9yLmggYnkgdXNpbmcgdGhlIHNoYXJlZAorICAgICAgICBhbmQgcHJlLWRlZmluZWQgZW51bSBm b3IgZXJyb3IgY29kZXMgYW5kIFdlYkVycm9yOjp3ZWJraXRFcnJvckRvbWFpbigpLgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9xdC9XZWJFcnJvcnNRdC5jcHA6CisgICAg ICAgIChXZWJLaXQ6OmJsb2NrZWRFcnJvcik6CisgICAgICAgIChXZWJLaXQ6OmNhbm5vdFNob3dV UkxFcnJvcik6CisgICAgICAgIChXZWJLaXQ6OmludGVycnVwdGVkRm9yUG9saWN5Q2hhbmdlRXJy b3IpOgorICAgICAgICAoV2ViS2l0OjpjYW5ub3RTaG93TUlNRVR5cGVFcnJvcik6CisgICAgICAg IChXZWJLaXQ6OnBsdWdpbldpbGxIYW5kbGVMb2FkRXJyb3IpOgorCiAyMDExLTEwLTEzICBSYXZp IFBoYW5lZW5kcmEgS2FzaWJoYXRsYSAgPHJhdmkua2FzaWJoYXRsYUBtb3Rvcm9sYS5jb20+CiAK ICAgICAgICAgSW1wbGVtZW50IFRleHRDaGVja2VyIGZvciBXZWJLaXQyIEdUSysKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvcXQvV2ViRXJyb3Jz UXQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9xdC9XZWJF cnJvcnNRdC5jcHAKaW5kZXggYmNkMWZhNWVmYWEwZDY4YTE0M2IwNmZhYTI4NGVlZjNjOTk2OGVk Yy4uODY4NGYxYzgzNDRkNzE1MjhkMWI2ZjUyMTBlMjY2ODQxNzYxNGJiZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9xdC9XZWJFcnJvcnNRdC5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9xdC9XZWJF cnJvcnNRdC5jcHAKQEAgLTI3LDYgKzI3LDggQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs dWRlICJXZWJFcnJvcnMuaCIKIAorI2luY2x1ZGUgIldLRXJyb3IuaCIKKyNpbmNsdWRlICJXZWJF cnJvci5oIgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VFcnJvci5oPgogI2luY2x1ZGUgPFdl YkNvcmUvUmVzb3VyY2VSZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZVJlc3Bv bnNlLmg+CkBAIC0zOCwxOCArNDAsNiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFt ZXNwYWNlIFdlYktpdCB7CiAKLS8vIGNvcGllZCBmcm9tIFdlYktpdC9NaXNjL1dlYktpdEVycm9y c1tQcml2YXRlXS5oCi1lbnVtIHsKLSAgICBXZWJLaXRFcnJvckNhbm5vdFNob3dNSU1FVHlwZSA9 ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAxMDAsCi0gICAgV2ViS2l0RXJyb3JDYW5ub3RT aG93VVJMID0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMTAxLAotICAgIFdlYktp dEVycm9yRnJhbWVMb2FkSW50ZXJydXB0ZWRCeVBvbGljeUNoYW5nZSA9ICAgICAgICAgICAgIDEw MiwKLSAgICBXZWJLaXRFcnJvckNhbm5vdFVzZVJlc3RyaWN0ZWRQb3J0ID0gICAgICAgICAgICAg ICAgICAgICAgICAxMDMsCi0gICAgV2ViS2l0RXJyb3JDYW5ub3RGaW5kUGx1Z0luID0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgMjAwLAotICAgIFdlYktpdEVycm9yQ2Fubm90TG9hZFBs dWdJbiA9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDIwMSwKLSAgICBXZWJLaXRFcnJv ckphdmFVbmF2YWlsYWJsZSA9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAyMDIsCi0g ICAgV2ViS2l0RXJyb3JQbHVnaW5XaWxsSGFuZGxlTG9hZCA9ICAgICAgICAgICAgICAgICAgICAg ICAgICAgMjAzCi19OwotCiBSZXNvdXJjZUVycm9yIGNhbmNlbGxlZEVycm9yKGNvbnN0IFJlc291 cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICBSZXNvdXJjZUVycm9yIGVycm9yID0gUmVzb3Vy Y2VFcnJvcigiUXROZXR3b3JrIiwgUU5ldHdvcmtSZXBseTo6T3BlcmF0aW9uQ2FuY2VsZWRFcnJv ciwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKSwKQEAgLTYwLDI1ICs1MCwyNSBAQCBSZXNvdXJjZUVy cm9yIGNhbmNlbGxlZEVycm9yKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIAogUmVz b3VyY2VFcnJvciBibG9ja2VkRXJyb3IoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQog ewotICAgIHJldHVybiBSZXNvdXJjZUVycm9yKCJXZWJLaXQiLCBXZWJLaXRFcnJvckNhbm5vdFVz ZVJlc3RyaWN0ZWRQb3J0LCByZXF1ZXN0LnVybCgpLnN0cmluZygpLAorICAgIHJldHVybiBSZXNv dXJjZUVycm9yKFdlYkVycm9yOjp3ZWJLaXRFcnJvckRvbWFpbigpLCBrV0tFcnJvckNvZGVDYW5u b3RVc2VSZXN0cmljdGVkUG9ydCwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKSwKICAgICAgICAgICAg ICAgICAgICAgICAgICBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJGcmFtZSIsICJS ZXF1ZXN0IGJsb2NrZWQiLCAwLCBRQ29yZUFwcGxpY2F0aW9uOjpVbmljb2RlVVRGOCkpOwogfQog CiBSZXNvdXJjZUVycm9yIGNhbm5vdFNob3dVUkxFcnJvcihjb25zdCBSZXNvdXJjZVJlcXVlc3Qm IHJlcXVlc3QpCiB7Ci0gICAgcmV0dXJuIFJlc291cmNlRXJyb3IoIldlYktpdCIsIFdlYktpdEVy cm9yQ2Fubm90U2hvd1VSTCwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKSwKKyAgICByZXR1cm4gUmVz b3VyY2VFcnJvcihXZWJFcnJvcjo6d2ViS2l0RXJyb3JEb21haW4oKSwga1dLRXJyb3JDb2RlQ2Fu bm90U2hvd1VSTCwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKSwKICAgICAgICAgICAgICAgICAgICAg ICAgICBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJGcmFtZSIsICJDYW5ub3Qgc2hv dyBVUkwiLCAwLCBRQ29yZUFwcGxpY2F0aW9uOjpVbmljb2RlVVRGOCkpOwogfQogCiBSZXNvdXJj ZUVycm9yIGludGVycnVwdGVkRm9yUG9saWN5Q2hhbmdlRXJyb3IoY29uc3QgUmVzb3VyY2VSZXF1 ZXN0JiByZXF1ZXN0KQogewotICAgIHJldHVybiBSZXNvdXJjZUVycm9yKCJXZWJLaXQiLCBXZWJL aXRFcnJvckZyYW1lTG9hZEludGVycnVwdGVkQnlQb2xpY3lDaGFuZ2UsIHJlcXVlc3QudXJsKCku c3RyaW5nKCksCisgICAgcmV0dXJuIFJlc291cmNlRXJyb3IoV2ViRXJyb3I6OndlYktpdEVycm9y RG9tYWluKCksIGtXS0Vycm9yQ29kZUZyYW1lTG9hZEludGVycnVwdGVkQnlQb2xpY3lDaGFuZ2Us IHJlcXVlc3QudXJsKCkuc3RyaW5nKCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgUUNvcmVB cHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViRnJhbWUiLCAiRnJhbWUgbG9hZCBpbnRlcnJ1cHRl ZCBieSBwb2xpY3kgY2hhbmdlIiwgMCwgUUNvcmVBcHBsaWNhdGlvbjo6VW5pY29kZVVURjgpKTsK IH0KIAogUmVzb3VyY2VFcnJvciBjYW5ub3RTaG93TUlNRVR5cGVFcnJvcihjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKLSAgICByZXR1cm4gUmVzb3VyY2VFcnJvcigiV2ViS2l0 IiwgV2ViS2l0RXJyb3JDYW5ub3RTaG93TUlNRVR5cGUsIHJlc3BvbnNlLnVybCgpLnN0cmluZygp LAorICAgIHJldHVybiBSZXNvdXJjZUVycm9yKFdlYkVycm9yOjp3ZWJLaXRFcnJvckRvbWFpbigp LCBrV0tFcnJvckNvZGVDYW5ub3RTaG93TUlNRVR5cGUsIHJlc3BvbnNlLnVybCgpLnN0cmluZygp LAogICAgICAgICAgICAgICAgICAgICAgICAgIFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgi UVdlYkZyYW1lIiwgIkNhbm5vdCBzaG93IG1pbWV0eXBlIiwgMCwgUUNvcmVBcHBsaWNhdGlvbjo6 VW5pY29kZVVURjgpKTsKIH0KIApAQCAtOTAsNyArODAsNyBAQCBSZXNvdXJjZUVycm9yIGZpbGVE b2VzTm90RXhpc3RFcnJvcihjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIAogUmVz b3VyY2VFcnJvciBwbHVnaW5XaWxsSGFuZGxlTG9hZEVycm9yKGNvbnN0IFJlc291cmNlUmVzcG9u c2UmIHJlc3BvbnNlKQogewotICAgIHJldHVybiBSZXNvdXJjZUVycm9yKCJXZWJLaXQiLCBXZWJL aXRFcnJvclBsdWdpbldpbGxIYW5kbGVMb2FkLCByZXNwb25zZS51cmwoKS5zdHJpbmcoKSwKKyAg ICByZXR1cm4gUmVzb3VyY2VFcnJvcihXZWJFcnJvcjo6d2ViS2l0RXJyb3JEb21haW4oKSwga1dL RXJyb3JDb2RlUGx1Z0luV2lsbEhhbmRsZUxvYWQsIHJlc3BvbnNlLnVybCgpLnN0cmluZygpLAog ICAgICAgICAgICAgICAgICAgICAgICAgIFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdl YkZyYW1lIiwgIkxvYWRpbmcgaXMgaGFuZGxlZCBieSB0aGUgbWVkaWEgZW5naW5lIiwgMCwgUUNv cmVBcHBsaWNhdGlvbjo6VW5pY29kZVVURjgpKTsKIH0KIAo=