34655 2010-02-05 11:12:19 -0800 [chromium] Change chromium interface to handle DownloadURL format. 2010-02-07 04:35:50 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jianli jianli commit-queue dimich fishd oldest_to_newest 188227 0 jianli 2010-02-05 11:12:19 -0800 Now the value of DownloadURL format is a string containing a list of values. So we need to change the chromium interface for it. In order not to break the existing stuff, I will first add the new member in this patch. Later on when chromium side change is committed, I will remove the obsolete member. 188228 1 48244 jianli 2010-02-05 11:14:32 -0800 Created attachment 48244 Proposed Patch 188450 2 48244 fishd 2010-02-06 12:35:49 -0800 Comment on attachment 48244 Proposed Patch > +++ b/WebCore/platform/chromium/ChromiumDataObject.cpp > @@ -38,6 +38,7 @@ void ChromiumDataObject::clear() > url = KURL(); > urlTitle = ""; > downloadURL = KURL(); > + downloadMetadata = ""; nit: should be "downloadMetaData" <-- cap "Data" > +++ b/WebKit/chromium/public/WebDragData.h > @@ -74,6 +74,8 @@ public: > > WEBKIT_API WebURL downloadURL() const; > WEBKIT_API void setDownloadURL(const WebURL&); > + WEBKIT_API WebString downloadMetadata() const; > + WEBKIT_API void setDownloadMetadata(const WebString&); same nit: should be named downloadMetaData and setDownloadMetaData otherwise, this LGTM 188451 3 fishd 2010-02-06 12:37:23 -0800 Actually, I take it back. http://en.wikipedia.org/wiki/Metadata seems to strongly favor the spelling you used. I had always thought of it as two words combined meta plus data, but I guess I was wrong. 188452 4 48244 fishd 2010-02-06 12:38:08 -0800 Comment on attachment 48244 Proposed Patch R=me (I'm also doing CQ+ since this shouldn't break the Chromium build.) 188500 5 48244 commit-queue 2010-02-07 04:35:42 -0800 Comment on attachment 48244 Proposed Patch Clearing flags on attachment: 48244 Committed r54469: <http://trac.webkit.org/changeset/54469> 188501 6 commit-queue 2010-02-07 04:35:50 -0800 All reviewed patches have been landed. Closing bug. 48244 2010-02-05 11:14:32 -0800 2010-02-07 04:35:41 -0800 Proposed Patch 34655 text/plain 4908 jianli ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzdkNWM3Zi4uNzJhYWQ3ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wMi0wNSAgSmlhbiBMaSAgPGpp YW5saUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW2Nocm9taXVtXSBDaGFuZ2UgY2hyb21pdW0gaW50ZXJmYWNlIHRvIGhhbmRs ZSBEb3dubG9hZFVSTCBmb3JtYXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zNDY1NQorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21p dW1EYXRhT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9taXVtRGF0YU9iamVjdDo6 Y2xlYXIpOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21pdW1EYXRhT2JqZWN0OjpoYXNEYXRhKToK KyAgICAgICAgKFdlYkNvcmU6OkNocm9taXVtRGF0YU9iamVjdDo6Q2hyb21pdW1EYXRhT2JqZWN0 KToKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bURhdGFPYmplY3QuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9DbGlwYm9hcmRDaHJvbWl1bS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDbGlwYm9hcmRDaHJvbWl1bTo6c2V0RGF0YSk6CisKIDIwMTAtMDItMDUgIFN0 ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBBZGFtIFJvYmVuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DaHJv bWl1bURhdGFPYmplY3QuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bURh dGFPYmplY3QuY3BwCmluZGV4IGRmMDg0OWMuLjY5NWRhOWYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1EYXRhT2JqZWN0LmNwcAorKysgYi9XZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL0Nocm9taXVtRGF0YU9iamVjdC5jcHAKQEAgLTM4LDYgKzM4LDcgQEAg dm9pZCBDaHJvbWl1bURhdGFPYmplY3Q6OmNsZWFyKCkKICAgICB1cmwgPSBLVVJMKCk7CiAgICAg dXJsVGl0bGUgPSAiIjsKICAgICBkb3dubG9hZFVSTCA9IEtVUkwoKTsKKyAgICBkb3dubG9hZE1l dGFkYXRhID0gIiI7CiAgICAgZmlsZUV4dGVuc2lvbiA9ICIiOwogICAgIGZpbGVuYW1lcy5jbGVh cigpOwogICAgIHBsYWluVGV4dCA9ICIiOwpAQCAtNTIsNiArNTMsNyBAQCBib29sIENocm9taXVt RGF0YU9iamVjdDo6aGFzRGF0YSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuICF1cmwuaXNFbXB0eSgp CiAgICAgICAgIHx8ICFkb3dubG9hZFVSTC5pc0VtcHR5KCkKKyAgICAgICAgfHwgIWRvd25sb2Fk TWV0YWRhdGEuaXNFbXB0eSgpCiAgICAgICAgIHx8ICFmaWxlRXh0ZW5zaW9uLmlzRW1wdHkoKQog ICAgICAgICB8fCAhZmlsZW5hbWVzLmlzRW1wdHkoKQogICAgICAgICB8fCAhcGxhaW5UZXh0Lmlz RW1wdHkoKQpAQCAtNjMsNiArNjUsNyBAQCBDaHJvbWl1bURhdGFPYmplY3Q6OkNocm9taXVtRGF0 YU9iamVjdChjb25zdCBDaHJvbWl1bURhdGFPYmplY3QmIG90aGVyKQogICAgIDogdXJsKG90aGVy LnVybCkKICAgICAsIHVybFRpdGxlKG90aGVyLnVybFRpdGxlKQogICAgICwgZG93bmxvYWRVUkwo b3RoZXIuZG93bmxvYWRVUkwpCisgICAgLCBkb3dubG9hZE1ldGFkYXRhKG90aGVyLmRvd25sb2Fk TWV0YWRhdGEpCiAgICAgLCBmaWxlRXh0ZW5zaW9uKG90aGVyLmZpbGVFeHRlbnNpb24pCiAgICAg LCBmaWxlbmFtZXMob3RoZXIuZmlsZW5hbWVzKQogICAgICwgcGxhaW5UZXh0KG90aGVyLnBsYWlu VGV4dCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1EYXRh T2JqZWN0LmggYi9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtRGF0YU9iamVjdC5o CmluZGV4IDE1ZWI5MTEuLjE4NmExYTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vY2hy b21pdW0vQ2hyb21pdW1EYXRhT2JqZWN0LmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1 bS9DaHJvbWl1bURhdGFPYmplY3QuaApAQCAtNjAsNiArNjAsNyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIFN0cmluZyB1cmxUaXRsZTsKIAogICAgICAgICBLVVJMIGRvd25sb2FkVVJM OworICAgICAgICBTdHJpbmcgZG93bmxvYWRNZXRhZGF0YTsKIAogICAgICAgICBTdHJpbmcgZmls ZUV4dGVuc2lvbjsKICAgICAgICAgVmVjdG9yPFN0cmluZz4gZmlsZW5hbWVzOwpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DbGlwYm9hcmRDaHJvbWl1bS5jcHAgYi9XZWJD b3JlL3BsYXRmb3JtL2Nocm9taXVtL0NsaXBib2FyZENocm9taXVtLmNwcAppbmRleCA4OWZkNjFk Li5iZWNmMTY5IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0NsaXBib2Fy ZENocm9taXVtLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0NsaXBib2FyZENo cm9taXVtLmNwcApAQCAtMTYwLDExICsxNjAsMTEgQEAgYm9vbCBDbGlwYm9hcmRDaHJvbWl1bTo6 c2V0RGF0YShjb25zdCBTdHJpbmcmIHR5cGUsIGNvbnN0IFN0cmluZyYgZGF0YSkKICAgICB9CiAg ICAgCiAgICAgaWYgKHdpblR5cGUgPT0gQ2xpcGJvYXJkRGF0YVR5cGVEb3dubG9hZFVSTCkgewor ICAgICAgICBtX2RhdGFPYmplY3QtPmRvd25sb2FkTWV0YWRhdGEgPSBkYXRhOwogICAgICAgICBL VVJMIHVybCA9IEtVUkwoUGFyc2VkVVJMU3RyaW5nLCBkYXRhKTsKLSAgICAgICAgaWYgKHVybC5p c1ZhbGlkKCkpIHsKKyAgICAgICAgaWYgKHVybC5pc1ZhbGlkKCkpCiAgICAgICAgICAgICBtX2Rh dGFPYmplY3QtPmRvd25sb2FkVVJMID0gdXJsOwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0g ICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCiAgICAgcmV0dXJuIGZhbHNl OwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKaW5kZXggNzJkZDkxNS4uZmMzOWQ4ZiAxMDA2NDQKLS0tIGEvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTUgQEAKKzIwMTAtMDItMDUgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0g Q2hhbmdlIGNocm9taXVtIGludGVyZmFjZSB0byBoYW5kbGUgRG93bmxvYWRVUkwgZm9ybWF0Lgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ2NTUKKwor ICAgICAgICAqIHB1YmxpYy9XZWJEcmFnRGF0YS5oOgorICAgICAgICAqIHNyYy9XZWJEcmFnRGF0 YS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkRyYWdEYXRhOjpkb3dubG9hZE1ldGFkYXRhKToK KyAgICAgICAgKFdlYktpdDo6V2ViRHJhZ0RhdGE6OnNldERvd25sb2FkTWV0YWRhdGEpOgorCiAy MDEwLTAyLTA1ICBOYXRlIENoYXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJEcmFnRGF0YS5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEcmFnRGF0 YS5oCmluZGV4IDAxNTgyYTkuLjBiODYxYzggMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRHJhZ0RhdGEuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRyYWdE YXRhLmgKQEAgLTc0LDYgKzc0LDggQEAgcHVibGljOgogCiAgICAgV0VCS0lUX0FQSSBXZWJVUkwg ZG93bmxvYWRVUkwoKSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0RG93bmxvYWRVUkwo Y29uc3QgV2ViVVJMJik7CisgICAgV0VCS0lUX0FQSSBXZWJTdHJpbmcgZG93bmxvYWRNZXRhZGF0 YSgpIGNvbnN0OworICAgIFdFQktJVF9BUEkgdm9pZCBzZXREb3dubG9hZE1ldGFkYXRhKGNvbnN0 IFdlYlN0cmluZyYpOwogCiAgICAgV0VCS0lUX0FQSSBXZWJTdHJpbmcgZmlsZUV4dGVuc2lvbigp IGNvbnN0OwogICAgIFdFQktJVF9BUEkgdm9pZCBzZXRGaWxlRXh0ZW5zaW9uKGNvbnN0IFdlYlN0 cmluZyYpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEcmFnRGF0YS5jcHAg Yi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRyYWdEYXRhLmNwcAppbmRleCAzYmQ0YTAyLi5iMThh YjFiIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRyYWdEYXRhLmNwcAorKysg Yi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRyYWdEYXRhLmNwcApAQCAtMTAwLDYgKzEwMCwxOCBA QCB2b2lkIFdlYkRyYWdEYXRhOjpzZXREb3dubG9hZFVSTChjb25zdCBXZWJVUkwmIGRvd25sb2Fk VVJMKQogICAgIG1fcHJpdmF0ZS0+ZG93bmxvYWRVUkwgPSBkb3dubG9hZFVSTDsKIH0KIAorV2Vi U3RyaW5nIFdlYkRyYWdEYXRhOjpkb3dubG9hZE1ldGFkYXRhKCkgY29uc3QKK3sKKyAgICBBU1NF UlQoIWlzTnVsbCgpKTsKKyAgICByZXR1cm4gbV9wcml2YXRlLT5kb3dubG9hZE1ldGFkYXRhOwor fQorCit2b2lkIFdlYkRyYWdEYXRhOjpzZXREb3dubG9hZE1ldGFkYXRhKGNvbnN0IFdlYlN0cmlu ZyYgZG93bmxvYWRNZXRhZGF0YSkKK3sKKyAgICBlbnN1cmVNdXRhYmxlKCk7CisgICAgbV9wcml2 YXRlLT5kb3dubG9hZE1ldGFkYXRhID0gZG93bmxvYWRNZXRhZGF0YTsKK30KKwogV2ViU3RyaW5n IFdlYkRyYWdEYXRhOjpmaWxlRXh0ZW5zaW9uKCkgY29uc3QKIHsKICAgICBBU1NFUlQoIWlzTnVs bCgpKTsK