69598 2011-10-06 19:52:41 -0700 Pass Parsed Accept Attribute MIME Types to WebKit Clients 2011-11-07 11:24:22 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 70095 1 joepeck joepeck ddkilzer dglazkov gustavo joepeck jonlee rcombs tkent xan.lopez oldest_to_newest 479746 0 joepeck 2011-10-06 19:52:41 -0700 Rather then have each of the WebKit clients parse the MIME types from the accept attribute string via FileChooser, WebCore should parse the string and pass a list. WebCore already has the HTML5 compatible parser logic. NOTE: Chromium is the only client that uses the "acceptType" attribute of FileChooser right now. They pass it along as a string and parse it later in chromium code. See also: <http://webkit.org/b/51045> [Qt] Implement HTML File Input "accept" attribute <http://webkit.org/b/45079> HTML <input type="file"> accept attribute 479755 1 110082 joepeck 2011-10-06 20:02:25 -0700 Created attachment 110082 [PATCH] Proposed Fix I think this is the preferable approach. Rather then passing the "accept" attribute string to WebKit clients, we instead pass the parsed list of trimmed MIME types. This way ports don't have to write their own, possibly differing parsing implementations and we can make use of the HTML5 parsers already in WebCore. I'm not very familiar with WK2, but this looks like it would affect the WebKit2 API. Does that require any special considerations? 480226 2 110082 joepeck 2011-10-07 12:44:13 -0700 Comment on attachment 110082 [PATCH] Proposed Fix Clearing flags. Based on some feedback I'm going to do some extra clean-up and break this up into parts. 480228 3 110198 joepeck 2011-10-07 12:45:44 -0700 Created attachment 110198 [PATCH] Part 1 - Deprecate String version of acceptTypes Chromium folks, check out Part 3 when it is up. Instead of parsing the mime types in chromium WebKit ports should share the implementation in WebCore. 480231 4 110199 joepeck 2011-10-07 12:46:42 -0700 Created attachment 110199 [PATCH] Part 2 - Switch a WebKit2 mirror struct to just use WebCore::FileChooserSettings 480232 5 110200 joepeck 2011-10-07 12:47:23 -0700 Created attachment 110200 [PATCH] Part 3 - Add acceptMIMETypes parsed list to FileChooserSettings 480299 6 110198 gyuyoung.kim 2011-10-07 13:59:34 -0700 Comment on attachment 110198 [PATCH] Part 1 - Deprecate String version of acceptTypes Attachment 110198 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/10006296 480316 7 joepeck 2011-10-07 14:30:39 -0700 (In reply to comment #6) > (From update of attachment 110198 [details]) > Attachment 110198 [details] did not pass efl-ews (efl): > Output: http://queues.webkit.org/results/10006296 Looks like the EFL port also used this and exposed it to their api as a char*: Eina_Bool (*run_open_panel)(Ewk_View_Smart_Data *sd, Evas_Object *frame, Eina_Bool allows_multiple_files, const char *accept_types, Eina_List **selected_filenames); If they want to move away from the deprecated type It looks like they could upgrade their API to use an Eina_List* for the MIME types list. I'll update Part 1. 480318 8 110217 joepeck 2011-10-07 14:34:49 -0700 Created attachment 110217 [PATCH] Part 1 - Deprecate String version of acceptTypes (Fix EFL) 480425 9 110217 gustavo 2011-10-07 18:24:00 -0700 Comment on attachment 110217 [PATCH] Part 1 - Deprecate String version of acceptTypes (Fix EFL) Attachment 110217 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/10006349 481424 10 tkent 2011-10-10 20:57:20 -0700 Part 1 and Part3 look reasonable. Please fix build failures of GTK and Windows. 481711 11 110533 joepeck 2011-10-11 10:29:20 -0700 Created attachment 110533 [PATCH] Part 1 - Deprecate String version of acceptTypes (Fix Builds) I forgot to change the WebKit2 one that gets removed in the next patch. I retroactively created the patches. Lets give this one a shot on the bots, while my system is having a little bit of trouble building in general. 482008 12 110533 tkent 2011-10-11 16:25:04 -0700 Comment on attachment 110533 [PATCH] Part 1 - Deprecate String version of acceptTypes (Fix Builds) Looks good. 482616 13 110200 ddkilzer 2011-10-12 12:39:42 -0700 Comment on attachment 110200 [PATCH] Part 3 - Add acceptMIMETypes parsed list to FileChooserSettings r=me 482974 14 joepeck 2011-10-12 19:54:35 -0700 Landed the 3 Parts in: http://trac.webkit.org/changeset/97336 http://trac.webkit.org/changeset/97337 http://trac.webkit.org/changeset/97338 483023 15 joepeck 2011-10-12 23:42:14 -0700 The bots look good. I think this is the first time I had 3 patches reviewed by 3 different people. Thanks for coming together! To remove the deprecated string I filed bugs on EFL and Chromium: <http://webkit.org/b/70002> [EFL]: Move from FileChooserSettings deprecatedAcceptType to acceptMIMETypes <http://webkit.org/b/70003> [Chromium]: Move from FileChooserSettings deprecatedAcceptType to acceptMIMETypes 497323 16 jonlee 2011-11-07 11:24:22 -0800 *** Bug 45079 has been marked as a duplicate of this bug. *** 110082 2011-10-06 20:02:25 -0700 2011-10-07 12:45:44 -0700 [PATCH] Proposed Fix parse-mime-type-info.patch text/plain 7297 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiYjhhOGE2Li4zZWYzMzcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjgg QEAKIDIwMTEtMTAtMDYgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAor ICAgICAgICBQYXNzIFBhcnNlZCBBY2NlcHQgQXR0cmlidXRlIE1JTUUgVHlwZXMgdG8gV2ViS2l0 IENsaWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTY5NTk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiBObyBuZXcgZnVuY3Rpb25hbGl0eSBpbiBXZWJDb3JlLCBqdXN0CisgICAg ICAgIGV4cG9zaW5nIG1vcmUgaW5mb3JtYXRpb24gdG8gdGhlIFdlYktpdCBwb3J0LgorCisgICAg ICAgICogaHRtbC9GaWxlSW5wdXRUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVJbnB1 dFR5cGU6OmhhbmRsZURPTUFjdGl2YXRlRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6RmlsZUlu cHV0VHlwZTo6cmVjZWl2ZURyb3BGb3JEaXJlY3RvcnlVcGxvYWQpOgorICAgICAgICBTZXQgdGhl IE1JTUUgdHlwZSBsaXN0IG9uIHRoZSBGaWxlQ2hvb3NlciBzZXR0aW5ncy4KKworICAgICAgICAq IGh0bWwvSFRNTElucHV0RWxlbWVudC5oOgorICAgICAgICAqIGh0bWwvSFRNTElucHV0RWxlbWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50OjphY2NlcHRNSU1FVHlw ZXMpOgorICAgICAgICBBY2Nlc3NvciBmb3IgYSBwYXJzZWQgbGlzdCBvZiBNSU1FIHR5cGVzIGZy b20gdGhlIGFjY2VwdCBhdHRyaWJ1dGUuCisgICAgICAgIAorICAgICAgICAqIHBsYXRmb3JtL0Zp bGVDaG9vc2VyLmg6CisgICAgICAgIEFkZCBhIHNsb3QgZm9yIGEgTUlNRSB0eXBlIGxpc3Qgb24g dGhlIGNob29zZXIgc2V0dGluZ3MuCisKKzIwMTEtMTAtMDYgIEpvc2VwaCBQZWNvcmFybyAgPGpv ZXBlY2tAd2Via2l0Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K IAogICAgICAgICBQYXNzICJhY2NlcHQiIG1pbWUgdHlwZSBpbmZvcm1hdGlvbiBpbnRvIEZpbGVD aG9vc2VyIGF0IGFsbCBjYWxsIHNpdGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0ZpbGVJbnB1dFR5cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9GaWxlSW5wdXRUeXBlLmNw cAppbmRleCBjOTc3MWJhLi4yNjEyYTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0ZpbGVJbnB1dFR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvRmlsZUlucHV0VHlw ZS5jcHAKQEAgLTE1NCw2ICsxNTQsNyBAQCB2b2lkIEZpbGVJbnB1dFR5cGU6OmhhbmRsZURPTUFj dGl2YXRlRXZlbnQoRXZlbnQqIGV2ZW50KQogICAgICAgICBzZXR0aW5ncy5hbGxvd3NNdWx0aXBs ZUZpbGVzID0gaW5wdXQtPmZhc3RIYXNBdHRyaWJ1dGUobXVsdGlwbGVBdHRyKTsKICNlbmRpZgog ICAgICAgICBzZXR0aW5ncy5hY2NlcHRUeXBlcyA9IGlucHV0LT5hY2NlcHQoKTsKKyAgICAgICAg c2V0dGluZ3MuYWNjZXB0TUlNRVR5cGVzID0gaW5wdXQtPmFjY2VwdE1JTUVUeXBlcygpOwogICAg ICAgICBzZXR0aW5ncy5zZWxlY3RlZEZpbGVzID0gbV9maWxlTGlzdC0+cGF0aHMoKTsKICAgICAg ICAgY2hyb21lLT5ydW5PcGVuUGFuZWwoaW5wdXQtPmRvY3VtZW50KCktPmZyYW1lKCksIG5ld0Zp bGVDaG9vc2VyKHNldHRpbmdzKSk7CiAgICAgfQpAQCAtMzI0LDEwICszMjUsMTIgQEAgdm9pZCBG aWxlSW5wdXRUeXBlOjpyZWNlaXZlRHJvcEZvckRpcmVjdG9yeVVwbG9hZChjb25zdCBWZWN0b3I8 U3RyaW5nPiYgcGF0aHMpCiB7CiAgICAgaWYgKENocm9tZSogY2hyb21lID0gdGhpcy0+Y2hyb21l KCkpIHsKICAgICAgICAgRmlsZUNob29zZXJTZXR0aW5ncyBzZXR0aW5nczsKKyAgICAgICAgSFRN TElucHV0RWxlbWVudCogaW5wdXQgPSBlbGVtZW50KCk7CiAgICAgICAgIHNldHRpbmdzLmFsbG93 c0RpcmVjdG9yeVVwbG9hZCA9IHRydWU7CiAgICAgICAgIHNldHRpbmdzLmFsbG93c011bHRpcGxl RmlsZXMgPSB0cnVlOwogICAgICAgICBzZXR0aW5ncy5zZWxlY3RlZEZpbGVzLmFwcGVuZChwYXRo c1swXSk7Ci0gICAgICAgIHNldHRpbmdzLmFjY2VwdFR5cGVzID0gZWxlbWVudCgpLT5hY2NlcHQo KTsKKyAgICAgICAgc2V0dGluZ3MuYWNjZXB0VHlwZXMgPSBpbnB1dC0+YWNjZXB0KCk7CisgICAg ICAgIHNldHRpbmdzLmFjY2VwdE1JTUVUeXBlcyA9IGlucHV0LT5hY2NlcHRNSU1FVHlwZXMoKTsK ICAgICAgICAgY2hyb21lLT5lbnVtZXJhdGVDaG9zZW5EaXJlY3RvcnkobmV3RmlsZUNob29zZXIo c2V0dGluZ3MpKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxJbnB1dEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50 LmNwcAppbmRleCBhNGJhYTEyLi5hOGExZDVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElu cHV0RWxlbWVudC5jcHAKQEAgLTEzMDgsNiArMTMwOCwyNSBAQCB2b2lkIEhUTUxJbnB1dEVsZW1l bnQ6OnNldERlZmF1bHROYW1lKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSkKICAgICBtX25hbWUg PSBuYW1lOwogfQogCitWZWN0b3I8U3RyaW5nPiBIVE1MSW5wdXRFbGVtZW50OjphY2NlcHRNSU1F VHlwZXMoKQoreworICAgIFZlY3RvcjxTdHJpbmc+IG1pbWVUeXBlczsKKworICAgIFN0cmluZyBh Y2NlcHRTdHJpbmcgPSBhY2NlcHQoKTsKKyAgICBpZiAoYWNjZXB0U3RyaW5nLmlzRW1wdHkoKSkK KyAgICAgICAgcmV0dXJuIG1pbWVUeXBlczsKKworICAgIFZlY3RvcjxTdHJpbmc+IHNwbGl0VHlw ZXM7CisgICAgYWNjZXB0U3RyaW5nLnNwbGl0KCcsJywgZmFsc2UsIHNwbGl0VHlwZXMpOworICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc3BsaXRUeXBlcy5zaXplKCk7ICsraSkgeworICAgICAg ICBTdHJpbmcgdHJpbW1lZE1pbWVUeXBlID0gc3RyaXBMZWFkaW5nQW5kVHJhaWxpbmdIVE1MU3Bh Y2VzKHNwbGl0VHlwZXNbaV0pOworICAgICAgICBpZiAoIXRyaW1tZWRNaW1lVHlwZS5pc0VtcHR5 KCkpCisgICAgICAgICAgICBtaW1lVHlwZXMuYXBwZW5kKHRyaW1tZWRNaW1lVHlwZSk7CisgICAg fQorCisgICAgcmV0dXJuIG1pbWVUeXBlczsKK30KKwogU3RyaW5nIEhUTUxJbnB1dEVsZW1lbnQ6 OmFjY2VwdCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGZhc3RHZXRBdHRyaWJ1dGUoYWNjZXB0QXR0 cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuaCBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5oCmluZGV4IDZjZGU2YWUuLmJh MjFlM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5oCkBAIC0xOTAsNiAr MTkwLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXREZWZhdWx0TmFtZShjb25zdCBBdG9taWNT dHJpbmcmKTsKIAorICAgIFZlY3RvcjxTdHJpbmc+IGFjY2VwdE1JTUVUeXBlcygpOwogICAgIFN0 cmluZyBhY2NlcHQoKSBjb25zdDsKICAgICBTdHJpbmcgYWx0KCkgY29uc3Q7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZpbGVDaG9vc2VyLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9GaWxlQ2hvb3Nlci5oCmluZGV4IDk2ZTdhNDEuLjI5NDliZTUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZpbGVDaG9vc2VyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vRmlsZUNob29zZXIuaApAQCAtNDMsNiArNDMsNyBAQCBzdHJ1Y3QgRmls ZUNob29zZXJTZXR0aW5ncyB7CiAgICAgYm9vbCBhbGxvd3NEaXJlY3RvcnlVcGxvYWQ7CiAjZW5k aWYKICAgICBTdHJpbmcgYWNjZXB0VHlwZXM7CisgICAgVmVjdG9yPFN0cmluZz4gYWNjZXB0TUlN RVR5cGVzOwogICAgIFZlY3RvcjxTdHJpbmc+IHNlbGVjdGVkRmlsZXM7CiB9OwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK aW5kZXggZGRhYjMxZi4uYjQwZDMzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEx LTEwLTA2ICBKb3NlcGggUGVjb3Jhcm8gIDxqb2VwZWNrQHdlYmtpdC5vcmc+CisKKyAgICAgICAg UGFzcyBQYXJzZWQgQWNjZXB0IEF0dHJpYnV0ZSBNSU1FIFR5cGVzIHRvIFdlYktpdCBDbGllbnRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTU5OAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhc3MgdGhl IE1JTUUgdHlwZSBsaXN0IHRocm91Z2ggdG8gdGhlIEFQSS4KKworICAgICAgICAqIFNoYXJlZC9X ZWJPcGVuUGFuZWxQYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViT3BlblBhbmVs UGFyYW1ldGVyczo6RGF0YTo6ZW5jb2RlKToKKyAgICAgICAgKFdlYktpdDo6V2ViT3BlblBhbmVs UGFyYW1ldGVyczo6RGF0YTo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViT3BlblBhbmVs UGFyYW1ldGVycy5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hy b21lQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50OjpydW5PcGVu UGFuZWwpOgorCiAyMDExLTEwLTA2ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CiAKICAgICAgICAgSW4gYmFja2dyb3VuZCB3aW5kb3csIHBhZ2UgZmxhc2hlcyB3aGl0ZSBp ZiBpdCBlbnRlcnMgYW5kIHRoZW4gaW1tZWRpYXRlbHkgbGVhdmVzIGNvbXBvc2l0aW5nIG1vZGUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJPcGVuUGFuZWxQYXJhbWV0ZXJz LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJPcGVuUGFuZWxQYXJhbWV0ZXJzLmNwcApp bmRleCA5ODljOTQwLi5jM2JiYzNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViT3BlblBhbmVsUGFyYW1ldGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dl Yk9wZW5QYW5lbFBhcmFtZXRlcnMuY3BwCkBAIC00OSw2ICs0OSw3IEBAIHZvaWQgV2ViT3BlblBh bmVsUGFyYW1ldGVyczo6RGF0YTo6ZW5jb2RlKENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciogZW5j b2RlcikgY29uCiAgICAgZW5jb2Rlci0+ZW5jb2RlKGFsbG93TXVsdGlwbGVGaWxlcyk7CiAgICAg ZW5jb2Rlci0+ZW5jb2RlKGFsbG93c0RpcmVjdG9yeVVwbG9hZCk7CiAgICAgZW5jb2Rlci0+ZW5j b2RlKGFjY2VwdFR5cGVzKTsKKyAgICBlbmNvZGVyLT5lbmNvZGUoYWNjZXB0TUlNRVR5cGVzKTsK ICAgICBlbmNvZGVyLT5lbmNvZGUoZmlsZW5hbWVzKTsKIH0KIApAQCAtNjAsNiArNjEsOCBAQCBi b29sIFdlYk9wZW5QYW5lbFBhcmFtZXRlcnM6OkRhdGE6OmRlY29kZShDb3JlSVBDOjpBcmd1bWVu dERlY29kZXIqIGRlY29kZXIsIERhdAogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFk ZWNvZGVyLT5kZWNvZGUocmVzdWx0LmFjY2VwdFR5cGVzKSkKICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHJlc3VsdC5hY2NlcHRNSU1FVHlwZXMpKQorICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocmVzdWx0LmZpbGVu YW1lcykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYk9wZW5QYW5lbFBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9XZWJPcGVuUGFuZWxQYXJhbWV0ZXJzLmgKaW5kZXggNzY5NjhjNC4uYTgzYzkzNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYk9wZW5QYW5lbFBhcmFtZXRlcnMuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViT3BlblBhbmVsUGFyYW1ldGVycy5oCkBAIC00OCw2 ICs0OCw3IEBAIHB1YmxpYzoKICAgICAgICAgYm9vbCBhbGxvd011bHRpcGxlRmlsZXM7CiAgICAg ICAgIGJvb2wgYWxsb3dzRGlyZWN0b3J5VXBsb2FkOwogICAgICAgICBTdHJpbmcgYWNjZXB0VHlw ZXM7CisgICAgICAgIFZlY3RvcjxTdHJpbmc+IGFjY2VwdE1JTUVUeXBlczsKICAgICAgICAgVmVj dG9yPFN0cmluZz4gZmlsZW5hbWVzOwogICAgIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcApp bmRleCBmZmZiNjAyLi5mYzgyMWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCkBAIC02MjMs NiArNjIzLDcgQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6OnJ1bk9wZW5QYW5lbChGcmFtZSogZnJh bWUsIFBhc3NSZWZQdHI8RmlsZUNob29zZXI+IHBycEZpbGUKICAgICBwYXJhbWV0ZXJzLmFsbG93 c0RpcmVjdG9yeVVwbG9hZCA9IGZhbHNlOwogI2VuZGlmCiAgICAgcGFyYW1ldGVycy5hY2NlcHRU eXBlcyA9IGZpbGVDaG9vc2VyLT5zZXR0aW5ncygpLmFjY2VwdFR5cGVzOworICAgIHBhcmFtZXRl cnMuYWNjZXB0TUlNRVR5cGVzID0gZmlsZUNob29zZXItPnNldHRpbmdzKCkuYWNjZXB0TUlNRVR5 cGVzOwogICAgIHBhcmFtZXRlcnMuZmlsZW5hbWVzID0gZmlsZUNob29zZXItPnNldHRpbmdzKCku c2VsZWN0ZWRGaWxlczsKIAogICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpSdW5PcGVuUGFuZWwoc3RhdGljX2Nhc3Q8V2ViRnJhbWVMb2FkZXJDbGllbnQqPihmcmFtZS0+ bG9hZGVyKCktPmNsaWVudCgpKS0+d2ViRnJhbWUoKS0+ZnJhbWVJRCgpLCBwYXJhbWV0ZXJzKSk7 Cg== 110198 2011-10-07 12:45:44 -0700 2011-10-07 14:34:49 -0700 [PATCH] Part 1 - Deprecate String version of acceptTypes part-1.patch text/plain 3791 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiYjhhOGE2Li5lZTAxN2M1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMTAtMDcgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KKwor ICAgICAgICBQYXNzIFBhcnNlZCBBY2NlcHQgQXR0cmlidXRlIE1JTUUgVHlwZXMgdG8gV2ViS2l0 IENsaWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTY5NTk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg RGVwcmVjYXRlIHRoZSBvbGQgU3RyaW5nIHZlcnNpb24gb2YgZ2V0dGluZyB0aGUgImFjY2VwdCIK KyAgICAgICAgbWltZSB0eXBlIHZhbHVlcy4gSW5zdGVhZCB3ZSB3aWxsIGNoYW5nZSB0byBpbmNs dWRlIGEKKyAgICAgICAgbGlzdCBvZiBNSU1FIHR5cGVzLgorCisgICAgICAgICogaHRtbC9GaWxl SW5wdXRUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVJbnB1dFR5cGU6OmhhbmRsZURP TUFjdGl2YXRlRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6RmlsZUlucHV0VHlwZTo6cmVjZWl2 ZURyb3BGb3JEaXJlY3RvcnlVcGxvYWQpOgorICAgICAgICAqIHBsYXRmb3JtL0ZpbGVDaG9vc2Vy Lmg6CisKIDIwMTEtMTAtMDYgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvRmlsZUlucHV0VHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0Zp bGVJbnB1dFR5cGUuY3BwCmluZGV4IGM5NzcxYmEuLjIwNzJmOTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvRmlsZUlucHV0VHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9GaWxlSW5wdXRUeXBlLmNwcApAQCAtMTUzLDcgKzE1Myw3IEBAIHZvaWQgRmlsZUlucHV0VHlw ZTo6aGFuZGxlRE9NQWN0aXZhdGVFdmVudChFdmVudCogZXZlbnQpCiAjZWxzZQogICAgICAgICBz ZXR0aW5ncy5hbGxvd3NNdWx0aXBsZUZpbGVzID0gaW5wdXQtPmZhc3RIYXNBdHRyaWJ1dGUobXVs dGlwbGVBdHRyKTsKICNlbmRpZgotICAgICAgICBzZXR0aW5ncy5hY2NlcHRUeXBlcyA9IGlucHV0 LT5hY2NlcHQoKTsKKyAgICAgICAgc2V0dGluZ3MuZGVwcmVjYXRlZEFjY2VwdFR5cGVzID0gaW5w dXQtPmFjY2VwdCgpOwogICAgICAgICBzZXR0aW5ncy5zZWxlY3RlZEZpbGVzID0gbV9maWxlTGlz dC0+cGF0aHMoKTsKICAgICAgICAgY2hyb21lLT5ydW5PcGVuUGFuZWwoaW5wdXQtPmRvY3VtZW50 KCktPmZyYW1lKCksIG5ld0ZpbGVDaG9vc2VyKHNldHRpbmdzKSk7CiAgICAgfQpAQCAtMzI3LDcg KzMyNyw3IEBAIHZvaWQgRmlsZUlucHV0VHlwZTo6cmVjZWl2ZURyb3BGb3JEaXJlY3RvcnlVcGxv YWQoY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhdGhzKQogICAgICAgICBzZXR0aW5ncy5hbGxvd3NE aXJlY3RvcnlVcGxvYWQgPSB0cnVlOwogICAgICAgICBzZXR0aW5ncy5hbGxvd3NNdWx0aXBsZUZp bGVzID0gdHJ1ZTsKICAgICAgICAgc2V0dGluZ3Muc2VsZWN0ZWRGaWxlcy5hcHBlbmQocGF0aHNb MF0pOwotICAgICAgICBzZXR0aW5ncy5hY2NlcHRUeXBlcyA9IGVsZW1lbnQoKS0+YWNjZXB0KCk7 CisgICAgICAgIHNldHRpbmdzLmRlcHJlY2F0ZWRBY2NlcHRUeXBlcyA9IGVsZW1lbnQoKS0+YWNj ZXB0KCk7CiAgICAgICAgIGNocm9tZS0+ZW51bWVyYXRlQ2hvc2VuRGlyZWN0b3J5KG5ld0ZpbGVD aG9vc2VyKHNldHRpbmdzKSk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vRmlsZUNob29zZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZpbGVDaG9v c2VyLmgKaW5kZXggOTZlN2E0MS4uNWI4ZmI0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vRmlsZUNob29zZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GaWxl Q2hvb3Nlci5oCkBAIC00Miw3ICs0Miw3IEBAIHN0cnVjdCBGaWxlQ2hvb3NlclNldHRpbmdzIHsK ICNpZiBFTkFCTEUoRElSRUNUT1JZX1VQTE9BRCkKICAgICBib29sIGFsbG93c0RpcmVjdG9yeVVw bG9hZDsKICNlbmRpZgotICAgIFN0cmluZyBhY2NlcHRUeXBlczsKKyAgICBTdHJpbmcgZGVwcmVj YXRlZEFjY2VwdFR5cGVzOwogICAgIFZlY3RvcjxTdHJpbmc+IHNlbGVjdGVkRmlsZXM7CiB9Owog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDNiODZkYTIuLjBiZGEwMDggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMTAtMDcgIEpvc2VwaCBQ ZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KKworICAgICAgICBQYXNzIFBhcnNlZCBBY2Nl cHQgQXR0cmlidXRlIE1JTUUgVHlwZXMgdG8gV2ViS2l0IENsaWVudHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5NTk4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT25seSBDaHJvbWl1bSB1c2VzIHRoZSBk ZXByZWNhdGVkIGFjY2VwdCBzdHJpbmcuIFN3aXRjaGluZyB0bworICAgICAgICB0aGUgbmV3IGFw cHJvYWNoIHdpbGwgcmVxdWlyZSBjb29yZGluYXRpb24gd2l0aCB0aGVpciBwb3J0LgorCisgICAg ICAgICogc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVD bGllbnRJbXBsOjpydW5PcGVuUGFuZWwpOgorCiAyMDExLTEwLTA2ICBBbm5hIENhdmVuZGVyICA8 YW5uYWNjQGNocm9taXVtLm9yZz4KIAogICAgICAgICBUdXJuIEVOQUJMRV9WSURFT19UUkFDSyBv biBmb3IgY2hyb21pdW0uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9D aHJvbWVDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNs aWVudEltcGwuY3BwCmluZGV4IGE4MGM2OWEuLjA1OWRlNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCkBAIC02NjgsNyArNjY4LDcgQEAg dm9pZCBDaHJvbWVDbGllbnRJbXBsOjpydW5PcGVuUGFuZWwoRnJhbWUqIGZyYW1lLCBQYXNzUmVm UHRyPEZpbGVDaG9vc2VyPiBmaWxlQ2gKICNlbHNlCiAgICAgcGFyYW1zLmRpcmVjdG9yeSA9IGZh bHNlOwogI2VuZGlmCi0gICAgcGFyYW1zLmFjY2VwdFR5cGVzID0gZmlsZUNob29zZXItPnNldHRp bmdzKCkuYWNjZXB0VHlwZXM7CisgICAgcGFyYW1zLmFjY2VwdFR5cGVzID0gZmlsZUNob29zZXIt PnNldHRpbmdzKCkuZGVwcmVjYXRlZEFjY2VwdFR5cGVzOwogICAgIHBhcmFtcy5zZWxlY3RlZEZp bGVzID0gZmlsZUNob29zZXItPnNldHRpbmdzKCkuc2VsZWN0ZWRGaWxlczsKICAgICBpZiAocGFy YW1zLnNlbGVjdGVkRmlsZXMuc2l6ZSgpID4gMCkKICAgICAgICAgcGFyYW1zLmluaXRpYWxWYWx1 ZSA9IHBhcmFtcy5zZWxlY3RlZEZpbGVzWzBdOwo= 110199 2011-10-07 12:46:42 -0700 2011-10-11 11:47:55 -0700 [PATCH] Part 2 - Switch a WebKit2 mirror struct to just use WebCore::FileChooserSettings part-2.patch text/plain 16739 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkZGFiMzFmLi4wYjQyYTg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTEg QEAKKzIwMTEtMTAtMDcgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KKwor ICAgICAgICBQYXNzIFBhcnNlZCBBY2NlcHQgQXR0cmlidXRlIE1JTUUgVHlwZXMgdG8gV2ViS2l0 IENsaWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTY5NTk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhlIFdlYk9wZW5QYW5lbFBhcmFtZXRlcnM6OkRhdGEgc3RydWN0IHdhcyBhIG1pcnJvciBvZgor ICAgICAgICB0aGUgYWxyZWFkeSBleGlzdGluZyBXZWJDb3JlOjpGaWxlQ2hvb3NlclNldHRpbmdz IHN0cnVjdC4KKyAgICAgICAgU28gZWxpbWluYXRlIHRoZSBleGNlc3Mgc3RydWN0IGFuZCBnZW5l cmF0ZSBkZWZhdWx0CisgICAgICAgIFdlYkNvcmUgY29kZXJzIGZvciB0aGUgV2ViQ29yZTo6Rmls ZUNob29zZXJTZXR0aW5ncyBzdHJ1Y3QuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdDIvbWVz c2FnZXMucHk6CisgICAgICAgIFN3aXRjaCB0byB0aGUgbmV3IHR5cGUuIEZpbGVDaG9vc2VyU2V0 dGluZydzIGhlYWRlciBuZWVkcworICAgICAgICB0byBiZSBzcGVjaWFsIGNhc2VkIHRvIEZpbGVD aG9vc2VyLmguCisKKyAgICAgICAgKiBTaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmg6Cisg ICAgICAgICogU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHA6CisgICAgICAgIChDb3Jl SVBDOjo6OmVuY29kZSk6CisgICAgICAgIChDb3JlSVBDOjo6OmRlY29kZSk6CisgICAgICAgIEVu Y29kZSBhbmQgZGVjb2RlIGFsbCwgbm9uLWRlcHJlY2F0ZWQsIHZhbHVlcy4gU28gd2UKKyAgICAg ICAgaWdub3JlIGRlcHJlY2F0ZWRBY2NlcHRUeXBlcy4gQSBmb2xsb3ctdXAgcGF0Y2ggd2lsbCBh ZGQgaXQuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViT3BlblBhbmVsUGFyYW1ldGVycy5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYk9wZW5QYW5lbFBhcmFtZXRlcnM6OmNyZWF0ZSk6CisgICAgICAg IChXZWJLaXQ6OldlYk9wZW5QYW5lbFBhcmFtZXRlcnM6OldlYk9wZW5QYW5lbFBhcmFtZXRlcnMp OgorICAgICAgICBTd2l0Y2ggdG8gdGhlIG5ldyB0eXBlLgorCisgICAgICAgICogU2hhcmVkL1dl Yk9wZW5QYW5lbFBhcmFtZXRlcnMuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViT3BlblBhbmVsUGFy YW1ldGVyczo6YWxsb3dNdWx0aXBsZUZpbGVzKToKKyAgICAgICAgKFdlYktpdDo6V2ViT3BlblBh bmVsUGFyYW1ldGVyczo6c2VsZWN0ZWRGaWxlTmFtZXMpOgorICAgICAgICBGaWxlQ2hvb3NlclNl dHRpbmdzIGhhZCBkaWZmZXJlbnQgcHJvcGVydHkgbmFtZXMuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpydW5P cGVuUGFuZWwpOgorICAgICAgICBHZW5lcmF0ZSB0aGUgV2ViT3BlblBhbmVsUGFyYW1ldGVycyBv YmplY3QgaGVyZSwgYmVmb3JlCisgICAgICAgIHBhc3NpbmcgaW50byB0aGUgV2ViVUlDbGllbnQu IFRoaXMgc2VlbXMgdG8gYmUgdGhlIGNvbnZlbnRpb24KKyAgICAgICAgdG8gbm90IGhhdmUgV2Vi Q29yZSB0eXBlcyBpbiBXZWJVSUNsaWVudC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluOgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJVSUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlVJQ2xpZW50OjpydW5PcGVuUGFuZWwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJVSUNsaWVu dC5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50OjpydW5PcGVuUGFuZWwpOgor ICAgICAgICBTd2l0Y2ggdG8gdGhlIG5ldyB0eXBlLgorCiAyMDExLTEwLTA2ICBBbmRlcnMgQ2Fy bHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgSW4gYmFja2dyb3VuZCB3aW5k b3csIHBhZ2UgZmxhc2hlcyB3aGl0ZSBpZiBpdCBlbnRlcnMgYW5kIHRoZW4gaW1tZWRpYXRlbHkg bGVhdmVzIGNvbXBvc2l0aW5nIG1vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1Njcmlw dHMvd2Via2l0Mi9tZXNzYWdlcy5weSBiL1NvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9t ZXNzYWdlcy5weQppbmRleCBiODVkYTk4Li42YTJkMTkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMucHkKKysrIGIvU291cmNlL1dlYktpdDIvU2Ny aXB0cy93ZWJraXQyL21lc3NhZ2VzLnB5CkBAIC0xNzEsNiArMTcxLDcgQEAgZGVmIHN0cnVjdF9v cl9jbGFzcyhuYW1lc3BhY2UsIHR5cGUpOgogICAgICAgICAnV2ViQ29yZTo6RWRpdG9yQ29tbWFu ZHNGb3JLZXlFdmVudCcsCiAgICAgICAgICdXZWJDb3JlOjpDb21wb3NpdGlvblVuZGVybGluZScs CiAgICAgICAgICdXZWJDb3JlOjpGbG9hdFBvaW50M0QnLAorICAgICAgICAnV2ViQ29yZTo6Rmls ZUNob29zZXJTZXR0aW5ncycsCiAgICAgICAgICdXZWJDb3JlOjpHcmFtbWFyRGV0YWlsJywKICAg ICAgICAgJ1dlYkNvcmU6OklkZW50aXR5VHJhbnNmb3JtT3BlcmF0aW9uJywKICAgICAgICAgJ1dl YkNvcmU6OktleXByZXNzQ29tbWFuZCcsCkBAIC0yMDMsNyArMjA0LDYgQEAgZGVmIHN0cnVjdF9v cl9jbGFzcyhuYW1lc3BhY2UsIHR5cGUpOgogICAgICAgICAnV2ViS2l0OjpTdGF0aXN0aWNzRGF0 YScsCiAgICAgICAgICdXZWJLaXQ6OlRleHRDaGVja2VyU3RhdGUnLAogICAgICAgICAnV2ViS2l0 OjpXZWJOYXZpZ2F0aW9uRGF0YVN0b3JlJywKLSAgICAgICAgJ1dlYktpdDo6V2ViT3BlblBhbmVs UGFyYW1ldGVyczo6RGF0YScsCiAgICAgICAgICdXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMnLAogICAgICAgICAnV2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlJywKICAgICAgICAg J1dlYktpdDo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycycsCkBAIC0zNzYsNiArMzc2LDcg QEAgZGVmIGhlYWRlcnNfZm9yX3R5cGUodHlwZSk6CiAgICAgICAgICdXZWJDb3JlOjpDb21wb3Np dGlvblVuZGVybGluZSc6IFsnPFdlYkNvcmUvRWRpdG9yLmg+J10sCiAgICAgICAgICdXZWJDb3Jl OjpHcmFtbWFyRGV0YWlsJzogWyc8V2ViQ29yZS9UZXh0Q2hlY2tlckNsaWVudC5oPiddLAogICAg ICAgICAnV2ViQ29yZTo6S2V5cHJlc3NDb21tYW5kJzogWyc8V2ViQ29yZS9LZXlib2FyZEV2ZW50 Lmg+J10sCisgICAgICAgICdXZWJDb3JlOjpGaWxlQ2hvb3NlclNldHRpbmdzJzogWyc8V2ViQ29y ZS9GaWxlQ2hvb3Nlci5oPiddLAogICAgICAgICAnV2ViQ29yZTo6UGx1Z2luSW5mbyc6IFsnPFdl YkNvcmUvUGx1Z2luRGF0YS5oPiddLAogICAgICAgICAnV2ViQ29yZTo6VGV4dENoZWNraW5nUmVz dWx0JzogWyc8V2ViQ29yZS9UZXh0Q2hlY2tlckNsaWVudC5oPiddLAogICAgICAgICAnV2ViS2l0 OjpJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rlcic6IFtdLApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcAppbmRleCA3NmZjNWRhLi5mM2Rh ZTRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29k ZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJz LmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvQ3Vyc29yLmg+CiAjaW5j bHVkZSA8V2ViQ29yZS9EYXRhYmFzZURldGFpbHMuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0VkaXRv ci5oPgorI2luY2x1ZGUgPFdlYkNvcmUvRmlsZUNob29zZXIuaD4KICNpbmNsdWRlIDxXZWJDb3Jl L0dyYXBoaWNzQ29udGV4dC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSW1hZ2UuaD4KICNpbmNsdWRl IDxXZWJDb3JlL1BsdWdpbkRhdGEuaD4KQEAgLTUxOCw2ICs1MTksMzAgQEAgYm9vbCBBcmd1bWVu dENvZGVyPERhdGFiYXNlRGV0YWlscz46OmRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIs IERhdGFiYXNlRGUKIH0KIAogCit2b2lkIEFyZ3VtZW50Q29kZXI8RmlsZUNob29zZXJTZXR0aW5n cz46OmVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29kZXIsIGNvbnN0IEZpbGVDaG9vc2VyU2V0 dGluZ3MmIHNldHRpbmdzKQoreworICAgIGVuY29kZXItPmVuY29kZShzZXR0aW5ncy5hbGxvd3NN dWx0aXBsZUZpbGVzKTsKKyNpZiBFTkFCTEUoRElSRUNUT1JZX1VQTE9BRCkKKyAgICBlbmNvZGVy LT5lbmNvZGUoc2V0dGluZ3MuYWxsb3dzRGlyZWN0b3J5VXBsb2FkKTsKKyNlbmRpZgorICAgIGVu Y29kZXItPmVuY29kZShzZXR0aW5ncy5zZWxlY3RlZEZpbGVzKTsKK30KKworYm9vbCBBcmd1bWVu dENvZGVyPEZpbGVDaG9vc2VyU2V0dGluZ3M+OjpkZWNvZGUoQXJndW1lbnREZWNvZGVyKiBkZWNv ZGVyLCBGaWxlQ2hvb3NlclNldHRpbmdzJiBzZXR0aW5ncykKK3sKKyAgICBpZiAoIWRlY29kZXIt PmRlY29kZShzZXR0aW5ncy5hbGxvd3NNdWx0aXBsZUZpbGVzKSkKKyAgICAgICAgcmV0dXJuIGZh bHNlOworI2lmIEVOQUJMRShESVJFQ1RPUllfVVBMT0FEKQorICAgIGlmICghZGVjb2Rlci0+ZGVj b2RlKHNldHRpbmdzLmFsbG93c0RpcmVjdG9yeVVwbG9hZCkpCisgICAgICAgIHJldHVybiBmYWxz ZTsKKyNlbmRpZgorICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHNldHRpbmdzLnNlbGVjdGVkRmls ZXMpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworCiB2 b2lkIEFyZ3VtZW50Q29kZXI8R3JhbW1hckRldGFpbD46OmVuY29kZShBcmd1bWVudEVuY29kZXIq IGVuY29kZXIsIGNvbnN0IEdyYW1tYXJEZXRhaWwmIGRldGFpbCkKIHsKICAgICBlbmNvZGVyLT5l bmNvZGUoZGV0YWlsLmxvY2F0aW9uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3Jl QXJndW1lbnRDb2RlcnMuaAppbmRleCBmNDQzNjQwLi4wM2MyMDQ1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgKKysrIGIvU291cmNlL1dl YktpdDIvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5oCkBAIC00Niw2ICs0Niw3IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBSZXNvdXJjZVJlcXVlc3Q7CiAgICAgY2xhc3Mg UmVzb3VyY2VSZXNwb25zZTsKICAgICBzdHJ1Y3QgQ29tcG9zaXRpb25VbmRlcmxpbmU7CisgICAg c3RydWN0IEZpbGVDaG9vc2VyU2V0dGluZ3M7CiAgICAgc3RydWN0IEdyYW1tYXJEZXRhaWw7CiAg ICAgc3RydWN0IE1pbWVDbGFzc0luZm87CiAgICAgc3RydWN0IFBsdWdpbkluZm87CkBAIC0xOTIs NiArMTkzLDExIEBAIHRlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6RGF0 YWJhc2VEZXRhaWxzPiB7CiAgICAgc3RhdGljIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2Rlcios IFdlYkNvcmU6OkRhdGFiYXNlRGV0YWlscyYpOwogfTsKIAordGVtcGxhdGU8PiBzdHJ1Y3QgQXJn dW1lbnRDb2RlcjxXZWJDb3JlOjpGaWxlQ2hvb3NlclNldHRpbmdzPiB7CisgICAgc3RhdGljIHZv aWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciosIGNvbnN0IFdlYkNvcmU6OkZpbGVDaG9vc2VyU2V0 dGluZ3MmKTsKKyAgICBzdGF0aWMgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiwgV2ViQ29y ZTo6RmlsZUNob29zZXJTZXR0aW5ncyYpOworfTsKKwogdGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1l bnRDb2RlcjxXZWJDb3JlOjpHcmFtbWFyRGV0YWlsPiB7CiAgICAgc3RhdGljIHZvaWQgZW5jb2Rl KEFyZ3VtZW50RW5jb2RlciosIGNvbnN0IFdlYkNvcmU6OkdyYW1tYXJEZXRhaWwmKTsKICAgICBz dGF0aWMgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiwgV2ViQ29yZTo6R3JhbW1hckRldGFp bCYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYk9wZW5QYW5lbFBhcmFt ZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYk9wZW5QYW5lbFBhcmFtZXRlcnMu Y3BwCmluZGV4IDk4OWM5NDAuLjE0ZTQ4ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9XZWJPcGVuUGFuZWxQYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViT3BlblBhbmVsUGFyYW1ldGVycy5jcHAKQEAgLTI2LDE3ICsyNiwxNyBAQAogI2luY2x1 ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYk9wZW5QYW5lbFBhcmFtZXRlcnMuaCIKIAotI2lu Y2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVycy5oIgordXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7 CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1QYXNzUmVmUHRyPFdlYk9wZW5QYW5lbFBhcmFtZXRl cnM+IFdlYk9wZW5QYW5lbFBhcmFtZXRlcnM6OmNyZWF0ZShjb25zdCBEYXRhJiBkYXRhKQorUGFz c1JlZlB0cjxXZWJPcGVuUGFuZWxQYXJhbWV0ZXJzPiBXZWJPcGVuUGFuZWxQYXJhbWV0ZXJzOjpj cmVhdGUoY29uc3QgRmlsZUNob29zZXJTZXR0aW5ncyYgc2V0dGluZ3MpCiB7Ci0gICAgcmV0dXJu IGFkb3B0UmVmKG5ldyBXZWJPcGVuUGFuZWxQYXJhbWV0ZXJzKGRhdGEpKTsKKyAgICByZXR1cm4g YWRvcHRSZWYobmV3IFdlYk9wZW5QYW5lbFBhcmFtZXRlcnMoc2V0dGluZ3MpKTsKIH0KIAotV2Vi T3BlblBhbmVsUGFyYW1ldGVyczo6V2ViT3BlblBhbmVsUGFyYW1ldGVycyhjb25zdCBEYXRhJiBk YXRhKQotICAgIDogbV9kYXRhKGRhdGEpCitXZWJPcGVuUGFuZWxQYXJhbWV0ZXJzOjpXZWJPcGVu UGFuZWxQYXJhbWV0ZXJzKGNvbnN0IEZpbGVDaG9vc2VyU2V0dGluZ3MmIHNldHRpbmdzKQorICAg IDogbV9zZXR0aW5ncyhzZXR0aW5ncykKIHsKIH0KIApAQCAtNDQsMjYgKzQ0LDQgQEAgV2ViT3Bl blBhbmVsUGFyYW1ldGVyczo6fldlYk9wZW5QYW5lbFBhcmFtZXRlcnMoKQogewogfQogCi12b2lk IFdlYk9wZW5QYW5lbFBhcmFtZXRlcnM6OkRhdGE6OmVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVu Y29kZXIqIGVuY29kZXIpIGNvbnN0Ci17Ci0gICAgZW5jb2Rlci0+ZW5jb2RlKGFsbG93TXVsdGlw bGVGaWxlcyk7Ci0gICAgZW5jb2Rlci0+ZW5jb2RlKGFsbG93c0RpcmVjdG9yeVVwbG9hZCk7Ci0g ICAgZW5jb2Rlci0+ZW5jb2RlKGFjY2VwdFR5cGVzKTsKLSAgICBlbmNvZGVyLT5lbmNvZGUoZmls ZW5hbWVzKTsKLX0KLQotYm9vbCBXZWJPcGVuUGFuZWxQYXJhbWV0ZXJzOjpEYXRhOjpkZWNvZGUo Q29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBEYXRhJiByZXN1bHQpCi17Ci0gICAg aWYgKCFkZWNvZGVyLT5kZWNvZGUocmVzdWx0LmFsbG93TXVsdGlwbGVGaWxlcykpCi0gICAgICAg IHJldHVybiBmYWxzZTsKLSAgICBpZiAoIWRlY29kZXItPmRlY29kZShyZXN1bHQuYWxsb3dzRGly ZWN0b3J5VXBsb2FkKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghZGVjb2Rlci0+ ZGVjb2RlKHJlc3VsdC5hY2NlcHRUeXBlcykpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBp ZiAoIWRlY29kZXItPmRlY29kZShyZXN1bHQuZmlsZW5hbWVzKSkKLSAgICAgICAgcmV0dXJuIGZh bHNlOwotCi0gICAgcmV0dXJuIHRydWU7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJPcGVuUGFuZWxQYXJhbWV0ZXJzLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViT3BlblBhbmVsUGFyYW1ldGVycy5oCmluZGV4IDc2 OTY4YzQuLjVhNTk0OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJPcGVu UGFuZWxQYXJhbWV0ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYk9wZW5QYW5l bFBhcmFtZXRlcnMuaApAQCAtMjcsNDIgKzI3LDI4IEBACiAjZGVmaW5lIFdlYk9wZW5QYW5lbFBh cmFtZXRlcnNfaAogCiAjaW5jbHVkZSAiQVBJT2JqZWN0LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9G aWxlQ2hvb3Nlci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KICNpbmNsdWRlIDx3dGYvdGV4 dC9XVEZTdHJpbmcuaD4KIAotbmFtZXNwYWNlIENvcmVJUEMgewotICAgIGNsYXNzIEFyZ3VtZW50 RGVjb2RlcjsKLSAgICBjbGFzcyBBcmd1bWVudEVuY29kZXI7Ci19Ci0KIG5hbWVzcGFjZSBXZWJL aXQgewogCiBjbGFzcyBXZWJPcGVuUGFuZWxQYXJhbWV0ZXJzIDogcHVibGljIEFQSU9iamVjdCB7 CiBwdWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IFR5cGUgQVBJVHlwZSA9IFR5cGVPcGVuUGFuZWxQ YXJhbWV0ZXJzOwogCi0gICAgc3RydWN0IERhdGEgewotICAgICAgICB2b2lkIGVuY29kZShDb3Jl SVBDOjpBcmd1bWVudEVuY29kZXIqKSBjb25zdDsKLSAgICAgICAgc3RhdGljIGJvb2wgZGVjb2Rl KENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIERhdGEmKTsKLQotICAgICAgICBib29sIGFsbG93 TXVsdGlwbGVGaWxlczsKLSAgICAgICAgYm9vbCBhbGxvd3NEaXJlY3RvcnlVcGxvYWQ7Ci0gICAg ICAgIFN0cmluZyBhY2NlcHRUeXBlczsKLSAgICAgICAgVmVjdG9yPFN0cmluZz4gZmlsZW5hbWVz OwotICAgIH07Ci0KLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJPcGVuUGFuZWxQYXJhbWV0ZXJz PiBjcmVhdGUoY29uc3QgRGF0YSYpOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYk9wZW5QYW5l bFBhcmFtZXRlcnM+IGNyZWF0ZShjb25zdCBXZWJDb3JlOjpGaWxlQ2hvb3NlclNldHRpbmdzJik7 CiAgICAgfldlYk9wZW5QYW5lbFBhcmFtZXRlcnMoKTsKIAotICAgIGJvb2wgYWxsb3dNdWx0aXBs ZUZpbGVzKCkgY29uc3QgeyByZXR1cm4gbV9kYXRhLmFsbG93TXVsdGlwbGVGaWxlczsgfSAKLSAg ICBWZWN0b3I8U3RyaW5nPiBzZWxlY3RlZEZpbGVOYW1lcygpIGNvbnN0IHsgcmV0dXJuIG1fZGF0 YS5maWxlbmFtZXM7IH0KKyAgICBib29sIGFsbG93TXVsdGlwbGVGaWxlcygpIGNvbnN0IHsgcmV0 dXJuIG1fc2V0dGluZ3MuYWxsb3dzTXVsdGlwbGVGaWxlczsgfSAKKyAgICBWZWN0b3I8U3RyaW5n PiBzZWxlY3RlZEZpbGVOYW1lcygpIGNvbnN0IHsgcmV0dXJuIG1fc2V0dGluZ3Muc2VsZWN0ZWRG aWxlczsgfQogCiBwcml2YXRlOgotICAgIGV4cGxpY2l0IFdlYk9wZW5QYW5lbFBhcmFtZXRlcnMo Y29uc3QgRGF0YSYpOworICAgIGV4cGxpY2l0IFdlYk9wZW5QYW5lbFBhcmFtZXRlcnMoY29uc3Qg V2ViQ29yZTo6RmlsZUNob29zZXJTZXR0aW5ncyYpOwogCiAgICAgdmlydHVhbCBUeXBlIHR5cGUo KSBjb25zdCB7IHJldHVybiBBUElUeXBlOyB9CiAKLSAgICBEYXRhIG1fZGF0YTsKKyAgICBXZWJD b3JlOjpGaWxlQ2hvb3NlclNldHRpbmdzIG1fc2V0dGluZ3M7CiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXgg ZDlkZjljNi4uNjRhNjllMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKQEAgLTIxNDUsNyArMjE0NSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpwYWdlRGlkU2Ny b2xsKCkKICNlbmRpZgogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6cnVuT3BlblBhbmVsKHVpbnQ2 NF90IGZyYW1lSUQsIGNvbnN0IFdlYk9wZW5QYW5lbFBhcmFtZXRlcnM6OkRhdGEmIGRhdGEpCit2 b2lkIFdlYlBhZ2VQcm94eTo6cnVuT3BlblBhbmVsKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IEZp bGVDaG9vc2VyU2V0dGluZ3MmIHNldHRpbmdzKQogewogICAgIGlmIChtX29wZW5QYW5lbFJlc3Vs dExpc3RlbmVyKSB7CiAgICAgICAgIG1fb3BlblBhbmVsUmVzdWx0TGlzdGVuZXItPmludmFsaWRh dGUoKTsKQEAgLTIxNTUsMTIgKzIxNTUsMTMgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJ1bk9wZW5Q YW5lbCh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJPcGVuUGFuZWxQYXJhbWV0ZXJzOjoKICAg ICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IHByb2Nlc3MoKS0+d2ViRnJhbWUoZnJhbWVJRCk7CiAg ICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAKKyAgICBSZWZQdHI8V2ViT3BlblBhbmVsUGFyYW1l dGVycz4gcGFyYW1ldGVycyA9IFdlYk9wZW5QYW5lbFBhcmFtZXRlcnM6OmNyZWF0ZShzZXR0aW5n cyk7CiAgICAgbV9vcGVuUGFuZWxSZXN1bHRMaXN0ZW5lciA9IFdlYk9wZW5QYW5lbFJlc3VsdExp c3RlbmVyUHJveHk6OmNyZWF0ZSh0aGlzKTsKIAogICAgIC8vIFNpbmNlIHJ1bk9wZW5QYW5lbCgp IGNhbiBzcGluIGEgbmVzdGVkIHJ1biBsb29wIHdlIG5lZWQgdG8gdHVybiBvZmYgdGhlIHJlc3Bv bnNpdmVuZXNzIHRpbWVyLgogICAgIHByb2Nlc3MoKS0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5z dG9wKCk7CiAKLSAgICBpZiAoIW1fdWlDbGllbnQucnVuT3BlblBhbmVsKHRoaXMsIGZyYW1lLCBk YXRhLCBtX29wZW5QYW5lbFJlc3VsdExpc3RlbmVyLmdldCgpKSkKKyAgICBpZiAoIW1fdWlDbGll bnQucnVuT3BlblBhbmVsKHRoaXMsIGZyYW1lLCBwYXJhbWV0ZXJzLmdldCgpLCBtX29wZW5QYW5l bFJlc3VsdExpc3RlbmVyLmdldCgpKSkKICAgICAgICAgZGlkQ2FuY2VsRm9yT3BlblBhbmVsKCk7 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAxYjE4YWI4 Li5iYTM4YmE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC04 Miw2ICs4Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBGbG9hdFJlY3Q7CiAg ICAgY2xhc3MgSW50U2l6ZTsKICAgICBjbGFzcyBQcm90ZWN0aW9uU3BhY2U7CisgICAgc3RydWN0 IEZpbGVDaG9vc2VyU2V0dGluZ3M7CiAgICAgc3RydWN0IFRleHRDaGVja2luZ1Jlc3VsdDsKICAg ICBzdHJ1Y3QgVmlld3BvcnRBcmd1bWVudHM7CiAgICAgc3RydWN0IFdpbmRvd0ZlYXR1cmVzOwpA QCAtNjQ0LDcgKzY0NSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBydW5CZWZvcmVVbmxvYWRDb25m aXJtUGFuZWwoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCB1aW50NjRfdCBmcmFtZUlELCBib29sJiBz aG91bGRDbG9zZSk7CiAgICAgdm9pZCBkaWRDaGFuZ2VWaWV3cG9ydERhdGEoY29uc3QgV2ViQ29y ZTo6Vmlld3BvcnRBcmd1bWVudHMmKTsKICAgICB2b2lkIHBhZ2VEaWRTY3JvbGwoKTsKLSAgICB2 b2lkIHJ1bk9wZW5QYW5lbCh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJPcGVuUGFuZWxQYXJh bWV0ZXJzOjpEYXRhJik7CisgICAgdm9pZCBydW5PcGVuUGFuZWwodWludDY0X3QgZnJhbWVJRCwg Y29uc3QgV2ViQ29yZTo6RmlsZUNob29zZXJTZXR0aW5ncyYpOwogICAgIHZvaWQgcHJpbnRGcmFt ZSh1aW50NjRfdCBmcmFtZUlEKTsKICAgICB2b2lkIGV4Y2VlZGVkRGF0YWJhc2VRdW90YSh1aW50 NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIsIGNvbnN0IFN0cmlu ZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBTdHJpbmcmIGRpc3BsYXlOYW1lLCB1aW50NjRfdCBjdXJy ZW50UXVvdGEsIHVpbnQ2NF90IGN1cnJlbnRPcmlnaW5Vc2FnZSwgdWludDY0X3QgY3VycmVudERh dGFiYXNlVXNhZ2UsIHVpbnQ2NF90IGV4cGVjdGVkVXNhZ2UsIHVpbnQ2NF90JiBuZXdRdW90YSk7 CiAgICAgdm9pZCByZXF1ZXN0R2VvbG9jYXRpb25QZXJtaXNzaW9uRm9yRnJhbWUodWludDY0X3Qg Z2VvbG9jYXRpb25JRCwgdWludDY0X3QgZnJhbWVJRCwgU3RyaW5nIG9yaWdpbklkZW50aWZpZXIp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNz YWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMu aW4KaW5kZXggN2M5YzhmZC4uZTQ2MzhkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCkBAIC01Nyw3ICs1Nyw3IEBAIG1lc3NhZ2Vz IC0+IFdlYlBhZ2VQcm94eSB7CiAgICAgV2luZG93VG9TY3JlZW4oV2ViQ29yZTo6SW50UmVjdCBy ZWN0KSAtPiAoV2ViQ29yZTo6SW50UmVjdCBzY3JlZW5GcmFtZSkKICAgICBSdW5CZWZvcmVVbmxv YWRDb25maXJtUGFuZWwoV1RGOjpTdHJpbmcgbWVzc2FnZSwgdWludDY0X3QgZnJhbWVJRCkgLT4g KGJvb2wgc2hvdWxkQ2xvc2UpCiAgICAgUGFnZURpZFNjcm9sbCgpCi0gICAgUnVuT3BlblBhbmVs KHVpbnQ2NF90IGZyYW1lSUQsIFdlYktpdDo6V2ViT3BlblBhbmVsUGFyYW1ldGVyczo6RGF0YSBw YXJhbWV0ZXJzKQorICAgIFJ1bk9wZW5QYW5lbCh1aW50NjRfdCBmcmFtZUlELCBXZWJDb3JlOjpG aWxlQ2hvb3NlclNldHRpbmdzIHBhcmFtZXRlcnMpCiAgICAgUHJpbnRGcmFtZSh1aW50NjRfdCBm cmFtZUlEKSAtPiAoKQogICAgIFJ1bk1vZGFsKCkKICAgICBOb3RpZnlTY3JvbGxlclRodW1iSXNW aXNpYmxlSW5SZWN0KFdlYkNvcmU6OkludFJlY3Qgc2Nyb2xsZXJUaHVtYikKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViVUlDbGllbnQuY3BwCmluZGV4IGQzZDhiYTMuLmYxMzcwYWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNsaWVudC5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlVJQ2xpZW50LmNwcApAQCAtMzEzLDEzICszMTMsMTIg QEAgdW5zaWduZWQgbG9uZyBsb25nIFdlYlVJQ2xpZW50OjpleGNlZWRlZERhdGFiYXNlUXVvdGEo V2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmEKICAgICByZXR1cm4gbV9jbGllbnQuZXhjZWVkZWRE YXRhYmFzZVF1b3RhKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKG9yaWdpbiksIHRv QVBJKGRhdGFiYXNlTmFtZS5pbXBsKCkpLCB0b0FQSShkYXRhYmFzZURpc3BsYXlOYW1lLmltcGwo KSksIGN1cnJlbnRRdW90YSwgY3VycmVudE9yaWdpblVzYWdlLCBjdXJyZW50RGF0YWJhc2VVc2Fn ZSwgZXhwZWN0ZWRVc2FnZSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CiB9CiAKLWJvb2wgV2ViVUlD bGllbnQ6OnJ1bk9wZW5QYW5lbChXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYkZyYW1lUHJveHkqIGZy YW1lLCBjb25zdCBXZWJPcGVuUGFuZWxQYXJhbWV0ZXJzOjpEYXRhJiBwYXJhbWV0ZXJEYXRhLCBX ZWJPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclByb3h5KiBsaXN0ZW5lcikKK2Jvb2wgV2ViVUlDbGll bnQ6OnJ1bk9wZW5QYW5lbChXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYkZyYW1lUHJveHkqIGZyYW1l LCBXZWJPcGVuUGFuZWxQYXJhbWV0ZXJzKiBwYXJhbWV0ZXJzLCBXZWJPcGVuUGFuZWxSZXN1bHRM aXN0ZW5lclByb3h5KiBsaXN0ZW5lcikKIHsKICAgICBpZiAoIW1fY2xpZW50LnJ1bk9wZW5QYW5l bCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgUmVmUHRyPFdlYk9wZW5QYW5lbFBhcmFt ZXRlcnM+IHBhcmFtZXRlcnMgPSBXZWJPcGVuUGFuZWxQYXJhbWV0ZXJzOjpjcmVhdGUocGFyYW1l dGVyRGF0YSk7Ci0gICAgbV9jbGllbnQucnVuT3BlblBhbmVsKHRvQVBJKHBhZ2UpLCB0b0FQSShm cmFtZSksIHRvQVBJKHBhcmFtZXRlcnMuZ2V0KCkpLCB0b0FQSShsaXN0ZW5lciksIG1fY2xpZW50 LmNsaWVudEluZm8pOworICAgIG1fY2xpZW50LnJ1bk9wZW5QYW5lbCh0b0FQSShwYWdlKSwgdG9B UEkoZnJhbWUpLCB0b0FQSShwYXJhbWV0ZXJzKSwgdG9BUEkobGlzdGVuZXIpLCBtX2NsaWVudC5j bGllbnRJbmZvKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlVJQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViVUlDbGllbnQuaAppbmRleCA1MTk1OGExLi41NmUwOTg4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViVUlDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViVUlDbGllbnQuaApAQCAtOTcsNyArOTcsNyBAQCBwdWJsaWM6CiAKICAgICB1bnNp Z25lZCBsb25nIGxvbmcgZXhjZWVkZWREYXRhYmFzZVF1b3RhKFdlYlBhZ2VQcm94eSosIFdlYkZy YW1lUHJveHkqLCBXZWJTZWN1cml0eU9yaWdpbiosIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VOYW1l LCBjb25zdCBTdHJpbmcmIGRhdGFiYXNlRGlzcGxheU5hbWUsIHVuc2lnbmVkIGxvbmcgbG9uZyBj dXJyZW50UXVvdGEsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50T3JpZ2luVXNhZ2UsIHVuc2ln bmVkIGxvbmcgbG9uZyBjdXJyZW50RGF0YWJhc2VVc2FnZSwgdW5zaWduZWQgbG9uZyBsb25nIGV4 cGVjdGVkVXNhZ2UpOwogCi0gICAgYm9vbCBydW5PcGVuUGFuZWwoV2ViUGFnZVByb3h5KiwgV2Vi RnJhbWVQcm94eSosIGNvbnN0IFdlYk9wZW5QYW5lbFBhcmFtZXRlcnM6OkRhdGEmLCBXZWJPcGVu UGFuZWxSZXN1bHRMaXN0ZW5lclByb3h5Kik7CisgICAgYm9vbCBydW5PcGVuUGFuZWwoV2ViUGFn ZVByb3h5KiwgV2ViRnJhbWVQcm94eSosIFdlYk9wZW5QYW5lbFBhcmFtZXRlcnMqLCBXZWJPcGVu UGFuZWxSZXN1bHRMaXN0ZW5lclByb3h5Kik7CiAgICAgYm9vbCBkZWNpZGVQb2xpY3lGb3JHZW9s b2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0KFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqLCBX ZWJTZWN1cml0eU9yaWdpbiosIEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcm94eSopOwog CiAgICAgLy8gUHJpbnRpbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKaW5kZXggZmZmYjYwMi4u NjU3NzljZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcApAQCAtNjE0LDE4ICs2MTQsNyBAQCB2 b2lkIFdlYkNocm9tZUNsaWVudDo6cnVuT3BlblBhbmVsKEZyYW1lKiBmcmFtZSwgUGFzc1JlZlB0 cjxGaWxlQ2hvb3Nlcj4gcHJwRmlsZQogICAgIFJlZlB0cjxGaWxlQ2hvb3Nlcj4gZmlsZUNob29z ZXIgPSBwcnBGaWxlQ2hvb3NlcjsKIAogICAgIG1fcGFnZS0+c2V0QWN0aXZlT3BlblBhbmVsUmVz dWx0TGlzdGVuZXIoV2ViT3BlblBhbmVsUmVzdWx0TGlzdGVuZXI6OmNyZWF0ZShtX3BhZ2UsIGZp bGVDaG9vc2VyLmdldCgpKSk7Ci0gICAgCi0gICAgV2ViT3BlblBhbmVsUGFyYW1ldGVyczo6RGF0 YSBwYXJhbWV0ZXJzOwotICAgIHBhcmFtZXRlcnMuYWxsb3dNdWx0aXBsZUZpbGVzID0gZmlsZUNo b29zZXItPnNldHRpbmdzKCkuYWxsb3dzTXVsdGlwbGVGaWxlczsKLSNpZiBFTkFCTEUoRElSRUNU T1JZX1VQTE9BRCkKLSAgICBwYXJhbWV0ZXJzLmFsbG93c0RpcmVjdG9yeVVwbG9hZCA9IGZpbGVD aG9vc2VyLT5zZXR0aW5ncygpLmFsbG93c0RpcmVjdG9yeVVwbG9hZDsKLSNlbHNlCi0gICAgcGFy YW1ldGVycy5hbGxvd3NEaXJlY3RvcnlVcGxvYWQgPSBmYWxzZTsKLSNlbmRpZgotICAgIHBhcmFt ZXRlcnMuYWNjZXB0VHlwZXMgPSBmaWxlQ2hvb3Nlci0+c2V0dGluZ3MoKS5hY2NlcHRUeXBlczsK LSAgICBwYXJhbWV0ZXJzLmZpbGVuYW1lcyA9IGZpbGVDaG9vc2VyLT5zZXR0aW5ncygpLnNlbGVj dGVkRmlsZXM7Ci0KLSAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVu T3BlblBhbmVsKHN0YXRpY19jYXN0PFdlYkZyYW1lTG9hZGVyQ2xpZW50Kj4oZnJhbWUtPmxvYWRl cigpLT5jbGllbnQoKSktPndlYkZyYW1lKCktPmZyYW1lSUQoKSwgcGFyYW1ldGVycykpOworICAg IG1fcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpSdW5PcGVuUGFuZWwoc3RhdGlj X2Nhc3Q8V2ViRnJhbWVMb2FkZXJDbGllbnQqPihmcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpKS0+ d2ViRnJhbWUoKS0+ZnJhbWVJRCgpLCBmaWxlQ2hvb3Nlci0+c2V0dGluZ3MoKSkpOwogfQogCiB2 b2lkIFdlYkNocm9tZUNsaWVudDo6bG9hZEljb25Gb3JGaWxlcyhjb25zdCBWZWN0b3I8U3RyaW5n PiYgZmlsZW5hbWVzLCBGaWxlSWNvbkxvYWRlciogbG9hZGVyKQo= 110200 2011-10-07 12:47:23 -0700 2011-10-12 12:39:42 -0700 [PATCH] Part 3 - Add acceptMIMETypes parsed list to FileChooserSettings part-3.patch text/plain 5891 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZTAxN2M1Li5mMGRiMDQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC01LDYgKzUsMjkg QEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBObyBu ZXcgdGVzdHMuIE5vIG5ldyBmdW5jdGlvbmFsaXR5IGluIFdlYkNvcmUsIGp1c3QKKyAgICAgICAg ZXhwb3NpbmcgbW9yZSBpbmZvcm1hdGlvbiB0byB0aGUgV2ViS2l0IHBvcnQuCisKKyAgICAgICAg KiBodG1sL0ZpbGVJbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmlsZUlucHV0VHlw ZTo6aGFuZGxlRE9NQWN0aXZhdGVFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpGaWxlSW5wdXRU eXBlOjpyZWNlaXZlRHJvcEZvckRpcmVjdG9yeVVwbG9hZCk6CisgICAgICAgIFNldCB0aGUgTUlN RSB0eXBlIGxpc3Qgb24gdGhlIEZpbGVDaG9vc2VyIHNldHRpbmdzLgorCisgICAgICAgICogaHRt bC9IVE1MSW5wdXRFbGVtZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQ6OmFjY2VwdE1JTUVUeXBlcyk6 CisgICAgICAgIEFjY2Vzc29yIGZvciBhIHBhcnNlZCBsaXN0IG9mIE1JTUUgdHlwZXMgZnJvbSB0 aGUgYWNjZXB0IGF0dHJpYnV0ZS4KKyAgICAgICAgCisgICAgICAgICogcGxhdGZvcm0vRmlsZUNo b29zZXIuaDoKKyAgICAgICAgQWRkIGEgc2xvdCBmb3IgYSBNSU1FIHR5cGUgbGlzdCBvbiB0aGUg Y2hvb3NlciBzZXR0aW5ncy4KKworMjAxMS0xMC0wNyAgSm9zZXBoIFBlY29yYXJvICA8am9lcGVj a0B3ZWJraXQub3JnPgorCisgICAgICAgIFBhc3MgUGFyc2VkIEFjY2VwdCBBdHRyaWJ1dGUgTUlN RSBUeXBlcyB0byBXZWJLaXQgQ2xpZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Njk1OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKwogICAgICAgICBEZXByZWNhdGUgdGhlIG9sZCBTdHJpbmcgdmVyc2lvbiBvZiBnZXR0 aW5nIHRoZSAiYWNjZXB0IgogICAgICAgICBtaW1lIHR5cGUgdmFsdWVzLiBJbnN0ZWFkIHdlIHdp bGwgY2hhbmdlIHRvIGluY2x1ZGUgYQogICAgICAgICBsaXN0IG9mIE1JTUUgdHlwZXMuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0ZpbGVJbnB1dFR5cGUuY3BwIGIvU291cmNlL1dl YkNvcmUvaHRtbC9GaWxlSW5wdXRUeXBlLmNwcAppbmRleCAyMDcyZjk4Li5hYzljZmJjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0ZpbGVJbnB1dFR5cGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvRmlsZUlucHV0VHlwZS5jcHAKQEAgLTE1NCw2ICsxNTQsNyBAQCB2b2lk IEZpbGVJbnB1dFR5cGU6OmhhbmRsZURPTUFjdGl2YXRlRXZlbnQoRXZlbnQqIGV2ZW50KQogICAg ICAgICBzZXR0aW5ncy5hbGxvd3NNdWx0aXBsZUZpbGVzID0gaW5wdXQtPmZhc3RIYXNBdHRyaWJ1 dGUobXVsdGlwbGVBdHRyKTsKICNlbmRpZgogICAgICAgICBzZXR0aW5ncy5kZXByZWNhdGVkQWNj ZXB0VHlwZXMgPSBpbnB1dC0+YWNjZXB0KCk7CisgICAgICAgIHNldHRpbmdzLmFjY2VwdE1JTUVU eXBlcyA9IGlucHV0LT5hY2NlcHRNSU1FVHlwZXMoKTsKICAgICAgICAgc2V0dGluZ3Muc2VsZWN0 ZWRGaWxlcyA9IG1fZmlsZUxpc3QtPnBhdGhzKCk7CiAgICAgICAgIGNocm9tZS0+cnVuT3BlblBh bmVsKGlucHV0LT5kb2N1bWVudCgpLT5mcmFtZSgpLCBuZXdGaWxlQ2hvb3NlcihzZXR0aW5ncykp OwogICAgIH0KQEAgLTMyNCwxMCArMzI1LDEyIEBAIHZvaWQgRmlsZUlucHV0VHlwZTo6cmVjZWl2 ZURyb3BGb3JEaXJlY3RvcnlVcGxvYWQoY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhdGhzKQogewog ICAgIGlmIChDaHJvbWUqIGNocm9tZSA9IHRoaXMtPmNocm9tZSgpKSB7CiAgICAgICAgIEZpbGVD aG9vc2VyU2V0dGluZ3Mgc2V0dGluZ3M7CisgICAgICAgIEhUTUxJbnB1dEVsZW1lbnQqIGlucHV0 ID0gZWxlbWVudCgpOwogICAgICAgICBzZXR0aW5ncy5hbGxvd3NEaXJlY3RvcnlVcGxvYWQgPSB0 cnVlOwogICAgICAgICBzZXR0aW5ncy5hbGxvd3NNdWx0aXBsZUZpbGVzID0gdHJ1ZTsKICAgICAg ICAgc2V0dGluZ3Muc2VsZWN0ZWRGaWxlcy5hcHBlbmQocGF0aHNbMF0pOwotICAgICAgICBzZXR0 aW5ncy5kZXByZWNhdGVkQWNjZXB0VHlwZXMgPSBlbGVtZW50KCktPmFjY2VwdCgpOworICAgICAg ICBzZXR0aW5ncy5kZXByZWNhdGVkQWNjZXB0VHlwZXMgPSBpbnB1dC0+YWNjZXB0KCk7CisgICAg ICAgIHNldHRpbmdzLmFjY2VwdE1JTUVUeXBlcyA9IGlucHV0LT5hY2NlcHRNSU1FVHlwZXMoKTsK ICAgICAgICAgY2hyb21lLT5lbnVtZXJhdGVDaG9zZW5EaXJlY3RvcnkobmV3RmlsZUNob29zZXIo c2V0dGluZ3MpKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxJbnB1dEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50 LmNwcAppbmRleCBhNGJhYTEyLi5hOGExZDVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElu cHV0RWxlbWVudC5jcHAKQEAgLTEzMDgsNiArMTMwOCwyNSBAQCB2b2lkIEhUTUxJbnB1dEVsZW1l bnQ6OnNldERlZmF1bHROYW1lKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSkKICAgICBtX25hbWUg PSBuYW1lOwogfQogCitWZWN0b3I8U3RyaW5nPiBIVE1MSW5wdXRFbGVtZW50OjphY2NlcHRNSU1F VHlwZXMoKQoreworICAgIFZlY3RvcjxTdHJpbmc+IG1pbWVUeXBlczsKKworICAgIFN0cmluZyBh Y2NlcHRTdHJpbmcgPSBhY2NlcHQoKTsKKyAgICBpZiAoYWNjZXB0U3RyaW5nLmlzRW1wdHkoKSkK KyAgICAgICAgcmV0dXJuIG1pbWVUeXBlczsKKworICAgIFZlY3RvcjxTdHJpbmc+IHNwbGl0VHlw ZXM7CisgICAgYWNjZXB0U3RyaW5nLnNwbGl0KCcsJywgZmFsc2UsIHNwbGl0VHlwZXMpOworICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc3BsaXRUeXBlcy5zaXplKCk7ICsraSkgeworICAgICAg ICBTdHJpbmcgdHJpbW1lZE1pbWVUeXBlID0gc3RyaXBMZWFkaW5nQW5kVHJhaWxpbmdIVE1MU3Bh Y2VzKHNwbGl0VHlwZXNbaV0pOworICAgICAgICBpZiAoIXRyaW1tZWRNaW1lVHlwZS5pc0VtcHR5 KCkpCisgICAgICAgICAgICBtaW1lVHlwZXMuYXBwZW5kKHRyaW1tZWRNaW1lVHlwZSk7CisgICAg fQorCisgICAgcmV0dXJuIG1pbWVUeXBlczsKK30KKwogU3RyaW5nIEhUTUxJbnB1dEVsZW1lbnQ6 OmFjY2VwdCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGZhc3RHZXRBdHRyaWJ1dGUoYWNjZXB0QXR0 cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuaCBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5oCmluZGV4IDZjZGU2YWUuLmJh MjFlM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5oCkBAIC0xOTAsNiAr MTkwLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXREZWZhdWx0TmFtZShjb25zdCBBdG9taWNT dHJpbmcmKTsKIAorICAgIFZlY3RvcjxTdHJpbmc+IGFjY2VwdE1JTUVUeXBlcygpOwogICAgIFN0 cmluZyBhY2NlcHQoKSBjb25zdDsKICAgICBTdHJpbmcgYWx0KCkgY29uc3Q7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZpbGVDaG9vc2VyLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9GaWxlQ2hvb3Nlci5oCmluZGV4IDViOGZiNDcuLmY1ZmM4M2UgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZpbGVDaG9vc2VyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vRmlsZUNob29zZXIuaApAQCAtNDMsNiArNDMsNyBAQCBzdHJ1Y3QgRmls ZUNob29zZXJTZXR0aW5ncyB7CiAgICAgYm9vbCBhbGxvd3NEaXJlY3RvcnlVcGxvYWQ7CiAjZW5k aWYKICAgICBTdHJpbmcgZGVwcmVjYXRlZEFjY2VwdFR5cGVzOworICAgIFZlY3RvcjxTdHJpbmc+ IGFjY2VwdE1JTUVUeXBlczsKICAgICBWZWN0b3I8U3RyaW5nPiBzZWxlY3RlZEZpbGVzOwogfTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCmluZGV4IDBiNDJhODkuLjA3ZDBjMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTUsNiArNSwx NyBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgICog U2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHA6CisgICAgICAgIChDb3JlSVBDOjo6OmVu Y29kZSk6CisgICAgICAgIChDb3JlSVBDOjo6OmRlY29kZSk6CisKKzIwMTEtMTAtMDcgIEpvc2Vw aCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KKworICAgICAgICBQYXNzIFBhcnNlZCBB Y2NlcHQgQXR0cmlidXRlIE1JTUUgVHlwZXMgdG8gV2ViS2l0IENsaWVudHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5NTk4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgVGhlIFdlYk9wZW5QYW5lbFBhcmFt ZXRlcnM6OkRhdGEgc3RydWN0IHdhcyBhIG1pcnJvciBvZgogICAgICAgICB0aGUgYWxyZWFkeSBl eGlzdGluZyBXZWJDb3JlOjpGaWxlQ2hvb3NlclNldHRpbmdzIHN0cnVjdC4KICAgICAgICAgU28g ZWxpbWluYXRlIHRoZSBleGNlc3Mgc3RydWN0IGFuZCBnZW5lcmF0ZSBkZWZhdWx0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCmluZGV4IGYzZGFl NGQuLmM0ODU0MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJn dW1lbnRDb2RlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1l bnRDb2RlcnMuY3BwCkBAIC01MjUsNiArNTI1LDcgQEAgdm9pZCBBcmd1bWVudENvZGVyPEZpbGVD aG9vc2VyU2V0dGluZ3M+OjplbmNvZGUoQXJndW1lbnRFbmNvZGVyKiBlbmNvZGVyLCBjb25zdAog I2lmIEVOQUJMRShESVJFQ1RPUllfVVBMT0FEKQogICAgIGVuY29kZXItPmVuY29kZShzZXR0aW5n cy5hbGxvd3NEaXJlY3RvcnlVcGxvYWQpOwogI2VuZGlmCisgICAgZW5jb2Rlci0+ZW5jb2RlKHNl dHRpbmdzLmFjY2VwdE1JTUVUeXBlcyk7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKHNldHRpbmdzLnNl bGVjdGVkRmlsZXMpOwogfQogCkBAIC01MzYsNiArNTM3LDggQEAgYm9vbCBBcmd1bWVudENvZGVy PEZpbGVDaG9vc2VyU2V0dGluZ3M+OjpkZWNvZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBG aWxlQ2gKICAgICBpZiAoIWRlY29kZXItPmRlY29kZShzZXR0aW5ncy5hbGxvd3NEaXJlY3RvcnlV cGxvYWQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKKyAgICBpZiAoIWRlY29kZXIt PmRlY29kZShzZXR0aW5ncy5hY2NlcHRNSU1FVHlwZXMpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUoc2V0dGluZ3Muc2VsZWN0ZWRGaWxlcykpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAo= 110217 2011-10-07 14:34:49 -0700 2011-10-11 10:29:20 -0700 [PATCH] Part 1 - Deprecate String version of acceptTypes (Fix EFL) part-1.patch text/plain 6345 joepeck Y29tbWl0IGM1ZTViZWIyZTc3ZjYxZDFlN2E2ZDk2NzI0MjUyM2QyNDU1YTYyODMKQXV0aG9yOiBK b3NlcGggUGVjb3Jhcm8gPGpvZXBlY2tAd2Via2l0Lm9yZz4KRGF0ZTogICBGcmkgT2N0IDcgMTI6 MjU6NTkgMjAxMSAtMDcwMAoKICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzY5NTk4PiBQYXNzIFBh cnNlZCBBY2NlcHQgQXR0cmlidXRlIE1JTUUgVHlwZXMgdG8gV2ViS2l0IENsaWVudHMKICAgIAog ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgIFNvdXJjZS9XZWJDb3JlOgog ICAgCiAgICBEZXByZWNhdGUgdGhlIG9sZCBTdHJpbmcgdmVyc2lvbiBvZiBnZXR0aW5nIHRoZSAi YWNjZXB0IgogICAgbWltZSB0eXBlIHZhbHVlcy4gSW5zdGVhZCB3ZSB3aWxsIGNoYW5nZSB0byBp bmNsdWRlIGEKICAgIGxpc3Qgb2YgTUlNRSB0eXBlcy4KICAgIAogICAgKiBodG1sL0ZpbGVJbnB1 dFR5cGUuY3BwOgogICAgKFdlYkNvcmU6OkZpbGVJbnB1dFR5cGU6OmhhbmRsZURPTUFjdGl2YXRl RXZlbnQpOgogICAgKFdlYkNvcmU6OkZpbGVJbnB1dFR5cGU6OnJlY2VpdmVEcm9wRm9yRGlyZWN0 b3J5VXBsb2FkKToKICAgICogcGxhdGZvcm0vRmlsZUNob29zZXIuaDoKICAgIAogICAgU291cmNl L1dlYktpdC9jaHJvbWl1bToKICAgIAogICAgQ2hyb21pdW0gdXNlcyB0aGUgZGVwcmVjYXRlZCBh Y2NlcHQgc3RyaW5nLiBTd2l0Y2hpbmcgdG8KICAgIHRoZSBuZXcgYXBwcm9hY2ggd2lsbCByZXF1 aXJlIGNvb3JkaW5hdGlvbiB3aXRoIHRoZWlyIHBvcnQuCiAgICAKICAgICogc3JjL0Nocm9tZUNs aWVudEltcGwuY3BwOgogICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1wbDo6cnVuT3BlblBhbmVs KToKICAgIAogICAgU291cmNlL1dlYktpdC9lZmw6CiAgICAKICAgIEVGTCB1c2VzIHRoZSBkZXBy ZWNhdGVkIGFjY2VwdCBzdHJpbmcuIFRoZXkgY2FuIHN3aXRjaAogICAgdG8gYW4gRWluYV9MaXN0 IGlmIHRoZXkgd2FudCB0byB1cGRhdGUgdGhlaXIgQVBJLgogICAgCiAgICAqIHNyYy9DaHJvbWVD bGllbnRJbXBsLmNwcDoKICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudEltcGw6OnJ1bk9wZW5QYW5l bCk6CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IGJiOGE4YTYuLmVlMDE3YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxOSBAQAorMjAxMS0xMC0wNyAgSm9zZXBoIFBlY29yYXJvICA8am9lcGVja0B3ZWJraXQub3Jn PgorCisgICAgICAgIFBhc3MgUGFyc2VkIEFjY2VwdCBBdHRyaWJ1dGUgTUlNRSBUeXBlcyB0byBX ZWJLaXQgQ2xpZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9Njk1OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBEZXByZWNhdGUgdGhlIG9sZCBTdHJpbmcgdmVyc2lvbiBvZiBnZXR0aW5nIHRoZSAiYWNj ZXB0IgorICAgICAgICBtaW1lIHR5cGUgdmFsdWVzLiBJbnN0ZWFkIHdlIHdpbGwgY2hhbmdlIHRv IGluY2x1ZGUgYQorICAgICAgICBsaXN0IG9mIE1JTUUgdHlwZXMuCisKKyAgICAgICAgKiBodG1s L0ZpbGVJbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmlsZUlucHV0VHlwZTo6aGFu ZGxlRE9NQWN0aXZhdGVFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpGaWxlSW5wdXRUeXBlOjpy ZWNlaXZlRHJvcEZvckRpcmVjdG9yeVVwbG9hZCk6CisgICAgICAgICogcGxhdGZvcm0vRmlsZUNo b29zZXIuaDoKKwogMjAxMS0xMC0wNiAgSm9zZXBoIFBlY29yYXJvICA8am9lcGVja0B3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaHRtbC9GaWxlSW5wdXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvRmlsZUlucHV0VHlwZS5jcHAKaW5kZXggYzk3NzFiYS4uMjA3MmY5OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9GaWxlSW5wdXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0ZpbGVJbnB1dFR5cGUuY3BwCkBAIC0xNTMsNyArMTUzLDcgQEAgdm9pZCBGaWxlSW5w dXRUeXBlOjpoYW5kbGVET01BY3RpdmF0ZUV2ZW50KEV2ZW50KiBldmVudCkKICNlbHNlCiAgICAg ICAgIHNldHRpbmdzLmFsbG93c011bHRpcGxlRmlsZXMgPSBpbnB1dC0+ZmFzdEhhc0F0dHJpYnV0 ZShtdWx0aXBsZUF0dHIpOwogI2VuZGlmCi0gICAgICAgIHNldHRpbmdzLmFjY2VwdFR5cGVzID0g aW5wdXQtPmFjY2VwdCgpOworICAgICAgICBzZXR0aW5ncy5kZXByZWNhdGVkQWNjZXB0VHlwZXMg PSBpbnB1dC0+YWNjZXB0KCk7CiAgICAgICAgIHNldHRpbmdzLnNlbGVjdGVkRmlsZXMgPSBtX2Zp bGVMaXN0LT5wYXRocygpOwogICAgICAgICBjaHJvbWUtPnJ1bk9wZW5QYW5lbChpbnB1dC0+ZG9j dW1lbnQoKS0+ZnJhbWUoKSwgbmV3RmlsZUNob29zZXIoc2V0dGluZ3MpKTsKICAgICB9CkBAIC0z MjcsNyArMzI3LDcgQEAgdm9pZCBGaWxlSW5wdXRUeXBlOjpyZWNlaXZlRHJvcEZvckRpcmVjdG9y eVVwbG9hZChjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGF0aHMpCiAgICAgICAgIHNldHRpbmdzLmFs bG93c0RpcmVjdG9yeVVwbG9hZCA9IHRydWU7CiAgICAgICAgIHNldHRpbmdzLmFsbG93c011bHRp cGxlRmlsZXMgPSB0cnVlOwogICAgICAgICBzZXR0aW5ncy5zZWxlY3RlZEZpbGVzLmFwcGVuZChw YXRoc1swXSk7Ci0gICAgICAgIHNldHRpbmdzLmFjY2VwdFR5cGVzID0gZWxlbWVudCgpLT5hY2Nl cHQoKTsKKyAgICAgICAgc2V0dGluZ3MuZGVwcmVjYXRlZEFjY2VwdFR5cGVzID0gZWxlbWVudCgp LT5hY2NlcHQoKTsKICAgICAgICAgY2hyb21lLT5lbnVtZXJhdGVDaG9zZW5EaXJlY3RvcnkobmV3 RmlsZUNob29zZXIoc2V0dGluZ3MpKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9GaWxlQ2hvb3Nlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmls ZUNob29zZXIuaAppbmRleCA5NmU3YTQxLi41YjhmYjQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9GaWxlQ2hvb3Nlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L0ZpbGVDaG9vc2VyLmgKQEAgLTQyLDcgKzQyLDcgQEAgc3RydWN0IEZpbGVDaG9vc2VyU2V0dGlu Z3MgewogI2lmIEVOQUJMRShESVJFQ1RPUllfVVBMT0FEKQogICAgIGJvb2wgYWxsb3dzRGlyZWN0 b3J5VXBsb2FkOwogI2VuZGlmCi0gICAgU3RyaW5nIGFjY2VwdFR5cGVzOworICAgIFN0cmluZyBk ZXByZWNhdGVkQWNjZXB0VHlwZXM7CiAgICAgVmVjdG9yPFN0cmluZz4gc2VsZWN0ZWRGaWxlczsK IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggM2I4NmRhMi4uMjE3OTdiZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0xMC0wNyAgSm9z ZXBoIFBlY29yYXJvICA8am9lcGVja0B3ZWJraXQub3JnPgorCisgICAgICAgIFBhc3MgUGFyc2Vk IEFjY2VwdCBBdHRyaWJ1dGUgTUlNRSBUeXBlcyB0byBXZWJLaXQgQ2xpZW50cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk1OTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaHJvbWl1bSB1c2VzIHRoZSBk ZXByZWNhdGVkIGFjY2VwdCBzdHJpbmcuIFN3aXRjaGluZyB0bworICAgICAgICB0aGUgbmV3IGFw cHJvYWNoIHdpbGwgcmVxdWlyZSBjb29yZGluYXRpb24gd2l0aCB0aGVpciBwb3J0LgorCisgICAg ICAgICogc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVD bGllbnRJbXBsOjpydW5PcGVuUGFuZWwpOgorCiAyMDExLTEwLTA2ICBBbm5hIENhdmVuZGVyICA8 YW5uYWNjQGNocm9taXVtLm9yZz4KIAogICAgICAgICBUdXJuIEVOQUJMRV9WSURFT19UUkFDSyBv biBmb3IgY2hyb21pdW0uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9D aHJvbWVDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNs aWVudEltcGwuY3BwCmluZGV4IGE4MGM2OWEuLjA1OWRlNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCkBAIC02NjgsNyArNjY4LDcgQEAg dm9pZCBDaHJvbWVDbGllbnRJbXBsOjpydW5PcGVuUGFuZWwoRnJhbWUqIGZyYW1lLCBQYXNzUmVm UHRyPEZpbGVDaG9vc2VyPiBmaWxlQ2gKICNlbHNlCiAgICAgcGFyYW1zLmRpcmVjdG9yeSA9IGZh bHNlOwogI2VuZGlmCi0gICAgcGFyYW1zLmFjY2VwdFR5cGVzID0gZmlsZUNob29zZXItPnNldHRp bmdzKCkuYWNjZXB0VHlwZXM7CisgICAgcGFyYW1zLmFjY2VwdFR5cGVzID0gZmlsZUNob29zZXIt PnNldHRpbmdzKCkuZGVwcmVjYXRlZEFjY2VwdFR5cGVzOwogICAgIHBhcmFtcy5zZWxlY3RlZEZp bGVzID0gZmlsZUNob29zZXItPnNldHRpbmdzKCkuc2VsZWN0ZWRGaWxlczsKICAgICBpZiAocGFy YW1zLnNlbGVjdGVkRmlsZXMuc2l6ZSgpID4gMCkKICAgICAgICAgcGFyYW1zLmluaXRpYWxWYWx1 ZSA9IHBhcmFtcy5zZWxlY3RlZEZpbGVzWzBdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9l ZmwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCmluZGV4IDk5NzBmNjAu LjZlYzNmNzUgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0xMC0wNyAg Sm9zZXBoIFBlY29yYXJvICA8am9lcGVja0B3ZWJraXQub3JnPgorCisgICAgICAgIFBhc3MgUGFy c2VkIEFjY2VwdCBBdHRyaWJ1dGUgTUlNRSBUeXBlcyB0byBXZWJLaXQgQ2xpZW50cworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk1OTgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFRkwgdXNlcyB0aGUgZGVw cmVjYXRlZCBhY2NlcHQgc3RyaW5nLiBUaGV5IGNhbiBzd2l0Y2gKKyAgICAgICAgdG8gYW4gRWlu YV9MaXN0IGlmIHRoZXkgd2FudCB0byB1cGRhdGUgdGhlaXIgQVBJLgorCisgICAgICAgICogc3Jj L0Nocm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnRJbXBs OjpydW5PcGVuUGFuZWwpOgorCiAyMDExLTEwLTA0ICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5r aW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gT25seSBzZXQgd2hlbiB0aGUgY3VzdG9t IGVuY29kaW5nIGlzIGRpZmZlcmVudCBmcm9tIGV4aXN0aW5nIHZhbHVlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuY3BwIGIvU291 cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcAppbmRleCAw NzU1MDE1NS4uODc1ZjM1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1 cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3Jl U3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuY3BwCkBAIC00MzMsNyArNDMzLDcgQEAgdm9pZCBDaHJv bWVDbGllbnRFZmw6OnJ1bk9wZW5QYW5lbChGcmFtZSogZnJhbWUsIFBhc3NSZWZQdHI8RmlsZUNo b29zZXI+IHBycEZpbGUKICAgICB2b2lkKiBmaWxlbmFtZTsKICAgICBWZWN0b3I8U3RyaW5nPiBm aWxlbmFtZXM7CiAKLSAgICBDU3RyaW5nIGFjY2VwdCA9IGNob29zZXItPnNldHRpbmdzKCkuYWNj ZXB0VHlwZXMudXRmOCgpOworICAgIENTdHJpbmcgYWNjZXB0ID0gY2hvb3Nlci0+c2V0dGluZ3Mo KS5kZXByZWNhdGVkQWNjZXB0VHlwZXMudXRmOCgpOwogICAgIGNvbmZpcm0gPSBld2tfdmlld19y dW5fb3Blbl9wYW5lbChtX3ZpZXcsIGtpdChmcmFtZSksIGNob29zZXItPnNldHRpbmdzKCkuYWxs b3dzTXVsdGlwbGVGaWxlcywgYWNjZXB0LmRhdGEoKSwgJnNlbGVjdGVkRmlsZW5hbWVzKTsKIAog ICAgIGlmICghY29uZmlybSkK 110533 2011-10-11 10:29:20 -0700 2011-10-11 16:25:04 -0700 [PATCH] Part 1 - Deprecate String version of acceptTypes (Fix Builds) part-1.patch text/plain 8218 joepeck Y29tbWl0IGFjNmU0OGFmNjM5ZjFlMzdmNmM5NTY5MmNlN2ViMjg3NDhhMjg5MTkKQXV0aG9yOiBK b3NlcGggUGVjb3Jhcm8gPGpvZXBlY2tAd2Via2l0Lm9yZz4KRGF0ZTogICBGcmkgT2N0IDcgMTI6 MjU6NTkgMjAxMSAtMDcwMAoKICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzY5NTk4PiBQYXNzIFBh cnNlZCBBY2NlcHQgQXR0cmlidXRlIE1JTUUgVHlwZXMgdG8gV2ViS2l0IENsaWVudHMKICAgIAog ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgIFNvdXJjZS9XZWJDb3JlOgog ICAgCiAgICBEZXByZWNhdGUgdGhlIG9sZCBTdHJpbmcgdmVyc2lvbiBvZiBnZXR0aW5nIHRoZSAi YWNjZXB0IgogICAgbWltZSB0eXBlIHZhbHVlcy4gSW5zdGVhZCB3ZSB3aWxsIGNoYW5nZSB0byBp bmNsdWRlIGEKICAgIGxpc3Qgb2YgTUlNRSB0eXBlcy4KICAgIAogICAgKiBodG1sL0ZpbGVJbnB1 dFR5cGUuY3BwOgogICAgKFdlYkNvcmU6OkZpbGVJbnB1dFR5cGU6OmhhbmRsZURPTUFjdGl2YXRl RXZlbnQpOgogICAgKFdlYkNvcmU6OkZpbGVJbnB1dFR5cGU6OnJlY2VpdmVEcm9wRm9yRGlyZWN0 b3J5VXBsb2FkKToKICAgICogcGxhdGZvcm0vRmlsZUNob29zZXIuaDoKICAgIAogICAgU291cmNl L1dlYktpdC9jaHJvbWl1bToKICAgIAogICAgQ2hyb21pdW0gdXNlcyB0aGUgZGVwcmVjYXRlZCBh Y2NlcHQgc3RyaW5nLiBTd2l0Y2hpbmcgdG8KICAgIHRoZSBuZXcgYXBwcm9hY2ggd2lsbCByZXF1 aXJlIGNvb3JkaW5hdGlvbiB3aXRoIHRoZWlyIHBvcnQuCiAgICAKICAgICogc3JjL0Nocm9tZUNs aWVudEltcGwuY3BwOgogICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1wbDo6cnVuT3BlblBhbmVs KToKICAgIAogICAgU291cmNlL1dlYktpdC9lZmw6CiAgICAKICAgIEVGTCB1c2VzIHRoZSBkZXBy ZWNhdGVkIGFjY2VwdCBzdHJpbmcuIFRoZXkgY2FuIHN3aXRjaAogICAgdG8gYW4gRWluYV9MaXN0 IGlmIHRoZXkgd2FudCB0byB1cGRhdGUgdGhlaXIgQVBJLgogICAgCiAgICAqIHNyYy9DaHJvbWVD bGllbnRJbXBsLmNwcDoKICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudEltcGw6OnJ1bk9wZW5QYW5l bCk6CiAgICAKICAgIFNvdXJjZS9XZWJLaXQyOgogICAgCiAgICBTd2l0Y2ggdG8gZGVwcmVjYXRl ZCBmb3Igbm93LCBidXQgdGhlIG5leHQgcGF0Y2hlcyB3aWxsCiAgICByZW1vdmUgdGhlIGRlcHJl Y2F0ZWQgdmVyc2lvbiBmcm9tIHRoZSBXZWJLaXQyIHBhdGguCiAgICAKICAgICogV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwOgogICAgKFdlYktpdDo6V2ViQ2hy b21lQ2xpZW50OjpydW5PcGVuUGFuZWwpOgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0YTdhZjg1Li5hMzRmN2Yw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMTEgIEpvc2VwaCBQZWNvcmFy byAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KKworICAgICAgICBQYXNzIFBhcnNlZCBBY2NlcHQgQXR0 cmlidXRlIE1JTUUgVHlwZXMgdG8gV2ViS2l0IENsaWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5NTk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGVwcmVjYXRlIHRoZSBvbGQgU3RyaW5nIHZlcnNp b24gb2YgZ2V0dGluZyB0aGUgImFjY2VwdCIKKyAgICAgICAgbWltZSB0eXBlIHZhbHVlcy4gSW5z dGVhZCB3ZSB3aWxsIGNoYW5nZSB0byBpbmNsdWRlIGEKKyAgICAgICAgbGlzdCBvZiBNSU1FIHR5 cGVzLgorCisgICAgICAgICogaHRtbC9GaWxlSW5wdXRUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZpbGVJbnB1dFR5cGU6OmhhbmRsZURPTUFjdGl2YXRlRXZlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6RmlsZUlucHV0VHlwZTo6cmVjZWl2ZURyb3BGb3JEaXJlY3RvcnlVcGxvYWQpOgorICAg ICAgICAqIHBsYXRmb3JtL0ZpbGVDaG9vc2VyLmg6CisKIDIwMTEtMTAtMDYgIEplciBOb2JsZSAg PGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgbWVkaWEvdmlkZW8tbG9vcC5odG1sIGlz IGZhaWxpbmcgb24gTGlvbiBiZWNhdXNlIG9mIG5lZ2F0aXZlIGN1cnJlbnRUaW1lKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvRmlsZUlucHV0VHlwZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0ZpbGVJbnB1dFR5cGUuY3BwCmluZGV4IGM5NzcxYmEuLjIwNzJmOTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvRmlsZUlucHV0VHlwZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaHRtbC9GaWxlSW5wdXRUeXBlLmNwcApAQCAtMTUzLDcgKzE1Myw3IEBAIHZvaWQg RmlsZUlucHV0VHlwZTo6aGFuZGxlRE9NQWN0aXZhdGVFdmVudChFdmVudCogZXZlbnQpCiAjZWxz ZQogICAgICAgICBzZXR0aW5ncy5hbGxvd3NNdWx0aXBsZUZpbGVzID0gaW5wdXQtPmZhc3RIYXNB dHRyaWJ1dGUobXVsdGlwbGVBdHRyKTsKICNlbmRpZgotICAgICAgICBzZXR0aW5ncy5hY2NlcHRU eXBlcyA9IGlucHV0LT5hY2NlcHQoKTsKKyAgICAgICAgc2V0dGluZ3MuZGVwcmVjYXRlZEFjY2Vw dFR5cGVzID0gaW5wdXQtPmFjY2VwdCgpOwogICAgICAgICBzZXR0aW5ncy5zZWxlY3RlZEZpbGVz ID0gbV9maWxlTGlzdC0+cGF0aHMoKTsKICAgICAgICAgY2hyb21lLT5ydW5PcGVuUGFuZWwoaW5w dXQtPmRvY3VtZW50KCktPmZyYW1lKCksIG5ld0ZpbGVDaG9vc2VyKHNldHRpbmdzKSk7CiAgICAg fQpAQCAtMzI3LDcgKzMyNyw3IEBAIHZvaWQgRmlsZUlucHV0VHlwZTo6cmVjZWl2ZURyb3BGb3JE aXJlY3RvcnlVcGxvYWQoY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhdGhzKQogICAgICAgICBzZXR0 aW5ncy5hbGxvd3NEaXJlY3RvcnlVcGxvYWQgPSB0cnVlOwogICAgICAgICBzZXR0aW5ncy5hbGxv d3NNdWx0aXBsZUZpbGVzID0gdHJ1ZTsKICAgICAgICAgc2V0dGluZ3Muc2VsZWN0ZWRGaWxlcy5h cHBlbmQocGF0aHNbMF0pOwotICAgICAgICBzZXR0aW5ncy5hY2NlcHRUeXBlcyA9IGVsZW1lbnQo KS0+YWNjZXB0KCk7CisgICAgICAgIHNldHRpbmdzLmRlcHJlY2F0ZWRBY2NlcHRUeXBlcyA9IGVs ZW1lbnQoKS0+YWNjZXB0KCk7CiAgICAgICAgIGNocm9tZS0+ZW51bWVyYXRlQ2hvc2VuRGlyZWN0 b3J5KG5ld0ZpbGVDaG9vc2VyKHNldHRpbmdzKSk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmlsZUNob29zZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL0ZpbGVDaG9vc2VyLmgKaW5kZXggOTZlN2E0MS4uNWI4ZmI0NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmlsZUNob29zZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9GaWxlQ2hvb3Nlci5oCkBAIC00Miw3ICs0Miw3IEBAIHN0cnVjdCBGaWxlQ2hvb3Nl clNldHRpbmdzIHsKICNpZiBFTkFCTEUoRElSRUNUT1JZX1VQTE9BRCkKICAgICBib29sIGFsbG93 c0RpcmVjdG9yeVVwbG9hZDsKICNlbmRpZgotICAgIFN0cmluZyBhY2NlcHRUeXBlczsKKyAgICBT dHJpbmcgZGVwcmVjYXRlZEFjY2VwdFR5cGVzOwogICAgIFZlY3RvcjxTdHJpbmc+IHNlbGVjdGVk RmlsZXM7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDg2ZTk3ZmMuLjVkNTQx NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMTAt MDcgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KKworICAgICAgICBQYXNz IFBhcnNlZCBBY2NlcHQgQXR0cmlidXRlIE1JTUUgVHlwZXMgdG8gV2ViS2l0IENsaWVudHMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5NTk4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hyb21pdW0gdXNl cyB0aGUgZGVwcmVjYXRlZCBhY2NlcHQgc3RyaW5nLiBTd2l0Y2hpbmcgdG8KKyAgICAgICAgdGhl IG5ldyBhcHByb2FjaCB3aWxsIHJlcXVpcmUgY29vcmRpbmF0aW9uIHdpdGggdGhlaXIgcG9ydC4K KworICAgICAgICAqIHNyYy9DaHJvbWVDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 Q2hyb21lQ2xpZW50SW1wbDo6cnVuT3BlblBhbmVsKToKKwogMjAxMS0xMC0xMCAgU2VyZ2V5IEds YXp1bm92ICA8c2VyZy5nbGF6dW5vdkBnbWFpbC5jb20+CiAKICAgICAgICAgU2NyaXB0Q29udHJv bGxlcjo6ZXhlY3V0ZUlmSmF2YVNjcmlwdFVSTCBnZXRzIGNvbmZ1c2VkIGJ5IHN5bmNocm9ub3Vz IGZyYW1lIGxvYWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJv bWVDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVu dEltcGwuY3BwCmluZGV4IGE4MGM2OWEuLjA1OWRlNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCkBAIC02NjgsNyArNjY4LDcgQEAgdm9p ZCBDaHJvbWVDbGllbnRJbXBsOjpydW5PcGVuUGFuZWwoRnJhbWUqIGZyYW1lLCBQYXNzUmVmUHRy PEZpbGVDaG9vc2VyPiBmaWxlQ2gKICNlbHNlCiAgICAgcGFyYW1zLmRpcmVjdG9yeSA9IGZhbHNl OwogI2VuZGlmCi0gICAgcGFyYW1zLmFjY2VwdFR5cGVzID0gZmlsZUNob29zZXItPnNldHRpbmdz KCkuYWNjZXB0VHlwZXM7CisgICAgcGFyYW1zLmFjY2VwdFR5cGVzID0gZmlsZUNob29zZXItPnNl dHRpbmdzKCkuZGVwcmVjYXRlZEFjY2VwdFR5cGVzOwogICAgIHBhcmFtcy5zZWxlY3RlZEZpbGVz ID0gZmlsZUNob29zZXItPnNldHRpbmdzKCkuc2VsZWN0ZWRGaWxlczsKICAgICBpZiAocGFyYW1z LnNlbGVjdGVkRmlsZXMuc2l6ZSgpID4gMCkKICAgICAgICAgcGFyYW1zLmluaXRpYWxWYWx1ZSA9 IHBhcmFtcy5zZWxlY3RlZEZpbGVzWzBdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCmluZGV4IGNjYjI4OGUuLmNk ZDU3ZjQgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0xMC0xMSAgSm9z ZXBoIFBlY29yYXJvICA8am9lcGVja0B3ZWJraXQub3JnPgorCisgICAgICAgIFBhc3MgUGFyc2Vk IEFjY2VwdCBBdHRyaWJ1dGUgTUlNRSBUeXBlcyB0byBXZWJLaXQgQ2xpZW50cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk1OTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFRkwgdXNlcyB0aGUgZGVwcmVj YXRlZCBhY2NlcHQgc3RyaW5nLiBUaGV5IGNhbiBzd2l0Y2gKKyAgICAgICAgdG8gYW4gRWluYV9M aXN0IGlmIHRoZXkgd2FudCB0byB1cGRhdGUgdGhlaXIgQVBJLgorCisgICAgICAgICogc3JjL0No cm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnRJbXBsOjpy dW5PcGVuUGFuZWwpOgorCiAyMDExLTEwLTEwICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxrdWJv QHByb2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFtFRkxdIERvIG5vdCBjYWNoZSBhIGZyYW1lJ3Mg Y29udGVudHMgc2l6ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBw b3J0L0Nocm9tZUNsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9y dC9DaHJvbWVDbGllbnRFZmwuY3BwCmluZGV4IDA3NTUwMTU1Li44NzVmMzUzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5jcHAK QEAgLTQzMyw3ICs0MzMsNyBAQCB2b2lkIENocm9tZUNsaWVudEVmbDo6cnVuT3BlblBhbmVsKEZy YW1lKiBmcmFtZSwgUGFzc1JlZlB0cjxGaWxlQ2hvb3Nlcj4gcHJwRmlsZQogICAgIHZvaWQqIGZp bGVuYW1lOwogICAgIFZlY3RvcjxTdHJpbmc+IGZpbGVuYW1lczsKIAotICAgIENTdHJpbmcgYWNj ZXB0ID0gY2hvb3Nlci0+c2V0dGluZ3MoKS5hY2NlcHRUeXBlcy51dGY4KCk7CisgICAgQ1N0cmlu ZyBhY2NlcHQgPSBjaG9vc2VyLT5zZXR0aW5ncygpLmRlcHJlY2F0ZWRBY2NlcHRUeXBlcy51dGY4 KCk7CiAgICAgY29uZmlybSA9IGV3a192aWV3X3J1bl9vcGVuX3BhbmVsKG1fdmlldywga2l0KGZy YW1lKSwgY2hvb3Nlci0+c2V0dGluZ3MoKS5hbGxvd3NNdWx0aXBsZUZpbGVzLCBhY2NlcHQuZGF0 YSgpLCAmc2VsZWN0ZWRGaWxlbmFtZXMpOwogCiAgICAgaWYgKCFjb25maXJtKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IDE2MTRkZTguLjEwMzM1NGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0x MC0xMSAgSm9zZXBoIFBlY29yYXJvICA8am9lcGVja0B3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9i LzY5NTk4PiBQYXNzIFBhcnNlZCBBY2NlcHQgQXR0cmlidXRlIE1JTUUgVHlwZXMgdG8gV2ViS2l0 IENsaWVudHMKKworICAgICAgICBTd2l0Y2ggdG8gZGVwcmVjYXRlZCBmb3Igbm93LCBidXQgdGhl IG5leHQgcGF0Y2hlcyB3aWxsCisgICAgICAgIHJlbW92ZSB0aGUgZGVwcmVjYXRlZCB2ZXJzaW9u IGZyb20gdGhlIFdlYktpdDIgcGF0aC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xp ZW50OjpydW5PcGVuUGFuZWwpOgorCiAyMDExLTEwLTEwICBTaW1vbiBIYXVzbWFubiAgPHNpbW9u LmhhdXNtYW5uQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIEZpeCBidWlsZCB3aXRoIHFyZWFs ID09IGZsb2F0IG9uIE1lZUdvIDEuMiBIYXJtYXR0YW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcApp bmRleCBmZmZiNjAyLi5kYTE0YWM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCkBAIC02MjIs NyArNjIyLDcgQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6OnJ1bk9wZW5QYW5lbChGcmFtZSogZnJh bWUsIFBhc3NSZWZQdHI8RmlsZUNob29zZXI+IHBycEZpbGUKICNlbHNlCiAgICAgcGFyYW1ldGVy cy5hbGxvd3NEaXJlY3RvcnlVcGxvYWQgPSBmYWxzZTsKICNlbmRpZgotICAgIHBhcmFtZXRlcnMu YWNjZXB0VHlwZXMgPSBmaWxlQ2hvb3Nlci0+c2V0dGluZ3MoKS5hY2NlcHRUeXBlczsKKyAgICBw YXJhbWV0ZXJzLmFjY2VwdFR5cGVzID0gZmlsZUNob29zZXItPnNldHRpbmdzKCkuZGVwcmVjYXRl ZEFjY2VwdFR5cGVzOwogICAgIHBhcmFtZXRlcnMuZmlsZW5hbWVzID0gZmlsZUNob29zZXItPnNl dHRpbmdzKCkuc2VsZWN0ZWRGaWxlczsKIAogICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpSdW5PcGVuUGFuZWwoc3RhdGljX2Nhc3Q8V2ViRnJhbWVMb2FkZXJDbGllbnQq PihmcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpKS0+d2ViRnJhbWUoKS0+ZnJhbWVJRCgpLCBwYXJh bWV0ZXJzKSk7Cg==