92933 2012-08-01 19:00:37 -0700 [chromium] Add API to make it possible to request several variants of a WebImage 2012-08-03 20:25:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thakis thakis abarth dglazkov fishd jamesr tkent+wkapi webkit.review.bot oldest_to_newest 684877 0 thakis 2012-08-01 19:00:37 -0700 [chromium] Add API to make it possible to request several variants of a WebImage 684878 1 155948 thakis 2012-08-01 19:01:04 -0700 Created attachment 155948 Patch 684880 2 155948 thakis 2012-08-01 19:01:18 -0700 Comment on attachment 155948 Patch just wip 685903 3 156181 thakis 2012-08-02 15:29:39 -0700 Created attachment 156181 Patch 687173 4 156463 thakis 2012-08-03 14:50:41 -0700 Created attachment 156463 Patch 687176 5 webkit.review.bot 2012-08-03 14:53:06 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 687181 6 156463 abarth 2012-08-03 14:57:12 -0700 Comment on attachment 156463 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156463&action=review > Source/WebKit/chromium/src/WebImageSkia.cpp:92 > + // This is to protect from malicious favicons. It should be big enough that it's never hit in pracice. > + const size_t kMaxFaviconCount = 8; As written, this function doesn't have anything to do with favicons. Maybe we should use a different name for this constant? Also, WebKit doesn't use the k prefix. > Source/WebKit/chromium/src/WebImageSkia.cpp:100 > + // Frames are arranged by decreasing size, then decreasing bit depth. > + // Keep the first frame at every size, has the highest bit depth. Is this true of things other than favicons? I would imagine that a GIF might not follow this rule. 687182 7 abarth 2012-08-03 14:57:45 -0700 Is this function specific to favicons? If so, we should put that in the name somewhere. 687185 8 thakis 2012-08-03 15:02:28 -0700 Thanks! (In reply to comment #6) > (From update of attachment 156463 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=156463&action=review > > > Source/WebKit/chromium/src/WebImageSkia.cpp:92 > > + // This is to protect from malicious favicons. It should be big enough that it's never hit in pracice. > > + const size_t kMaxFaviconCount = 8; > > As written, this function doesn't have anything to do with favicons. Maybe we should use a different name for this constant? Also, WebKit doesn't use the k prefix. Change "favicon" to "frame". WebKit/Source/WTF/wtf/ThreadSpecific.h and a few other places do seem to use it. But constantNamesLikeThis seem most common, so changed to that. > > Source/WebKit/chromium/src/WebImageSkia.cpp:100 > > + // Frames are arranged by decreasing size, then decreasing bit depth. > > + // Keep the first frame at every size, has the highest bit depth. > > Is this true of things other than favicons? I would imagine that a GIF might not follow this rule. WebImage::fromData() above has the same comment. In practice, these functions are only used for favicon-like functionality at the moment, but they aren't inherently favicon-specific. The APIs can't be used to get all frames from a gif, but since that's not needed anywhere at the moment I think that's fine? 687186 9 156466 thakis 2012-08-03 15:02:56 -0700 Created attachment 156466 Patch 687193 10 156466 abarth 2012-08-03 15:08:35 -0700 Comment on attachment 156466 Patch ok 687235 11 156466 fishd 2012-08-03 16:13:41 -0700 Comment on attachment 156466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156466&action=review > Source/WebKit/chromium/src/WebImageSkia.cpp:119 > + return result; nit: you should just be able to write "return frames;" here. It should auto-convert to WebVector for you. See the WebVector(const C&) constructor. 687241 12 156476 thakis 2012-08-03 16:17:28 -0700 Created attachment 156476 Patch for landing 687242 13 thakis 2012-08-03 16:17:43 -0700 > nit: you should just be able to write "return frames;" here. It should auto-convert to WebVector for you. See the WebVector(const C&) constructor. Neat! Done. 687363 14 156476 webkit.review.bot 2012-08-03 20:25:37 -0700 Comment on attachment 156476 Patch for landing Clearing flags on attachment: 156476 Committed r124688: <http://trac.webkit.org/changeset/124688> 687364 15 webkit.review.bot 2012-08-03 20:25:42 -0700 All reviewed patches have been landed. Closing bug. 155948 2012-08-01 19:01:04 -0700 2012-08-02 15:29:38 -0700 Patch bug-92933-20120801190048.patch text/plain 4892 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBmYTU1ODUwNmNiYWFj MzBiZDVmOWI1NzVkYjc4ZDQ0N2Y2YmZjNjBmLi5iY2NhYTdiMTU2YjFjYzVhYTk5YjQ0ZTVlOTVh ODQxYzI4Y2IzMDY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wOC0wMSAg TmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBB ZGQgQVBJIHRvIG1ha2UgaXQgcG9zc2libGUgdG8gcmVxdWVzdCBzZXZlcmFsIHZhcmlhbnRzIG9m IGEgV2ViSW1hZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTkyOTMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBjaHJvbWl1bS9wdWJsaWMvV2ViSW1hZ2UuaDoKKyAgICAgICAgKFdlYkltYWdlKToKKwog MjAxMi0wNy0zMCAgS2Vpc2hpIEhhdHRvcmkgIDxrZWlzaGlAd2Via2l0Lm9yZz4KIAogICAgICAg ICBJbXBsZW1lbnQgZGF0YWxpc3QgVUkgZm9yIGlucHV0IHR5cGUgY29sb3IgZm9yIENocm9taXVt CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDVkMDc4MTdmMGMxZDJiZDliM2E1MGE4MTcz ODg3NzZmZmI5MmEzNTMuLmUzYjc5NWIwNGVhM2M0MTQ0OTlhN2FiMDRmYzY5NzJjZWU0ZDcwZGEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDgtMDEg IE5pY28gV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g QWRkIEFQSSB0byBtYWtlIGl0IHBvc3NpYmxlIHRvIHJlcXVlc3Qgc2V2ZXJhbCB2YXJpYW50cyBv ZiBhIFdlYkltYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05MjkzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogc3JjL1dlYkltYWdlU2tpYS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkltYWdlOjpm cmFtZXNGcm9tRGF0YSk6CisgICAgICAgIChXZWJLaXQpOgorCiAyMDEyLTA3LTMxICBTaGVyaWZm IEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMTI0MTc5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9t aXVtL3B1YmxpYy9XZWJJbWFnZS5oIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9X ZWJJbWFnZS5oCmluZGV4IDI5YmVmMWMzNDA5N2I5ZmVhNzc0ZjY4YmNhMDEwZGJlMDJkY2FjOTQu LjBjYTgxZmMwOGZmZGMyNDEzYzIzNzUxZWVjMWEyYTk1YmZlMzRmZTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViSW1hZ2UuaAorKysgYi9Tb3VyY2UvUGxh dGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkltYWdlLmgKQEAgLTMyLDYgKzMyLDcgQEAKICNkZWZp bmUgV2ViSW1hZ2VfaAogCiAjaW5jbHVkZSAiV2ViQ29tbW9uLmgiCisjaW5jbHVkZSAiV2ViVmVj dG9yLmgiCiAKICNpbmNsdWRlIDxTa0JpdG1hcC5oPgogCkBAIC02OCw2ICs2OSwxNCBAQCBwdWJs aWM6CiAgICAgLy8gdGhlIGZpcnN0IGZyYW1lIGlzIHJldHVybmVkLgogICAgIFdFQktJVF9FWFBP UlQgc3RhdGljIFdlYkltYWdlIGZyb21EYXRhKGNvbnN0IFdlYkRhdGEmLCBjb25zdCBXZWJTaXpl JiBkZXNpcmVkU2l6ZSk7CiAKKyAgICAvLyBSZXR1cm5zIGEgbGlzdCBvZiBhbGwgZnJhbWVzIGlu IHRoZSBpbWFnZS4gT25seSBpbWFnZXMgd2hvc2Ugc2l6ZSBpcworICAgIC8vIGluIGRlc2lyZWRT aXplcyB3aWxsIGhhdmUgZGVjb2RlZCBpbWFnZSBkYXRhLCB0aGUgb3RoZXIgaW1hZ2VzIHdpbGwK KyAgICAvLyBiZSBudWxsIGltYWdlcyBhbmQgd2lsbCBvbmx5IGhhdmUgdmFsaWQgZGltZW5zaW9u cy4gSWYgdGhlcmUgYXJlIG11bHRpcGxlCisgICAgLy8gZnJhbWVzIGF0IHRoZSBzYW1lIHNpemUs IG9ubHkgdGhlIGZpcnN0IG9mIHRoZW0gaXMgcmV0dXJuZWQuCisgICAgLy8gSWYgbm9uZSBvZiB0 aGUgZGVzaXJlZFNpemVzIGlzIHByZXNlbnQsIGEgYmVzdC1lZmZvcnQgbWF0Y2ggaXMgcmV0dXJu ZWQKKyAgICAvLyBmb3IgZGVzaXJlZFNpemVzWzBdLgorICAgIFdFQktJVF9FWFBPUlQgc3RhdGlj IFdlYlZlY3RvcjxXZWJJbWFnZT4gZnJhbWVzRnJvbURhdGEoY29uc3QgV2ViRGF0YSYsIGNvbnN0 IFdlYlZlY3RvcjxXZWJTaXplPiYgZGVzaXJlZFNpemVzKTsKKwogICAgIFdFQktJVF9FWFBPUlQg dm9pZCByZXNldCgpOwogICAgIFdFQktJVF9FWFBPUlQgdm9pZCBhc3NpZ24oY29uc3QgV2ViSW1h Z2UmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW1hZ2VT a2lhLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkltYWdlU2tpYS5jcHAKaW5k ZXggMzZkYWJhYzNlNTVmOTc3OTAxYTliMmMzMTJiZDVlYWQ0NWYwM2U2ZS4uZDFjYzUyZmZjNjAw NDZlN2QzZmMyZDRkYzVlMDVkMDU3MTE1OTZkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViSW1hZ2VTa2lhLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJJbWFnZVNraWEuY3BwCkBAIC04NCw2ICs4NCw1OSBAQCBXZWJJbWFnZSBXZWJJbWFn ZTo6ZnJvbURhdGEoY29uc3QgV2ViRGF0YSYgZGF0YSwgY29uc3QgV2ViU2l6ZSYgZGVzaXJlZFNp emUpCiAgICAgcmV0dXJuIFdlYkltYWdlKGZyYW1lLT5iaXRtYXAoKSk7CiB9CiAKK1dlYlZlY3Rv cjxXZWJJbWFnZT4gV2ViSW1hZ2U6OmZyYW1lc0Zyb21EYXRhKGNvbnN0IFdlYkRhdGEmIGRhdGEs IGNvbnN0IFdlYlZlY3RvcjxXZWJTaXplPiYgZGVzaXJlZFNpemVzKQoreworICAgIEltYWdlU291 cmNlIHNvdXJjZTsKKyAgICBzb3VyY2Uuc2V0RGF0YShQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4o ZGF0YSkuZ2V0KCksIHRydWUpOworICAgIGlmICghc291cmNlLmlzU2l6ZUF2YWlsYWJsZSgpKQor ICAgICAgICByZXR1cm4gV2ViVmVjdG9yPFdlYkltYWdlPigpOworCisgICAgLy8gRnJhbWVzIGFy ZSBhcnJhbmdlZCBieSBkZWNyZWFzaW5nIHNpemUsIHRoZW4gZGVjcmVhc2luZyBiaXQgZGVwdGgu CisgICAgLy8gUGljayB0aGUgZnJhbWUgY2xvc2VzdCB0byB8ZGVzaXJlZFNpemV8J3MgYXJlYSB3 aXRob3V0IGJlaW5nIHNtYWxsZXIsCisgICAgLy8gd2hpY2ggaGFzIHRoZSBoaWdoZXN0IGJpdCBk ZXB0aC4KKyAgICBjb25zdCBzaXplX3QgZnJhbWVDb3VudCA9IHNvdXJjZS5mcmFtZUNvdW50KCk7 CisgICAgSW50U2l6ZSBsYXN0U2l6ZTsKKworICAgIHNpemVfdCBudW1EaXN0aW5jdFNpemVzID0g MDsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGZyYW1lQ291bnQ7ICsraSkgeworICAgICAg ICBjb25zdCBJbnRTaXplIGZyYW1lU2l6ZSA9IHNvdXJjZS5mcmFtZVNpemVBdEluZGV4KGkpOwor ICAgICAgICBpZiAoZnJhbWVTaXplID09IGxhc3RTaXplKQorICAgICAgICAgICAgY29udGludWU7 CisgICAgICAgIGxhc3RTaXplID0gZnJhbWVTaXplOworICAgICAgICArK251bURpc3RpbmN0U2l6 ZXM7CisgICAgfQorCisgICAgV2ViVmVjdG9yPFdlYkltYWdlPiByZXN1bHQobnVtRGlzdGluY3RT aXplcyk7CisKKyAgICBsYXN0U2l6ZSA9IEludFNpemUoKTsKKyAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IGZyYW1lQ291bnQ7ICsraSkgeworICAgICAgICBjb25zdCBJbnRTaXplIGZyYW1lU2l6 ZSA9IHNvdXJjZS5mcmFtZVNpemVBdEluZGV4KGkpOworICAgICAgICBpZiAoZnJhbWVTaXplID09 IGxhc3RTaXplKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIGxhc3RTaXplID0gZnJh bWVTaXplOworCisgICAgICAgIGJvb2wgZGVjb2RlID0gZmFsc2U7CisgICAgICAgIC8vIGRlc2ly ZWRTaXplcyBoYXMgPD0gNCBlbGVtZW50cyBpbiBwcmFjdGljZSwgc28gYSBuZXN0ZWQgbG9vcCBp cyBmaW5lLgorICAgICAgICBmb3IgKHNpemVfdCBqID0gMDsgaiA8IGRlc2lyZWRTaXplcy5zaXpl KCk7ICsraikKKyAgICAgICAgICAgIGlmIChkZXNpcmVkU2l6ZXNbal0gPT0gV2ViU2l6ZShmcmFt ZVNpemUpKQorICAgICAgICAgICAgICAgIGRlY29kZSA9IHRydWU7CisKKyAgICAgICAgaWYgKGRl Y29kZSkgeworICAgICAgICAgICAgT3duUHRyPE5hdGl2ZUltYWdlU2tpYT4gZnJhbWUgPSBhZG9w dFB0cihzb3VyY2UuY3JlYXRlRnJhbWVBdEluZGV4KGkpKTsKKyAgICAgICAgICAgIGlmIChmcmFt ZSkgeworICAgICAgICAgICAgICAgIHJlc3VsdFtpXSA9IFdlYkltYWdlKGZyYW1lLT5iaXRtYXAo KSk7CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAgIH0K KworICAgICAgICBTa0JpdG1hcCBiaXRtYXA7CisgICAgICAgIGJpdG1hcC5zZXRDb25maWcoU2tC aXRtYXA6OmtOb19Db25maWcsIGZyYW1lU2l6ZS53aWR0aCgpLCBmcmFtZVNpemUuaGVpZ2h0KCks IDApOworICAgICAgICAvLyBEb24ndCBhbGxvY2F0ZSBwaXhlbHMuCisgICAgICAgIHJlc3VsdFtp XSA9IFdlYkltYWdlKGJpdG1hcCk7CisgICAgfQorICAgIHJldHVybiByZXN1bHQ7Cit9CisKIHZv aWQgV2ViSW1hZ2U6OnJlc2V0KCkKIHsKICAgICBtX2JpdG1hcC5yZXNldCgpOwo= 156181 2012-08-02 15:29:39 -0700 2012-08-03 14:50:40 -0700 Patch bug-92933-20120802152921.patch text/plain 5066 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBmYTU1ODUwNmNiYWFj MzBiZDVmOWI1NzVkYjc4ZDQ0N2Y2YmZjNjBmLi5iY2NhYTdiMTU2YjFjYzVhYTk5YjQ0ZTVlOTVh ODQxYzI4Y2IzMDY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wOC0wMSAg TmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBB ZGQgQVBJIHRvIG1ha2UgaXQgcG9zc2libGUgdG8gcmVxdWVzdCBzZXZlcmFsIHZhcmlhbnRzIG9m IGEgV2ViSW1hZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTkyOTMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBjaHJvbWl1bS9wdWJsaWMvV2ViSW1hZ2UuaDoKKyAgICAgICAgKFdlYkltYWdlKToKKwog MjAxMi0wNy0zMCAgS2Vpc2hpIEhhdHRvcmkgIDxrZWlzaGlAd2Via2l0Lm9yZz4KIAogICAgICAg ICBJbXBsZW1lbnQgZGF0YWxpc3QgVUkgZm9yIGlucHV0IHR5cGUgY29sb3IgZm9yIENocm9taXVt CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDVkMDc4MTdmMGMxZDJiZDliM2E1MGE4MTcz ODg3NzZmZmI5MmEzNTMuLmUzYjc5NWIwNGVhM2M0MTQ0OTlhN2FiMDRmYzY5NzJjZWU0ZDcwZGEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDgtMDEg IE5pY28gV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g QWRkIEFQSSB0byBtYWtlIGl0IHBvc3NpYmxlIHRvIHJlcXVlc3Qgc2V2ZXJhbCB2YXJpYW50cyBv ZiBhIFdlYkltYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05MjkzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogc3JjL1dlYkltYWdlU2tpYS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkltYWdlOjpm cmFtZXNGcm9tRGF0YSk6CisgICAgICAgIChXZWJLaXQpOgorCiAyMDEyLTA3LTMxICBTaGVyaWZm IEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMTI0MTc5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9t aXVtL3B1YmxpYy9XZWJJbWFnZS5oIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9X ZWJJbWFnZS5oCmluZGV4IDI5YmVmMWMzNDA5N2I5ZmVhNzc0ZjY4YmNhMDEwZGJlMDJkY2FjOTQu LmE4ZmVmNTRhZDc1MDczNDAzNzU2MjEzZDE5MDJjNTdlZmZmOTUxNjcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViSW1hZ2UuaAorKysgYi9Tb3VyY2UvUGxh dGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkltYWdlLmgKQEAgLTMyLDYgKzMyLDcgQEAKICNkZWZp bmUgV2ViSW1hZ2VfaAogCiAjaW5jbHVkZSAiV2ViQ29tbW9uLmgiCisjaW5jbHVkZSAiV2ViVmVj dG9yLmgiCiAKICNpbmNsdWRlIDxTa0JpdG1hcC5oPgogCkBAIC02OCw2ICs2OSwxNCBAQCBwdWJs aWM6CiAgICAgLy8gdGhlIGZpcnN0IGZyYW1lIGlzIHJldHVybmVkLgogICAgIFdFQktJVF9FWFBP UlQgc3RhdGljIFdlYkltYWdlIGZyb21EYXRhKGNvbnN0IFdlYkRhdGEmLCBjb25zdCBXZWJTaXpl JiBkZXNpcmVkU2l6ZSk7CiAKKyAgICAvLyBSZXR1cm5zIGEgbGlzdCBvZiBhbGwgZnJhbWVzIGlu IHRoZSBpbWFnZS4gT25seSBpbWFnZXMgd2hvc2Ugc2l6ZSBpcworICAgIC8vIGluIGRlc2lyZWRT aXplcyB3aWxsIGhhdmUgZGVjb2RlZCBpbWFnZSBkYXRhLCB0aGUgb3RoZXIgaW1hZ2VzIHdpbGwK KyAgICAvLyBiZSBudWxsIGltYWdlcyBhbmQgd2lsbCBvbmx5IGhhdmUgdmFsaWQgZGltZW5zaW9u cy4gSWYgdGhlcmUgYXJlIG11bHRpcGxlCisgICAgLy8gZnJhbWVzIGF0IHRoZSBzYW1lIHNpemUs IG9ubHkgdGhlIGZpcnN0IG9mIHRoZW0gaXMgcmV0dXJuZWQuCisgICAgLy8gKElmIG5vbmUgb2Yg dGhlIGRlc2lyZWRTaXplcyBpcyBwcmVzZW50LCBhIGJlc3QtZWZmb3J0IG1hdGNoIGlzIHJldHVy bmVkCisgICAgLy8gZm9yIGRlc2lyZWRTaXplc1swXS4gWFhYPyBtYXliZSBhbHdheXMgYmVzdC1l ZmZvcnQgZm9yIGZpcnN0IHNpemU/CisgICAgV0VCS0lUX0VYUE9SVCBzdGF0aWMgV2ViVmVjdG9y PFdlYkltYWdlPiBmcmFtZXNGcm9tRGF0YShjb25zdCBXZWJEYXRhJiwgY29uc3QgV2ViVmVjdG9y PFdlYlNpemU+JiBkZXNpcmVkU2l6ZXMpOworCiAgICAgV0VCS0lUX0VYUE9SVCB2b2lkIHJlc2V0 KCk7CiAgICAgV0VCS0lUX0VYUE9SVCB2b2lkIGFzc2lnbihjb25zdCBXZWJJbWFnZSYpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbWFnZVNraWEuY3BwIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW1hZ2VTa2lhLmNwcAppbmRleCAzNmRhYmFj M2U1NWY5Nzc5MDFhOWIyYzMxMmJkNWVhZDQ1ZjAzZTZlLi41YjExMmQ3YWYzNWI1ZTEzZTUzN2I3 ZWJlMTllY2UwYTlmMTkyMTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJJbWFnZVNraWEuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklt YWdlU2tpYS5jcHAKQEAgLTg0LDYgKzg0LDYzIEBAIFdlYkltYWdlIFdlYkltYWdlOjpmcm9tRGF0 YShjb25zdCBXZWJEYXRhJiBkYXRhLCBjb25zdCBXZWJTaXplJiBkZXNpcmVkU2l6ZSkKICAgICBy ZXR1cm4gV2ViSW1hZ2UoZnJhbWUtPmJpdG1hcCgpKTsKIH0KIAorV2ViVmVjdG9yPFdlYkltYWdl PiBXZWJJbWFnZTo6ZnJhbWVzRnJvbURhdGEoY29uc3QgV2ViRGF0YSYgZGF0YSwgY29uc3QgV2Vi VmVjdG9yPFdlYlNpemU+JiBkZXNpcmVkU2l6ZXMpCit7CisgICAgSW1hZ2VTb3VyY2Ugc291cmNl OworICAgIHNvdXJjZS5zZXREYXRhKFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPihkYXRhKS5nZXQo KSwgdHJ1ZSk7CisgICAgaWYgKCFzb3VyY2UuaXNTaXplQXZhaWxhYmxlKCkpCisgICAgICAgIHJl dHVybiBXZWJWZWN0b3I8V2ViSW1hZ2U+KCk7CisKKyAgICAvLyBGcmFtZXMgYXJlIGFycmFuZ2Vk IGJ5IGRlY3JlYXNpbmcgc2l6ZSwgdGhlbiBkZWNyZWFzaW5nIGJpdCBkZXB0aC4KKyAgICAvLyBQ aWNrIHRoZSBmcmFtZSBjbG9zZXN0IHRvIHxkZXNpcmVkU2l6ZXwncyBhcmVhIHdpdGhvdXQgYmVp bmcgc21hbGxlciwKKyAgICAvLyB3aGljaCBoYXMgdGhlIGhpZ2hlc3QgYml0IGRlcHRoLgorICAg IGNvbnN0IHNpemVfdCBmcmFtZUNvdW50ID0gc291cmNlLmZyYW1lQ291bnQoKTsKKyAgICBJbnRT aXplIGxhc3RTaXplOworCisgICAgc2l6ZV90IG51bURpc3RpbmN0U2l6ZXMgPSAwOworICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgZnJhbWVDb3VudDsgKytpKSB7CisgICAgICAgIGNvbnN0IElu dFNpemUgZnJhbWVTaXplID0gc291cmNlLmZyYW1lU2l6ZUF0SW5kZXgoaSk7CisgICAgICAgIGlm IChmcmFtZVNpemUgPT0gbGFzdFNpemUpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg bGFzdFNpemUgPSBmcmFtZVNpemU7CisgICAgICAgICsrbnVtRGlzdGluY3RTaXplczsKKyAgICB9 CisKKyAgICBXZWJWZWN0b3I8V2ViSW1hZ2U+IHJlc3VsdChudW1EaXN0aW5jdFNpemVzKTsKKwor ICAgIGxhc3RTaXplID0gSW50U2l6ZSgpOworICAgIGludCBqID0gLTE7CisgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBmcmFtZUNvdW50OyArK2kpIHsKKyAgICAgICAgY29uc3QgSW50U2l6ZSBm cmFtZVNpemUgPSBzb3VyY2UuZnJhbWVTaXplQXRJbmRleChpKTsKKyAgICAgICAgaWYgKGZyYW1l U2l6ZSA9PSBsYXN0U2l6ZSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBsYXN0U2l6 ZSA9IGZyYW1lU2l6ZTsKKyAgICAgICAgKytqOworCisgICAgICAgIGJvb2wgZGVjb2RlID0gZmFs c2U7CisgICAgICAgIC8vIGRlc2lyZWRTaXplcyBoYXMgPD0gNCBlbGVtZW50cyBpbiBwcmFjdGlj ZSwgc28gYSBuZXN0ZWQgbG9vcCBpcyBmaW5lLgorICAgICAgICBmb3IgKHNpemVfdCBrID0gMDsg ayA8IGRlc2lyZWRTaXplcy5zaXplKCk7ICsraykKKyAgICAgICAgICAgIGlmIChkZXNpcmVkU2l6 ZXNba10gPT0gV2ViU2l6ZShmcmFtZVNpemUpKQorICAgICAgICAgICAgICAgIGRlY29kZSA9IHRy dWU7CisKKyAgICAgICAgaWYgKGRlY29kZSkgeworICAgICAgICAgICAgT3duUHRyPE5hdGl2ZUlt YWdlU2tpYT4gZnJhbWUgPSBhZG9wdFB0cihzb3VyY2UuY3JlYXRlRnJhbWVBdEluZGV4KGkpKTsK KyAgICAgICAgICAgIGlmIChmcmFtZSkgeworICAgICAgICAgICAgICAgIHJlc3VsdFtqXSA9IFdl YkltYWdlKGZyYW1lLT5iaXRtYXAoKSk7CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICBTa0JpdG1hcCBiaXRtYXA7CisgICAgICAg IGJpdG1hcC5zZXRDb25maWcoU2tCaXRtYXA6OmtOb19Db25maWcsIGZyYW1lU2l6ZS53aWR0aCgp LCBmcmFtZVNpemUuaGVpZ2h0KCksIDApOworICAgICAgICAvLyBEb24ndCBhbGxvY2F0ZSBwaXhl bHMuCisgICAgICAgIHJlc3VsdFtqXSA9IFdlYkltYWdlKGJpdG1hcCk7CisgICAgfQorICAgIGZw cmludGYoc3RkZXJyLCAiJWQsICV6dVxuIiwgaiwgbnVtRGlzdGluY3RTaXplcyk7CisgICAgQVNT RVJUKGogKyAxID09IG51bURpc3RpbmN0U2l6ZXMpOworICAgIHJldHVybiByZXN1bHQ7Cit9CisK IHZvaWQgV2ViSW1hZ2U6OnJlc2V0KCkKIHsKICAgICBtX2JpdG1hcC5yZXNldCgpOwo= 156463 2012-08-03 14:50:41 -0700 2012-08-03 15:02:51 -0700 Patch bug-92933-20120803145021.patch text/plain 4278 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA1YzNmYmYxOTQ5Mzc4 NzEzZDk2Yzc3OWZlNzYwMzgyN2I3ZmI2NWY3Li5mMzE0MDM5ZjI5YzM2OWMwM2FhZjFiMGZhODU4 OGU4MDZlMDM5YjAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0wOC0wMyAg TmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBB ZGQgQVBJIHRvIG1ha2UgaXQgcG9zc2libGUgdG8gcmVxdWVzdCBhbGwgdmFyaWFudHMgb2YgYSBX ZWJJbWFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTI5MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQ YXJ0IG9mIGh0dHA6Ly9jcmJ1Zy5jb20vMTM4NTUwCisKKyAgICAgICAgKiBjaHJvbWl1bS9wdWJs aWMvV2ViSW1hZ2UuaDoKKyAgICAgICAgKFdlYkltYWdlKToKKwogMjAxMi0wOC0wMiAgQWxleGFu ZHJlIEVsaWFzICA8YWVsaWFzQGdvb2dsZS5jb20+CiAKICAgICAgICAgW2Nocm9taXVtXSBkZXZp Y2VWaWV3cG9ydFNpemUgY2xlYW51cApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCBjMDdi OTI5YTliZDEzMGE3NDAxZDQxYTc3ZDI5YzIxYWM1YzhiYTFhLi44MzU4OTNhMmE5ZjAxNGVlNDFj OWYxZTY5Y2YxZTMxOGZlOGE3ZGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE2IEBACisyMDEyLTA4LTAzICBOaWNvIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4K KworICAgICAgICBbY2hyb21pdW1dIEFkZCBBUEkgdG8gbWFrZSBpdCBwb3NzaWJsZSB0byByZXF1 ZXN0IGFsbCB2YXJpYW50cyBvZiBhIFdlYkltYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjkzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFBhcnQgb2YgaHR0cDovL2NyYnVnLmNvbS8xMzg1NTAKKwor ICAgICAgICAqIHNyYy9XZWJJbWFnZVNraWEuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbWFn ZTo6ZnJhbWVzRnJvbURhdGEpOgorICAgICAgICAoV2ViS2l0KToKKwogMjAxMi0wOC0wMiAgSWx5 YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogZXh0ZW5kIHRlc3QgY292ZXJhZ2UgZm9yIG5taSBjb2RlIGFuZCBmaXggMiBidWdzLgpk aWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJJbWFnZS5oIGIv U291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJJbWFnZS5oCmluZGV4IDI5YmVmMWMz NDA5N2I5ZmVhNzc0ZjY4YmNhMDEwZGJlMDJkY2FjOTQuLmRhNjVhYzk1NGUyZmYyYWQwNGYxNmE5 MjI4N2YzNzdmM2U2N2I3MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9w dWJsaWMvV2ViSW1hZ2UuaAorKysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dl YkltYWdlLmgKQEAgLTMyLDYgKzMyLDcgQEAKICNkZWZpbmUgV2ViSW1hZ2VfaAogCiAjaW5jbHVk ZSAiV2ViQ29tbW9uLmgiCisjaW5jbHVkZSAiV2ViVmVjdG9yLmgiCiAKICNpbmNsdWRlIDxTa0Jp dG1hcC5oPgogCkBAIC02OCw2ICs2OSwxMCBAQCBwdWJsaWM6CiAgICAgLy8gdGhlIGZpcnN0IGZy YW1lIGlzIHJldHVybmVkLgogICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIFdlYkltYWdlIGZyb21E YXRhKGNvbnN0IFdlYkRhdGEmLCBjb25zdCBXZWJTaXplJiBkZXNpcmVkU2l6ZSk7CiAKKyAgICAv LyBSZXR1cm5zIGEgbGlzdCBvZiBhbGwgZnJhbWVzIGluIHRoZSBpbWFnZS4gT25seSB0aGUgZmly c3QgZnJhbWUgYXQgZWFjaCBwaXhlbAorICAgIC8vIHNpemUgd2lsbCBiZSByZXR1cm5lZC4KKyAg ICBXRUJLSVRfRVhQT1JUIHN0YXRpYyBXZWJWZWN0b3I8V2ViSW1hZ2U+IGZyYW1lc0Zyb21EYXRh KGNvbnN0IFdlYkRhdGEmKTsKKwogICAgIFdFQktJVF9FWFBPUlQgdm9pZCByZXNldCgpOwogICAg IFdFQktJVF9FWFBPUlQgdm9pZCBhc3NpZ24oY29uc3QgV2ViSW1hZ2UmKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW1hZ2VTa2lhLmNwcCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkltYWdlU2tpYS5jcHAKaW5kZXggMzZkYWJhYzNlNTVmOTc3 OTAxYTliMmMzMTJiZDVlYWQ0NWYwM2U2ZS4uMmNhYTAwMTJmYzdlM2M5NjU4NjIxMWVmMzQyMmVm ZTJmNTMyNjlkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW1h Z2VTa2lhLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbWFnZVNraWEu Y3BwCkBAIC0zOCwxMCArMzgsMTIgQEAKICNpbmNsdWRlICJwbGF0Zm9ybS9XZWJEYXRhLmgiCiAj aW5jbHVkZSAicGxhdGZvcm0vV2ViU2l6ZS5oIgogCisjaW5jbHVkZSA8YWxnb3JpdGhtPgogI2lu Y2x1ZGUgPHB1YmxpYy9XZWJJbWFnZS5oPgogI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNs dWRlIDx3dGYvUGFzc093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CisjaW5j bHVkZSA8d3RmL1ZlY3Rvci5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtODQs NiArODYsMzkgQEAgV2ViSW1hZ2UgV2ViSW1hZ2U6OmZyb21EYXRhKGNvbnN0IFdlYkRhdGEmIGRh dGEsIGNvbnN0IFdlYlNpemUmIGRlc2lyZWRTaXplKQogICAgIHJldHVybiBXZWJJbWFnZShmcmFt ZS0+Yml0bWFwKCkpOwogfQogCitXZWJWZWN0b3I8V2ViSW1hZ2U+IFdlYkltYWdlOjpmcmFtZXNG cm9tRGF0YShjb25zdCBXZWJEYXRhJiBkYXRhKQoreworICAgIC8vIFRoaXMgaXMgdG8gcHJvdGVj dCBmcm9tIG1hbGljaW91cyBmYXZpY29ucy4gSXQgc2hvdWxkIGJlIGJpZyBlbm91Z2ggdGhhdCBp dCdzIG5ldmVyIGhpdCBpbiBwcmFjaWNlLgorICAgIGNvbnN0IHNpemVfdCBrTWF4RmF2aWNvbkNv dW50ID0gODsKKworICAgIEltYWdlU291cmNlIHNvdXJjZTsKKyAgICBzb3VyY2Uuc2V0RGF0YShQ YXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4oZGF0YSkuZ2V0KCksIHRydWUpOworICAgIGlmICghc291 cmNlLmlzU2l6ZUF2YWlsYWJsZSgpKQorICAgICAgICByZXR1cm4gV2ViVmVjdG9yPFdlYkltYWdl PigpOworCisgICAgLy8gRnJhbWVzIGFyZSBhcnJhbmdlZCBieSBkZWNyZWFzaW5nIHNpemUsIHRo ZW4gZGVjcmVhc2luZyBiaXQgZGVwdGguCisgICAgLy8gS2VlcCB0aGUgZmlyc3QgZnJhbWUgYXQg ZXZlcnkgc2l6ZSwgaGFzIHRoZSBoaWdoZXN0IGJpdCBkZXB0aC4KKyAgICBjb25zdCBzaXplX3Qg ZnJhbWVDb3VudCA9IHNvdXJjZS5mcmFtZUNvdW50KCk7CisgICAgSW50U2l6ZSBsYXN0U2l6ZTsK KworICAgIFZlY3RvcjxXZWJJbWFnZT4gZnJhbWVzOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgc3RkOjptaW4oZnJhbWVDb3VudCwga01heEZhdmljb25Db3VudCk7ICsraSkgeworICAgICAg ICBjb25zdCBJbnRTaXplIGZyYW1lU2l6ZSA9IHNvdXJjZS5mcmFtZVNpemVBdEluZGV4KGkpOwor ICAgICAgICBpZiAoZnJhbWVTaXplID09IGxhc3RTaXplKQorICAgICAgICAgICAgY29udGludWU7 CisgICAgICAgIGxhc3RTaXplID0gZnJhbWVTaXplOworCisgICAgICAgIE93blB0cjxOYXRpdmVJ bWFnZVNraWE+IGZyYW1lID0gYWRvcHRQdHIoc291cmNlLmNyZWF0ZUZyYW1lQXRJbmRleChpKSk7 CisgICAgICAgIGlmIChmcmFtZSkKKyAgICAgICAgICAgIGZyYW1lcy5hcHBlbmQoV2ViSW1hZ2Uo ZnJhbWUtPmJpdG1hcCgpKSk7CisgICAgfQorCisgICAgV2ViVmVjdG9yPFdlYkltYWdlPiByZXN1 bHQoZnJhbWVzLnNpemUoKSk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBmcmFtZXMuc2l6 ZSgpOyArK2kpCisgICAgICAgIHJlc3VsdFtpXSA9IGZyYW1lc1tpXTsKKyAgICByZXR1cm4gcmVz dWx0OworfQorCiB2b2lkIFdlYkltYWdlOjpyZXNldCgpCiB7CiAgICAgbV9iaXRtYXAucmVzZXQo KTsK 156466 2012-08-03 15:02:56 -0700 2012-08-03 16:17:25 -0700 Patch bug-92933-20120803150235.patch text/plain 4270 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA1YzNmYmYxOTQ5Mzc4 NzEzZDk2Yzc3OWZlNzYwMzgyN2I3ZmI2NWY3Li5mMzE0MDM5ZjI5YzM2OWMwM2FhZjFiMGZhODU4 OGU4MDZlMDM5YjAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0wOC0wMyAg TmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBB ZGQgQVBJIHRvIG1ha2UgaXQgcG9zc2libGUgdG8gcmVxdWVzdCBhbGwgdmFyaWFudHMgb2YgYSBX ZWJJbWFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTI5MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQ YXJ0IG9mIGh0dHA6Ly9jcmJ1Zy5jb20vMTM4NTUwCisKKyAgICAgICAgKiBjaHJvbWl1bS9wdWJs aWMvV2ViSW1hZ2UuaDoKKyAgICAgICAgKFdlYkltYWdlKToKKwogMjAxMi0wOC0wMiAgQWxleGFu ZHJlIEVsaWFzICA8YWVsaWFzQGdvb2dsZS5jb20+CiAKICAgICAgICAgW2Nocm9taXVtXSBkZXZp Y2VWaWV3cG9ydFNpemUgY2xlYW51cApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCBjMDdi OTI5YTliZDEzMGE3NDAxZDQxYTc3ZDI5YzIxYWM1YzhiYTFhLi44MzU4OTNhMmE5ZjAxNGVlNDFj OWYxZTY5Y2YxZTMxOGZlOGE3ZGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE2IEBACisyMDEyLTA4LTAzICBOaWNvIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4K KworICAgICAgICBbY2hyb21pdW1dIEFkZCBBUEkgdG8gbWFrZSBpdCBwb3NzaWJsZSB0byByZXF1 ZXN0IGFsbCB2YXJpYW50cyBvZiBhIFdlYkltYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjkzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFBhcnQgb2YgaHR0cDovL2NyYnVnLmNvbS8xMzg1NTAKKwor ICAgICAgICAqIHNyYy9XZWJJbWFnZVNraWEuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbWFn ZTo6ZnJhbWVzRnJvbURhdGEpOgorICAgICAgICAoV2ViS2l0KToKKwogMjAxMi0wOC0wMiAgSWx5 YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogZXh0ZW5kIHRlc3QgY292ZXJhZ2UgZm9yIG5taSBjb2RlIGFuZCBmaXggMiBidWdzLgpk aWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJJbWFnZS5oIGIv U291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJJbWFnZS5oCmluZGV4IDI5YmVmMWMz NDA5N2I5ZmVhNzc0ZjY4YmNhMDEwZGJlMDJkY2FjOTQuLmRhNjVhYzk1NGUyZmYyYWQwNGYxNmE5 MjI4N2YzNzdmM2U2N2I3MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9w dWJsaWMvV2ViSW1hZ2UuaAorKysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dl YkltYWdlLmgKQEAgLTMyLDYgKzMyLDcgQEAKICNkZWZpbmUgV2ViSW1hZ2VfaAogCiAjaW5jbHVk ZSAiV2ViQ29tbW9uLmgiCisjaW5jbHVkZSAiV2ViVmVjdG9yLmgiCiAKICNpbmNsdWRlIDxTa0Jp dG1hcC5oPgogCkBAIC02OCw2ICs2OSwxMCBAQCBwdWJsaWM6CiAgICAgLy8gdGhlIGZpcnN0IGZy YW1lIGlzIHJldHVybmVkLgogICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIFdlYkltYWdlIGZyb21E YXRhKGNvbnN0IFdlYkRhdGEmLCBjb25zdCBXZWJTaXplJiBkZXNpcmVkU2l6ZSk7CiAKKyAgICAv LyBSZXR1cm5zIGEgbGlzdCBvZiBhbGwgZnJhbWVzIGluIHRoZSBpbWFnZS4gT25seSB0aGUgZmly c3QgZnJhbWUgYXQgZWFjaCBwaXhlbAorICAgIC8vIHNpemUgd2lsbCBiZSByZXR1cm5lZC4KKyAg ICBXRUJLSVRfRVhQT1JUIHN0YXRpYyBXZWJWZWN0b3I8V2ViSW1hZ2U+IGZyYW1lc0Zyb21EYXRh KGNvbnN0IFdlYkRhdGEmKTsKKwogICAgIFdFQktJVF9FWFBPUlQgdm9pZCByZXNldCgpOwogICAg IFdFQktJVF9FWFBPUlQgdm9pZCBhc3NpZ24oY29uc3QgV2ViSW1hZ2UmKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW1hZ2VTa2lhLmNwcCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkltYWdlU2tpYS5jcHAKaW5kZXggMzZkYWJhYzNlNTVmOTc3 OTAxYTliMmMzMTJiZDVlYWQ0NWYwM2U2ZS4uZjhmODQ2MjE4MDZkNTA5YWUwZDkzZGQ1NGQ1MDIw MzU1MTA4NzZmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW1h Z2VTa2lhLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbWFnZVNraWEu Y3BwCkBAIC0zOCwxMCArMzgsMTIgQEAKICNpbmNsdWRlICJwbGF0Zm9ybS9XZWJEYXRhLmgiCiAj aW5jbHVkZSAicGxhdGZvcm0vV2ViU2l6ZS5oIgogCisjaW5jbHVkZSA8YWxnb3JpdGhtPgogI2lu Y2x1ZGUgPHB1YmxpYy9XZWJJbWFnZS5oPgogI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNs dWRlIDx3dGYvUGFzc093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CisjaW5j bHVkZSA8d3RmL1ZlY3Rvci5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtODQs NiArODYsMzkgQEAgV2ViSW1hZ2UgV2ViSW1hZ2U6OmZyb21EYXRhKGNvbnN0IFdlYkRhdGEmIGRh dGEsIGNvbnN0IFdlYlNpemUmIGRlc2lyZWRTaXplKQogICAgIHJldHVybiBXZWJJbWFnZShmcmFt ZS0+Yml0bWFwKCkpOwogfQogCitXZWJWZWN0b3I8V2ViSW1hZ2U+IFdlYkltYWdlOjpmcmFtZXNG cm9tRGF0YShjb25zdCBXZWJEYXRhJiBkYXRhKQoreworICAgIC8vIFRoaXMgaXMgdG8gcHJvdGVj dCBmcm9tIG1hbGljaW91cyBpbWFnZXMuIEl0IHNob3VsZCBiZSBiaWcgZW5vdWdoIHRoYXQgaXQn cyBuZXZlciBoaXQgaW4gcHJhY2ljZS4KKyAgICBjb25zdCBzaXplX3QgbWF4RnJhbWVDb3VudCA9 IDg7CisKKyAgICBJbWFnZVNvdXJjZSBzb3VyY2U7CisgICAgc291cmNlLnNldERhdGEoUGFzc1Jl ZlB0cjxTaGFyZWRCdWZmZXI+KGRhdGEpLmdldCgpLCB0cnVlKTsKKyAgICBpZiAoIXNvdXJjZS5p c1NpemVBdmFpbGFibGUoKSkKKyAgICAgICAgcmV0dXJuIFdlYlZlY3RvcjxXZWJJbWFnZT4oKTsK KworICAgIC8vIEZyYW1lcyBhcmUgYXJyYW5nZWQgYnkgZGVjcmVhc2luZyBzaXplLCB0aGVuIGRl Y3JlYXNpbmcgYml0IGRlcHRoLgorICAgIC8vIEtlZXAgdGhlIGZpcnN0IGZyYW1lIGF0IGV2ZXJ5 IHNpemUsIGhhcyB0aGUgaGlnaGVzdCBiaXQgZGVwdGguCisgICAgY29uc3Qgc2l6ZV90IGZyYW1l Q291bnQgPSBzb3VyY2UuZnJhbWVDb3VudCgpOworICAgIEludFNpemUgbGFzdFNpemU7CisKKyAg ICBWZWN0b3I8V2ViSW1hZ2U+IGZyYW1lczsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHN0 ZDo6bWluKGZyYW1lQ291bnQsIG1heEZyYW1lQ291bnQpOyArK2kpIHsKKyAgICAgICAgY29uc3Qg SW50U2l6ZSBmcmFtZVNpemUgPSBzb3VyY2UuZnJhbWVTaXplQXRJbmRleChpKTsKKyAgICAgICAg aWYgKGZyYW1lU2l6ZSA9PSBsYXN0U2l6ZSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg ICBsYXN0U2l6ZSA9IGZyYW1lU2l6ZTsKKworICAgICAgICBPd25QdHI8TmF0aXZlSW1hZ2VTa2lh PiBmcmFtZSA9IGFkb3B0UHRyKHNvdXJjZS5jcmVhdGVGcmFtZUF0SW5kZXgoaSkpOworICAgICAg ICBpZiAoZnJhbWUpCisgICAgICAgICAgICBmcmFtZXMuYXBwZW5kKFdlYkltYWdlKGZyYW1lLT5i aXRtYXAoKSkpOworICAgIH0KKworICAgIFdlYlZlY3RvcjxXZWJJbWFnZT4gcmVzdWx0KGZyYW1l cy5zaXplKCkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZnJhbWVzLnNpemUoKTsgKytp KQorICAgICAgICByZXN1bHRbaV0gPSBmcmFtZXNbaV07CisgICAgcmV0dXJuIHJlc3VsdDsKK30K Kwogdm9pZCBXZWJJbWFnZTo6cmVzZXQoKQogewogICAgIG1fYml0bWFwLnJlc2V0KCk7Cg== 156476 2012-08-03 16:17:28 -0700 2012-08-03 20:25:37 -0700 Patch for landing bug-92933-20120803161709.patch text/plain 4134 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA1YzNmYmYxOTQ5Mzc4 NzEzZDk2Yzc3OWZlNzYwMzgyN2I3ZmI2NWY3Li40YjU4NzgxOGNkNzE2NDY3NDcyYTM1Mjk5ZjVm N2VkMTY2MTE0OWY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0wOC0wMyAg TmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBB ZGQgQVBJIHRvIG1ha2UgaXQgcG9zc2libGUgdG8gcmVxdWVzdCBhbGwgdmFyaWFudHMgb2YgYSBX ZWJJbWFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTI5MzMKKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIFBhcnQg b2YgaHR0cDovL2NyYnVnLmNvbS8xMzg1NTAKKworICAgICAgICAqIGNocm9taXVtL3B1YmxpYy9X ZWJJbWFnZS5oOgorICAgICAgICAoV2ViSW1hZ2UpOgorCiAyMDEyLTA4LTAyICBBbGV4YW5kcmUg RWxpYXMgIDxhZWxpYXNAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIGRldmljZVZp ZXdwb3J0U2l6ZSBjbGVhbnVwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGMwN2I5Mjlh OWJkMTMwYTc0MDFkNDFhNzdkMjljMjFhYzVjOGJhMWEuLjMxN2VmNzcxMjNmZWQ4MTE4OTNkNjc4 Yzc0ODIxYzgzY2U5MTdlNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTYgQEAKKzIwMTItMDgtMDMgIE5pY28gV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFtjaHJvbWl1bV0gQWRkIEFQSSB0byBtYWtlIGl0IHBvc3NpYmxlIHRvIHJlcXVlc3Qg YWxsIHZhcmlhbnRzIG9mIGEgV2ViSW1hZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTkyOTMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0 aC4KKworICAgICAgICBQYXJ0IG9mIGh0dHA6Ly9jcmJ1Zy5jb20vMTM4NTUwCisKKyAgICAgICAg KiBzcmMvV2ViSW1hZ2VTa2lhLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW1hZ2U6OmZyYW1l c0Zyb21EYXRhKToKKyAgICAgICAgKFdlYktpdCk6CisKIDIwMTItMDgtMDIgIElseWEgVGlraG9u b3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGV4 dGVuZCB0ZXN0IGNvdmVyYWdlIGZvciBubWkgY29kZSBhbmQgZml4IDIgYnVncy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViSW1hZ2UuaCBiL1NvdXJjZS9Q bGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViSW1hZ2UuaAppbmRleCAyOWJlZjFjMzQwOTdiOWZl YTc3NGY2OGJjYTAxMGRiZTAyZGNhYzk0Li5kYTY1YWM5NTRlMmZmMmFkMDRmMTZhOTIyODdmMzc3 ZjNlNjdiNzBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dl YkltYWdlLmgKKysrIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJJbWFnZS5o CkBAIC0zMiw2ICszMiw3IEBACiAjZGVmaW5lIFdlYkltYWdlX2gKIAogI2luY2x1ZGUgIldlYkNv bW1vbi5oIgorI2luY2x1ZGUgIldlYlZlY3Rvci5oIgogCiAjaW5jbHVkZSA8U2tCaXRtYXAuaD4K IApAQCAtNjgsNiArNjksMTAgQEAgcHVibGljOgogICAgIC8vIHRoZSBmaXJzdCBmcmFtZSBpcyBy ZXR1cm5lZC4KICAgICBXRUJLSVRfRVhQT1JUIHN0YXRpYyBXZWJJbWFnZSBmcm9tRGF0YShjb25z dCBXZWJEYXRhJiwgY29uc3QgV2ViU2l6ZSYgZGVzaXJlZFNpemUpOwogCisgICAgLy8gUmV0dXJu cyBhIGxpc3Qgb2YgYWxsIGZyYW1lcyBpbiB0aGUgaW1hZ2UuIE9ubHkgdGhlIGZpcnN0IGZyYW1l IGF0IGVhY2ggcGl4ZWwKKyAgICAvLyBzaXplIHdpbGwgYmUgcmV0dXJuZWQuCisgICAgV0VCS0lU X0VYUE9SVCBzdGF0aWMgV2ViVmVjdG9yPFdlYkltYWdlPiBmcmFtZXNGcm9tRGF0YShjb25zdCBX ZWJEYXRhJik7CisKICAgICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVzZXQoKTsKICAgICBXRUJLSVRf RVhQT1JUIHZvaWQgYXNzaWduKGNvbnN0IFdlYkltYWdlJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkltYWdlU2tpYS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJJbWFnZVNraWEuY3BwCmluZGV4IDM2ZGFiYWMzZTU1Zjk3NzkwMWE5YjJj MzEyYmQ1ZWFkNDVmMDNlNmUuLmUxYTkyNjA1MDYyODFkODlhMjhmYTBjZDI0MDMzZDAzOTcxODA1 YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkltYWdlU2tpYS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW1hZ2VTa2lhLmNwcApAQCAt MzgsMTAgKzM4LDEyIEBACiAjaW5jbHVkZSAicGxhdGZvcm0vV2ViRGF0YS5oIgogI2luY2x1ZGUg InBsYXRmb3JtL1dlYlNpemUuaCIKIAorI2luY2x1ZGUgPGFsZ29yaXRobT4KICNpbmNsdWRlIDxw dWJsaWMvV2ViSW1hZ2UuaD4KICNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CiAjaW5jbHVkZSA8d3Rm L1Bhc3NPd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0 Zi9WZWN0b3IuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTg0LDYgKzg2LDM2 IEBAIFdlYkltYWdlIFdlYkltYWdlOjpmcm9tRGF0YShjb25zdCBXZWJEYXRhJiBkYXRhLCBjb25z dCBXZWJTaXplJiBkZXNpcmVkU2l6ZSkKICAgICByZXR1cm4gV2ViSW1hZ2UoZnJhbWUtPmJpdG1h cCgpKTsKIH0KIAorV2ViVmVjdG9yPFdlYkltYWdlPiBXZWJJbWFnZTo6ZnJhbWVzRnJvbURhdGEo Y29uc3QgV2ViRGF0YSYgZGF0YSkKK3sKKyAgICAvLyBUaGlzIGlzIHRvIHByb3RlY3QgZnJvbSBt YWxpY2lvdXMgaW1hZ2VzLiBJdCBzaG91bGQgYmUgYmlnIGVub3VnaCB0aGF0IGl0J3MgbmV2ZXIg aGl0IGluIHByYWNpY2UuCisgICAgY29uc3Qgc2l6ZV90IG1heEZyYW1lQ291bnQgPSA4OworCisg ICAgSW1hZ2VTb3VyY2Ugc291cmNlOworICAgIHNvdXJjZS5zZXREYXRhKFBhc3NSZWZQdHI8U2hh cmVkQnVmZmVyPihkYXRhKS5nZXQoKSwgdHJ1ZSk7CisgICAgaWYgKCFzb3VyY2UuaXNTaXplQXZh aWxhYmxlKCkpCisgICAgICAgIHJldHVybiBXZWJWZWN0b3I8V2ViSW1hZ2U+KCk7CisKKyAgICAv LyBGcmFtZXMgYXJlIGFycmFuZ2VkIGJ5IGRlY3JlYXNpbmcgc2l6ZSwgdGhlbiBkZWNyZWFzaW5n IGJpdCBkZXB0aC4KKyAgICAvLyBLZWVwIHRoZSBmaXJzdCBmcmFtZSBhdCBldmVyeSBzaXplLCBo YXMgdGhlIGhpZ2hlc3QgYml0IGRlcHRoLgorICAgIGNvbnN0IHNpemVfdCBmcmFtZUNvdW50ID0g c291cmNlLmZyYW1lQ291bnQoKTsKKyAgICBJbnRTaXplIGxhc3RTaXplOworCisgICAgVmVjdG9y PFdlYkltYWdlPiBmcmFtZXM7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzdGQ6Om1pbihm cmFtZUNvdW50LCBtYXhGcmFtZUNvdW50KTsgKytpKSB7CisgICAgICAgIGNvbnN0IEludFNpemUg ZnJhbWVTaXplID0gc291cmNlLmZyYW1lU2l6ZUF0SW5kZXgoaSk7CisgICAgICAgIGlmIChmcmFt ZVNpemUgPT0gbGFzdFNpemUpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgbGFzdFNp emUgPSBmcmFtZVNpemU7CisKKyAgICAgICAgT3duUHRyPE5hdGl2ZUltYWdlU2tpYT4gZnJhbWUg PSBhZG9wdFB0cihzb3VyY2UuY3JlYXRlRnJhbWVBdEluZGV4KGkpKTsKKyAgICAgICAgaWYgKGZy YW1lKQorICAgICAgICAgICAgZnJhbWVzLmFwcGVuZChXZWJJbWFnZShmcmFtZS0+Yml0bWFwKCkp KTsKKyAgICB9CisKKyAgICByZXR1cm4gZnJhbWVzOworfQorCiB2b2lkIFdlYkltYWdlOjpyZXNl dCgpCiB7CiAgICAgbV9iaXRtYXAucmVzZXQoKTsK