46937 2010-09-30 14:25:05 -0700 [chromium] Minor naming cleanup in WebDragData 2010-10-06 10:13:55 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 dcheng webkit-unassigned abarth commit-queue eric rniwa tony webkit.review.bot oldest_to_newest 287823 0 dcheng 2010-09-30 14:25:05 -0700 This is just a minor cleanup change. We need to duplicate the original method, switch Chromium, and then remove the obsolete method in WebKit. 287832 1 dcheng 2010-09-30 14:34:50 -0700 Rename hasFileNames to containsFilenames and normalize fileName/FileName to filename/Filename. 288097 2 69430 dcheng 2010-10-01 00:48:51 -0700 Created attachment 69430 Patch 288116 3 69430 rniwa 2010-10-01 01:13:06 -0700 Comment on attachment 69430 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69430&action=review > WebKit/chromium/ChangeLog:10 > + This is a two-part patch--one to add the new methods with normalized > + names, and a followup patch to remove the original methods once > + Chromium is updated. You probably want to mention why we're doing this cleanup. > WebKit/chromium/ChangeLog:19 > + (WebKit::WebDragData::containsFilenames): > + (WebKit::WebDragData::filenames): > + (WebKit::WebDragData::setFilenames): > + (WebKit::WebDragData::appendToFilenames): > + (WebKit::WebDragData::fileContentFilename): > + (WebKit::WebDragData::setFileContentFilename): Could you mention which function replaces what? > WebKit/chromium/src/WebDragData.cpp:163 > + ensureMutable(); > + Vector<String> filenamesCopy; > + filenamesCopy.append(filenames.data(), filenames.size()); > + m_private->setFilenames(filenamesCopy); Instead of duplicating code, can we call setFileNames here? We can move the code here when we're removing setFileNames. > WebKit/chromium/src/WebDragData.cpp:171 > + ensureMutable(); > + Vector<String> filenames = m_private->filenames(); > + filenames.append(filename); > + m_private->setFilenames(filenames); Ditto. 288337 4 69485 dcheng 2010-10-01 10:43:26 -0700 Created attachment 69485 Patch 288348 5 69485 tony 2010-10-01 11:01:11 -0700 Comment on attachment 69485 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69485&action=review > WebKit/chromium/ChangeLog:14 > + The list of methods that have been renamed: > + * hasFileNames() -> containsFilenames() > + * fileNames() -> filenames() I think Ryosuke was saying that you can put this in the section below. The : after the method names is supposed to be space to write comments about how you modified the method. > WebKit/chromium/ChangeLog:22 > + (WebKit::WebDragData::hasFileNames): For example, here you would write "(WebKit::WebDragData::hasFileNames): renamed to containsFilenames" > WebKit/chromium/public/WebDragData.h:84 > WEBKIT_API void setFileNames(const WebVector<WebString>&); > WEBKIT_API void appendToFileNames(const WebString&); Nit: Can you add a comment that these methods are deprecated/obsolete? 288359 6 69490 dcheng 2010-10-01 11:20:18 -0700 Created attachment 69490 Patch 288362 7 69490 rniwa 2010-10-01 11:29:39 -0700 Comment on attachment 69490 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69490&action=review (In reply to comment #5) > (From update of attachment 69485 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=69485&action=review > > > WebKit/chromium/ChangeLog:14 > > + The list of methods that have been renamed: > > + * hasFileNames() -> containsFilenames() > > + * fileNames() -> filenames() > > I think Ryosuke was saying that you can put this in the section below. The : after the method names is supposed to be space to write comments about how you modified the method. Yup. That's what I meant. Sorry I should have been more clear. > WebKit/chromium/src/WebDragData.cpp:139 > + return containsFilenames(); > +} > + > +void WebDragData::fileNames(WebVector<WebString>& fileNames) const > +{ > + filenames(fileNames); > +} > + > +void WebDragData::setFileNames(const WebVector<WebString>& fileNames) > +{ > + return setFilenames(fileNames); > +} > + > +void WebDragData::appendToFileNames(const WebString& fileName) > +{ > + return appendToFilenames(fileName); > +} > + > +bool WebDragData::containsFilenames() const > +{ Ah! this is nice. You don't have to move the code anymore! Otherwise LGTM but I'm not a reviewer yet. 288421 8 69490 commit-queue 2010-10-01 12:40:44 -0700 Comment on attachment 69490 Patch Clearing flags on attachment: 69490 Committed r68915: <http://trac.webkit.org/changeset/68915> 288422 9 commit-queue 2010-10-01 12:40:49 -0700 All reviewed patches have been landed. Closing bug. 288473 10 webkit.review.bot 2010-10-01 14:07:55 -0700 http://trac.webkit.org/changeset/68915 might have broken GTK Linux 32-bit Debug 289858 11 69836 dcheng 2010-10-05 13:56:59 -0700 Created attachment 69836 Patch 289871 12 69836 tony 2010-10-05 14:05:12 -0700 Comment on attachment 69836 Patch Actually, do you need to roll WebKit/chromium/DEPS? 289874 13 69836 tony 2010-10-05 14:09:22 -0700 Comment on attachment 69836 Patch r- because of DEPS roll needed. Also, I suggest opening a new bug for this since this bug is already closed. 290377 14 tony 2010-10-06 09:46:07 -0700 Committed r69202: <http://trac.webkit.org/changeset/69202> 290401 15 tony 2010-10-06 10:10:20 -0700 Reverted r69202 for reason: Broke compile of test_shell Committed r69207: <http://trac.webkit.org/changeset/69207> 290406 16 tony 2010-10-06 10:13:55 -0700 Sorry, this should be in https://bugs.webkit.org/show_bug.cgi?id=47227 . 69430 2010-10-01 00:48:51 -0700 2010-10-01 10:43:23 -0700 Patch bug-46937-20101001004850.patch text/plain 3895 dcheng ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDRkMzJjNTQ0MzQ0ODMyM2RmOGY5ZmI4YmU1YWM5ZWY0ZTE3MjA0OWIu LjBlMzVhMmI4ZTNjNGM3NGExMTQxZTBiZDY4ZGQzNDI2MjU1NmM4OWUgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIzIEBACisyMDEwLTEwLTAxICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtjaHJvbWl1bV0gTWlub3IgbmFtaW5nIGNsZWFudXAgaW4gV2ViRHJhZ0RhdGEKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2OTM3CisKKyAgICAgICAg VGhpcyBpcyBhIHR3by1wYXJ0IHBhdGNoLS1vbmUgdG8gYWRkIHRoZSBuZXcgbWV0aG9kcyB3aXRo IG5vcm1hbGl6ZWQKKyAgICAgICAgbmFtZXMsIGFuZCBhIGZvbGxvd3VwIHBhdGNoIHRvIHJlbW92 ZSB0aGUgb3JpZ2luYWwgbWV0aG9kcyBvbmNlCisgICAgICAgIENocm9taXVtIGlzIHVwZGF0ZWQu CisKKyAgICAgICAgKiBwdWJsaWMvV2ViRHJhZ0RhdGEuaDoKKyAgICAgICAgKiBzcmMvV2ViRHJh Z0RhdGEuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJEcmFnRGF0YTo6Y29udGFpbnNGaWxlbmFt ZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJEcmFnRGF0YTo6ZmlsZW5hbWVzKToKKyAgICAgICAg KFdlYktpdDo6V2ViRHJhZ0RhdGE6OnNldEZpbGVuYW1lcyk6CisgICAgICAgIChXZWJLaXQ6Oldl YkRyYWdEYXRhOjphcHBlbmRUb0ZpbGVuYW1lcyk6CisgICAgICAgIChXZWJLaXQ6OldlYkRyYWdE YXRhOjpmaWxlQ29udGVudEZpbGVuYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViRHJhZ0RhdGE6 OnNldEZpbGVDb250ZW50RmlsZW5hbWUpOgorCiAyMDEwLTA5LTMwICBEdW1pdHJ1IERhbmlsaXVj ICA8ZHVtaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVy LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEcmFnRGF0YS5oIGIvV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEcmFnRGF0YS5oCmluZGV4IDY3NDhmZTA2YmFhNTBjMmM3 Y2QyZmNlNzk3NTM4MTE4NDcyODE2M2YuLjgzYmYwYzk1NGM4YTE5Yjg0NDg2ZDRhYTY2YTEzMmUx MDYzZjc2N2MgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRHJhZ0RhdGEu aAorKysgYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRyYWdEYXRhLmgKQEAgLTgzLDYgKzgz LDExIEBAIHB1YmxpYzoKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0RmlsZU5hbWVzKGNvbnN0IFdl YlZlY3RvcjxXZWJTdHJpbmc+Jik7CiAgICAgV0VCS0lUX0FQSSB2b2lkIGFwcGVuZFRvRmlsZU5h bWVzKGNvbnN0IFdlYlN0cmluZyYpOwogCisgICAgV0VCS0lUX0FQSSBib29sIGNvbnRhaW5zRmls ZW5hbWVzKCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSB2b2lkIGZpbGVuYW1lcyhXZWJWZWN0b3I8 V2ViU3RyaW5nPiYpIGNvbnN0OworICAgIFdFQktJVF9BUEkgdm9pZCBzZXRGaWxlbmFtZXMoY29u c3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mKTsKKyAgICBXRUJLSVRfQVBJIHZvaWQgYXBwZW5kVG9G aWxlbmFtZXMoY29uc3QgV2ViU3RyaW5nJik7CisKICAgICBXRUJLSVRfQVBJIFdlYlN0cmluZyBw bGFpblRleHQoKSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0UGxhaW5UZXh0KGNvbnN0 IFdlYlN0cmluZyYpOwogCkBAIC05NSw2ICsxMDAsOSBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0FQ SSBXZWJTdHJpbmcgZmlsZUNvbnRlbnRGaWxlTmFtZSgpIGNvbnN0OwogICAgIFdFQktJVF9BUEkg dm9pZCBzZXRGaWxlQ29udGVudEZpbGVOYW1lKGNvbnN0IFdlYlN0cmluZyYpOwogCisgICAgV0VC S0lUX0FQSSBXZWJTdHJpbmcgZmlsZUNvbnRlbnRGaWxlbmFtZSgpIGNvbnN0OworICAgIFdFQktJ VF9BUEkgdm9pZCBzZXRGaWxlQ29udGVudEZpbGVuYW1lKGNvbnN0IFdlYlN0cmluZyYpOworCiAg ICAgV0VCS0lUX0FQSSBXZWJEYXRhIGZpbGVDb250ZW50KCkgY29uc3Q7CiAgICAgV0VCS0lUX0FQ SSB2b2lkIHNldEZpbGVDb250ZW50KGNvbnN0IFdlYkRhdGEmKTsKIApkaWZmIC0tZ2l0IGEvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJEcmFnRGF0YS5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkRyYWdEYXRhLmNwcAppbmRleCBiYzZiZGNjZjY2ODdlNDgxZGZmYTg1MjY2YjYyNjYxNjhlMjg5 NTY5Li5hYjdjYjI2NGU5YWY2NGQ4MDAyMTIyZWEwOThlNGIwOGM1NTgwZmZmIDEwMDY0NAotLS0g YS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRyYWdEYXRhLmNwcAorKysgYi9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYkRyYWdEYXRhLmNwcApAQCAtMTQzLDYgKzE0MywzNCBAQCB2b2lkIFdlYkRyYWdE YXRhOjphcHBlbmRUb0ZpbGVOYW1lcyhjb25zdCBXZWJTdHJpbmcmIGZpbGVOYW1lKQogICAgIG1f cHJpdmF0ZS0+c2V0RmlsZW5hbWVzKGZpbGVOYW1lcyk7CiB9CiAKK2Jvb2wgV2ViRHJhZ0RhdGE6 OmNvbnRhaW5zRmlsZW5hbWVzKCkgY29uc3QKK3sKKyAgICBBU1NFUlQoIWlzTnVsbCgpKTsKKyAg ICByZXR1cm4gbV9wcml2YXRlLT5jb250YWluc0ZpbGVuYW1lcygpOworfQorCit2b2lkIFdlYkRy YWdEYXRhOjpmaWxlbmFtZXMoV2ViVmVjdG9yPFdlYlN0cmluZz4mIGZpbGVuYW1lcykgY29uc3QK K3sKKyAgICBBU1NFUlQoIWlzTnVsbCgpKTsKKyAgICBmaWxlbmFtZXMgPSBtX3ByaXZhdGUtPmZp bGVuYW1lcygpOworfQorCit2b2lkIFdlYkRyYWdEYXRhOjpzZXRGaWxlbmFtZXMoY29uc3QgV2Vi VmVjdG9yPFdlYlN0cmluZz4mIGZpbGVuYW1lcykKK3sKKyAgICBlbnN1cmVNdXRhYmxlKCk7Cisg ICAgVmVjdG9yPFN0cmluZz4gZmlsZW5hbWVzQ29weTsKKyAgICBmaWxlbmFtZXNDb3B5LmFwcGVu ZChmaWxlbmFtZXMuZGF0YSgpLCBmaWxlbmFtZXMuc2l6ZSgpKTsKKyAgICBtX3ByaXZhdGUtPnNl dEZpbGVuYW1lcyhmaWxlbmFtZXNDb3B5KTsKK30KKwordm9pZCBXZWJEcmFnRGF0YTo6YXBwZW5k VG9GaWxlbmFtZXMoY29uc3QgV2ViU3RyaW5nJiBmaWxlbmFtZSkKK3sKKyAgICBlbnN1cmVNdXRh YmxlKCk7CisgICAgVmVjdG9yPFN0cmluZz4gZmlsZW5hbWVzID0gbV9wcml2YXRlLT5maWxlbmFt ZXMoKTsKKyAgICBmaWxlbmFtZXMuYXBwZW5kKGZpbGVuYW1lKTsKKyAgICBtX3ByaXZhdGUtPnNl dEZpbGVuYW1lcyhmaWxlbmFtZXMpOworfQorCiBXZWJTdHJpbmcgV2ViRHJhZ0RhdGE6OnBsYWlu VGV4dCgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKCFpc051bGwoKSk7CkBAIC0xOTMsNiArMjIxLDE4 IEBAIHZvaWQgV2ViRHJhZ0RhdGE6OnNldEZpbGVDb250ZW50RmlsZU5hbWUoY29uc3QgV2ViU3Ry aW5nJiBmaWxlTmFtZSkKICAgICBtX3ByaXZhdGUtPnNldEZpbGVDb250ZW50RmlsZW5hbWUoZmls ZU5hbWUpOwogfQogCitXZWJTdHJpbmcgV2ViRHJhZ0RhdGE6OmZpbGVDb250ZW50RmlsZW5hbWUo KSBjb25zdAoreworICAgIEFTU0VSVCghaXNOdWxsKCkpOworICAgIHJldHVybiBtX3ByaXZhdGUt PmZpbGVDb250ZW50RmlsZW5hbWUoKTsKK30KKwordm9pZCBXZWJEcmFnRGF0YTo6c2V0RmlsZUNv bnRlbnRGaWxlbmFtZShjb25zdCBXZWJTdHJpbmcmIGZpbGVuYW1lKQoreworICAgIGVuc3VyZU11 dGFibGUoKTsKKyAgICBtX3ByaXZhdGUtPnNldEZpbGVDb250ZW50RmlsZW5hbWUoZmlsZW5hbWUp OworfQorCiBXZWJEYXRhIFdlYkRyYWdEYXRhOjpmaWxlQ29udGVudCgpIGNvbnN0CiB7CiAgICAg QVNTRVJUKCFpc051bGwoKSk7Cg== 69485 2010-10-01 10:43:26 -0700 2010-10-01 11:20:14 -0700 Patch bug-46937-20101001104325.patch text/plain 5704 dcheng ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDRkMzJjNTQ0MzQ0ODMyM2RmOGY5ZmI4YmU1YWM5ZWY0ZTE3MjA0OWIu LjY4MDMzZDVhYjA0MzlhMjMzOGNiMjJjOGIyNmRjMDQ0N2U2ZjRlMjEgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDM3IEBACisyMDEwLTEwLTAxICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtjaHJvbWl1bV0gTWlub3IgbmFtaW5nIGNsZWFudXAgaW4gV2ViRHJhZ0RhdGEKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2OTM3CisKKyAgICAgICAg VGhpcyBpcyBhIHR3by1wYXJ0IHBhdGNoLS1vbmUgdG8gYWRkIHRoZSBuZXcgbWV0aG9kcyB3aXRo IG5vcm1hbGl6ZWQKKyAgICAgICAgbmFtZXMgdGhhdCBmb2xsb3cgZ2VuZXJhbCBXZWJLaXQgY29u dmVudGlvbiwgYW5kIGEgZm9sbG93dXAgcGF0Y2ggdG8KKyAgICAgICAgcmVtb3ZlIHRoZSBvcmln aW5hbCBtZXRob2RzIG9uY2UgQ2hyb21pdW0gaXMgdXBkYXRlZC4KKworICAgICAgICBUaGUgbGlz dCBvZiBtZXRob2RzIHRoYXQgaGF2ZSBiZWVuIHJlbmFtZWQ6CisgICAgICAgICogaGFzRmlsZU5h bWVzKCkgLT4gY29udGFpbnNGaWxlbmFtZXMoKQorICAgICAgICAqIGZpbGVOYW1lcygpIC0+IGZp bGVuYW1lcygpCisgICAgICAgICogc2V0RmlsZU5hbWVzKCkgLT4gc2V0RmlsZW5hbWVzKCkKKyAg ICAgICAgKiBhcHBlbmRUb0ZpbGVOYW1lcygpIC0+IGFwcGVuZFRvRmlsZW5hbWVzKCkKKyAgICAg ICAgKiBmaWxlQ29udGVudEZpbGVOYW1lKCkgLT4gZmlsZUNvbnRlbnRGaWxlbmFtZSgpCisgICAg ICAgICogc2V0RmlsZUNvbnRlbnRGaWxlTmFtZSgpIC0+IHNldEZpbGVDb250ZW50RmlsZW5hbWUo KQorCisgICAgICAgICogcHVibGljL1dlYkRyYWdEYXRhLmg6CisgICAgICAgICogc3JjL1dlYkRy YWdEYXRhLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRHJhZ0RhdGE6Omhhc0ZpbGVOYW1lcyk6 CisgICAgICAgIChXZWJLaXQ6OldlYkRyYWdEYXRhOjpmaWxlTmFtZXMpOgorICAgICAgICAoV2Vi S2l0OjpXZWJEcmFnRGF0YTo6c2V0RmlsZU5hbWVzKToKKyAgICAgICAgKFdlYktpdDo6V2ViRHJh Z0RhdGE6OmFwcGVuZFRvRmlsZU5hbWVzKToKKyAgICAgICAgKFdlYktpdDo6V2ViRHJhZ0RhdGE6 OmNvbnRhaW5zRmlsZW5hbWVzKToKKyAgICAgICAgKFdlYktpdDo6V2ViRHJhZ0RhdGE6OmZpbGVu YW1lcyk6CisgICAgICAgIChXZWJLaXQ6OldlYkRyYWdEYXRhOjpzZXRGaWxlbmFtZXMpOgorICAg ICAgICAoV2ViS2l0OjpXZWJEcmFnRGF0YTo6YXBwZW5kVG9GaWxlbmFtZXMpOgorICAgICAgICAo V2ViS2l0OjpXZWJEcmFnRGF0YTo6ZmlsZUNvbnRlbnRGaWxlTmFtZSk6CisgICAgICAgIChXZWJL aXQ6OldlYkRyYWdEYXRhOjpzZXRGaWxlQ29udGVudEZpbGVOYW1lKToKKyAgICAgICAgKFdlYktp dDo6V2ViRHJhZ0RhdGE6OmZpbGVDb250ZW50RmlsZW5hbWUpOgorICAgICAgICAoV2ViS2l0OjpX ZWJEcmFnRGF0YTo6c2V0RmlsZUNvbnRlbnRGaWxlbmFtZSk6CisKIDIwMTAtMDktMzAgIER1bWl0 cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBGaXNoZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRyYWdE YXRhLmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRyYWdEYXRhLmgKaW5kZXggNjc0OGZl MDZiYWE1MGMyYzdjZDJmY2U3OTc1MzgxMTg0NzI4MTYzZi4uODNiZjBjOTU0YzhhMTliODQ0ODZk NGFhNjZhMTMyZTEwNjNmNzY3YyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJEcmFnRGF0YS5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRHJhZ0RhdGEuaApA QCAtODMsNiArODMsMTEgQEAgcHVibGljOgogICAgIFdFQktJVF9BUEkgdm9pZCBzZXRGaWxlTmFt ZXMoY29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mKTsKICAgICBXRUJLSVRfQVBJIHZvaWQgYXBw ZW5kVG9GaWxlTmFtZXMoY29uc3QgV2ViU3RyaW5nJik7CiAKKyAgICBXRUJLSVRfQVBJIGJvb2wg Y29udGFpbnNGaWxlbmFtZXMoKSBjb25zdDsKKyAgICBXRUJLSVRfQVBJIHZvaWQgZmlsZW5hbWVz KFdlYlZlY3RvcjxXZWJTdHJpbmc+JikgY29uc3Q7CisgICAgV0VCS0lUX0FQSSB2b2lkIHNldEZp bGVuYW1lcyhjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYpOworICAgIFdFQktJVF9BUEkgdm9p ZCBhcHBlbmRUb0ZpbGVuYW1lcyhjb25zdCBXZWJTdHJpbmcmKTsKKwogICAgIFdFQktJVF9BUEkg V2ViU3RyaW5nIHBsYWluVGV4dCgpIGNvbnN0OwogICAgIFdFQktJVF9BUEkgdm9pZCBzZXRQbGFp blRleHQoY29uc3QgV2ViU3RyaW5nJik7CiAKQEAgLTk1LDYgKzEwMCw5IEBAIHB1YmxpYzoKICAg ICBXRUJLSVRfQVBJIFdlYlN0cmluZyBmaWxlQ29udGVudEZpbGVOYW1lKCkgY29uc3Q7CiAgICAg V0VCS0lUX0FQSSB2b2lkIHNldEZpbGVDb250ZW50RmlsZU5hbWUoY29uc3QgV2ViU3RyaW5nJik7 CiAKKyAgICBXRUJLSVRfQVBJIFdlYlN0cmluZyBmaWxlQ29udGVudEZpbGVuYW1lKCkgY29uc3Q7 CisgICAgV0VCS0lUX0FQSSB2b2lkIHNldEZpbGVDb250ZW50RmlsZW5hbWUoY29uc3QgV2ViU3Ry aW5nJik7CisKICAgICBXRUJLSVRfQVBJIFdlYkRhdGEgZmlsZUNvbnRlbnQoKSBjb25zdDsKICAg ICBXRUJLSVRfQVBJIHZvaWQgc2V0RmlsZUNvbnRlbnQoY29uc3QgV2ViRGF0YSYpOwogCmRpZmYg LS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRyYWdEYXRhLmNwcCBiL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViRHJhZ0RhdGEuY3BwCmluZGV4IGJjNmJkY2NmNjY4N2U0ODFkZmZhODUyNjZi NjI2NjE2OGUyODk1NjkuLjFiMTk5NDBjNzE0ZGNjMzFlZTljYmExZjgyODkzMTdiN2U3ODA0Njkg MTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRHJhZ0RhdGEuY3BwCisrKyBiL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViRHJhZ0RhdGEuY3BwCkBAIC0xMTcsMzAgKzExNyw1MCBAQCB2 b2lkIFdlYkRyYWdEYXRhOjpzZXRGaWxlRXh0ZW5zaW9uKGNvbnN0IFdlYlN0cmluZyYgZmlsZUV4 dGVuc2lvbikKIAogYm9vbCBXZWJEcmFnRGF0YTo6aGFzRmlsZU5hbWVzKCkgY29uc3QKIHsKKyAg ICByZXR1cm4gY29udGFpbnNGaWxlbmFtZXMoKTsKK30KKwordm9pZCBXZWJEcmFnRGF0YTo6Zmls ZU5hbWVzKFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBmaWxlTmFtZXMpIGNvbnN0Cit7CisgICAgZmls ZW5hbWVzKGZpbGVOYW1lcyk7Cit9CisKK3ZvaWQgV2ViRHJhZ0RhdGE6OnNldEZpbGVOYW1lcyhj b25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgZmlsZU5hbWVzKQoreworICAgIHJldHVybiBzZXRG aWxlbmFtZXMoZmlsZU5hbWVzKTsKK30KKwordm9pZCBXZWJEcmFnRGF0YTo6YXBwZW5kVG9GaWxl TmFtZXMoY29uc3QgV2ViU3RyaW5nJiBmaWxlTmFtZSkKK3sKKyAgICByZXR1cm4gYXBwZW5kVG9G aWxlbmFtZXMoZmlsZU5hbWUpOworfQorCitib29sIFdlYkRyYWdEYXRhOjpjb250YWluc0ZpbGVu YW1lcygpIGNvbnN0Cit7CiAgICAgQVNTRVJUKCFpc051bGwoKSk7CiAgICAgcmV0dXJuIG1fcHJp dmF0ZS0+Y29udGFpbnNGaWxlbmFtZXMoKTsKIH0KIAotdm9pZCBXZWJEcmFnRGF0YTo6ZmlsZU5h bWVzKFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBmaWxlTmFtZXMpIGNvbnN0Cit2b2lkIFdlYkRyYWdE YXRhOjpmaWxlbmFtZXMoV2ViVmVjdG9yPFdlYlN0cmluZz4mIGZpbGVuYW1lcykgY29uc3QKIHsK ICAgICBBU1NFUlQoIWlzTnVsbCgpKTsKLSAgICBmaWxlTmFtZXMgPSBtX3ByaXZhdGUtPmZpbGVu YW1lcygpOworICAgIGZpbGVuYW1lcyA9IG1fcHJpdmF0ZS0+ZmlsZW5hbWVzKCk7CiB9CiAKLXZv aWQgV2ViRHJhZ0RhdGE6OnNldEZpbGVOYW1lcyhjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYg ZmlsZU5hbWVzKQordm9pZCBXZWJEcmFnRGF0YTo6c2V0RmlsZW5hbWVzKGNvbnN0IFdlYlZlY3Rv cjxXZWJTdHJpbmc+JiBmaWxlbmFtZXMpCiB7CiAgICAgZW5zdXJlTXV0YWJsZSgpOwotICAgIFZl Y3RvcjxTdHJpbmc+IGZpbGVOYW1lc0NvcHk7Ci0gICAgZmlsZU5hbWVzQ29weS5hcHBlbmQoZmls ZU5hbWVzLmRhdGEoKSwgZmlsZU5hbWVzLnNpemUoKSk7Ci0gICAgbV9wcml2YXRlLT5zZXRGaWxl bmFtZXMoZmlsZU5hbWVzQ29weSk7CisgICAgVmVjdG9yPFN0cmluZz4gZmlsZW5hbWVzQ29weTsK KyAgICBmaWxlbmFtZXNDb3B5LmFwcGVuZChmaWxlbmFtZXMuZGF0YSgpLCBmaWxlbmFtZXMuc2l6 ZSgpKTsKKyAgICBtX3ByaXZhdGUtPnNldEZpbGVuYW1lcyhmaWxlbmFtZXNDb3B5KTsKIH0KIAot dm9pZCBXZWJEcmFnRGF0YTo6YXBwZW5kVG9GaWxlTmFtZXMoY29uc3QgV2ViU3RyaW5nJiBmaWxl TmFtZSkKK3ZvaWQgV2ViRHJhZ0RhdGE6OmFwcGVuZFRvRmlsZW5hbWVzKGNvbnN0IFdlYlN0cmlu ZyYgZmlsZW5hbWUpCiB7CiAgICAgZW5zdXJlTXV0YWJsZSgpOwotICAgIFZlY3RvcjxTdHJpbmc+ IGZpbGVOYW1lcyA9IG1fcHJpdmF0ZS0+ZmlsZW5hbWVzKCk7Ci0gICAgZmlsZU5hbWVzLmFwcGVu ZChmaWxlTmFtZSk7Ci0gICAgbV9wcml2YXRlLT5zZXRGaWxlbmFtZXMoZmlsZU5hbWVzKTsKKyAg ICBWZWN0b3I8U3RyaW5nPiBmaWxlbmFtZXMgPSBtX3ByaXZhdGUtPmZpbGVuYW1lcygpOworICAg IGZpbGVuYW1lcy5hcHBlbmQoZmlsZW5hbWUpOworICAgIG1fcHJpdmF0ZS0+c2V0RmlsZW5hbWVz KGZpbGVuYW1lcyk7CiB9CiAKIFdlYlN0cmluZyBXZWJEcmFnRGF0YTo6cGxhaW5UZXh0KCkgY29u c3QKQEAgLTE4MywxNCArMjAzLDI0IEBAIHZvaWQgV2ViRHJhZ0RhdGE6OnNldEhUTUxCYXNlVVJM KGNvbnN0IFdlYlVSTCYgaHRtbEJhc2VVUkwpCiAKIFdlYlN0cmluZyBXZWJEcmFnRGF0YTo6Zmls ZUNvbnRlbnRGaWxlTmFtZSgpIGNvbnN0CiB7CisgICAgcmV0dXJuIGZpbGVDb250ZW50RmlsZW5h bWUoKTsKK30KKwordm9pZCBXZWJEcmFnRGF0YTo6c2V0RmlsZUNvbnRlbnRGaWxlTmFtZShjb25z dCBXZWJTdHJpbmcmIGZpbGVOYW1lKQoreworICAgIHJldHVybiBzZXRGaWxlQ29udGVudEZpbGVu YW1lKGZpbGVOYW1lKTsKK30KKworV2ViU3RyaW5nIFdlYkRyYWdEYXRhOjpmaWxlQ29udGVudEZp bGVuYW1lKCkgY29uc3QKK3sKICAgICBBU1NFUlQoIWlzTnVsbCgpKTsKICAgICByZXR1cm4gbV9w cml2YXRlLT5maWxlQ29udGVudEZpbGVuYW1lKCk7CiB9CiAKLXZvaWQgV2ViRHJhZ0RhdGE6OnNl dEZpbGVDb250ZW50RmlsZU5hbWUoY29uc3QgV2ViU3RyaW5nJiBmaWxlTmFtZSkKK3ZvaWQgV2Vi RHJhZ0RhdGE6OnNldEZpbGVDb250ZW50RmlsZW5hbWUoY29uc3QgV2ViU3RyaW5nJiBmaWxlbmFt ZSkKIHsKICAgICBlbnN1cmVNdXRhYmxlKCk7Ci0gICAgbV9wcml2YXRlLT5zZXRGaWxlQ29udGVu dEZpbGVuYW1lKGZpbGVOYW1lKTsKKyAgICBtX3ByaXZhdGUtPnNldEZpbGVDb250ZW50RmlsZW5h bWUoZmlsZW5hbWUpOwogfQogCiBXZWJEYXRhIFdlYkRyYWdEYXRhOjpmaWxlQ29udGVudCgpIGNv bnN0Cg== 69490 2010-10-01 11:20:18 -0700 2010-10-01 12:40:44 -0700 Patch bug-46937-20101001112016.patch text/plain 5975 dcheng ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDRkMzJjNTQ0MzQ0ODMyM2RmOGY5ZmI4YmU1YWM5ZWY0ZTE3MjA0OWIu LmFhZTM0MjZhYTBmMWFhZDc3NjBlNzQ0OWMzNDZjNjFkYWI4MGFiNDggMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDI5IEBACisyMDEwLTEwLTAxICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtjaHJvbWl1bV0gTWlub3IgbmFtaW5nIGNsZWFudXAgaW4gV2ViRHJhZ0RhdGEKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2OTM3CisKKyAgICAgICAg VGhpcyBpcyBhIHR3by1wYXJ0IHBhdGNoLS1vbmUgdG8gYWRkIHRoZSBuZXcgbWV0aG9kcyB3aXRo IG5vcm1hbGl6ZWQKKyAgICAgICAgbmFtZXMgdGhhdCBmb2xsb3cgZ2VuZXJhbCBXZWJLaXQgY29u dmVudGlvbiwgYW5kIGEgZm9sbG93dXAgcGF0Y2ggdG8KKyAgICAgICAgcmVtb3ZlIHRoZSBvcmln aW5hbCBtZXRob2RzIG9uY2UgQ2hyb21pdW0gaXMgdXBkYXRlZC4KKworICAgICAgICAqIHB1Ymxp Yy9XZWJEcmFnRGF0YS5oOgorICAgICAgICAqIHNyYy9XZWJEcmFnRGF0YS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkRyYWdEYXRhOjpoYXNGaWxlTmFtZXMpOiByZW5hbWVkIHRvIGNvbnRhaW5z RmlsZW5hbWVzCisgICAgICAgIChXZWJLaXQ6OldlYkRyYWdEYXRhOjpmaWxlTmFtZXMpOiByZW5h bWVkIHRvIGZpbGVuYW1lcworICAgICAgICAoV2ViS2l0OjpXZWJEcmFnRGF0YTo6c2V0RmlsZU5h bWVzKTogcmVuYW1lZCB0byBzZXRGaWxlbmFtZXMKKyAgICAgICAgKFdlYktpdDo6V2ViRHJhZ0Rh dGE6OmFwcGVuZFRvRmlsZU5hbWVzKTogcmVuYW1lZCB0byBhcHBlbmRUb0ZpbGVuYW1lcworICAg ICAgICAoV2ViS2l0OjpXZWJEcmFnRGF0YTo6Y29udGFpbnNGaWxlbmFtZXMpOgorICAgICAgICAo V2ViS2l0OjpXZWJEcmFnRGF0YTo6ZmlsZW5hbWVzKToKKyAgICAgICAgKFdlYktpdDo6V2ViRHJh Z0RhdGE6OnNldEZpbGVuYW1lcyk6CisgICAgICAgIChXZWJLaXQ6OldlYkRyYWdEYXRhOjphcHBl bmRUb0ZpbGVuYW1lcyk6CisgICAgICAgIChXZWJLaXQ6OldlYkRyYWdEYXRhOjpmaWxlQ29udGVu dEZpbGVOYW1lKTogcmVuYW1lZCB0byBmaWxlQ29udGVudEZpbGVuYW1lCisgICAgICAgIChXZWJL aXQ6OldlYkRyYWdEYXRhOjpzZXRGaWxlQ29udGVudEZpbGVOYW1lKTogcmVuYW1lZCB0byBzZXRG aWxlQ29udGVudEZpbGVuYW1lCisgICAgICAgIChXZWJLaXQ6OldlYkRyYWdEYXRhOjpmaWxlQ29u dGVudEZpbGVuYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViRHJhZ0RhdGE6OnNldEZpbGVDb250 ZW50RmlsZW5hbWUpOgorCiAyMDEwLTA5LTMwICBEdW1pdHJ1IERhbmlsaXVjICA8ZHVtaUBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEcmFnRGF0YS5oIGIvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJEcmFnRGF0YS5oCmluZGV4IDY3NDhmZTA2YmFhNTBjMmM3Y2QyZmNlNzk3NTM4 MTE4NDcyODE2M2YuLmIxOTg1YzFkOGJlZTMyMDcwM2Y3ZTVlZWVhM2E4YTJkZTQwYjQ3ZjIgMTAw NjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRHJhZ0RhdGEuaAorKysgYi9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkRyYWdEYXRhLmgKQEAgLTc4LDExICs3OCwxNyBAQCBwdWJs aWM6CiAgICAgV0VCS0lUX0FQSSBXZWJTdHJpbmcgZmlsZUV4dGVuc2lvbigpIGNvbnN0OwogICAg IFdFQktJVF9BUEkgdm9pZCBzZXRGaWxlRXh0ZW5zaW9uKGNvbnN0IFdlYlN0cmluZyYpOwogCisg ICAgLy8gVGhlc2UgbWV0aG9kcyBhcmUgZGVwcmVjYXRlZCBpbiBmYXZvciBvZiB0aGUgb25lcyBp biB0aGUgbmV4dCBibG9jay4KICAgICBXRUJLSVRfQVBJIGJvb2wgaGFzRmlsZU5hbWVzKCkgY29u c3Q7CiAgICAgV0VCS0lUX0FQSSB2b2lkIGZpbGVOYW1lcyhXZWJWZWN0b3I8V2ViU3RyaW5nPiYp IGNvbnN0OwogICAgIFdFQktJVF9BUEkgdm9pZCBzZXRGaWxlTmFtZXMoY29uc3QgV2ViVmVjdG9y PFdlYlN0cmluZz4mKTsKICAgICBXRUJLSVRfQVBJIHZvaWQgYXBwZW5kVG9GaWxlTmFtZXMoY29u c3QgV2ViU3RyaW5nJik7CiAKKyAgICBXRUJLSVRfQVBJIGJvb2wgY29udGFpbnNGaWxlbmFtZXMo KSBjb25zdDsKKyAgICBXRUJLSVRfQVBJIHZvaWQgZmlsZW5hbWVzKFdlYlZlY3RvcjxXZWJTdHJp bmc+JikgY29uc3Q7CisgICAgV0VCS0lUX0FQSSB2b2lkIHNldEZpbGVuYW1lcyhjb25zdCBXZWJW ZWN0b3I8V2ViU3RyaW5nPiYpOworICAgIFdFQktJVF9BUEkgdm9pZCBhcHBlbmRUb0ZpbGVuYW1l cyhjb25zdCBXZWJTdHJpbmcmKTsKKwogICAgIFdFQktJVF9BUEkgV2ViU3RyaW5nIHBsYWluVGV4 dCgpIGNvbnN0OwogICAgIFdFQktJVF9BUEkgdm9pZCBzZXRQbGFpblRleHQoY29uc3QgV2ViU3Ry aW5nJik7CiAKQEAgLTkyLDkgKzk4LDEzIEBAIHB1YmxpYzoKICAgICBXRUJLSVRfQVBJIFdlYlVS TCBodG1sQmFzZVVSTCgpIGNvbnN0OwogICAgIFdFQktJVF9BUEkgdm9pZCBzZXRIVE1MQmFzZVVS TChjb25zdCBXZWJVUkwmKTsKIAorICAgIC8vIFRoZXNlIG1ldGhvZHMgYXJlIGRlcHJlY2F0ZWQg aW4gZmF2b3Igb2YgdGhlIG9uZXMgaW4gdGhlIG5leHQgYmxvY2suCiAgICAgV0VCS0lUX0FQSSBX ZWJTdHJpbmcgZmlsZUNvbnRlbnRGaWxlTmFtZSgpIGNvbnN0OwogICAgIFdFQktJVF9BUEkgdm9p ZCBzZXRGaWxlQ29udGVudEZpbGVOYW1lKGNvbnN0IFdlYlN0cmluZyYpOwogCisgICAgV0VCS0lU X0FQSSBXZWJTdHJpbmcgZmlsZUNvbnRlbnRGaWxlbmFtZSgpIGNvbnN0OworICAgIFdFQktJVF9B UEkgdm9pZCBzZXRGaWxlQ29udGVudEZpbGVuYW1lKGNvbnN0IFdlYlN0cmluZyYpOworCiAgICAg V0VCS0lUX0FQSSBXZWJEYXRhIGZpbGVDb250ZW50KCkgY29uc3Q7CiAgICAgV0VCS0lUX0FQSSB2 b2lkIHNldEZpbGVDb250ZW50KGNvbnN0IFdlYkRhdGEmKTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJEcmFnRGF0YS5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRy YWdEYXRhLmNwcAppbmRleCBiYzZiZGNjZjY2ODdlNDgxZGZmYTg1MjY2YjYyNjYxNjhlMjg5NTY5 Li4xYjE5OTQwYzcxNGRjYzMxZWU5Y2JhMWY4Mjg5MzE3YjdlNzgwNDY5IDEwMDY0NAotLS0gYS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRyYWdEYXRhLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYkRyYWdEYXRhLmNwcApAQCAtMTE3LDMwICsxMTcsNTAgQEAgdm9pZCBXZWJEcmFnRGF0 YTo6c2V0RmlsZUV4dGVuc2lvbihjb25zdCBXZWJTdHJpbmcmIGZpbGVFeHRlbnNpb24pCiAKIGJv b2wgV2ViRHJhZ0RhdGE6Omhhc0ZpbGVOYW1lcygpIGNvbnN0CiB7CisgICAgcmV0dXJuIGNvbnRh aW5zRmlsZW5hbWVzKCk7Cit9CisKK3ZvaWQgV2ViRHJhZ0RhdGE6OmZpbGVOYW1lcyhXZWJWZWN0 b3I8V2ViU3RyaW5nPiYgZmlsZU5hbWVzKSBjb25zdAoreworICAgIGZpbGVuYW1lcyhmaWxlTmFt ZXMpOworfQorCit2b2lkIFdlYkRyYWdEYXRhOjpzZXRGaWxlTmFtZXMoY29uc3QgV2ViVmVjdG9y PFdlYlN0cmluZz4mIGZpbGVOYW1lcykKK3sKKyAgICByZXR1cm4gc2V0RmlsZW5hbWVzKGZpbGVO YW1lcyk7Cit9CisKK3ZvaWQgV2ViRHJhZ0RhdGE6OmFwcGVuZFRvRmlsZU5hbWVzKGNvbnN0IFdl YlN0cmluZyYgZmlsZU5hbWUpCit7CisgICAgcmV0dXJuIGFwcGVuZFRvRmlsZW5hbWVzKGZpbGVO YW1lKTsKK30KKworYm9vbCBXZWJEcmFnRGF0YTo6Y29udGFpbnNGaWxlbmFtZXMoKSBjb25zdAor ewogICAgIEFTU0VSVCghaXNOdWxsKCkpOwogICAgIHJldHVybiBtX3ByaXZhdGUtPmNvbnRhaW5z RmlsZW5hbWVzKCk7CiB9CiAKLXZvaWQgV2ViRHJhZ0RhdGE6OmZpbGVOYW1lcyhXZWJWZWN0b3I8 V2ViU3RyaW5nPiYgZmlsZU5hbWVzKSBjb25zdAordm9pZCBXZWJEcmFnRGF0YTo6ZmlsZW5hbWVz KFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBmaWxlbmFtZXMpIGNvbnN0CiB7CiAgICAgQVNTRVJUKCFp c051bGwoKSk7Ci0gICAgZmlsZU5hbWVzID0gbV9wcml2YXRlLT5maWxlbmFtZXMoKTsKKyAgICBm aWxlbmFtZXMgPSBtX3ByaXZhdGUtPmZpbGVuYW1lcygpOwogfQogCi12b2lkIFdlYkRyYWdEYXRh OjpzZXRGaWxlTmFtZXMoY29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIGZpbGVOYW1lcykKK3Zv aWQgV2ViRHJhZ0RhdGE6OnNldEZpbGVuYW1lcyhjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYg ZmlsZW5hbWVzKQogewogICAgIGVuc3VyZU11dGFibGUoKTsKLSAgICBWZWN0b3I8U3RyaW5nPiBm aWxlTmFtZXNDb3B5OwotICAgIGZpbGVOYW1lc0NvcHkuYXBwZW5kKGZpbGVOYW1lcy5kYXRhKCks IGZpbGVOYW1lcy5zaXplKCkpOwotICAgIG1fcHJpdmF0ZS0+c2V0RmlsZW5hbWVzKGZpbGVOYW1l c0NvcHkpOworICAgIFZlY3RvcjxTdHJpbmc+IGZpbGVuYW1lc0NvcHk7CisgICAgZmlsZW5hbWVz Q29weS5hcHBlbmQoZmlsZW5hbWVzLmRhdGEoKSwgZmlsZW5hbWVzLnNpemUoKSk7CisgICAgbV9w cml2YXRlLT5zZXRGaWxlbmFtZXMoZmlsZW5hbWVzQ29weSk7CiB9CiAKLXZvaWQgV2ViRHJhZ0Rh dGE6OmFwcGVuZFRvRmlsZU5hbWVzKGNvbnN0IFdlYlN0cmluZyYgZmlsZU5hbWUpCit2b2lkIFdl YkRyYWdEYXRhOjphcHBlbmRUb0ZpbGVuYW1lcyhjb25zdCBXZWJTdHJpbmcmIGZpbGVuYW1lKQog ewogICAgIGVuc3VyZU11dGFibGUoKTsKLSAgICBWZWN0b3I8U3RyaW5nPiBmaWxlTmFtZXMgPSBt X3ByaXZhdGUtPmZpbGVuYW1lcygpOwotICAgIGZpbGVOYW1lcy5hcHBlbmQoZmlsZU5hbWUpOwot ICAgIG1fcHJpdmF0ZS0+c2V0RmlsZW5hbWVzKGZpbGVOYW1lcyk7CisgICAgVmVjdG9yPFN0cmlu Zz4gZmlsZW5hbWVzID0gbV9wcml2YXRlLT5maWxlbmFtZXMoKTsKKyAgICBmaWxlbmFtZXMuYXBw ZW5kKGZpbGVuYW1lKTsKKyAgICBtX3ByaXZhdGUtPnNldEZpbGVuYW1lcyhmaWxlbmFtZXMpOwog fQogCiBXZWJTdHJpbmcgV2ViRHJhZ0RhdGE6OnBsYWluVGV4dCgpIGNvbnN0CkBAIC0xODMsMTQg KzIwMywyNCBAQCB2b2lkIFdlYkRyYWdEYXRhOjpzZXRIVE1MQmFzZVVSTChjb25zdCBXZWJVUkwm IGh0bWxCYXNlVVJMKQogCiBXZWJTdHJpbmcgV2ViRHJhZ0RhdGE6OmZpbGVDb250ZW50RmlsZU5h bWUoKSBjb25zdAogeworICAgIHJldHVybiBmaWxlQ29udGVudEZpbGVuYW1lKCk7Cit9CisKK3Zv aWQgV2ViRHJhZ0RhdGE6OnNldEZpbGVDb250ZW50RmlsZU5hbWUoY29uc3QgV2ViU3RyaW5nJiBm aWxlTmFtZSkKK3sKKyAgICByZXR1cm4gc2V0RmlsZUNvbnRlbnRGaWxlbmFtZShmaWxlTmFtZSk7 Cit9CisKK1dlYlN0cmluZyBXZWJEcmFnRGF0YTo6ZmlsZUNvbnRlbnRGaWxlbmFtZSgpIGNvbnN0 Cit7CiAgICAgQVNTRVJUKCFpc051bGwoKSk7CiAgICAgcmV0dXJuIG1fcHJpdmF0ZS0+ZmlsZUNv bnRlbnRGaWxlbmFtZSgpOwogfQogCi12b2lkIFdlYkRyYWdEYXRhOjpzZXRGaWxlQ29udGVudEZp bGVOYW1lKGNvbnN0IFdlYlN0cmluZyYgZmlsZU5hbWUpCit2b2lkIFdlYkRyYWdEYXRhOjpzZXRG aWxlQ29udGVudEZpbGVuYW1lKGNvbnN0IFdlYlN0cmluZyYgZmlsZW5hbWUpCiB7CiAgICAgZW5z dXJlTXV0YWJsZSgpOwotICAgIG1fcHJpdmF0ZS0+c2V0RmlsZUNvbnRlbnRGaWxlbmFtZShmaWxl TmFtZSk7CisgICAgbV9wcml2YXRlLT5zZXRGaWxlQ29udGVudEZpbGVuYW1lKGZpbGVuYW1lKTsK IH0KIAogV2ViRGF0YSBXZWJEcmFnRGF0YTo6ZmlsZUNvbnRlbnQoKSBjb25zdAo= 69836 2010-10-05 13:56:59 -0700 2010-10-05 14:09:22 -0700 Patch foo.patch text/plain 3124 dcheng ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDQ0MDIyOTMuLmY0NGY1NTYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE1IEBACisyMDEwLTEwLTA1ICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1 bV0gTWlub3IgbmFtaW5nIGNsZWFudXAgaW4gV2ViRHJhZ0RhdGEKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2OTM3CisKKyAgICAgICAgQ2hyb21pdW0g bm8gbG9uZ2VyIHVzZXMgdGhlIGRlcHJlY2F0ZWQgbWV0aG9kcywgc28gZGVsZXRlIHRoZW0uCisK KyAgICAgICAgKiBwdWJsaWMvV2ViRHJhZ0RhdGEuaDoKKyAgICAgICAgKiBzcmMvV2ViRHJhZ0Rh dGEuY3BwOgorCiAyMDEwLTEwLTAxICBWaWN0b3JpYSBLaXJzdCAgPHZya0Bnb29nbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJEcmFnRGF0YS5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJEcmFnRGF0YS5oCmluZGV4IGIxOTg1YzEuLjFkNzA0ZjAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRHJhZ0RhdGEuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkRyYWdEYXRhLmgKQEAgLTc4LDEyICs3OCw2IEBAIHB1YmxpYzoKICAgICBXRUJLSVRfQVBJ IFdlYlN0cmluZyBmaWxlRXh0ZW5zaW9uKCkgY29uc3Q7CiAgICAgV0VCS0lUX0FQSSB2b2lkIHNl dEZpbGVFeHRlbnNpb24oY29uc3QgV2ViU3RyaW5nJik7CiAKLSAgICAvLyBUaGVzZSBtZXRob2Rz IGFyZSBkZXByZWNhdGVkIGluIGZhdm9yIG9mIHRoZSBvbmVzIGluIHRoZSBuZXh0IGJsb2NrLgot ICAgIFdFQktJVF9BUEkgYm9vbCBoYXNGaWxlTmFtZXMoKSBjb25zdDsKLSAgICBXRUJLSVRfQVBJ IHZvaWQgZmlsZU5hbWVzKFdlYlZlY3RvcjxXZWJTdHJpbmc+JikgY29uc3Q7Ci0gICAgV0VCS0lU X0FQSSB2b2lkIHNldEZpbGVOYW1lcyhjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYpOwotICAg IFdFQktJVF9BUEkgdm9pZCBhcHBlbmRUb0ZpbGVOYW1lcyhjb25zdCBXZWJTdHJpbmcmKTsKLQog ICAgIFdFQktJVF9BUEkgYm9vbCBjb250YWluc0ZpbGVuYW1lcygpIGNvbnN0OwogICAgIFdFQktJ VF9BUEkgdm9pZCBmaWxlbmFtZXMoV2ViVmVjdG9yPFdlYlN0cmluZz4mKSBjb25zdDsKICAgICBX RUJLSVRfQVBJIHZvaWQgc2V0RmlsZW5hbWVzKGNvbnN0IFdlYlZlY3RvcjxXZWJTdHJpbmc+Jik7 CkBAIC05OCwxMCArOTIsNiBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0FQSSBXZWJVUkwgaHRtbEJh c2VVUkwoKSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0SFRNTEJhc2VVUkwoY29uc3Qg V2ViVVJMJik7CiAKLSAgICAvLyBUaGVzZSBtZXRob2RzIGFyZSBkZXByZWNhdGVkIGluIGZhdm9y IG9mIHRoZSBvbmVzIGluIHRoZSBuZXh0IGJsb2NrLgotICAgIFdFQktJVF9BUEkgV2ViU3RyaW5n IGZpbGVDb250ZW50RmlsZU5hbWUoKSBjb25zdDsKLSAgICBXRUJLSVRfQVBJIHZvaWQgc2V0Rmls ZUNvbnRlbnRGaWxlTmFtZShjb25zdCBXZWJTdHJpbmcmKTsKLQogICAgIFdFQktJVF9BUEkgV2Vi U3RyaW5nIGZpbGVDb250ZW50RmlsZW5hbWUoKSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQg c2V0RmlsZUNvbnRlbnRGaWxlbmFtZShjb25zdCBXZWJTdHJpbmcmKTsKIApkaWZmIC0tZ2l0IGEv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEcmFnRGF0YS5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkRyYWdEYXRhLmNwcAppbmRleCAxYjE5OTQwLi5mMjY0MzY5IDEwMDY0NAotLS0gYS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYkRyYWdEYXRhLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkRyYWdEYXRhLmNwcApAQCAtMTE1LDI2ICsxMTUsNiBAQCB2b2lkIFdlYkRyYWdEYXRhOjpz ZXRGaWxlRXh0ZW5zaW9uKGNvbnN0IFdlYlN0cmluZyYgZmlsZUV4dGVuc2lvbikKICAgICBtX3By aXZhdGUtPnNldEZpbGVFeHRlbnNpb24oZmlsZUV4dGVuc2lvbik7CiB9CiAKLWJvb2wgV2ViRHJh Z0RhdGE6Omhhc0ZpbGVOYW1lcygpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGNvbnRhaW5zRmlsZW5h bWVzKCk7Ci19Ci0KLXZvaWQgV2ViRHJhZ0RhdGE6OmZpbGVOYW1lcyhXZWJWZWN0b3I8V2ViU3Ry aW5nPiYgZmlsZU5hbWVzKSBjb25zdAotewotICAgIGZpbGVuYW1lcyhmaWxlTmFtZXMpOwotfQot Ci12b2lkIFdlYkRyYWdEYXRhOjpzZXRGaWxlTmFtZXMoY29uc3QgV2ViVmVjdG9yPFdlYlN0cmlu Zz4mIGZpbGVOYW1lcykKLXsKLSAgICByZXR1cm4gc2V0RmlsZW5hbWVzKGZpbGVOYW1lcyk7Ci19 Ci0KLXZvaWQgV2ViRHJhZ0RhdGE6OmFwcGVuZFRvRmlsZU5hbWVzKGNvbnN0IFdlYlN0cmluZyYg ZmlsZU5hbWUpCi17Ci0gICAgcmV0dXJuIGFwcGVuZFRvRmlsZW5hbWVzKGZpbGVOYW1lKTsKLX0K LQogYm9vbCBXZWJEcmFnRGF0YTo6Y29udGFpbnNGaWxlbmFtZXMoKSBjb25zdAogewogICAgIEFT U0VSVCghaXNOdWxsKCkpOwpAQCAtMjAxLDE2ICsxODEsNiBAQCB2b2lkIFdlYkRyYWdEYXRhOjpz ZXRIVE1MQmFzZVVSTChjb25zdCBXZWJVUkwmIGh0bWxCYXNlVVJMKQogICAgIG1fcHJpdmF0ZS0+ c2V0SHRtbEJhc2VVcmwoaHRtbEJhc2VVUkwpOwogfQogCi1XZWJTdHJpbmcgV2ViRHJhZ0RhdGE6 OmZpbGVDb250ZW50RmlsZU5hbWUoKSBjb25zdAotewotICAgIHJldHVybiBmaWxlQ29udGVudEZp bGVuYW1lKCk7Ci19Ci0KLXZvaWQgV2ViRHJhZ0RhdGE6OnNldEZpbGVDb250ZW50RmlsZU5hbWUo Y29uc3QgV2ViU3RyaW5nJiBmaWxlTmFtZSkKLXsKLSAgICByZXR1cm4gc2V0RmlsZUNvbnRlbnRG aWxlbmFtZShmaWxlTmFtZSk7Ci19Ci0KIFdlYlN0cmluZyBXZWJEcmFnRGF0YTo6ZmlsZUNvbnRl bnRGaWxlbmFtZSgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKCFpc051bGwoKSk7Cg==