131852 2014-04-18 12:48:13 -0700 Correct some issues small issues in WK2 file upload InjectedBundle APIs 2014-04-18 16:11:40 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned andersca commit-queue mitz oldest_to_newest 1001986 0 joepeck 2014-04-18 12:48:13 -0700 There are some minor issues in WK2 file upload injected bundle APIs. - the default for shouldGenerateFileForUpload should return a null string, not an empty string. null string is special. - an injected bundle API is pre-checking the wrong function 1001987 1 229666 joepeck 2014-04-18 12:50:00 -0700 Created attachment 229666 [PATCH] Proposed Fix 1002010 2 229666 joepeck 2014-04-18 13:44:15 -0700 Comment on attachment 229666 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=229666&action=review > Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h:60 > virtual WTF::String generateFileForUpload(WebKit::WebPage*, const WTF::String& originalFilePath) { UNUSED_PARAM(originalFilePath); return emptyString(); } I suppose this could also return a null string. However null string is only really important in should. As null string => should not, but anything else => should. 1002059 3 229666 commit-queue 2014-04-18 16:11:34 -0700 Comment on attachment 229666 [PATCH] Proposed Fix Clearing flags on attachment: 229666 Committed r167514: <http://trac.webkit.org/changeset/167514> 1002060 4 commit-queue 2014-04-18 16:11:40 -0700 All reviewed patches have been landed. Closing bug. 229666 2014-04-18 12:50:00 -0700 2014-04-18 16:11:34 -0700 [PATCH] Proposed Fix proposed-fix.patch text/plain 3120 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4OGY5NDc0Li5iOTY1MzQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTQtMDQtMTggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBDb3JyZWN0IHNvbWUgaXNzdWVzIHNtYWxsIGlzc3VlcyBpbiBXSzIgZmlsZSB1cGxv YWQgSW5qZWN0ZWRCdW5kbGUgQVBJcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTMxODUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9BUElJbmplY3Rl ZEJ1bmRsZVBhZ2VVSUNsaWVudC5oOgorICAgICAgICAoQVBJOjpJbmplY3RlZEJ1bmRsZTo6UGFn ZVVJQ2xpZW50OjpzaG91bGRHZW5lcmF0ZUZpbGVGb3JVcGxvYWQpOgorICAgICAgICBUaGUgZGVm YXVsdCByZXR1cm4gdmFsdWUsIG1lYW5pbmcgbm8sIHNob3VsZCByZXR1cm4gdGhlIG51bGwgc3Ry aW5nLiBUaGUKKyAgICAgICAgcmVzdWx0IGlzIGNoZWNrZWQgbGF0ZXIsIGFuZCBudWxsIHN0cmlu ZyBpcyBhIHNwZWNpYWwgdmFsdWUgbWVhbmluZyBuby4KKworICAgICAgICAqIFdlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQuY3BwOgorICAgICAgICAo V2ViS2l0OjpJbmplY3RlZEJ1bmRsZVBhZ2VVSUNsaWVudDo6Z2VuZXJhdGVGaWxlRm9yVXBsb2Fk KToKKyAgICAgICAgUHJlLWNoZWNrIGZvciB0aGUgY29ycmVjdCBjbGllbnQgZnVuY3Rpb24gd2Ug d2lsbCB1c2UuCisKIDIwMTQtMDQtMTQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBs ZS5jb20+CiAKICAgICAgICAgUnVuIGZpbHRlciBhbmltYXRpb25zIGluIHRoZSBVSSBwcm9jZXNz IHdpdGggVUktc2lkZSBjb21wb3NpdGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQVBJSW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQu aCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0FQSUluamVj dGVkQnVuZGxlUGFnZVVJQ2xpZW50LmgKaW5kZXggNGE3YjVlOS4uYWE4MGUzZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQVBJSW5qZWN0 ZWRCdW5kbGVQYWdlVUlDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0FQSS9BUElJbmplY3RlZEJ1bmRsZVBhZ2VVSUNsaWVudC5oCkBAIC01Niw3 ICs1Niw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgbW91c2VEaWRNb3ZlT3ZlckVsZW1l bnQoV2ViS2l0OjpXZWJQYWdlKiwgY29uc3QgV2ViQ29yZTo6SGl0VGVzdFJlc3VsdCYsIFdlYktp dDo6V2ViRXZlbnQ6Ok1vZGlmaWVycywgUmVmUHRyPEFQSTo6T2JqZWN0PiYgdXNlckRhdGEpIHsg VU5VU0VEX1BBUkFNKHVzZXJEYXRhKTsgfQogICAgIHZpcnR1YWwgdm9pZCBwYWdlRGlkU2Nyb2xs KFdlYktpdDo6V2ViUGFnZSopIHsgfQogCi0gICAgdmlydHVhbCBXVEY6OlN0cmluZyBzaG91bGRH ZW5lcmF0ZUZpbGVGb3JVcGxvYWQoV2ViS2l0OjpXZWJQYWdlKiwgY29uc3QgV1RGOjpTdHJpbmcm IG9yaWdpbmFsRmlsZVBhdGgpIHsgVU5VU0VEX1BBUkFNKG9yaWdpbmFsRmlsZVBhdGgpOyByZXR1 cm4gZW1wdHlTdHJpbmcoKTsgfQorICAgIHZpcnR1YWwgV1RGOjpTdHJpbmcgc2hvdWxkR2VuZXJh dGVGaWxlRm9yVXBsb2FkKFdlYktpdDo6V2ViUGFnZSosIGNvbnN0IFdURjo6U3RyaW5nJiBvcmln aW5hbEZpbGVQYXRoKSB7IFVOVVNFRF9QQVJBTShvcmlnaW5hbEZpbGVQYXRoKTsgcmV0dXJuIFdU Rjo6U3RyaW5nKCk7IH0KICAgICB2aXJ0dWFsIFdURjo6U3RyaW5nIGdlbmVyYXRlRmlsZUZvclVw bG9hZChXZWJLaXQ6OldlYlBhZ2UqLCBjb25zdCBXVEY6OlN0cmluZyYgb3JpZ2luYWxGaWxlUGF0 aCkgeyBVTlVTRURfUEFSQU0ob3JpZ2luYWxGaWxlUGF0aCk7IHJldHVybiBlbXB0eVN0cmluZygp OyB9CiAKICAgICBlbnVtIGNsYXNzIFVJRWxlbWVudFZpc2liaWxpdHkgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBh Z2VVSUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0luamVjdGVkQnVuZGxlUGFnZVVJQ2xpZW50LmNwcAppbmRleCBiZTI2M2I5Li5mYmEyYTU1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVj dGVkQnVuZGxlUGFnZVVJQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZVVJQ2xpZW50LmNwcApAQCAtMTAxLDcg KzEwMSw3IEBAIFN0cmluZyBJbmplY3RlZEJ1bmRsZVBhZ2VVSUNsaWVudDo6c2hvdWxkR2VuZXJh dGVGaWxlRm9yVXBsb2FkKFdlYlBhZ2UqIHBhZ2UsIGNvCiAKIFN0cmluZyBJbmplY3RlZEJ1bmRs ZVBhZ2VVSUNsaWVudDo6Z2VuZXJhdGVGaWxlRm9yVXBsb2FkKFdlYlBhZ2UqIHBhZ2UsIGNvbnN0 IFN0cmluZyYgb3JpZ2luYWxGaWxlUGF0aCkKIHsKLSAgICBpZiAoIW1fY2xpZW50LnNob3VsZEdl bmVyYXRlRmlsZUZvclVwbG9hZCkKKyAgICBpZiAoIW1fY2xpZW50LmdlbmVyYXRlRmlsZUZvclVw bG9hZCkKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwogICAgIFJlZlB0cjxBUEk6OlN0cmluZz4g Z2VuZXJhdGVkRmlsZVBhdGggPSBhZG9wdFJlZih0b0ltcGwobV9jbGllbnQuZ2VuZXJhdGVGaWxl Rm9yVXBsb2FkKHRvQVBJKHBhZ2UpLCB0b0FQSShvcmlnaW5hbEZpbGVQYXRoLmltcGwoKSksIG1f Y2xpZW50LmJhc2UuY2xpZW50SW5mbykpKTsKICAgICByZXR1cm4gZ2VuZXJhdGVkRmlsZVBhdGgg PyBnZW5lcmF0ZWRGaWxlUGF0aC0+c3RyaW5nKCkgOiBTdHJpbmcoKTsK