39486 2010-05-21 07:26:23 -0700 Regression: Database origins aren't populated at launch (missing db in prefs sheet, possible other symptoms) 2010-06-17 01:38:46 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) PC All RESOLVED FIXED InRadar, Regression P2 Normal --- 1 aroben beidson beidson dglazkov dumi hamaji webkit.review.bot oldest_to_newest 228896 0 aroben 2010-05-21 07:26:23 -0700 To reproduce: 1. Go to http://webkit.org/misc/DatabaseExample.html 2. Make a few notes 3. Go to Preferences > Security > Show Databases No databases are listed. But there should be a database for webkit.org! 228897 1 aroben 2010-05-21 07:26:48 -0700 This happens on both Mac and Windows. 228898 2 aroben 2010-05-21 07:26:53 -0700 <rdar://problem/8013233> 229070 3 beidson 2010-05-21 13:26:46 -0700 The first major cause I've found is http://trac.webkit.org/changeset/57668. Things happen like this: -On launch, WebKit initializes databases in WebKitInitializeDatabasesIfNecessary() -In that method the first thing it tries to do is: DatabaseTracker::tracker().setDatabaseDirectoryPath(databasesDirectoryPath()); -In r57668, populating the origins was moved to the constructor. Other than rote refactoring, it's not immediately clear to me why this was necessary. -So when that initialization code runs, it creates the tracker, whose c'tor tries to populate the origins, but the database path hasn't been set, so that fails. And after it fails once the tracker is in a pretty bogus state. The fix for this might be very, very easy, but I can't get to it for an hour or two. 229152 4 beidson 2010-05-21 15:58:18 -0700 There was a lot of changes and refactoring done in database code that I didn't pay super close attention to, but I think the change to move populateOrigins() into the constructor was misguided, since it forced origin populate on startup for at least 2 ports - even if databases are never to be used. 229181 5 56765 beidson 2010-05-21 17:09:58 -0700 Created attachment 56765 Initialize a DatabaseTracker with it's initial path, instead of setting the path later. I can test this in DRT to make sure it doesn't break again but doing so will require an API-specific test. I plan to followup this patch with that, as this bug is keeping us from doing real work in the short term. 229186 6 webkit.review.bot 2010-05-21 17:12:51 -0700 Attachment 56765 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/2312434 229189 7 56767 beidson 2010-05-21 17:31:46 -0700 Created attachment 56767 Same thing, with Chromium build fix 229957 8 beidson 2010-05-24 15:47:01 -0700 Landed in http://trac.webkit.org/changeset/60092 239292 9 hamaji 2010-06-17 01:38:46 -0700 Looks like this issue was fixed? 56765 2010-05-21 17:09:58 -0700 2010-05-21 17:31:46 -0700 Initialize a DatabaseTracker with it's initial path, instead of setting the path later. patch.txt text/plain 8803 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTk3NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMTAtMDUtMjEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERh dGFiYXNlIG9yaWdpbnMgYXJlbid0IHBvcHVsYXRlZCBhdCBsYXVuY2ggKG1pc3NpbmcgZGIgaW4g cHJlZnMgc2hlZXQsIHBvc3NpYmxlIG90aGVyIHN5bXB0b21zKQorICAgICAgICA8cmRhcjovL3By b2JsZW0vODAxMzIzMz4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zOTQ4NgorCisgICAgICAgIEN1cnJlbnRseSwgYSBUcmFja2VyIG5lZWRzIHRvIGtub3cgaXQn cyBwYXRoIGJlZm9yZSBvcmlnaW5zIGFyZSBwb3B1bGF0ZWQuIFRlc3RpbmcgZGF0YWJhc2VzIGFu ZCAKKyAgICAgICAgcmVsYXRlZCBmZWF0dXJlcyBpcyBtYWRlIHZlcnkgZGlmZmljdWx0IHdpdGgg dGhpcyByZWdyZXNzaW9uLCBzbyBpbnN0ZWFkIG9mIGNoYW5naW5nIHRoaW5ncyBpbiBhCisgICAg ICAgIGNvbXBsaWNhdGVkIHdheSB0byBtYWtlIHRoaXMgbm90IHRoZSBjYXNlLCBJJ3ZlIGFkZGVk IGFuICJpbml0aWFsaXplIFRyYWNrZXIgd2l0aCB0aGlzIHBhdGgiIGZ1bmN0aW9uCisgICAgICAg IHRoYXQgY2FsbHMgdGhlIERhdGFiYXNlVHJhY2tlciBjb25zdHJ1Y3RvciB3aXRoIHRoZSBpbml0 aWFsIHBhdGguCisKKyAgICAgICAgSSBjaGVja2VkIHRoZSBvdGhlciBwbGF0Zm9ybXMgYmVzaWRl cyBNYWMgYW5kIFdpbiwgYW5kIG5vbmUgb2YgdGhlbSBzZWVtIHRvIHBlcmZvcm0gdGhlIAorICAg ICAgICAiaW5pdGlhbGl6ZSBkYXRhYmFzZXMgaWYgbmVjZXNzYXJ5IiBzdGVwIGluIHRoZWlyIGlu aXQgcm91dGluZXMsIHNvIHRoaXMgY2hhbmdlIHNob3VsZG4ndCBlZmZlY3QgdGhlbS4KKworICAg ICAgICBObyBuZXcgdGVzdHMuIChBUEkgc3BlY2lmaWMgbGF5b3V0IHRlc3QgaW4gRFJUIGlzIGZv cnRoY29taW5nKQorCisgICAgICAgICogV2ViQ29yZS5iYXNlLmV4cDoKKworICAgICAgICAqIHN0 b3JhZ2UvRGF0YWJhc2VUcmFja2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJh Y2tlcjo6aW5pdGlhbGl6ZVRyYWNrZXIpOiBBZGRlZCB0byBjcmVhdGUgdGhlIHRyYWNrZXIgd2l0 aCBpdHMgaW5pdGlhbCBwYXRoLgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VUcmFja2VyOjp0 cmFja2VyKTogTW92ZSB0aGUgc3RhdGljIHRyYWNrZXIgb3V0IHNvIHRyYWNrZXIoKSBhbmQgaW5p dGlhbGl6ZVRyYWNrZXIoKQorICAgICAgICAgIGNhbiBzaGFyZSBpdC4gQWRkIGEgZmFsbGJhY2sg dG8gbm90IGNoYW5nZSBiZWhhdmlvciBvZiBwbGF0Zm9ybXMgdGhhdCBkb24ndCBjYWxsIHRoZSBu ZXcgCisgICAgICAgICAgImluaXRpYWxpemVUcmFja2VyKCkiIG1ldGhvZC4KKyAgICAgICAgKFdl YkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6RGF0YWJhc2VUcmFja2VyKTogQ2hhbmdlZCB0byB0YWtl IHRoZSBpbml0aWFsIHBhdGggYXMgYW4gYXJndW1lbnQuCisgICAgICAgICogc3RvcmFnZS9EYXRh YmFzZVRyYWNrZXIuaDoKKwogMjAxMC0wNS0yMSAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KSW5kZXg6IFdlYkNvcmUv V2ViQ29yZS5iYXNlLmV4cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAJ KHJldmlzaW9uIDU5OTc2KQorKysgV2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwCSh3b3JraW5nIGNv cHkpCkBAIC0zNDMsNiArMzQzLDcgQEAgX19aTjdXZWJDb3JlMTVEYXRhYmFzZVRyYWNrZXIxMmRl bGV0ZU9yaQogX19aTjdXZWJDb3JlMTVEYXRhYmFzZVRyYWNrZXIxNGRlbGV0ZURhdGFiYXNlRVBO U18xNFNlY3VyaXR5T3JpZ2luRVJLTlNfNlN0cmluZ0UKIF9fWk43V2ViQ29yZTE1RGF0YWJhc2VU cmFja2VyMTRxdW90YUZvck9yaWdpbkVQTlNfMTRTZWN1cml0eU9yaWdpbkUKIF9fWk43V2ViQ29y ZTE1RGF0YWJhc2VUcmFja2VyMTR1c2FnZUZvck9yaWdpbkVQTlNfMTRTZWN1cml0eU9yaWdpbkUK K19fWk43V2ViQ29yZTE1RGF0YWJhc2VUcmFja2VyMTdpbml0aWFsaXplVHJhY2tlckVSS05TXzZT dHJpbmdFCiBfX1pON1dlYkNvcmUxNURhdGFiYXNlVHJhY2tlcjE4ZGVsZXRlQWxsRGF0YWJhc2Vz RXYKIF9fWk43V2ViQ29yZTE1RGF0YWJhc2VUcmFja2VyMjJkYXRhYmFzZU5hbWVzRm9yT3JpZ2lu RVBOU18xNFNlY3VyaXR5T3JpZ2luRVJOM1dURjZWZWN0b3JJTlNfNlN0cmluZ0VMbTBFRUUKIF9f Wk43V2ViQ29yZTE1RGF0YWJhc2VUcmFja2VyMjNkZXRhaWxzRm9yTmFtZUFuZE9yaWdpbkVSS05T XzZTdHJpbmdFUE5TXzE0U2VjdXJpdHlPcmlnaW5FCkluZGV4OiBXZWJDb3JlL3N0b3JhZ2UvRGF0 YWJhc2VUcmFja2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VU cmFja2VyLmNwcAkocmV2aXNpb24gNTk5NzYpCisrKyBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VU cmFja2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTcsMTUgKzU3LDMwIEBAIHN0YXRpYyBXZWJD b3JlOjpPcmlnaW5RdW90YU1hbmFnZXImIG9yaWcKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitz dGF0aWMgRGF0YWJhc2VUcmFja2VyKiBzdGF0aWNUcmFja2VyID0gMDsKKwordm9pZCBEYXRhYmFz ZVRyYWNrZXI6OmluaXRpYWxpemVUcmFja2VyKGNvbnN0IFN0cmluZyYgZGF0YWJhc2VQYXRoKQor eworICAgIEFTU0VSVCghc3RhdGljVHJhY2tlcik7CisgICAgaWYgKHN0YXRpY1RyYWNrZXIpCisg ICAgICAgIHJldHVybjsKKworICAgIHN0YXRpY1RyYWNrZXIgPSBuZXcgRGF0YWJhc2VUcmFja2Vy KGRhdGFiYXNlUGF0aCk7Cit9CisKIERhdGFiYXNlVHJhY2tlciYgRGF0YWJhc2VUcmFja2VyOjp0 cmFja2VyKCkKIHsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKERhdGFiYXNlVHJhY2tlciwgdHJh Y2tlciwgKCkpOwotICAgIHJldHVybiB0cmFja2VyOworICAgIGlmICghc3RhdGljVHJhY2tlcikK KyAgICAgICAgc3RhdGljVHJhY2tlciA9IG5ldyBEYXRhYmFzZVRyYWNrZXIoIiIpOworCisgICAg cmV0dXJuICpzdGF0aWNUcmFja2VyOwogfQogCi1EYXRhYmFzZVRyYWNrZXI6OkRhdGFiYXNlVHJh Y2tlcigpCitEYXRhYmFzZVRyYWNrZXI6OkRhdGFiYXNlVHJhY2tlcihjb25zdCBTdHJpbmcmIGRh dGFiYXNlUGF0aCkKICAgICA6IG1fY2xpZW50KDApCiB7CisgICAgc2V0RGF0YWJhc2VEaXJlY3Rv cnlQYXRoKGRhdGFiYXNlUGF0aCk7CisgICAgCiAgICAgU1FMaXRlRmlsZVN5c3RlbTo6cmVnaXN0 ZXJTUUxpdGVWRlMoKTsKIAogICAgIE11dGV4TG9ja2VyIGxvY2tEYXRhYmFzZShtX2RhdGFiYXNl R3VhcmQpOwpJbmRleDogV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVHJhY2tlci5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZVRyYWNrZXIuaAkocmV2aXNpb24gNTk5NzYp CisrKyBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VUcmFja2VyLmgJKHdvcmtpbmcgY29weSkKQEAg LTU4LDYgKzU4LDcgQEAgc3RydWN0IFNlY3VyaXR5T3JpZ2luVHJhaXRzOwogCiBjbGFzcyBEYXRh YmFzZVRyYWNrZXIgOiBwdWJsaWMgTm9uY29weWFibGUgewogcHVibGljOgorICAgIHN0YXRpYyB2 b2lkIGluaXRpYWxpemVUcmFja2VyKGNvbnN0IFN0cmluZyYgZGF0YWJhc2VQYXRoKTsKICAgICBz dGF0aWMgRGF0YWJhc2VUcmFja2VyJiB0cmFja2VyKCk7CiAgICAgLy8gVGhpcyBzaW5nbGV0b24g d2lsbCBwb3RlbnRpYWxseSBiZSB1c2VkIGZyb20gbXVsdGlwbGUgd29ya2VyIHRocmVhZHMgYW5k IHRoZSBwYWdlJ3MgY29udGV4dCB0aHJlYWQgc2ltdWx0YW5lb3VzbHkuICBUbyBrZWVwIHRoaXMg c2FmZSwgaXQncwogICAgIC8vIGN1cnJlbnRseSB1c2luZyA0IGxvY2tzLiAgSW4gb3JkZXIgdG8g YXZvaWQgZGVhZGxvY2sgd2hlbiB0YWtpbmcgbXVsdGlwbGUgbG9ja3MsIHlvdSBtdXN0IHRha2Ug dGhlbSBpbiB0aGUgY29ycmVjdCBvcmRlcjoKQEAgLTc3LDcgKzc4LDcgQEAgcHVibGljOgogICAg IHZvaWQgZGF0YWJhc2VDaGFuZ2VkKERhdGFiYXNlKik7CiAKIHByaXZhdGU6Ci0gICAgRGF0YWJh c2VUcmFja2VyKCk7CisgICAgRGF0YWJhc2VUcmFja2VyKGNvbnN0IFN0cmluZyYgZGF0YWJhc2VQ YXRoKTsKIAogICAgIHR5cGVkZWYgSGFzaFNldDxEYXRhYmFzZSo+IERhdGFiYXNlU2V0OwogICAg IHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIERhdGFiYXNlU2V0Kj4gRGF0YWJhc2VOYW1lTWFwOwpJ bmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9DaGFu Z2VMb2cJKHJldmlzaW9uIDU5OTc2KQorKysgV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wNS0yMSAgQnJhZHkgRWlkc29uICA8YmVpZHNv bkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRGF0YWJhc2Ugb3JpZ2lucyBhcmVuJ3QgcG9wdWxhdGVkIGF0IGxhdW5jaCAobWlzc2lu ZyBkYiBpbiBwcmVmcyBzaGVldCwgcG9zc2libGUgb3RoZXIgc3ltcHRvbXMpCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS84MDEzMjMzPiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTM5NDg2CisKKyAgICAgICAgKiBTdG9yYWdlL1dlYkRhdGFiYXNlTWFuYWdlci5t bToKKyAgICAgICAgKFdlYktpdEluaXRpYWxpemVEYXRhYmFzZXNJZk5lY2Vzc2FyeSk6IENhbGwg aW5pdGlhbGl6ZVRyYWNrZXIoKSBpbnN0ZWFkIG9mIHRyeWluZyB0byBzZXQgdGhlIHBhdGggb24K KyAgICAgICAgICBhbiBhbHJlYWR5IGNyZWF0ZWQgdHJhY2tlciB0aGF0IGFscmVhZHkgaGFzIGl0 cyBvcmlnaW5zIHBvcHVsYXRlZC4KKwogMjAxMC0wNS0yMSAgRGF2aWQgSHlhdHQgIDxoeWF0dEBh cHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KSW5kZXg6IFdl YktpdC9tYWMvU3RvcmFnZS9XZWJEYXRhYmFzZU1hbmFnZXIubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L21hYy9TdG9yYWdlL1dlYkRhdGFiYXNlTWFuYWdlci5tbQkocmV2aXNpb24gNTk5NzYpCisr KyBXZWJLaXQvbWFjL1N0b3JhZ2UvV2ViRGF0YWJhc2VNYW5hZ2VyLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0xMzgsNyArMTM4LDcgQEAgdm9pZCBXZWJLaXRJbml0aWFsaXplRGF0YWJhc2VzSWZOZWNl c3NhcgogICAgICAgICByZXR1cm47CiAKICAgICAvLyBTZXQgdGhlIGRhdGFiYXNlIHJvb3QgcGF0 aCBpbiBXZWJDb3JlCi0gICAgRGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkuc2V0RGF0YWJhc2VE aXJlY3RvcnlQYXRoKGRhdGFiYXNlc0RpcmVjdG9yeVBhdGgoKSk7CisgICAgRGF0YWJhc2VUcmFj a2VyOjppbml0aWFsaXplVHJhY2tlcihkYXRhYmFzZXNEaXJlY3RvcnlQYXRoKCkpOwogCiAgICAg Ly8gU2V0IHRoZSBEYXRhYmFzZVRyYWNrZXJDbGllbnQKICAgICBEYXRhYmFzZVRyYWNrZXI6OnRy YWNrZXIoKS5zZXRDbGllbnQoV2ViRGF0YWJhc2VUcmFja2VyQ2xpZW50OjpzaGFyZWRXZWJEYXRh YmFzZVRyYWNrZXJDbGllbnQoKSk7CkluZGV4OiBXZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvd2luL0NoYW5nZUxvZwkocmV2aXNpb24gNTk5NzYpCisrKyBXZWJLaXQv d2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEwLTA1LTIx ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEYXRhYmFzZSBvcmlnaW5zIGFyZW4ndCBwb3B1 bGF0ZWQgYXQgbGF1bmNoIChtaXNzaW5nIGRiIGluIHByZWZzIHNoZWV0LCBwb3NzaWJsZSBvdGhl ciBzeW1wdG9tcykKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgwMTMyMzM+IGFuZCBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzk0ODYKKworICAgICAgICAqIFdlYkRh dGFiYXNlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXRJbml0aWFsaXplV2ViRGF0YWJhc2Vz SWZOZWNlc3NhcnkpOiBDYWxsIGluaXRpYWxpemVUcmFja2VyKCkgaW5zdGVhZCBvZiB0cnlpbmcg dG8gc2V0IHRoZSBwYXRoIG9uCisgICAgICAgICAgYW4gYWxyZWFkeSBjcmVhdGVkIHRyYWNrZXIg dGhhdCBhbHJlYWR5IGhhcyBpdHMgb3JpZ2lucyBwb3B1bGF0ZWQuCisgICAgICAgICogV2ViRGF0 YWJhc2VNYW5hZ2VyLmg6CisKKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYlZp ZXc6OmluaXRXaXRoRnJhbWUpOiBDYWxsIGEgcmVuYW1lZCBtZXRob2QgaW5zdGVhZC4KKwogMjAx MC0wNS0yMSAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpJbmRleDogV2ViS2l0L3dpbi9XZWJEYXRhYmFzZU1h bmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViRGF0YWJhc2VNYW5hZ2VyLmNw cAkocmV2aXNpb24gNTk5NzYpCisrKyBXZWJLaXQvd2luL1dlYkRhdGFiYXNlTWFuYWdlci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTM3MCwxNiArMzcwLDE2IEBAIHZvaWQgV2ViRGF0YWJhc2VNYW5h Z2VyOjpkaXNwYXRjaERpZE1vZGkKICAgICBub3RpZnlDZW50ZXItPnBvc3ROb3RpZmljYXRpb25O YW1lKGRhdGFiYXNlRGlkTW9kaWZ5T3JpZ2luTmFtZSwgc2VjdXJpdHlPcmlnaW4uZ2V0KCksIHVz ZXJJbmZvQmFnLmdldCgpKTsKIH0KIAotdm9pZCBXZWJLaXRTZXRXZWJEYXRhYmFzZXNQYXRoSWZO ZWNlc3NhcnkoKQordm9pZCBXZWJLaXRJbml0aWFsaXplV2ViRGF0YWJhc2VzSWZOZWNlc3Nhcnko KQogewotICAgIHN0YXRpYyBib29sIHBhdGhTZXQgPSBmYWxzZTsKLSAgICBpZiAocGF0aFNldCkK KyAgICBzdGF0aWMgYm9vbCBpbml0aWFsaXplZCA9IGZhbHNlOworICAgIGlmIChpbml0aWFsaXpl ZCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgV2ViQ29yZTo6U3RyaW5nIGRhdGFiYXNlc0RpcmVj dG9yeSA9IFdlYkNvcmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChXZWJDb3JlOjpsb2NhbFVz ZXJTcGVjaWZpY1N0b3JhZ2VEaXJlY3RvcnkoKSwgIkRhdGFiYXNlcyIpOwotICAgIFdlYkNvcmU6 OkRhdGFiYXNlVHJhY2tlcjo6dHJhY2tlcigpLnNldERhdGFiYXNlRGlyZWN0b3J5UGF0aChkYXRh YmFzZXNEaXJlY3RvcnkpOworICAgIFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6aW5pdGlhbGl6 ZVRyYWNrZXIoZGF0YWJhc2VzRGlyZWN0b3J5KTsKIAotICAgIHBhdGhTZXQgPSB0cnVlOworICAg IGluaXRpYWxpemVkID0gdHJ1ZTsKIH0KIAogI2VuZGlmCkluZGV4OiBXZWJLaXQvd2luL1dlYkRh dGFiYXNlTWFuYWdlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViRGF0YWJhc2VNYW5h Z2VyLmgJKHJldmlzaW9uIDU5OTc2KQorKysgV2ViS2l0L3dpbi9XZWJEYXRhYmFzZU1hbmFnZXIu aAkod29ya2luZyBjb3B5KQpAQCAtODgsNyArODgsNyBAQCBwcml2YXRlOgogICAgIFVMT05HIG1f cmVmQ291bnQ7CiB9OwogCi12b2lkIFdlYktpdFNldFdlYkRhdGFiYXNlc1BhdGhJZk5lY2Vzc2Fy eSgpOwordm9pZCBXZWJLaXRJbml0aWFsaXplV2ViRGF0YWJhc2VzSWZOZWNlc3NhcnkoKTsKIAog I2VuZGlmCiAKSW5kZXg6IFdlYktpdC93aW4vV2ViVmlldy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L3dpbi9XZWJWaWV3LmNwcAkocmV2aXNpb24gNTk5NzYpCisrKyBXZWJLaXQvd2luL1dlYlZp ZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTQ2LDcgKzI1NDYsNyBAQCBIUkVTVUxUIFNURE1F VEhPRENBTExUWVBFIFdlYlZpZXc6OmluaXRXCiAKICAgICBJbml0aWFsaXplTG9nZ2luZ0NoYW5u ZWxzSWZOZWNlc3NhcnkoKTsKICNpZiBFTkFCTEUoREFUQUJBU0UpCi0gICAgV2ViS2l0U2V0V2Vi RGF0YWJhc2VzUGF0aElmTmVjZXNzYXJ5KCk7CisgICAgV2ViS2l0SW5pdGlhbGl6ZVdlYkRhdGFi YXNlc0lmTmVjZXNzYXJ5KCk7CiAjZW5kaWYKICAgICBXZWJLaXRTZXRBcHBsaWNhdGlvbkNhY2hl UGF0aElmTmVjZXNzYXJ5KCk7CiAgICAgCg== 56767 2010-05-21 17:31:46 -0700 2010-06-11 13:29:58 -0700 Same thing, with Chromium build fix patch.txt text/plain 9632 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTk3OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzUgQEAKKzIwMTAtMDUtMjEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERh dGFiYXNlIG9yaWdpbnMgYXJlbid0IHBvcHVsYXRlZCBhdCBsYXVuY2ggKG1pc3NpbmcgZGIgaW4g cHJlZnMgc2hlZXQsIHBvc3NpYmxlIG90aGVyIHN5bXB0b21zKQorICAgICAgICA8cmRhcjovL3By b2JsZW0vODAxMzIzMz4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zOTQ4NgorCisgICAgICAgIEN1cnJlbnRseSwgYSBUcmFja2VyIG5lZWRzIHRvIGtub3cgaXQn cyBwYXRoIGJlZm9yZSBvcmlnaW5zIGFyZSBwb3B1bGF0ZWQuIFRlc3RpbmcgZGF0YWJhc2VzIGFu ZCAKKyAgICAgICAgcmVsYXRlZCBmZWF0dXJlcyBpcyBtYWRlIHZlcnkgZGlmZmljdWx0IHdpdGgg dGhpcyByZWdyZXNzaW9uLCBzbyBpbnN0ZWFkIG9mIGNoYW5naW5nIHRoaW5ncyBpbiBhCisgICAg ICAgIGNvbXBsaWNhdGVkIHdheSB0byBtYWtlIHRoaXMgbm90IHRoZSBjYXNlLCBJJ3ZlIGFkZGVk IGFuICJpbml0aWFsaXplIFRyYWNrZXIgd2l0aCB0aGlzIHBhdGgiIGZ1bmN0aW9uCisgICAgICAg IHRoYXQgY2FsbHMgdGhlIERhdGFiYXNlVHJhY2tlciBjb25zdHJ1Y3RvciB3aXRoIHRoZSBpbml0 aWFsIHBhdGguCisKKyAgICAgICAgSSBjaGVja2VkIHRoZSBvdGhlciBwbGF0Zm9ybXMgYmVzaWRl cyBNYWMgYW5kIFdpbiwgYW5kIG5vbmUgb2YgdGhlbSBzZWVtIHRvIHBlcmZvcm0gdGhlIAorICAg ICAgICAiaW5pdGlhbGl6ZSBkYXRhYmFzZXMgaWYgbmVjZXNzYXJ5IiBzdGVwIGluIHRoZWlyIGlu aXQgcm91dGluZXMsIHNvIHRoaXMgY2hhbmdlIHNob3VsZG4ndCBlZmZlY3QgdGhlbS4KKworICAg ICAgICBObyBuZXcgdGVzdHMuIChBUEkgc3BlY2lmaWMgbGF5b3V0IHRlc3QgaW4gRFJUIGlzIGZv cnRoY29taW5nKQorCisgICAgICAgICogV2ViQ29yZS5iYXNlLmV4cDoKKworICAgICAgICAqIHN0 b3JhZ2UvRGF0YWJhc2VUcmFja2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJh Y2tlcjo6aW5pdGlhbGl6ZVRyYWNrZXIpOiBBZGRlZCB0byBjcmVhdGUgdGhlIHRyYWNrZXIgd2l0 aCBpdHMgaW5pdGlhbCBwYXRoLgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VUcmFja2VyOjp0 cmFja2VyKTogTW92ZSB0aGUgc3RhdGljIHRyYWNrZXIgb3V0IHNvIHRyYWNrZXIoKSBhbmQgaW5p dGlhbGl6ZVRyYWNrZXIoKQorICAgICAgICAgIGNhbiBzaGFyZSBpdC4gQWRkIGEgZmFsbGJhY2sg dG8gbm90IGNoYW5nZSBiZWhhdmlvciBvZiBwbGF0Zm9ybXMgdGhhdCBkb24ndCBjYWxsIHRoZSBu ZXcgCisgICAgICAgICAgImluaXRpYWxpemVUcmFja2VyKCkiIG1ldGhvZC4KKyAgICAgICAgKFdl YkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6RGF0YWJhc2VUcmFja2VyKTogQ2hhbmdlZCB0byB0YWtl IHRoZSBpbml0aWFsIHBhdGggYXMgYW4gYXJndW1lbnQuCisgICAgICAgICogc3RvcmFnZS9EYXRh YmFzZVRyYWNrZXIuaDoKKworICAgICAgICAqIHN0b3JhZ2UvY2hyb21pdW0vRGF0YWJhc2VUcmFj a2VyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VUcmFja2VyOjp0cmFj a2VyKTogQWRhcHQgdG8gbmV3IGMndG9yLgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VUcmFj a2VyOjpEYXRhYmFzZVRyYWNrZXIpOiBEaXR0by4KKworCiAyMDEwLTA1LTIxICBHZW9mZnJleSBH YXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRs ZXIuCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9XZWJDb3JlLmJhc2UuZXhwCShyZXZpc2lvbiA1OTk3NikKKysrIFdlYkNvcmUvV2ViQ29yZS5i YXNlLmV4cAkod29ya2luZyBjb3B5KQpAQCAtMzQzLDYgKzM0Myw3IEBAIF9fWk43V2ViQ29yZTE1 RGF0YWJhc2VUcmFja2VyMTJkZWxldGVPcmkKIF9fWk43V2ViQ29yZTE1RGF0YWJhc2VUcmFja2Vy MTRkZWxldGVEYXRhYmFzZUVQTlNfMTRTZWN1cml0eU9yaWdpbkVSS05TXzZTdHJpbmdFCiBfX1pO N1dlYkNvcmUxNURhdGFiYXNlVHJhY2tlcjE0cXVvdGFGb3JPcmlnaW5FUE5TXzE0U2VjdXJpdHlP cmlnaW5FCiBfX1pON1dlYkNvcmUxNURhdGFiYXNlVHJhY2tlcjE0dXNhZ2VGb3JPcmlnaW5FUE5T XzE0U2VjdXJpdHlPcmlnaW5FCitfX1pON1dlYkNvcmUxNURhdGFiYXNlVHJhY2tlcjE3aW5pdGlh bGl6ZVRyYWNrZXJFUktOU182U3RyaW5nRQogX19aTjdXZWJDb3JlMTVEYXRhYmFzZVRyYWNrZXIx OGRlbGV0ZUFsbERhdGFiYXNlc0V2CiBfX1pON1dlYkNvcmUxNURhdGFiYXNlVHJhY2tlcjIyZGF0 YWJhc2VOYW1lc0Zvck9yaWdpbkVQTlNfMTRTZWN1cml0eU9yaWdpbkVSTjNXVEY2VmVjdG9ySU5T XzZTdHJpbmdFTG0wRUVFCiBfX1pON1dlYkNvcmUxNURhdGFiYXNlVHJhY2tlcjIzZGV0YWlsc0Zv ck5hbWVBbmRPcmlnaW5FUktOU182U3RyaW5nRVBOU18xNFNlY3VyaXR5T3JpZ2luRQpJbmRleDog V2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVHJhY2tlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9zdG9yYWdlL0RhdGFiYXNlVHJhY2tlci5jcHAJKHJldmlzaW9uIDU5OTc2KQorKysgV2ViQ29y ZS9zdG9yYWdlL0RhdGFiYXNlVHJhY2tlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU3LDE1ICs1 NywzMCBAQCBzdGF0aWMgV2ViQ29yZTo6T3JpZ2luUXVvdGFNYW5hZ2VyJiBvcmlnCiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAorc3RhdGljIERhdGFiYXNlVHJhY2tlciogc3RhdGljVHJhY2tlciA9 IDA7CisKK3ZvaWQgRGF0YWJhc2VUcmFja2VyOjppbml0aWFsaXplVHJhY2tlcihjb25zdCBTdHJp bmcmIGRhdGFiYXNlUGF0aCkKK3sKKyAgICBBU1NFUlQoIXN0YXRpY1RyYWNrZXIpOworICAgIGlm IChzdGF0aWNUcmFja2VyKQorICAgICAgICByZXR1cm47CisKKyAgICBzdGF0aWNUcmFja2VyID0g bmV3IERhdGFiYXNlVHJhY2tlcihkYXRhYmFzZVBhdGgpOworfQorCiBEYXRhYmFzZVRyYWNrZXIm IERhdGFiYXNlVHJhY2tlcjo6dHJhY2tlcigpCiB7Ci0gICAgREVGSU5FX1NUQVRJQ19MT0NBTChE YXRhYmFzZVRyYWNrZXIsIHRyYWNrZXIsICgpKTsKLSAgICByZXR1cm4gdHJhY2tlcjsKKyAgICBp ZiAoIXN0YXRpY1RyYWNrZXIpCisgICAgICAgIHN0YXRpY1RyYWNrZXIgPSBuZXcgRGF0YWJhc2VU cmFja2VyKCIiKTsKKworICAgIHJldHVybiAqc3RhdGljVHJhY2tlcjsKIH0KIAotRGF0YWJhc2VU cmFja2VyOjpEYXRhYmFzZVRyYWNrZXIoKQorRGF0YWJhc2VUcmFja2VyOjpEYXRhYmFzZVRyYWNr ZXIoY29uc3QgU3RyaW5nJiBkYXRhYmFzZVBhdGgpCiAgICAgOiBtX2NsaWVudCgwKQogeworICAg IHNldERhdGFiYXNlRGlyZWN0b3J5UGF0aChkYXRhYmFzZVBhdGgpOworICAgIAogICAgIFNRTGl0 ZUZpbGVTeXN0ZW06OnJlZ2lzdGVyU1FMaXRlVkZTKCk7CiAKICAgICBNdXRleExvY2tlciBsb2Nr RGF0YWJhc2UobV9kYXRhYmFzZUd1YXJkKTsKSW5kZXg6IFdlYkNvcmUvc3RvcmFnZS9EYXRhYmFz ZVRyYWNrZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VUcmFja2Vy LmgJKHJldmlzaW9uIDU5OTc2KQorKysgV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVHJhY2tlci5o CSh3b3JraW5nIGNvcHkpCkBAIC01OCw2ICs1OCw3IEBAIHN0cnVjdCBTZWN1cml0eU9yaWdpblRy YWl0czsKIAogY2xhc3MgRGF0YWJhc2VUcmFja2VyIDogcHVibGljIE5vbmNvcHlhYmxlIHsKIHB1 YmxpYzoKKyAgICBzdGF0aWMgdm9pZCBpbml0aWFsaXplVHJhY2tlcihjb25zdCBTdHJpbmcmIGRh dGFiYXNlUGF0aCk7CiAgICAgc3RhdGljIERhdGFiYXNlVHJhY2tlciYgdHJhY2tlcigpOwogICAg IC8vIFRoaXMgc2luZ2xldG9uIHdpbGwgcG90ZW50aWFsbHkgYmUgdXNlZCBmcm9tIG11bHRpcGxl IHdvcmtlciB0aHJlYWRzIGFuZCB0aGUgcGFnZSdzIGNvbnRleHQgdGhyZWFkIHNpbXVsdGFuZW91 c2x5LiAgVG8ga2VlcCB0aGlzIHNhZmUsIGl0J3MKICAgICAvLyBjdXJyZW50bHkgdXNpbmcgNCBs b2Nrcy4gIEluIG9yZGVyIHRvIGF2b2lkIGRlYWRsb2NrIHdoZW4gdGFraW5nIG11bHRpcGxlIGxv Y2tzLCB5b3UgbXVzdCB0YWtlIHRoZW0gaW4gdGhlIGNvcnJlY3Qgb3JkZXI6CkBAIC03Nyw3ICs3 OCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRhdGFiYXNlQ2hhbmdlZChEYXRhYmFzZSopOwogCiBw cml2YXRlOgotICAgIERhdGFiYXNlVHJhY2tlcigpOworICAgIERhdGFiYXNlVHJhY2tlcihjb25z dCBTdHJpbmcmIGRhdGFiYXNlUGF0aCk7CiAKICAgICB0eXBlZGVmIEhhc2hTZXQ8RGF0YWJhc2Uq PiBEYXRhYmFzZVNldDsKICAgICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBEYXRhYmFzZVNldCo+ IERhdGFiYXNlTmFtZU1hcDsKSW5kZXg6IFdlYkNvcmUvc3RvcmFnZS9jaHJvbWl1bS9EYXRhYmFz ZVRyYWNrZXJDaHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdG9yYWdlL2Nocm9t aXVtL0RhdGFiYXNlVHJhY2tlckNocm9taXVtLmNwcAkocmV2aXNpb24gNTk5NzYpCisrKyBXZWJD b3JlL3N0b3JhZ2UvY2hyb21pdW0vRGF0YWJhc2VUcmFja2VyQ2hyb21pdW0uY3BwCSh3b3JraW5n IGNvcHkpCkBAIC00OCwxMSArNDgsMTEgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBEYXRhYmFz ZVRyYWNrZXImIERhdGFiYXNlVHJhY2tlcjo6dHJhY2tlcigpCiB7Ci0gICAgREVGSU5FX1NUQVRJ Q19MT0NBTChEYXRhYmFzZVRyYWNrZXIsIHRyYWNrZXIsICgpKTsKKyAgICBERUZJTkVfU1RBVElD X0xPQ0FMKERhdGFiYXNlVHJhY2tlciwgdHJhY2tlciwgKCIiKSk7CiAgICAgcmV0dXJuIHRyYWNr ZXI7CiB9CiAKLURhdGFiYXNlVHJhY2tlcjo6RGF0YWJhc2VUcmFja2VyKCkKK0RhdGFiYXNlVHJh Y2tlcjo6RGF0YWJhc2VUcmFja2VyKGNvbnN0IFN0cmluZyYpCiB7CiAgICAgU1FMaXRlRmlsZVN5 c3RlbTo6cmVnaXN0ZXJTUUxpdGVWRlMoKTsKIH0KSW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1OTk3NikKKysr IFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIw MTAtMDUtMjEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERhdGFiYXNlIG9yaWdpbnMgYXJl bid0IHBvcHVsYXRlZCBhdCBsYXVuY2ggKG1pc3NpbmcgZGIgaW4gcHJlZnMgc2hlZXQsIHBvc3Np YmxlIG90aGVyIHN5bXB0b21zKQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODAxMzIzMz4gYW5k IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zOTQ4NgorCisgICAgICAg ICogU3RvcmFnZS9XZWJEYXRhYmFzZU1hbmFnZXIubW06CisgICAgICAgIChXZWJLaXRJbml0aWFs aXplRGF0YWJhc2VzSWZOZWNlc3NhcnkpOiBDYWxsIGluaXRpYWxpemVUcmFja2VyKCkgaW5zdGVh ZCBvZiB0cnlpbmcgdG8gc2V0IHRoZSBwYXRoIG9uCisgICAgICAgICAgYW4gYWxyZWFkeSBjcmVh dGVkIHRyYWNrZXIgdGhhdCBhbHJlYWR5IGhhcyBpdHMgb3JpZ2lucyBwb3B1bGF0ZWQuCisKIDIw MTAtMDUtMjEgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBXZWJLaXQvbWFjL1N0b3JhZ2UvV2ViRGF0YWJh c2VNYW5hZ2VyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvU3RvcmFnZS9XZWJEYXRhYmFz ZU1hbmFnZXIubW0JKHJldmlzaW9uIDU5OTc2KQorKysgV2ViS2l0L21hYy9TdG9yYWdlL1dlYkRh dGFiYXNlTWFuYWdlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMTM4LDcgKzEzOCw3IEBAIHZvaWQg V2ViS2l0SW5pdGlhbGl6ZURhdGFiYXNlc0lmTmVjZXNzYXIKICAgICAgICAgcmV0dXJuOwogCiAg ICAgLy8gU2V0IHRoZSBkYXRhYmFzZSByb290IHBhdGggaW4gV2ViQ29yZQotICAgIERhdGFiYXNl VHJhY2tlcjo6dHJhY2tlcigpLnNldERhdGFiYXNlRGlyZWN0b3J5UGF0aChkYXRhYmFzZXNEaXJl Y3RvcnlQYXRoKCkpOworICAgIERhdGFiYXNlVHJhY2tlcjo6aW5pdGlhbGl6ZVRyYWNrZXIoZGF0 YWJhc2VzRGlyZWN0b3J5UGF0aCgpKTsKIAogICAgIC8vIFNldCB0aGUgRGF0YWJhc2VUcmFja2Vy Q2xpZW50CiAgICAgRGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkuc2V0Q2xpZW50KFdlYkRhdGFi YXNlVHJhY2tlckNsaWVudDo6c2hhcmVkV2ViRGF0YWJhc2VUcmFja2VyQ2xpZW50KCkpOwpJbmRl eDogV2ViS2l0L3dpbi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3dpbi9DaGFuZ2VM b2cJKHJldmlzaW9uIDU5OTc2KQorKysgV2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wNS0yMSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRGF0YWJhc2Ugb3JpZ2lucyBhcmVuJ3QgcG9wdWxhdGVkIGF0IGxhdW5jaCAobWlzc2luZyBk YiBpbiBwcmVmcyBzaGVldCwgcG9zc2libGUgb3RoZXIgc3ltcHRvbXMpCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS84MDEzMjMzPiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM5NDg2CisKKyAgICAgICAgKiBXZWJEYXRhYmFzZU1hbmFnZXIuY3BwOgorICAgICAg ICAoV2ViS2l0SW5pdGlhbGl6ZVdlYkRhdGFiYXNlc0lmTmVjZXNzYXJ5KTogQ2FsbCBpbml0aWFs aXplVHJhY2tlcigpIGluc3RlYWQgb2YgdHJ5aW5nIHRvIHNldCB0aGUgcGF0aCBvbgorICAgICAg ICAgIGFuIGFscmVhZHkgY3JlYXRlZCB0cmFja2VyIHRoYXQgYWxyZWFkeSBoYXMgaXRzIG9yaWdp bnMgcG9wdWxhdGVkLgorICAgICAgICAqIFdlYkRhdGFiYXNlTWFuYWdlci5oOgorCisgICAgICAg ICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3Ojppbml0V2l0aEZyYW1lKTogQ2FsbCBh IHJlbmFtZWQgbWV0aG9kIGluc3RlYWQuCisKIDIwMTAtMDUtMjEgIFN0ZXZlIEJsb2NrICA8c3Rl dmVibG9ja0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVteSBPcmxvdy4K SW5kZXg6IFdlYktpdC93aW4vV2ViRGF0YWJhc2VNYW5hZ2VyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvd2luL1dlYkRhdGFiYXNlTWFuYWdlci5jcHAJKHJldmlzaW9uIDU5OTc2KQorKysgV2Vi S2l0L3dpbi9XZWJEYXRhYmFzZU1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNzAsMTYg KzM3MCwxNiBAQCB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlcjo6ZGlzcGF0Y2hEaWRNb2RpCiAgICAg bm90aWZ5Q2VudGVyLT5wb3N0Tm90aWZpY2F0aW9uTmFtZShkYXRhYmFzZURpZE1vZGlmeU9yaWdp bk5hbWUsIHNlY3VyaXR5T3JpZ2luLmdldCgpLCB1c2VySW5mb0JhZy5nZXQoKSk7CiB9CiAKLXZv aWQgV2ViS2l0U2V0V2ViRGF0YWJhc2VzUGF0aElmTmVjZXNzYXJ5KCkKK3ZvaWQgV2ViS2l0SW5p dGlhbGl6ZVdlYkRhdGFiYXNlc0lmTmVjZXNzYXJ5KCkKIHsKLSAgICBzdGF0aWMgYm9vbCBwYXRo U2V0ID0gZmFsc2U7Ci0gICAgaWYgKHBhdGhTZXQpCisgICAgc3RhdGljIGJvb2wgaW5pdGlhbGl6 ZWQgPSBmYWxzZTsKKyAgICBpZiAoaW5pdGlhbGl6ZWQpCiAgICAgICAgIHJldHVybjsKIAogICAg IFdlYkNvcmU6OlN0cmluZyBkYXRhYmFzZXNEaXJlY3RvcnkgPSBXZWJDb3JlOjpwYXRoQnlBcHBl bmRpbmdDb21wb25lbnQoV2ViQ29yZTo6bG9jYWxVc2VyU3BlY2lmaWNTdG9yYWdlRGlyZWN0b3J5 KCksICJEYXRhYmFzZXMiKTsKLSAgICBXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIo KS5zZXREYXRhYmFzZURpcmVjdG9yeVBhdGgoZGF0YWJhc2VzRGlyZWN0b3J5KTsKKyAgICBXZWJD b3JlOjpEYXRhYmFzZVRyYWNrZXI6OmluaXRpYWxpemVUcmFja2VyKGRhdGFiYXNlc0RpcmVjdG9y eSk7CiAKLSAgICBwYXRoU2V0ID0gdHJ1ZTsKKyAgICBpbml0aWFsaXplZCA9IHRydWU7CiB9CiAK ICNlbmRpZgpJbmRleDogV2ViS2l0L3dpbi9XZWJEYXRhYmFzZU1hbmFnZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvd2luL1dlYkRhdGFiYXNlTWFuYWdlci5oCShyZXZpc2lvbiA1OTk3NikKKysr IFdlYktpdC93aW4vV2ViRGF0YWJhc2VNYW5hZ2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTg4LDcg Kzg4LDcgQEAgcHJpdmF0ZToKICAgICBVTE9ORyBtX3JlZkNvdW50OwogfTsKIAotdm9pZCBXZWJL aXRTZXRXZWJEYXRhYmFzZXNQYXRoSWZOZWNlc3NhcnkoKTsKK3ZvaWQgV2ViS2l0SW5pdGlhbGl6 ZVdlYkRhdGFiYXNlc0lmTmVjZXNzYXJ5KCk7CiAKICNlbmRpZgogCkluZGV4OiBXZWJLaXQvd2lu L1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViVmlldy5jcHAJKHJldmlz aW9uIDU5OTc2KQorKysgV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjU0Niw3ICsyNTQ2LDcgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJWaWV3Ojppbml0 VwogCiAgICAgSW5pdGlhbGl6ZUxvZ2dpbmdDaGFubmVsc0lmTmVjZXNzYXJ5KCk7CiAjaWYgRU5B QkxFKERBVEFCQVNFKQotICAgIFdlYktpdFNldFdlYkRhdGFiYXNlc1BhdGhJZk5lY2Vzc2FyeSgp OworICAgIFdlYktpdEluaXRpYWxpemVXZWJEYXRhYmFzZXNJZk5lY2Vzc2FyeSgpOwogI2VuZGlm CiAgICAgV2ViS2l0U2V0QXBwbGljYXRpb25DYWNoZVBhdGhJZk5lY2Vzc2FyeSgpOwogICAgIAo=