99863 2012-10-19 12:35:32 -0700 [chromium] API to pass impl thread via WebLayerTreeView 2013-04-15 08:52:18 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 99891 1 aelias aelias abarth dglazkov fishd jamesr schenney tkent+wkapi webkit.review.bot oldest_to_newest 746534 0 aelias 2012-10-19 12:35:32 -0700 [chromium] API to pass impl thread via WebLayerTreeView 746538 1 169675 aelias 2012-10-19 12:39:15 -0700 Created attachment 169675 Patch 746543 2 webkit.review.bot 2012-10-19 12:40:43 -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. 746545 3 aelias 2012-10-19 12:41:23 -0700 Hi James, this is the WebKit side of the change, carefully designed to land first without breaking anything. After this, I'll make a big Chromium patch switching everything over, then go back to WebKit to delete the cruft. 746560 4 169675 jamesr 2012-10-19 12:53:51 -0700 Comment on attachment 169675 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169675&action=review This looks great. > Source/Platform/chromium/public/WebLayerTreeView.h:75 > + WEBKIT_EXPORT static WebLayerTreeView* create(WebLayerTreeViewClient*, const WebLayer& root, const Settings&, WebThread* implThread); > + // FIXME(aelias): Delete this version when the above is implemented. > WEBKIT_EXPORT static WebLayerTreeView* create(WebLayerTreeViewClient*, const WebLayer& root, const Settings&); Actually both of these ::create()s are dead - in fact all of the ::create() functions for things that hang off of WebCompositorSupport are currently unimplemented and uncalled. I still haven't deleted them because I suck :(. Don't worry about patching this file 746564 5 aelias 2012-10-19 12:57:18 -0700 I noticed that, but I actually intend to use the new create() I added. The reason is that I want to avoid calling compositorSupport() from the browser process. As part of my Chromium-side change, I'll change the CompositorSupport implementation to use that create() as well to avoid the duplicate code. 746570 6 jamesr 2012-10-19 13:03:44 -0700 I don't think that's a good idea - I'm about to delete the whole ::create() family. There's no way to implement them from inside WebKit.dll and no way to provide exported functions from outside WebKit.dll. This way lies madness, I tried pretty hard. What you should do is get an instance of a WebCompositorSupport implementation in your browser code from somewhere other than WebKit::Platform::current() and use the factory functions on it. 746578 7 169681 aelias 2012-10-19 13:10:25 -0700 Created attachment 169681 Patch Don't add a new WebLayerTreeView::create 746579 8 169682 aelias 2012-10-19 13:11:50 -0700 Created attachment 169682 Patch Remove accidentally added PageWidgetDelegate change 746582 9 aelias 2012-10-19 13:12:37 -0700 OK, makes sense. Please r+ again. 746642 10 169682 webkit.review.bot 2012-10-19 14:30:26 -0700 Comment on attachment 169682 Patch Clearing flags on attachment: 169682 Committed r131944: <http://trac.webkit.org/changeset/131944> 746643 11 webkit.review.bot 2012-10-19 14:30:30 -0700 All reviewed patches have been landed. Closing bug. 746661 12 jamesr 2012-10-19 14:46:43 -0700 On further thought, I actually think this is going in the wrong direction - we can't really support different thread modes on different views. 169675 2012-10-19 12:39:15 -0700 2012-10-19 13:10:22 -0700 Patch bug-99863-20121019123759.patch text/plain 10725 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA3MWM3NzNjZTE0ZmRh MTk2ZmFiYTNiZDNiOGRiMWI3OWVjZDUyOTc4Li4zZjkwNjU3ZjI1YzkyYmFkMmYxNGU1OTc5NjE1 NGZlODI1ZDBlOTI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMi0xMC0xOSAg QWxleGFuZHJlIEVsaWFzICA8YWVsaWFzQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21p dW1dIEFQSSB0byBwYXNzIGltcGwgdGhyZWFkIHZpYSBXZWJMYXllclRyZWVWaWV3CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTg2MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgYWRkcyBhbiBBUEkg dG8gcGFzcyB0aGUgY29tcG9zaXRvciBpbXBsIHRocmVhZCB2aWEgV2ViVmlldyBhbmQKKyAgICAg ICAgV2ViTGF5ZXJUcmVlVmlldy4gVGhpcyBpcyBjdXJyZW50bHkgYSBuby1vcCBjaGFuZ2UsIGJ1 dCBpbiB0aGUgZnV0dXJlCisgICAgICAgIHRoaXMgY29kZXBhdGggd2lsbCBzdXBlcmNlZGUgV2Vi Q29tcG9zaXRvci4gVGhlIGdvYWwgaXMgdG8gYXZvaWQgc3RhdGljcworICAgICAgICBpbiBjb21w b3NpdG9yIGluaXRpYWxpemF0aW9uLgorCisgICAgICAgICogY2hyb21pdW0vcHVibGljL1dlYkNv bXBvc2l0b3JTdXBwb3J0Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBvc2l0b3JTdXBwb3J0 OjpjcmVhdGVMYXllclRyZWVWaWV3KToKKyAgICAgICAgKFdlYkNvbXBvc2l0b3JTdXBwb3J0KToK KyAgICAgICAgKiBjaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5oOgorICAgICAgICAo V2ViS2l0KToKKyAgICAgICAgKFdlYkxheWVyVHJlZVZpZXcpOgorCiAyMDEyLTEwLTE3ICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIE1h a2UgV2ViQ29udGVudExheWVyIGluY2x1ZGUgd2hhdCBpdCB1c2VzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCmluZGV4IDRhZWFjN2UzYmZjYTRiMGNiY2EyMzQxNGFiYWQ3Y2YwYWZhNGUzNWUuLmU2 NTZlODY4ZTlmYTMyNTM2ZmY0ZjRiZGFiYmNiZDQyNTRlZjg2NmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTItMTAtMTkgIEFsZXhhbmRyZSBFbGlhcyAg PGFlbGlhc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBBUEkgdG8gcGFzcyBp bXBsIHRocmVhZCB2aWEgV2ViTGF5ZXJUcmVlVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk4NjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFkZHMgYW4gQVBJIHRvIHBhc3MgdGhlIGNvbXBv c2l0b3IgaW1wbCB0aHJlYWQgdmlhIFdlYlZpZXcgYW5kCisgICAgICAgIFdlYkxheWVyVHJlZVZp ZXcuIFRoaXMgaXMgY3VycmVudGx5IGEgbm8tb3AgY2hhbmdlLCBidXQgaW4gdGhlIGZ1dHVyZQor ICAgICAgICB0aGlzIGNvZGVwYXRoIHdpbGwgc3VwZXJjZWRlIFdlYkNvbXBvc2l0b3IuIFRoZSBn b2FsIGlzIHRvIGF2b2lkIHN0YXRpY3MKKyAgICAgICAgaW4gY29tcG9zaXRvciBpbml0aWFsaXph dGlvbi4KKworICAgICAgICAqIHB1YmxpYy9XZWJWaWV3Lmg6CisgICAgICAgIChXZWJLaXQpOgor ICAgICAgICAoV2ViVmlldyk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKToKKyAgICAgICAgKFdlYktpdDo6 V2ViVmlld0ltcGw6OnNldENvbXBvc2l0b3JJbXBsVGhyZWFkKToKKyAgICAgICAgKFdlYktpdCk6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZXRJc0FjY2VsZXJhdGVkQ29tcG9zaXRp bmdBY3RpdmUpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorICAgICAgICAoV2ViVmll d0ltcGwpOgorICAgICAgICAqIHRlc3RzL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bVRlc3QuY3BwOgor ICAgICAgICAoV2ViS2l0OjpHcmFwaGljc0xheWVyQ2hyb21pdW1UZXN0OjpHcmFwaGljc0xheWVy Q2hyb21pdW1UZXN0KToKKwogMjAxMi0xMC0xOCAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3 LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gIFJvbGxlZCBERVBTLgpkaWZm IC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdG9yU3Vw cG9ydC5oIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdG9yU3Vw cG9ydC5oCmluZGV4IDFlNGM2ZTIwNGZkMWM0MGVkYzU3ODBmYTI0OTI2YmM3MzA0ZjBiNDIuLmFh NTY3NDNkOThjNWEwNzI5NTNhNTVjM2IxN2ZjNWQ4MmE1ZmY3MDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViQ29tcG9zaXRvclN1cHBvcnQuaAorKysgYi9T b3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkNvbXBvc2l0b3JTdXBwb3J0LmgKQEAg LTc0LDYgKzc0LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlU2NhbGVQaW5j aFpvb21FbmFibGVkKGJvb2wpIHsgfQogCiAgICAgLy8gTWF5IHJldHVybiAwIGlmIGluaXRpYWxp emF0aW9uIGZhaWxzLgorICAgIHZpcnR1YWwgV2ViTGF5ZXJUcmVlVmlldyogY3JlYXRlTGF5ZXJU cmVlVmlldyhXZWJMYXllclRyZWVWaWV3Q2xpZW50KiBjbGllbnQsIGNvbnN0IFdlYkxheWVyJiBy b290LCBjb25zdCBXZWJMYXllclRyZWVWaWV3OjpTZXR0aW5ncyYgc2V0dGluZ3MsIFdlYlRocmVh ZCogaW1wbFRocmVhZCkgeyByZXR1cm4gY3JlYXRlTGF5ZXJUcmVlVmlldyhjbGllbnQsIHJvb3Qs IHNldHRpbmdzKTsgfQorICAgIC8vIEZJWE1FKGFlbGlhcyk6IERlbGV0ZSB0aGlzIHZlcnNpb24g d2hlbiB0aGUgYWJvdmUgaXMgaW1wbGVtZW50ZWQuCiAgICAgdmlydHVhbCBXZWJMYXllclRyZWVW aWV3KiBjcmVhdGVMYXllclRyZWVWaWV3KFdlYkxheWVyVHJlZVZpZXdDbGllbnQqLCBjb25zdCBX ZWJMYXllciYgcm9vdCwgY29uc3QgV2ViTGF5ZXJUcmVlVmlldzo6U2V0dGluZ3MmKSB7IHJldHVy biAwOyB9CiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9X ZWJMYXllclRyZWVWaWV3LmggYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkxh eWVyVHJlZVZpZXcuaAppbmRleCA5Yzk1YWQyZDNlNGQ0ODgwYTc3NTI5ZmFjNjE2OGJmOTUzZGFj NDg3Li45Y2M0MzlmMTQyYzU2MWJjMjJiMTk2MmU3MDZiNDNjYWMxNjUzMzFiIDEwMDY0NAotLS0g YS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkxheWVyVHJlZVZpZXcuaAorKysg Yi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkxheWVyVHJlZVZpZXcuaApAQCAt NDAsNiArNDAsNyBAQCBjbGFzcyBXZWJMYXllclRyZWVWaWV3Q2xpZW50Owogc3RydWN0IFdlYlBv aW50Owogc3RydWN0IFdlYlJlY3Q7CiBzdHJ1Y3QgV2ViUmVuZGVyaW5nU3RhdHM7CitjbGFzcyBX ZWJUaHJlYWQ7CiAKIGNsYXNzIFdlYkxheWVyVHJlZVZpZXcgewogcHVibGljOgpAQCAtNjksNiAr NzAsOCBAQCBwdWJsaWM6CiAjZGVmaW5lIFdFQkxBWUVSVFJFRVZJRVdfSVNfUFVSRV9WSVJUVUFM CiAgICAgLy8gQXR0ZW1wdHMgdG8gaW5pdGlhbGl6ZSB0aGlzIFdlYkxheWVyVHJlZVZpZXcgd2l0 aCB0aGUgZ2l2ZW4gY2xpZW50LCByb290IGxheWVyLCBhbmQgc2V0dGluZ3MuCiAgICAgLy8gSWYg aW5pdGlhbGl6YXRpb24gZmFpbHMsIHRoaXMgd2lsbCByZXR1cm4gbmlsLgorICAgIFdFQktJVF9F WFBPUlQgc3RhdGljIFdlYkxheWVyVHJlZVZpZXcqIGNyZWF0ZShXZWJMYXllclRyZWVWaWV3Q2xp ZW50KiwgY29uc3QgV2ViTGF5ZXImIHJvb3QsIGNvbnN0IFNldHRpbmdzJiwgV2ViVGhyZWFkKiBp bXBsVGhyZWFkKTsKKyAgICAvLyBGSVhNRShhZWxpYXMpOiBEZWxldGUgdGhpcyB2ZXJzaW9uIHdo ZW4gdGhlIGFib3ZlIGlzIGltcGxlbWVudGVkLgogICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIFdl YkxheWVyVHJlZVZpZXcqIGNyZWF0ZShXZWJMYXllclRyZWVWaWV3Q2xpZW50KiwgY29uc3QgV2Vi TGF5ZXImIHJvb3QsIGNvbnN0IFNldHRpbmdzJik7CiAKICAgICB2aXJ0dWFsIH5XZWJMYXllclRy ZWVWaWV3KCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3LmgKaW5kZXgg Yjc3OGYyOTZhNGUzMmIxY2NjY2IzMzcxNzY0MTY0ZjkyMGUzZDJmOS4uMjI1MzkyMTJlNzhiNTg3 ZGU5N2MzZjNjYjUzYzRlNGY1YzNhNDYwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYlZpZXcuaApAQCAtNTgsNiArNTgsNyBAQCBjbGFzcyBXZWJTZXR0aW5nczsKIGNsYXNzIFdl YlNwZWxsQ2hlY2tDbGllbnQ7CiBjbGFzcyBXZWJTdHJpbmc7CiBjbGFzcyBXZWJUZXh0RmllbGRE ZWNvcmF0b3JDbGllbnQ7CitjbGFzcyBXZWJUaHJlYWQ7CiBjbGFzcyBXZWJWaWV3Q2xpZW50Owog c3RydWN0IFdlYkFjdGl2ZVdoZWVsRmxpbmdQYXJhbWV0ZXJzOwogc3RydWN0IFdlYk1lZGlhUGxh eWVyQWN0aW9uOwpAQCAtNDY3LDYgKzQ2OCw4IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9v bCBpc1NlbGVjdGlvbkVkaXRhYmxlKCkgY29uc3QgPSAwOwogCisgICAgdmlydHVhbCB2b2lkIHNl dENvbXBvc2l0b3JJbXBsVGhyZWFkKFdlYlRocmVhZCopID0gMDsKKwogICAgIC8vIEJlbmNobWFy a2luZyBzdXBwb3J0IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KIAogICAgIHZpcnR1YWwgV2ViVmlld0JlbmNobWFya1N1cHBvcnQqIGJlbmNobWFya1N1 cHBvcnQoKSB7IHJldHVybiAwOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAKaW5kZXggZDZiZjk0Yjk2NzYzOTg0Nzk3NDZkOGIzMzE3YzA3MTkxMzg5NWYwNi4u NDM3YzBkMWIyNDA3ZGNkZDIwNGExNWIwYzU5MDE5ZWEyNDdkM2ViZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtNDI0LDYgKzQyNCw3IEBAIFdlYlZp ZXdJbXBsOjpXZWJWaWV3SW1wbChXZWJWaWV3Q2xpZW50KiBjbGllbnQpCiAgICAgLCBtX2NvbXBv c2l0b3JTdXJmYWNlUmVhZHkoZmFsc2UpCiAgICAgLCBtX2RldmljZVNjYWxlSW5Db21wb3NpdG9y KDEpCiAgICAgLCBtX2lucHV0SGFuZGxlcklkZW50aWZpZXIoLTEpCisgICAgLCBtX2NvbXBvc2l0 b3JJbXBsVGhyZWFkKDApCiAjZW5kaWYKICNpZiBFTkFCTEUoSU5QVVRfU1BFRUNIKQogICAgICwg bV9zcGVlY2hJbnB1dENsaWVudChTcGVlY2hJbnB1dENsaWVudEltcGw6OmNyZWF0ZShjbGllbnQp KQpAQCAtMzg3MCw2ICszODcxLDExIEBAIHZvaWQgV2ViVmlld0ltcGw6OnBhaW50Um9vdExheWVy KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgSW50UmVjdCYgY29udGVuCiAgICAgc2V0 QmFja2dyb3VuZENvbG9yKHZpZXctPmRvY3VtZW50QmFja2dyb3VuZENvbG9yKCkpOwogfQogCit2 b2lkIFdlYlZpZXdJbXBsOjpzZXRDb21wb3NpdG9ySW1wbFRocmVhZChXZWJUaHJlYWQqIGNvbXBv c2l0b3JJbXBsVGhyZWFkKQoreworICAgIG1fY29tcG9zaXRvckltcGxUaHJlYWQgPSBjb21wb3Np dG9ySW1wbFRocmVhZDsKK30KKwogdm9pZCBXZWJWaWV3SW1wbDo6c2V0SXNBY2NlbGVyYXRlZENv bXBvc2l0aW5nQWN0aXZlKGJvb2wgYWN0aXZlKQogewogICAgIFdlYktpdDo6UGxhdGZvcm06OmN1 cnJlbnQoKS0+aGlzdG9ncmFtRW51bWVyYXRpb24oIkdQVS5zZXRJc0FjY2VsZXJhdGVkQ29tcG9z aXRpbmdBY3RpdmUiLCBhY3RpdmUgKiAyICsgbV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3Rp dmUsIDQpOwpAQCAtMzkwNyw3ICszOTEzLDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6c2V0SXNBY2Nl bGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKGJvb2wgYWN0aXZlKQogICAgICAgICBtX25vbkNvbXBv c2l0ZWRDb250ZW50SG9zdC0+c2V0U2hvd0RlYnVnQm9yZGVycyhwYWdlKCktPnNldHRpbmdzKCkt PnNob3dEZWJ1Z0JvcmRlcnMoKSk7CiAgICAgICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRIb3N0 LT5zZXRPcGFxdWUoIWlzVHJhbnNwYXJlbnQoKSk7CiAKLSAgICAgICAgbV9sYXllclRyZWVWaWV3 ID0gYWRvcHRQdHIoUGxhdGZvcm06OmN1cnJlbnQoKS0+Y29tcG9zaXRvclN1cHBvcnQoKS0+Y3Jl YXRlTGF5ZXJUcmVlVmlldyh0aGlzLCAqbV9yb290TGF5ZXIsIGxheWVyVHJlZVZpZXdTZXR0aW5n cykpOworICAgICAgICBtX2xheWVyVHJlZVZpZXcgPSBhZG9wdFB0cihQbGF0Zm9ybTo6Y3VycmVu dCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpLT5jcmVhdGVMYXllclRyZWVWaWV3KHRoaXMsICptX3Jv b3RMYXllciwgbGF5ZXJUcmVlVmlld1NldHRpbmdzLCBtX2NvbXBvc2l0b3JJbXBsVGhyZWFkKSk7 CiAgICAgICAgIGlmIChtX2xheWVyVHJlZVZpZXcpIHsKICAgICAgICAgICAgIGlmIChtX3dlYlNl dHRpbmdzLT5hcHBseURlZmF1bHREZXZpY2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcigpICYmIHBh Z2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSAhPSAxKSB7CiAgICAgICAgICAgICAgICAgQVNTRVJU KHBhZ2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuaAppbmRleCA0NzkwN2YxMjQxN2UzZjIyMGFjOGIwMGY5MzYwYWVmYWFhMGRh ZjQyLi42MGJhZTNlZmViMTRkZjhhYjA4NzFkNTM1NDlhOWRlYzNjYTI3ZDUxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTIwMiw2ICsyMDIsNyBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCBib29sIGlzQWN0aXZlKCkgY29uc3Q7CiAgICAgdmlydHVhbCB2b2lk IHNldElzQWN0aXZlKGJvb2wgdmFsdWUpOwogICAgIHZpcnR1YWwgdm9pZCBzZXREb21haW5SZWxh eGF0aW9uRm9yYmlkZGVuKGJvb2wsIGNvbnN0IFdlYlN0cmluZyYgc2NoZW1lKTsKKyAgICB2aXJ0 dWFsIHZvaWQgc2V0Q29tcG9zaXRvckltcGxUaHJlYWQoV2ViVGhyZWFkKik7CiAgICAgdmlydHVh bCBib29sIGRpc3BhdGNoQmVmb3JlVW5sb2FkRXZlbnQoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlz cGF0Y2hVbmxvYWRFdmVudCgpOwogICAgIHZpcnR1YWwgV2ViRnJhbWUqIG1haW5GcmFtZSgpOwpA QCAtODQwLDYgKzg0MSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2NvbXBvc2l0b3JTdXJmYWNl UmVhZHk7CiAgICAgZmxvYXQgbV9kZXZpY2VTY2FsZUluQ29tcG9zaXRvcjsKICAgICBpbnQgbV9p bnB1dEhhbmRsZXJJZGVudGlmaWVyOworICAgIFdlYlRocmVhZCogbV9jb21wb3NpdG9ySW1wbFRo cmVhZDsKICNlbmRpZgogICAgIHN0YXRpYyBjb25zdCBXZWJJbnB1dEV2ZW50KiBtX2N1cnJlbnRJ bnB1dEV2ZW50OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0dy YXBoaWNzTGF5ZXJDaHJvbWl1bVRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0 cy9HcmFwaGljc0xheWVyQ2hyb21pdW1UZXN0LmNwcAppbmRleCAwY2U4NDI1N2I1YmE3YmI4MzAx ZWU3ZWQ2MTM3YmI1ZGIwNDQ1ZmU3Li4zYjFmNmQ1MjcxMGVmNzcyNWJmZDY2YWQwMWQxODY0ZmQ3 ODdkMjU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0dyYXBoaWNz TGF5ZXJDaHJvbWl1bVRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv R3JhcGhpY3NMYXllckNocm9taXVtVGVzdC5jcHAKQEAgLTY2LDcgKzY2LDcgQEAgcHVibGljOgog ICAgICAgICBQbGF0Zm9ybTo6Y3VycmVudCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpLT5pbml0aWFs aXplKDApOwogICAgICAgICBtX2dyYXBoaWNzTGF5ZXIgPSBzdGF0aWNfcG9pbnRlcl9jYXN0PEdy YXBoaWNzTGF5ZXJDaHJvbWl1bT4oR3JhcGhpY3NMYXllcjo6Y3JlYXRlKCZtX2NsaWVudCkpOwog ICAgICAgICBtX3BsYXRmb3JtTGF5ZXIgPSBtX2dyYXBoaWNzTGF5ZXItPnBsYXRmb3JtTGF5ZXIo KTsKLSAgICAgICAgbV9sYXllclRyZWVWaWV3ID0gYWRvcHRQdHIoUGxhdGZvcm06OmN1cnJlbnQo KS0+Y29tcG9zaXRvclN1cHBvcnQoKS0+Y3JlYXRlTGF5ZXJUcmVlVmlldygmbV9sYXllclRyZWVW aWV3Q2xpZW50LCAqbV9wbGF0Zm9ybUxheWVyLCBXZWJMYXllclRyZWVWaWV3OjpTZXR0aW5ncygp KSk7CisgICAgICAgIG1fbGF5ZXJUcmVlVmlldyA9IGFkb3B0UHRyKFBsYXRmb3JtOjpjdXJyZW50 KCktPmNvbXBvc2l0b3JTdXBwb3J0KCktPmNyZWF0ZUxheWVyVHJlZVZpZXcoJm1fbGF5ZXJUcmVl Vmlld0NsaWVudCwgKm1fcGxhdGZvcm1MYXllciwgV2ViTGF5ZXJUcmVlVmlldzo6U2V0dGluZ3Mo KSwgMCkpOwogICAgICAgICBtX2xheWVyVHJlZVZpZXctPnNldFZpZXdwb3J0U2l6ZShXZWJTaXpl KDEsIDEpLCBXZWJTaXplKDEsIDEpKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5n ZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyOWQwZTJlN2FmOWMxOGQ4OWQ4N2NiOGUwYmYz YTk0Yzg2YTliYTA4Li5hOThjZTU1ODA0ODhlODFlNWMwMGM1N2JiNThhMGUwZjE1YjJkNWVlIDEw MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTggQEAKKzIwMTItMTAtMTkgIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0BjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBBUEkgdG8gcGFzcyBpbXBsIHRocmVhZCB2aWEgV2Vi TGF5ZXJUcmVlVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTk4NjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGlzIGFkZHMgYW4gQVBJIHRvIHBhc3MgdGhlIGNvbXBvc2l0b3IgaW1wbCB0aHJlYWQg dmlhIFdlYlZpZXcgYW5kCisgICAgICAgIFdlYkxheWVyVHJlZVZpZXcuIFRoaXMgaXMgY3VycmVu dGx5IGEgbm8tb3AgY2hhbmdlLCBidXQgaW4gdGhlIGZ1dHVyZQorICAgICAgICB0aGlzIGNvZGVw YXRoIHdpbGwgc3VwZXJjZWRlIFdlYkNvbXBvc2l0b3IuIFRoZSBnb2FsIGlzIHRvIGF2b2lkIHN0 YXRpY3MKKyAgICAgICAgaW4gY29tcG9zaXRvciBpbml0aWFsaXphdGlvbi4KKworICAgICAgICAq IER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHA6CisgICAgICAgIChUZXN0U2hl bGw6OmNyZWF0ZU5ld1dpbmRvdyk6CisKIDIwMTItMTAtMTggIFRpbW90aHkgSGF0Y2hlciAgPHRp bW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFRlYWNoIHByZXBhcmUtQ2hhbmdlTG9nIGhvdyB0 byBoYW5kbGUgbm9uLWZ1bmN0aW9uIHByb3BlcnRpZXMgaW4gSmF2YVNjcmlwdCBwcm90b3R5cGVz LgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNw cCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHAKaW5kZXggMzI1 ODVmYWExYjJkOGFkODFhODNiMTVlOGY3MTJiZDhjYTcyNDg5Yi4uODUxYWYzNTNmZWM0YmU1Y2I0 Yzk5ODQwOGQyMzU4MWE0MzkzOWQ2NSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vVGVzdFNoZWxsLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9UZXN0U2hlbGwuY3BwCkBAIC03MzgsNiArNzM4LDcgQEAgV2ViVmlld0hvc3QqIFRlc3RTaGVs bDo6Y3JlYXRlTmV3V2luZG93KGNvbnN0IFdlYktpdDo6V2ViVVJMJiB1cmwsIERSVERldlRvb2xz QWcKIHsKICAgICBXZWJWaWV3SG9zdCogaG9zdCA9IG5ldyBXZWJWaWV3SG9zdCh0aGlzKTsKICAg ICBXZWJWaWV3KiB2aWV3ID0gV2ViVmlldzo6Y3JlYXRlKGhvc3QpOworICAgIHZpZXctPnNldENv bXBvc2l0b3JJbXBsVGhyZWFkKG1fd2ViQ29tcG9zaXRvclRocmVhZC5nZXQoKSk7CiAgICAgdmll dy0+c2V0UGVybWlzc2lvbkNsaWVudCh3ZWJQZXJtaXNzaW9ucygpKTsKICAgICB2aWV3LT5zZXRE ZXZUb29sc0FnZW50Q2xpZW50KGRldlRvb2xzQWdlbnQpOwogICAgIGhvc3QtPnNldFdlYldpZGdl dCh2aWV3KTsK 169681 2012-10-19 13:10:25 -0700 2012-10-19 13:11:46 -0700 Patch bug-99863-20121019130908.patch text/plain 10673 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA3MWM3NzNjZTE0ZmRh MTk2ZmFiYTNiZDNiOGRiMWI3OWVjZDUyOTc4Li4zZjkwNjU3ZjI1YzkyYmFkMmYxNGU1OTc5NjE1 NGZlODI1ZDBlOTI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMi0xMC0xOSAg QWxleGFuZHJlIEVsaWFzICA8YWVsaWFzQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21p dW1dIEFQSSB0byBwYXNzIGltcGwgdGhyZWFkIHZpYSBXZWJMYXllclRyZWVWaWV3CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTg2MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgYWRkcyBhbiBBUEkg dG8gcGFzcyB0aGUgY29tcG9zaXRvciBpbXBsIHRocmVhZCB2aWEgV2ViVmlldyBhbmQKKyAgICAg ICAgV2ViTGF5ZXJUcmVlVmlldy4gVGhpcyBpcyBjdXJyZW50bHkgYSBuby1vcCBjaGFuZ2UsIGJ1 dCBpbiB0aGUgZnV0dXJlCisgICAgICAgIHRoaXMgY29kZXBhdGggd2lsbCBzdXBlcmNlZGUgV2Vi Q29tcG9zaXRvci4gVGhlIGdvYWwgaXMgdG8gYXZvaWQgc3RhdGljcworICAgICAgICBpbiBjb21w b3NpdG9yIGluaXRpYWxpemF0aW9uLgorCisgICAgICAgICogY2hyb21pdW0vcHVibGljL1dlYkNv bXBvc2l0b3JTdXBwb3J0Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBvc2l0b3JTdXBwb3J0 OjpjcmVhdGVMYXllclRyZWVWaWV3KToKKyAgICAgICAgKFdlYkNvbXBvc2l0b3JTdXBwb3J0KToK KyAgICAgICAgKiBjaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5oOgorICAgICAgICAo V2ViS2l0KToKKyAgICAgICAgKFdlYkxheWVyVHJlZVZpZXcpOgorCiAyMDEyLTEwLTE3ICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIE1h a2UgV2ViQ29udGVudExheWVyIGluY2x1ZGUgd2hhdCBpdCB1c2VzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCmluZGV4IDRhZWFjN2UzYmZjYTRiMGNiY2EyMzQxNGFiYWQ3Y2YwYWZhNGUzNWUuLmU2 NTZlODY4ZTlmYTMyNTM2ZmY0ZjRiZGFiYmNiZDQyNTRlZjg2NmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTItMTAtMTkgIEFsZXhhbmRyZSBFbGlhcyAg PGFlbGlhc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBBUEkgdG8gcGFzcyBp bXBsIHRocmVhZCB2aWEgV2ViTGF5ZXJUcmVlVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk4NjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFkZHMgYW4gQVBJIHRvIHBhc3MgdGhlIGNvbXBv c2l0b3IgaW1wbCB0aHJlYWQgdmlhIFdlYlZpZXcgYW5kCisgICAgICAgIFdlYkxheWVyVHJlZVZp ZXcuIFRoaXMgaXMgY3VycmVudGx5IGEgbm8tb3AgY2hhbmdlLCBidXQgaW4gdGhlIGZ1dHVyZQor ICAgICAgICB0aGlzIGNvZGVwYXRoIHdpbGwgc3VwZXJjZWRlIFdlYkNvbXBvc2l0b3IuIFRoZSBn b2FsIGlzIHRvIGF2b2lkIHN0YXRpY3MKKyAgICAgICAgaW4gY29tcG9zaXRvciBpbml0aWFsaXph dGlvbi4KKworICAgICAgICAqIHB1YmxpYy9XZWJWaWV3Lmg6CisgICAgICAgIChXZWJLaXQpOgor ICAgICAgICAoV2ViVmlldyk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKToKKyAgICAgICAgKFdlYktpdDo6 V2ViVmlld0ltcGw6OnNldENvbXBvc2l0b3JJbXBsVGhyZWFkKToKKyAgICAgICAgKFdlYktpdCk6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZXRJc0FjY2VsZXJhdGVkQ29tcG9zaXRp bmdBY3RpdmUpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorICAgICAgICAoV2ViVmll d0ltcGwpOgorICAgICAgICAqIHRlc3RzL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bVRlc3QuY3BwOgor ICAgICAgICAoV2ViS2l0OjpHcmFwaGljc0xheWVyQ2hyb21pdW1UZXN0OjpHcmFwaGljc0xheWVy Q2hyb21pdW1UZXN0KToKKwogMjAxMi0xMC0xOCAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3 LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gIFJvbGxlZCBERVBTLgpkaWZm IC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdG9yU3Vw cG9ydC5oIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdG9yU3Vw cG9ydC5oCmluZGV4IDFlNGM2ZTIwNGZkMWM0MGVkYzU3ODBmYTI0OTI2YmM3MzA0ZjBiNDIuLmFh NTY3NDNkOThjNWEwNzI5NTNhNTVjM2IxN2ZjNWQ4MmE1ZmY3MDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViQ29tcG9zaXRvclN1cHBvcnQuaAorKysgYi9T b3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkNvbXBvc2l0b3JTdXBwb3J0LmgKQEAg LTc0LDYgKzc0LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlU2NhbGVQaW5j aFpvb21FbmFibGVkKGJvb2wpIHsgfQogCiAgICAgLy8gTWF5IHJldHVybiAwIGlmIGluaXRpYWxp emF0aW9uIGZhaWxzLgorICAgIHZpcnR1YWwgV2ViTGF5ZXJUcmVlVmlldyogY3JlYXRlTGF5ZXJU cmVlVmlldyhXZWJMYXllclRyZWVWaWV3Q2xpZW50KiBjbGllbnQsIGNvbnN0IFdlYkxheWVyJiBy b290LCBjb25zdCBXZWJMYXllclRyZWVWaWV3OjpTZXR0aW5ncyYgc2V0dGluZ3MsIFdlYlRocmVh ZCogaW1wbFRocmVhZCkgeyByZXR1cm4gY3JlYXRlTGF5ZXJUcmVlVmlldyhjbGllbnQsIHJvb3Qs IHNldHRpbmdzKTsgfQorICAgIC8vIEZJWE1FKGFlbGlhcyk6IERlbGV0ZSB0aGlzIHZlcnNpb24g d2hlbiB0aGUgYWJvdmUgaXMgaW1wbGVtZW50ZWQuCiAgICAgdmlydHVhbCBXZWJMYXllclRyZWVW aWV3KiBjcmVhdGVMYXllclRyZWVWaWV3KFdlYkxheWVyVHJlZVZpZXdDbGllbnQqLCBjb25zdCBX ZWJMYXllciYgcm9vdCwgY29uc3QgV2ViTGF5ZXJUcmVlVmlldzo6U2V0dGluZ3MmKSB7IHJldHVy biAwOyB9CiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Vmlldy5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCmluZGV4IGI3 NzhmMjk2YTRlMzJiMWNjY2NiMzM3MTc2NDE2NGY5MjBlM2QyZjkuLjIyNTM5MjEyZTc4YjU4N2Rl OTdjM2YzY2I1M2M0ZTRmNWMzYTQ2MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJWaWV3LmgKQEAgLTU4LDYgKzU4LDcgQEAgY2xhc3MgV2ViU2V0dGluZ3M7CiBjbGFzcyBXZWJT cGVsbENoZWNrQ2xpZW50OwogY2xhc3MgV2ViU3RyaW5nOwogY2xhc3MgV2ViVGV4dEZpZWxkRGVj b3JhdG9yQ2xpZW50OworY2xhc3MgV2ViVGhyZWFkOwogY2xhc3MgV2ViVmlld0NsaWVudDsKIHN0 cnVjdCBXZWJBY3RpdmVXaGVlbEZsaW5nUGFyYW1ldGVyczsKIHN0cnVjdCBXZWJNZWRpYVBsYXll ckFjdGlvbjsKQEAgLTQ2Nyw2ICs0NjgsOCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIGJvb2wg aXNTZWxlY3Rpb25FZGl0YWJsZSgpIGNvbnN0ID0gMDsKIAorICAgIHZpcnR1YWwgdm9pZCBzZXRD b21wb3NpdG9ySW1wbFRocmVhZChXZWJUaHJlYWQqKSA9IDA7CisKICAgICAvLyBCZW5jaG1hcmtp bmcgc3VwcG9ydCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCiAKICAgICB2aXJ0dWFsIFdlYlZpZXdCZW5jaG1hcmtTdXBwb3J0KiBiZW5jaG1hcmtTdXBw b3J0KCkgeyByZXR1cm4gMDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvUGFnZVdpZGdldERlbGVnYXRlLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1Bh Z2VXaWRnZXREZWxlZ2F0ZS5jcHAKaW5kZXggMDcxYzIyYTNkM2RlOTRkMDlkMGYxMmQyMDZhOTEx YmZlZDZjNmZkYi4uYmE2NDVjOGFlN2M0MWQ3MDgxMmQ1MzM1M2ZhNzdlZTkzMjJhZDdmMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGFnZVdpZGdldERlbGVnYXRlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QYWdlV2lkZ2V0RGVsZWdhdGUuY3Bw CkBAIC04OCw4ICs4OCwxMCBAQCB2b2lkIFBhZ2VXaWRnZXREZWxlZ2F0ZTo6cGFpbnQoUGFnZSog cGFnZSwgUGFnZU92ZXJsYXlMaXN0KiBvdmVybGF5cywgV2ViQ2FudmFzKgogICAgIEdyYXBoaWNz Q29udGV4dEJ1aWxkZXIgYnVpbGRlcihjYW52YXMpOwogICAgIEdyYXBoaWNzQ29udGV4dCYgZ2Mg PSBidWlsZGVyLmNvbnRleHQoKTsKICAgICBnYy5wbGF0Zm9ybUNvbnRleHQoKS0+c2V0RHJhd2lu Z1RvSW1hZ2VCdWZmZXIoYmFja2dyb3VuZCA9PSBPcGFxdWUgPyBmYWxzZSA6IHRydWUpOwotICAg IGdjLmFwcGx5RGV2aWNlU2NhbGVGYWN0b3IocGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7Ci0g ICAgZ2MucGxhdGZvcm1Db250ZXh0KCktPnNldERldmljZVNjYWxlRmFjdG9yKHBhZ2UtPmRldmlj ZVNjYWxlRmFjdG9yKCkpOworICAgIGlmIChzZXR0aW5ncygpLT5hcHBseURldmljZVNjYWxlSW5D b21wb3NpdG9yKCkpIHsKKyAgICAgICAgZ2MuYXBwbHlEZXZpY2VTY2FsZUZhY3RvcihwYWdlLT5k ZXZpY2VTY2FsZUZhY3RvcigpKTsKKyAgICAgICAgZ2MucGxhdGZvcm1Db250ZXh0KCktPnNldERl dmljZVNjYWxlRmFjdG9yKHBhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCkpOworICAgIH0KICAgICBJ bnRSZWN0IGRpcnR5UmVjdChyZWN0KTsKICAgICBnYy5zYXZlKCk7CiAgICAgRnJhbWVWaWV3KiB2 aWV3ID0gbWFpbkZyYW1lVmlldyhwYWdlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmNwcAppbmRleCBkNmJmOTRiOTY3NjM5ODQ3OTc0NmQ4YjMzMTdjMDcxOTEzODk1 ZjA2Li40MzdjMGQxYjI0MDdkY2RkMjA0YTE1YjBjNTkwMTllYTI0N2QzZWJkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC00MjQsNiArNDI0LDcgQEAg V2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKFdlYlZpZXdDbGllbnQqIGNsaWVudCkKICAgICAsIG1f Y29tcG9zaXRvclN1cmZhY2VSZWFkeShmYWxzZSkKICAgICAsIG1fZGV2aWNlU2NhbGVJbkNvbXBv c2l0b3IoMSkKICAgICAsIG1faW5wdXRIYW5kbGVySWRlbnRpZmllcigtMSkKKyAgICAsIG1fY29t cG9zaXRvckltcGxUaHJlYWQoMCkKICNlbmRpZgogI2lmIEVOQUJMRShJTlBVVF9TUEVFQ0gpCiAg ICAgLCBtX3NwZWVjaElucHV0Q2xpZW50KFNwZWVjaElucHV0Q2xpZW50SW1wbDo6Y3JlYXRlKGNs aWVudCkpCkBAIC0zODcwLDYgKzM4NzEsMTEgQEAgdm9pZCBXZWJWaWV3SW1wbDo6cGFpbnRSb290 TGF5ZXIoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBjb250ZW4KICAg ICBzZXRCYWNrZ3JvdW5kQ29sb3Iodmlldy0+ZG9jdW1lbnRCYWNrZ3JvdW5kQ29sb3IoKSk7CiB9 CiAKK3ZvaWQgV2ViVmlld0ltcGw6OnNldENvbXBvc2l0b3JJbXBsVGhyZWFkKFdlYlRocmVhZCog Y29tcG9zaXRvckltcGxUaHJlYWQpCit7CisgICAgbV9jb21wb3NpdG9ySW1wbFRocmVhZCA9IGNv bXBvc2l0b3JJbXBsVGhyZWFkOworfQorCiB2b2lkIFdlYlZpZXdJbXBsOjpzZXRJc0FjY2VsZXJh dGVkQ29tcG9zaXRpbmdBY3RpdmUoYm9vbCBhY3RpdmUpCiB7CiAgICAgV2ViS2l0OjpQbGF0Zm9y bTo6Y3VycmVudCgpLT5oaXN0b2dyYW1FbnVtZXJhdGlvbigiR1BVLnNldElzQWNjZWxlcmF0ZWRD b21wb3NpdGluZ0FjdGl2ZSIsIGFjdGl2ZSAqIDIgKyBtX2lzQWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0FjdGl2ZSwgNCk7CkBAIC0zOTA3LDcgKzM5MTMsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzZXRJ c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUoYm9vbCBhY3RpdmUpCiAgICAgICAgIG1fbm9u Q29tcG9zaXRlZENvbnRlbnRIb3N0LT5zZXRTaG93RGVidWdCb3JkZXJzKHBhZ2UoKS0+c2V0dGlu Z3MoKS0+c2hvd0RlYnVnQm9yZGVycygpKTsKICAgICAgICAgbV9ub25Db21wb3NpdGVkQ29udGVu dEhvc3QtPnNldE9wYXF1ZSghaXNUcmFuc3BhcmVudCgpKTsKIAotICAgICAgICBtX2xheWVyVHJl ZVZpZXcgPSBhZG9wdFB0cihQbGF0Zm9ybTo6Y3VycmVudCgpLT5jb21wb3NpdG9yU3VwcG9ydCgp LT5jcmVhdGVMYXllclRyZWVWaWV3KHRoaXMsICptX3Jvb3RMYXllciwgbGF5ZXJUcmVlVmlld1Nl dHRpbmdzKSk7CisgICAgICAgIG1fbGF5ZXJUcmVlVmlldyA9IGFkb3B0UHRyKFBsYXRmb3JtOjpj dXJyZW50KCktPmNvbXBvc2l0b3JTdXBwb3J0KCktPmNyZWF0ZUxheWVyVHJlZVZpZXcodGhpcywg Km1fcm9vdExheWVyLCBsYXllclRyZWVWaWV3U2V0dGluZ3MsIG1fY29tcG9zaXRvckltcGxUaHJl YWQpKTsKICAgICAgICAgaWYgKG1fbGF5ZXJUcmVlVmlldykgewogICAgICAgICAgICAgaWYgKG1f d2ViU2V0dGluZ3MtPmFwcGx5RGVmYXVsdERldmljZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yKCkg JiYgcGFnZSgpLT5kZXZpY2VTY2FsZUZhY3RvcigpICE9IDEpIHsKICAgICAgICAgICAgICAgICBB U1NFUlQocGFnZSgpLT5kZXZpY2VTY2FsZUZhY3RvcigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IDQ3OTA3ZjEyNDE3ZTNmMjIwYWM4YjAwZjkzNjBhZWZh YWEwZGFmNDIuLjYwYmFlM2VmZWIxNGRmOGFiMDg3MWQ1MzU0OWE5ZGVjM2NhMjdkNTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApAQCAtMjAyLDYgKzIwMiw3IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgaXNBY3RpdmUoKSBjb25zdDsKICAgICB2aXJ0dWFs IHZvaWQgc2V0SXNBY3RpdmUoYm9vbCB2YWx1ZSk7CiAgICAgdmlydHVhbCB2b2lkIHNldERvbWFp blJlbGF4YXRpb25Gb3JiaWRkZW4oYm9vbCwgY29uc3QgV2ViU3RyaW5nJiBzY2hlbWUpOworICAg IHZpcnR1YWwgdm9pZCBzZXRDb21wb3NpdG9ySW1wbFRocmVhZChXZWJUaHJlYWQqKTsKICAgICB2 aXJ0dWFsIGJvb2wgZGlzcGF0Y2hCZWZvcmVVbmxvYWRFdmVudCgpOwogICAgIHZpcnR1YWwgdm9p ZCBkaXNwYXRjaFVubG9hZEV2ZW50KCk7CiAgICAgdmlydHVhbCBXZWJGcmFtZSogbWFpbkZyYW1l KCk7CkBAIC04NDAsNiArODQxLDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fY29tcG9zaXRvclN1 cmZhY2VSZWFkeTsKICAgICBmbG9hdCBtX2RldmljZVNjYWxlSW5Db21wb3NpdG9yOwogICAgIGlu dCBtX2lucHV0SGFuZGxlcklkZW50aWZpZXI7CisgICAgV2ViVGhyZWFkKiBtX2NvbXBvc2l0b3JJ bXBsVGhyZWFkOwogI2VuZGlmCiAgICAgc3RhdGljIGNvbnN0IFdlYklucHV0RXZlbnQqIG1fY3Vy cmVudElucHV0RXZlbnQ7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvR3JhcGhpY3NMYXllckNocm9taXVtVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3Rlc3RzL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bVRlc3QuY3BwCmluZGV4IDBjZTg0MjU3YjViYTdi YjgzMDFlZTdlZDYxMzdiYjVkYjA0NDVmZTcuLjNiMWY2ZDUyNzEwZWY3NzI1YmZkNjZhZDAxZDE4 NjRmZDc4N2QyNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvR3Jh cGhpY3NMYXllckNocm9taXVtVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90 ZXN0cy9HcmFwaGljc0xheWVyQ2hyb21pdW1UZXN0LmNwcApAQCAtNjYsNyArNjYsNyBAQCBwdWJs aWM6CiAgICAgICAgIFBsYXRmb3JtOjpjdXJyZW50KCktPmNvbXBvc2l0b3JTdXBwb3J0KCktPmlu aXRpYWxpemUoMCk7CiAgICAgICAgIG1fZ3JhcGhpY3NMYXllciA9IHN0YXRpY19wb2ludGVyX2Nh c3Q8R3JhcGhpY3NMYXllckNocm9taXVtPihHcmFwaGljc0xheWVyOjpjcmVhdGUoJm1fY2xpZW50 KSk7CiAgICAgICAgIG1fcGxhdGZvcm1MYXllciA9IG1fZ3JhcGhpY3NMYXllci0+cGxhdGZvcm1M YXllcigpOwotICAgICAgICBtX2xheWVyVHJlZVZpZXcgPSBhZG9wdFB0cihQbGF0Zm9ybTo6Y3Vy cmVudCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpLT5jcmVhdGVMYXllclRyZWVWaWV3KCZtX2xheWVy VHJlZVZpZXdDbGllbnQsICptX3BsYXRmb3JtTGF5ZXIsIFdlYkxheWVyVHJlZVZpZXc6OlNldHRp bmdzKCkpKTsKKyAgICAgICAgbV9sYXllclRyZWVWaWV3ID0gYWRvcHRQdHIoUGxhdGZvcm06OmN1 cnJlbnQoKS0+Y29tcG9zaXRvclN1cHBvcnQoKS0+Y3JlYXRlTGF5ZXJUcmVlVmlldygmbV9sYXll clRyZWVWaWV3Q2xpZW50LCAqbV9wbGF0Zm9ybUxheWVyLCBXZWJMYXllclRyZWVWaWV3OjpTZXR0 aW5ncygpLCAwKSk7CiAgICAgICAgIG1fbGF5ZXJUcmVlVmlldy0+c2V0Vmlld3BvcnRTaXplKFdl YlNpemUoMSwgMSksIFdlYlNpemUoMSwgMSkpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMv Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDI5ZDBlMmU3YWY5YzE4ZDg5ZDg3Y2I4 ZTBiZjNhOTRjODZhOWJhMDguLmE5OGNlNTU4MDQ4OGU4MWU1YzAwYzU3YmI1OGEwZTBmMTViMmQ1 ZWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOCBAQAorMjAxMi0xMC0xOSAgQWxleGFuZHJlIEVsaWFzICA8YWVsaWFzQGNocm9t aXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEFQSSB0byBwYXNzIGltcGwgdGhyZWFkIHZp YSBXZWJMYXllclRyZWVWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05OTg2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoaXMgYWRkcyBhbiBBUEkgdG8gcGFzcyB0aGUgY29tcG9zaXRvciBpbXBsIHRo cmVhZCB2aWEgV2ViVmlldyBhbmQKKyAgICAgICAgV2ViTGF5ZXJUcmVlVmlldy4gVGhpcyBpcyBj dXJyZW50bHkgYSBuby1vcCBjaGFuZ2UsIGJ1dCBpbiB0aGUgZnV0dXJlCisgICAgICAgIHRoaXMg Y29kZXBhdGggd2lsbCBzdXBlcmNlZGUgV2ViQ29tcG9zaXRvci4gVGhlIGdvYWwgaXMgdG8gYXZv aWQgc3RhdGljcworICAgICAgICBpbiBjb21wb3NpdG9yIGluaXRpYWxpemF0aW9uLgorCisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcDoKKyAgICAgICAgKFRl c3RTaGVsbDo6Y3JlYXRlTmV3V2luZG93KToKKwogMjAxMi0xMC0xOCAgVGltb3RoeSBIYXRjaGVy ICA8dGltb3RoeUBhcHBsZS5jb20+CiAKICAgICAgICAgVGVhY2ggcHJlcGFyZS1DaGFuZ2VMb2cg aG93IHRvIGhhbmRsZSBub24tZnVuY3Rpb24gcHJvcGVydGllcyBpbiBKYXZhU2NyaXB0IHByb3Rv dHlwZXMuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hl bGwuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAppbmRl eCAzMjU4NWZhYTFiMmQ4YWQ4MWE4M2IxNWU4ZjcxMmJkOGNhNzI0ODliLi44NTFhZjM1M2ZlYzRi ZTVjYjRjOTk4NDA4ZDIzNTgxYTQzOTM5ZDY1IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL1Rlc3RTaGVsbC5jcHAKQEAgLTczOCw2ICs3MzgsNyBAQCBXZWJWaWV3SG9zdCogVGVz dFNoZWxsOjpjcmVhdGVOZXdXaW5kb3coY29uc3QgV2ViS2l0OjpXZWJVUkwmIHVybCwgRFJURGV2 VG9vbHNBZwogewogICAgIFdlYlZpZXdIb3N0KiBob3N0ID0gbmV3IFdlYlZpZXdIb3N0KHRoaXMp OwogICAgIFdlYlZpZXcqIHZpZXcgPSBXZWJWaWV3OjpjcmVhdGUoaG9zdCk7CisgICAgdmlldy0+ c2V0Q29tcG9zaXRvckltcGxUaHJlYWQobV93ZWJDb21wb3NpdG9yVGhyZWFkLmdldCgpKTsKICAg ICB2aWV3LT5zZXRQZXJtaXNzaW9uQ2xpZW50KHdlYlBlcm1pc3Npb25zKCkpOwogICAgIHZpZXct PnNldERldlRvb2xzQWdlbnRDbGllbnQoZGV2VG9vbHNBZ2VudCk7CiAgICAgaG9zdC0+c2V0V2Vi V2lkZ2V0KHZpZXcpOwo= 169682 2012-10-19 13:11:50 -0700 2012-10-19 14:30:26 -0700 Patch bug-99863-20121019131034.patch text/plain 9640 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA3MWM3NzNjZTE0ZmRh MTk2ZmFiYTNiZDNiOGRiMWI3OWVjZDUyOTc4Li4zZjkwNjU3ZjI1YzkyYmFkMmYxNGU1OTc5NjE1 NGZlODI1ZDBlOTI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMi0xMC0xOSAg QWxleGFuZHJlIEVsaWFzICA8YWVsaWFzQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21p dW1dIEFQSSB0byBwYXNzIGltcGwgdGhyZWFkIHZpYSBXZWJMYXllclRyZWVWaWV3CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTg2MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgYWRkcyBhbiBBUEkg dG8gcGFzcyB0aGUgY29tcG9zaXRvciBpbXBsIHRocmVhZCB2aWEgV2ViVmlldyBhbmQKKyAgICAg ICAgV2ViTGF5ZXJUcmVlVmlldy4gVGhpcyBpcyBjdXJyZW50bHkgYSBuby1vcCBjaGFuZ2UsIGJ1 dCBpbiB0aGUgZnV0dXJlCisgICAgICAgIHRoaXMgY29kZXBhdGggd2lsbCBzdXBlcmNlZGUgV2Vi Q29tcG9zaXRvci4gVGhlIGdvYWwgaXMgdG8gYXZvaWQgc3RhdGljcworICAgICAgICBpbiBjb21w b3NpdG9yIGluaXRpYWxpemF0aW9uLgorCisgICAgICAgICogY2hyb21pdW0vcHVibGljL1dlYkNv bXBvc2l0b3JTdXBwb3J0Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBvc2l0b3JTdXBwb3J0 OjpjcmVhdGVMYXllclRyZWVWaWV3KToKKyAgICAgICAgKFdlYkNvbXBvc2l0b3JTdXBwb3J0KToK KyAgICAgICAgKiBjaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5oOgorICAgICAgICAo V2ViS2l0KToKKyAgICAgICAgKFdlYkxheWVyVHJlZVZpZXcpOgorCiAyMDEyLTEwLTE3ICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIE1h a2UgV2ViQ29udGVudExheWVyIGluY2x1ZGUgd2hhdCBpdCB1c2VzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCmluZGV4IDRhZWFjN2UzYmZjYTRiMGNiY2EyMzQxNGFiYWQ3Y2YwYWZhNGUzNWUuLmU2 NTZlODY4ZTlmYTMyNTM2ZmY0ZjRiZGFiYmNiZDQyNTRlZjg2NmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTItMTAtMTkgIEFsZXhhbmRyZSBFbGlhcyAg PGFlbGlhc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBBUEkgdG8gcGFzcyBp bXBsIHRocmVhZCB2aWEgV2ViTGF5ZXJUcmVlVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk4NjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFkZHMgYW4gQVBJIHRvIHBhc3MgdGhlIGNvbXBv c2l0b3IgaW1wbCB0aHJlYWQgdmlhIFdlYlZpZXcgYW5kCisgICAgICAgIFdlYkxheWVyVHJlZVZp ZXcuIFRoaXMgaXMgY3VycmVudGx5IGEgbm8tb3AgY2hhbmdlLCBidXQgaW4gdGhlIGZ1dHVyZQor ICAgICAgICB0aGlzIGNvZGVwYXRoIHdpbGwgc3VwZXJjZWRlIFdlYkNvbXBvc2l0b3IuIFRoZSBn b2FsIGlzIHRvIGF2b2lkIHN0YXRpY3MKKyAgICAgICAgaW4gY29tcG9zaXRvciBpbml0aWFsaXph dGlvbi4KKworICAgICAgICAqIHB1YmxpYy9XZWJWaWV3Lmg6CisgICAgICAgIChXZWJLaXQpOgor ICAgICAgICAoV2ViVmlldyk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKToKKyAgICAgICAgKFdlYktpdDo6 V2ViVmlld0ltcGw6OnNldENvbXBvc2l0b3JJbXBsVGhyZWFkKToKKyAgICAgICAgKFdlYktpdCk6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZXRJc0FjY2VsZXJhdGVkQ29tcG9zaXRp bmdBY3RpdmUpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorICAgICAgICAoV2ViVmll d0ltcGwpOgorICAgICAgICAqIHRlc3RzL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bVRlc3QuY3BwOgor ICAgICAgICAoV2ViS2l0OjpHcmFwaGljc0xheWVyQ2hyb21pdW1UZXN0OjpHcmFwaGljc0xheWVy Q2hyb21pdW1UZXN0KToKKwogMjAxMi0xMC0xOCAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3 LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gIFJvbGxlZCBERVBTLgpkaWZm IC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdG9yU3Vw cG9ydC5oIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdG9yU3Vw cG9ydC5oCmluZGV4IDFlNGM2ZTIwNGZkMWM0MGVkYzU3ODBmYTI0OTI2YmM3MzA0ZjBiNDIuLmFh NTY3NDNkOThjNWEwNzI5NTNhNTVjM2IxN2ZjNWQ4MmE1ZmY3MDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViQ29tcG9zaXRvclN1cHBvcnQuaAorKysgYi9T b3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkNvbXBvc2l0b3JTdXBwb3J0LmgKQEAg LTc0LDYgKzc0LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlU2NhbGVQaW5j aFpvb21FbmFibGVkKGJvb2wpIHsgfQogCiAgICAgLy8gTWF5IHJldHVybiAwIGlmIGluaXRpYWxp emF0aW9uIGZhaWxzLgorICAgIHZpcnR1YWwgV2ViTGF5ZXJUcmVlVmlldyogY3JlYXRlTGF5ZXJU cmVlVmlldyhXZWJMYXllclRyZWVWaWV3Q2xpZW50KiBjbGllbnQsIGNvbnN0IFdlYkxheWVyJiBy b290LCBjb25zdCBXZWJMYXllclRyZWVWaWV3OjpTZXR0aW5ncyYgc2V0dGluZ3MsIFdlYlRocmVh ZCogaW1wbFRocmVhZCkgeyByZXR1cm4gY3JlYXRlTGF5ZXJUcmVlVmlldyhjbGllbnQsIHJvb3Qs IHNldHRpbmdzKTsgfQorICAgIC8vIEZJWE1FKGFlbGlhcyk6IERlbGV0ZSB0aGlzIHZlcnNpb24g d2hlbiB0aGUgYWJvdmUgaXMgaW1wbGVtZW50ZWQuCiAgICAgdmlydHVhbCBXZWJMYXllclRyZWVW aWV3KiBjcmVhdGVMYXllclRyZWVWaWV3KFdlYkxheWVyVHJlZVZpZXdDbGllbnQqLCBjb25zdCBX ZWJMYXllciYgcm9vdCwgY29uc3QgV2ViTGF5ZXJUcmVlVmlldzo6U2V0dGluZ3MmKSB7IHJldHVy biAwOyB9CiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Vmlldy5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCmluZGV4IGI3 NzhmMjk2YTRlMzJiMWNjY2NiMzM3MTc2NDE2NGY5MjBlM2QyZjkuLjIyNTM5MjEyZTc4YjU4N2Rl OTdjM2YzY2I1M2M0ZTRmNWMzYTQ2MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJWaWV3LmgKQEAgLTU4LDYgKzU4LDcgQEAgY2xhc3MgV2ViU2V0dGluZ3M7CiBjbGFzcyBXZWJT cGVsbENoZWNrQ2xpZW50OwogY2xhc3MgV2ViU3RyaW5nOwogY2xhc3MgV2ViVGV4dEZpZWxkRGVj b3JhdG9yQ2xpZW50OworY2xhc3MgV2ViVGhyZWFkOwogY2xhc3MgV2ViVmlld0NsaWVudDsKIHN0 cnVjdCBXZWJBY3RpdmVXaGVlbEZsaW5nUGFyYW1ldGVyczsKIHN0cnVjdCBXZWJNZWRpYVBsYXll ckFjdGlvbjsKQEAgLTQ2Nyw2ICs0NjgsOCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIGJvb2wg aXNTZWxlY3Rpb25FZGl0YWJsZSgpIGNvbnN0ID0gMDsKIAorICAgIHZpcnR1YWwgdm9pZCBzZXRD b21wb3NpdG9ySW1wbFRocmVhZChXZWJUaHJlYWQqKSA9IDA7CisKICAgICAvLyBCZW5jaG1hcmtp bmcgc3VwcG9ydCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCiAKICAgICB2aXJ0dWFsIFdlYlZpZXdCZW5jaG1hcmtTdXBwb3J0KiBiZW5jaG1hcmtTdXBw b3J0KCkgeyByZXR1cm4gMDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuY3BwCmluZGV4IGQ2YmY5NGI5Njc2Mzk4NDc5NzQ2ZDhiMzMxN2MwNzE5MTM4OTVmMDYuLjQz N2MwZDFiMjQwN2RjZGQyMDRhMTViMGM1OTAxOWVhMjQ3ZDNlYmQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTQyNCw2ICs0MjQsNyBAQCBXZWJWaWV3 SW1wbDo6V2ViVmlld0ltcGwoV2ViVmlld0NsaWVudCogY2xpZW50KQogICAgICwgbV9jb21wb3Np dG9yU3VyZmFjZVJlYWR5KGZhbHNlKQogICAgICwgbV9kZXZpY2VTY2FsZUluQ29tcG9zaXRvcigx KQogICAgICwgbV9pbnB1dEhhbmRsZXJJZGVudGlmaWVyKC0xKQorICAgICwgbV9jb21wb3NpdG9y SW1wbFRocmVhZCgwKQogI2VuZGlmCiAjaWYgRU5BQkxFKElOUFVUX1NQRUVDSCkKICAgICAsIG1f c3BlZWNoSW5wdXRDbGllbnQoU3BlZWNoSW5wdXRDbGllbnRJbXBsOjpjcmVhdGUoY2xpZW50KSkK QEAgLTM4NzAsNiArMzg3MSwxMSBAQCB2b2lkIFdlYlZpZXdJbXBsOjpwYWludFJvb3RMYXllcihH cmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGNvbnRlbgogICAgIHNldEJh Y2tncm91bmRDb2xvcih2aWV3LT5kb2N1bWVudEJhY2tncm91bmRDb2xvcigpKTsKIH0KIAordm9p ZCBXZWJWaWV3SW1wbDo6c2V0Q29tcG9zaXRvckltcGxUaHJlYWQoV2ViVGhyZWFkKiBjb21wb3Np dG9ySW1wbFRocmVhZCkKK3sKKyAgICBtX2NvbXBvc2l0b3JJbXBsVGhyZWFkID0gY29tcG9zaXRv ckltcGxUaHJlYWQ7Cit9CisKIHZvaWQgV2ViVmlld0ltcGw6OnNldElzQWNjZWxlcmF0ZWRDb21w b3NpdGluZ0FjdGl2ZShib29sIGFjdGl2ZSkKIHsKICAgICBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJy ZW50KCktPmhpc3RvZ3JhbUVudW1lcmF0aW9uKCJHUFUuc2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0 aW5nQWN0aXZlIiwgYWN0aXZlICogMiArIG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZl LCA0KTsKQEAgLTM5MDcsNyArMzkxMyw3IEBAIHZvaWQgV2ViVmlld0ltcGw6OnNldElzQWNjZWxl cmF0ZWRDb21wb3NpdGluZ0FjdGl2ZShib29sIGFjdGl2ZSkKICAgICAgICAgbV9ub25Db21wb3Np dGVkQ29udGVudEhvc3QtPnNldFNob3dEZWJ1Z0JvcmRlcnMocGFnZSgpLT5zZXR0aW5ncygpLT5z aG93RGVidWdCb3JkZXJzKCkpOwogICAgICAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50SG9zdC0+ c2V0T3BhcXVlKCFpc1RyYW5zcGFyZW50KCkpOwogCi0gICAgICAgIG1fbGF5ZXJUcmVlVmlldyA9 IGFkb3B0UHRyKFBsYXRmb3JtOjpjdXJyZW50KCktPmNvbXBvc2l0b3JTdXBwb3J0KCktPmNyZWF0 ZUxheWVyVHJlZVZpZXcodGhpcywgKm1fcm9vdExheWVyLCBsYXllclRyZWVWaWV3U2V0dGluZ3Mp KTsKKyAgICAgICAgbV9sYXllclRyZWVWaWV3ID0gYWRvcHRQdHIoUGxhdGZvcm06OmN1cnJlbnQo KS0+Y29tcG9zaXRvclN1cHBvcnQoKS0+Y3JlYXRlTGF5ZXJUcmVlVmlldyh0aGlzLCAqbV9yb290 TGF5ZXIsIGxheWVyVHJlZVZpZXdTZXR0aW5ncywgbV9jb21wb3NpdG9ySW1wbFRocmVhZCkpOwog ICAgICAgICBpZiAobV9sYXllclRyZWVWaWV3KSB7CiAgICAgICAgICAgICBpZiAobV93ZWJTZXR0 aW5ncy0+YXBwbHlEZWZhdWx0RGV2aWNlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IoKSAmJiBwYWdl KCktPmRldmljZVNjYWxlRmFjdG9yKCkgIT0gMSkgewogICAgICAgICAgICAgICAgIEFTU0VSVChw YWdlKCktPmRldmljZVNjYWxlRmFjdG9yKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmgKaW5kZXggNDc5MDdmMTI0MTdlM2YyMjBhYzhiMDBmOTM2MGFlZmFhYTBkYWY0 Mi4uNjBiYWUzZWZlYjE0ZGY4YWIwODcxZDUzNTQ5YTlkZWMzY2EyN2Q1MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCkBAIC0yMDIsNiArMjAyLDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgYm9vbCBpc0FjdGl2ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBz ZXRJc0FjdGl2ZShib29sIHZhbHVlKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0RG9tYWluUmVsYXhh dGlvbkZvcmJpZGRlbihib29sLCBjb25zdCBXZWJTdHJpbmcmIHNjaGVtZSk7CisgICAgdmlydHVh bCB2b2lkIHNldENvbXBvc2l0b3JJbXBsVGhyZWFkKFdlYlRocmVhZCopOwogICAgIHZpcnR1YWwg Ym9vbCBkaXNwYXRjaEJlZm9yZVVubG9hZEV2ZW50KCk7CiAgICAgdmlydHVhbCB2b2lkIGRpc3Bh dGNoVW5sb2FkRXZlbnQoKTsKICAgICB2aXJ0dWFsIFdlYkZyYW1lKiBtYWluRnJhbWUoKTsKQEAg LTg0MCw2ICs4NDEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9jb21wb3NpdG9yU3VyZmFjZVJl YWR5OwogICAgIGZsb2F0IG1fZGV2aWNlU2NhbGVJbkNvbXBvc2l0b3I7CiAgICAgaW50IG1faW5w dXRIYW5kbGVySWRlbnRpZmllcjsKKyAgICBXZWJUaHJlYWQqIG1fY29tcG9zaXRvckltcGxUaHJl YWQ7CiAjZW5kaWYKICAgICBzdGF0aWMgY29uc3QgV2ViSW5wdXRFdmVudCogbV9jdXJyZW50SW5w dXRFdmVudDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9HcmFw aGljc0xheWVyQ2hyb21pdW1UZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv R3JhcGhpY3NMYXllckNocm9taXVtVGVzdC5jcHAKaW5kZXggMGNlODQyNTdiNWJhN2JiODMwMWVl N2VkNjEzN2JiNWRiMDQ0NWZlNy4uM2IxZjZkNTI3MTBlZjc3MjViZmQ2NmFkMDFkMTg2NGZkNzg3 ZDI1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9HcmFwaGljc0xh eWVyQ2hyb21pdW1UZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0dy YXBoaWNzTGF5ZXJDaHJvbWl1bVRlc3QuY3BwCkBAIC02Niw3ICs2Niw3IEBAIHB1YmxpYzoKICAg ICAgICAgUGxhdGZvcm06OmN1cnJlbnQoKS0+Y29tcG9zaXRvclN1cHBvcnQoKS0+aW5pdGlhbGl6 ZSgwKTsKICAgICAgICAgbV9ncmFwaGljc0xheWVyID0gc3RhdGljX3BvaW50ZXJfY2FzdDxHcmFw aGljc0xheWVyQ2hyb21pdW0+KEdyYXBoaWNzTGF5ZXI6OmNyZWF0ZSgmbV9jbGllbnQpKTsKICAg ICAgICAgbV9wbGF0Zm9ybUxheWVyID0gbV9ncmFwaGljc0xheWVyLT5wbGF0Zm9ybUxheWVyKCk7 Ci0gICAgICAgIG1fbGF5ZXJUcmVlVmlldyA9IGFkb3B0UHRyKFBsYXRmb3JtOjpjdXJyZW50KCkt PmNvbXBvc2l0b3JTdXBwb3J0KCktPmNyZWF0ZUxheWVyVHJlZVZpZXcoJm1fbGF5ZXJUcmVlVmll d0NsaWVudCwgKm1fcGxhdGZvcm1MYXllciwgV2ViTGF5ZXJUcmVlVmlldzo6U2V0dGluZ3MoKSkp OworICAgICAgICBtX2xheWVyVHJlZVZpZXcgPSBhZG9wdFB0cihQbGF0Zm9ybTo6Y3VycmVudCgp LT5jb21wb3NpdG9yU3VwcG9ydCgpLT5jcmVhdGVMYXllclRyZWVWaWV3KCZtX2xheWVyVHJlZVZp ZXdDbGllbnQsICptX3BsYXRmb3JtTGF5ZXIsIFdlYkxheWVyVHJlZVZpZXc6OlNldHRpbmdzKCks IDApKTsKICAgICAgICAgbV9sYXllclRyZWVWaWV3LT5zZXRWaWV3cG9ydFNpemUoV2ViU2l6ZSgx LCAxKSwgV2ViU2l6ZSgxLCAxKSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjlkMGUyZTdhZjljMThkODlkODdjYjhlMGJmM2E5 NGM4NmE5YmEwOC4uYTk4Y2U1NTgwNDg4ZTgxZTVjMDBjNTdiYjU4YTBlMGYxNWIyZDVlZSAxMDA2 NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDEyLTEwLTE5ICBBbGV4YW5kcmUgRWxpYXMgIDxhZWxpYXNAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFtjaHJvbWl1bV0gQVBJIHRvIHBhc3MgaW1wbCB0aHJlYWQgdmlhIFdlYkxh eWVyVHJlZVZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTk5ODYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyBhZGRzIGFuIEFQSSB0byBwYXNzIHRoZSBjb21wb3NpdG9yIGltcGwgdGhyZWFkIHZp YSBXZWJWaWV3IGFuZAorICAgICAgICBXZWJMYXllclRyZWVWaWV3LiBUaGlzIGlzIGN1cnJlbnRs eSBhIG5vLW9wIGNoYW5nZSwgYnV0IGluIHRoZSBmdXR1cmUKKyAgICAgICAgdGhpcyBjb2RlcGF0 aCB3aWxsIHN1cGVyY2VkZSBXZWJDb21wb3NpdG9yLiBUaGUgZ29hbCBpcyB0byBhdm9pZCBzdGF0 aWNzCisgICAgICAgIGluIGNvbXBvc2l0b3IgaW5pdGlhbGl6YXRpb24uCisKKyAgICAgICAgKiBE dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwOgorICAgICAgICAoVGVzdFNoZWxs OjpjcmVhdGVOZXdXaW5kb3cpOgorCiAyMDEyLTEwLTE4ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1v dGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBUZWFjaCBwcmVwYXJlLUNoYW5nZUxvZyBob3cgdG8g aGFuZGxlIG5vbi1mdW5jdGlvbiBwcm9wZXJ0aWVzIGluIEphdmFTY3JpcHQgcHJvdG90eXBlcy4K ZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHAg Yi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwCmluZGV4IDMyNTg1 ZmFhMWIyZDhhZDgxYTgzYjE1ZThmNzEyYmQ4Y2E3MjQ4OWIuLjg1MWFmMzUzZmVjNGJlNWNiNGM5 OTg0MDhkMjM1ODFhNDM5MzlkNjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL1Rlc3RTaGVsbC5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v VGVzdFNoZWxsLmNwcApAQCAtNzM4LDYgKzczOCw3IEBAIFdlYlZpZXdIb3N0KiBUZXN0U2hlbGw6 OmNyZWF0ZU5ld1dpbmRvdyhjb25zdCBXZWJLaXQ6OldlYlVSTCYgdXJsLCBEUlREZXZUb29sc0Fn CiB7CiAgICAgV2ViVmlld0hvc3QqIGhvc3QgPSBuZXcgV2ViVmlld0hvc3QodGhpcyk7CiAgICAg V2ViVmlldyogdmlldyA9IFdlYlZpZXc6OmNyZWF0ZShob3N0KTsKKyAgICB2aWV3LT5zZXRDb21w b3NpdG9ySW1wbFRocmVhZChtX3dlYkNvbXBvc2l0b3JUaHJlYWQuZ2V0KCkpOwogICAgIHZpZXct PnNldFBlcm1pc3Npb25DbGllbnQod2ViUGVybWlzc2lvbnMoKSk7CiAgICAgdmlldy0+c2V0RGV2 VG9vbHNBZ2VudENsaWVudChkZXZUb29sc0FnZW50KTsKICAgICBob3N0LT5zZXRXZWJXaWRnZXQo dmlldyk7Cg==