41828 2010-07-07 19:38:50 -0700 [chromium] Allow resizing an offscreen GLES2Context's backing store and getting its texture ID for compositing 2010-07-08 17:41:54 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jamesr jamesr fishd kbr oldest_to_newest 247957 0 jamesr 2010-07-07 19:38:50 -0700 [chromium] Allow resizing an offscreen GLES2Context's backing store and getting its texture ID for compositing 247963 1 60829 jamesr 2010-07-07 20:02:24 -0700 Created attachment 60829 Patch 247977 2 jamesr 2010-07-07 20:45:51 -0700 Ken, Darin - mind taking a look? I added an ASSERT(webContext) rather than returning a bool since currently there is no good way for a caller to handle a failure and because getOffscreenContentParentTextureId naturally returns an unsigned. 248026 3 60829 fishd 2010-07-07 23:08:50 -0700 Comment on attachment 60829 Patch WebCore/platform/chromium/GLES2Context.h:65 + unsigned getOffscreenContentParentTextureId(); i like this name for this method. it helps me understand its distinction better. WebCore/platform/chromium/GLES2Context.h:62 + void resizeOffscreenContent(const IntSize& size); nit: webkit style is to leave off parameter names that do not add information. "size" is redundant with "IntSize" WebCore/platform/chromium/GLES2Context.h:63 + // Returns the ID of the texture used for offscreen rendering in the context of the parent. nit: a new line above this comment block would be nice for readability. WebKit/chromium/public/WebGLES2Context.h:52 + virtual void resizeOffscreenContent(int width, int height) = 0; nit: use WebSize in the WebKit API. WebKit/chromium/public/WebGLES2Context.h:53 + virtual unsigned getOffscreenContentParentTextureId() = 0; how about documenting these methods like you did for GLES2Context.h? it is important to document the WebKit API methods since that helps make the contract with the embedder clearer. WebKit/chromium/src/GLES2Context.cpp:148 + webContext->resizeOffscreenContent(size.width(), size.height()); WebSize can be constructed implicitly from IntSize :) otherwise, LGTM based on this being a faithful interpretation of what kbr wrote on the whiteboard earlier today :-) 248546 4 60959 jamesr 2010-07-08 14:24:47 -0700 Created attachment 60959 Patch 248565 5 60959 kbr 2010-07-08 14:49:40 -0700 Comment on attachment 60959 Patch Looks good to me. As in earlier Chromium review, uint32_t may be a better return type for getOffscreenContentParentTextureId(). 248623 6 60959 fishd 2010-07-08 16:31:15 -0700 Comment on attachment 60959 Patch WebKit/chromium/public/WebGLES2Context.h:54 > + // The follow two functions are for managing a context that renders offscreen. nit: put a new line after this comment so that it doesn't look like this comment is only talking about the first function? how critical is the unsigned vs uint32_t distinction? in the webkit api, we don't really have a uint32_t. (well, we do have one inherited from npruntime.h, but it would be odd to use that in this context.) anyways, r=me modulo the nit above. 248626 7 jamesr 2010-07-08 16:34:48 -0700 I don't think uint32_t vs unsigned will be an issue. If on some crazy moon system 'unsigned' was 64 bits things would still work fine since an unsigned would be able to represent the contents of a uint32_t without issue. We're using 'unsigned' for the GLuint type for texture IDs and other things elsewhere in WebKit code so I'd rather stick to that. 248637 8 kbr 2010-07-08 16:44:50 -0700 (In reply to comment #7) > I don't think uint32_t vs unsigned will be an issue. If on some crazy moon system 'unsigned' was 64 bits things would still work fine since an unsigned would be able to represent the contents of a uint32_t without issue. We're using 'unsigned' for the GLuint type for texture IDs and other things elsewhere in WebKit code so I'd rather stick to that. OK, sounds fine. 248654 9 jamesr 2010-07-08 17:41:28 -0700 Committed r62874: <http://trac.webkit.org/changeset/62874> 248656 10 jamesr 2010-07-08 17:41:54 -0700 Thanks for the review. Adjusted the space on the comments and landed. 60829 2010-07-07 20:02:24 -0700 2010-07-08 14:24:44 -0700 Patch bug-41828-20100707200223.patch text/plain 4300 jamesr ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDNhYzAwZTUzZGVjNDZiNTdhODRhN2E4N2MwOTgzMmU2M2RhYWU4YS4uNWZkYjRlNGY5ZmQ1N2Iy YTYzYWFkNDdjMjkxYzYzMTBiZDk4YTFkMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wNy0wNyAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyByZXNpemluZyBhbmQgZ2V0dGluZyB0aGUg dGV4dHVyZSBpZCBmcm9tIGFuIG9mZnNjcmVlbiBHTEVTMkNvbnRleHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxODI4CisKKyAgICAgICAgV2hlbiB1 c2luZyBhbiBvZmZzY3JlZW4gR0xFUzJDb250ZXh0IHRoZSBjYWxsZXIgbmVlZHMgdG8gYmUgYWJs ZSB0byByZXNpemUgdGhlIGJhY2tpbmcgc3RvcmUKKyAgICAgICAgbWFuYWdlZCBieSB0aGUgZW1i ZWRkZXIgYW5kIGdldCBhY2Nlc3MgdG8gYSB0ZXh0dXJlIGlkIHRvIHBhc3MgdG8gdGhlIGNvbXBv c2l0b3IuICBXZWJHTAorICAgICAgICBkb2VzIHRoZXNlIGFjdGlvbnMgaW4gYW4gaW5kaXJlY3Qg d2F5LCBpdCB3aWxsIGJlIHJlZmFjdG9yZWQgdG8gdXNlIHRoaXMgcGF0aC4KKworICAgICAgICAq IHBsYXRmb3JtL2Nocm9taXVtL0dMRVMyQ29udGV4dC5oOgorCiAyMDEwLTA2LTE4ICBNT1JJVEEg SGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9qYW4g VmFmYWkuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0dMRVMyQ29udGV4 dC5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9HTEVTMkNvbnRleHQuaAppbmRleCBlZjY3 MDEyNTJkNmRmNTlkN2IzMTA2MGUwNTdmNjU0NzFlNTY1YTZiLi43NWE4ODhkMGI3YjQ0NWFhOTU5 YThlODE2NzA5ZjE1M2ZkZGQ0Zjk1IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL0dMRVMyQ29udGV4dC5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vR0xFUzJD b250ZXh0LmgKQEAgLTMxLDYgKzMxLDggQEAKICNpZm5kZWYgR0xFUzJDb250ZXh0X2gKICNkZWZp bmUgR0xFUzJDb250ZXh0X2gKIAorI2luY2x1ZGUgIkludFNpemUuaCIKKwogI2luY2x1ZGUgPHd0 Zi9Ob25jb3B5YWJsZS5oPgogI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3dGYv UGFzc093blB0ci5oPgpAQCAtNTYsNiArNTgsMTIgQEAgcHVibGljOgogICAgIGJvb2wgZGVzdHJv eSgpOwogICAgIGJvb2wgc3dhcEJ1ZmZlcnMoKTsKIAorICAgIC8vIE9ubHkgdmFsaWQgZm9yIG9m ZnNjcmVlbiBjb250ZXh0cy4KKyAgICB2b2lkIHJlc2l6ZU9mZnNjcmVlbkNvbnRlbnQoY29uc3Qg SW50U2l6ZSYgc2l6ZSk7CisgICAgLy8gUmV0dXJucyB0aGUgSUQgb2YgdGhlIHRleHR1cmUgdXNl ZCBmb3Igb2Zmc2NyZWVuIHJlbmRlcmluZyBpbiB0aGUgY29udGV4dCBvZiB0aGUgcGFyZW50Lgor ICAgIC8vIFRoaXMgdGV4dHVyZSBpcyBhY2Nlc3NpYmxlIGJ5IHRoZSBHUFUgcGFnZSBjb21wb3Np dG9yLgorICAgIHVuc2lnbmVkIGdldE9mZnNjcmVlbkNvbnRlbnRQYXJlbnRUZXh0dXJlSWQoKTsK KwogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgR0xFUzJDb250ZXh0SW50ZXJuYWw7CiAgICAg T3duUHRyPEdMRVMyQ29udGV4dEludGVybmFsPiBtX2ludGVybmFsOwpkaWZmIC0tZ2l0IGEvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ZTlkZDM2MTE4Mzc0NDU0YWY3NWRiZTg2YmM0NmJiMGJkNTQyMGMyYy4uZTE2ODM4YjcxMGQ3Mjg4 YzU4YmQ1ZTIxZTA1NzM2YTBhYmMzZmE1ZCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMDctMDcgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGdvb2dsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3cgcmVzaXppbmcg YW5kIGdldHRpbmcgdGhlIHRleHR1cmUgSUQgZnJvbSBhbiBvZmZzY3JlZW4gR0xFUzJDb250ZXh0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTgyOAor CisgICAgICAgIFdoZW4gdXNpbmcgYW4gb2Zmc2NyZWVuIEdMRVMyQ29udGV4dCB0aGUgY2FsbGVy IG5lZWRzIHRvIGJlIGFibGUgdG8gcmVzaXplIHRoZSBiYWNraW5nIHN0b3JlCisgICAgICAgIG1h bmFnZWQgYnkgdGhlIGVtYmVkZGVyIGFuZCBnZXQgYWNjZXNzIHRvIGEgdGV4dHVyZSBpZCB0byBw YXNzIHRvIHRoZSBjb21wb3NpdG9yLiAgV2ViR0wKKyAgICAgICAgZG9lcyB0aGVzZSBhY3Rpb25z IGluIGFuIGluZGlyZWN0IHdheSwgaXQgd2lsbCBiZSByZWZhY3RvcmVkIHRvIHVzZSB0aGlzIHBh dGguCisKKyAgICAgICAgKiBwdWJsaWMvV2ViR0xFUzJDb250ZXh0Lmg6CisgICAgICAgICogc3Jj L0dMRVMyQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHTEVTMkNvbnRleHQ6OnJlc2l6 ZU9mZnNjcmVlbkNvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6R0xFUzJDb250ZXh0OjpnZXRP ZmZzY3JlZW5Db250ZW50UGFyZW50VGV4dHVyZUlkKToKKwogMjAxMC0wNy0wNyAgSmFtZXMgSGF3 a2lucyAgPGpoYXdraW5zQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1p dHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkdMRVMy Q29udGV4dC5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJHTEVTMkNvbnRleHQuaAppbmRl eCBhN2U5NTYwZTE3YzhmY2EzZTA0ODEyMWUxMGFmZmFmZTA5NTc5NDlhLi43M2ZiYzIxMDIxNzNi MjI4YjhiMzUyNzFjMzdjY2UxZTVlNzJkMDVmIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkdMRVMyQ29udGV4dC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi R0xFUzJDb250ZXh0LmgKQEAgLTQ5LDYgKzQ5LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9v bCBtYWtlQ3VycmVudCgpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgZGVzdHJveSgpID0gMDsKICAg ICB2aXJ0dWFsIGJvb2wgc3dhcEJ1ZmZlcnMoKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHJlc2l6 ZU9mZnNjcmVlbkNvbnRlbnQoaW50IHdpZHRoLCBpbnQgaGVpZ2h0KSA9IDA7CisgICAgdmlydHVh bCB1bnNpZ25lZCBnZXRPZmZzY3JlZW5Db250ZW50UGFyZW50VGV4dHVyZUlkKCkgPSAwOwogfTsK IAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3Jj L0dMRVMyQ29udGV4dC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL0dMRVMyQ29udGV4dC5jcHAK aW5kZXggMmI0NWE5MThhM2YyZWFiZTk4MzQ4Y2EwMTVlZjRmMDQ0YzRmNWQ5Ni4uYThkNDdlMGFh MzQ5YWMzNDBkMWY5OTAyODUzMjZkMDc1ZWIyNGU4NCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9t aXVtL3NyYy9HTEVTMkNvbnRleHQuY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvR0xFUzJD b250ZXh0LmNwcApAQCAtMTQxLDQgKzE0MSwxOCBAQCBib29sIEdMRVMyQ29udGV4dDo6c3dhcEJ1 ZmZlcnMoKQogICAgIHJldHVybiB3ZWJDb250ZXh0LT5zd2FwQnVmZmVycygpOwogfQogCit2b2lk IEdMRVMyQ29udGV4dDo6cmVzaXplT2Zmc2NyZWVuQ29udGVudChjb25zdCBJbnRTaXplJiBzaXpl KQoreworICAgIFdlYkdMRVMyQ29udGV4dCogd2ViQ29udGV4dCA9IG1faW50ZXJuYWwtPmdldFdl YkdMRVMyQ29udGV4dCgpOworICAgIEFTU0VSVCh3ZWJDb250ZXh0KTsKKyAgICB3ZWJDb250ZXh0 LT5yZXNpemVPZmZzY3JlZW5Db250ZW50KHNpemUud2lkdGgoKSwgc2l6ZS5oZWlnaHQoKSk7Cit9 CisKK3Vuc2lnbmVkIEdMRVMyQ29udGV4dDo6Z2V0T2Zmc2NyZWVuQ29udGVudFBhcmVudFRleHR1 cmVJZCgpCit7CisgICAgV2ViR0xFUzJDb250ZXh0KiB3ZWJDb250ZXh0ID0gbV9pbnRlcm5hbC0+ Z2V0V2ViR0xFUzJDb250ZXh0KCk7CisgICAgQVNTRVJUKHdlYkNvbnRleHQpOworICAgIHJldHVy biB3ZWJDb250ZXh0LT5nZXRPZmZzY3JlZW5Db250ZW50UGFyZW50VGV4dHVyZUlkKCk7Cit9CisK IH0gIC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 60959 2010-07-08 14:24:47 -0700 2010-07-08 16:31:14 -0700 Patch bug-41828-20100708142446.patch text/plain 4792 jamesr ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDNhYzAwZTUzZGVjNDZiNTdhODRhN2E4N2MwOTgzMmU2M2RhYWU4YS4uNWZkYjRlNGY5ZmQ1N2Iy YTYzYWFkNDdjMjkxYzYzMTBiZDk4YTFkMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wNy0wNyAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyByZXNpemluZyBhbmQgZ2V0dGluZyB0aGUg dGV4dHVyZSBpZCBmcm9tIGFuIG9mZnNjcmVlbiBHTEVTMkNvbnRleHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxODI4CisKKyAgICAgICAgV2hlbiB1 c2luZyBhbiBvZmZzY3JlZW4gR0xFUzJDb250ZXh0IHRoZSBjYWxsZXIgbmVlZHMgdG8gYmUgYWJs ZSB0byByZXNpemUgdGhlIGJhY2tpbmcgc3RvcmUKKyAgICAgICAgbWFuYWdlZCBieSB0aGUgZW1i ZWRkZXIgYW5kIGdldCBhY2Nlc3MgdG8gYSB0ZXh0dXJlIGlkIHRvIHBhc3MgdG8gdGhlIGNvbXBv c2l0b3IuICBXZWJHTAorICAgICAgICBkb2VzIHRoZXNlIGFjdGlvbnMgaW4gYW4gaW5kaXJlY3Qg d2F5LCBpdCB3aWxsIGJlIHJlZmFjdG9yZWQgdG8gdXNlIHRoaXMgcGF0aC4KKworICAgICAgICAq IHBsYXRmb3JtL2Nocm9taXVtL0dMRVMyQ29udGV4dC5oOgorCiAyMDEwLTA2LTE4ICBNT1JJVEEg SGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9qYW4g VmFmYWkuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0dMRVMyQ29udGV4 dC5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9HTEVTMkNvbnRleHQuaAppbmRleCBlZjY3 MDEyNTJkNmRmNTlkN2IzMTA2MGUwNTdmNjU0NzFlNTY1YTZiLi5iNzIzMjlhOGUwNjFhODYwOGNj MjExMzFlYWIwMTQ5NTg5ZjcyNGQ5IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL0dMRVMyQ29udGV4dC5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vR0xFUzJD b250ZXh0LmgKQEAgLTM4LDYgKzM4LDcgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3Mg R0xFUzJDb250ZXh0SW50ZXJuYWw7CitjbGFzcyBJbnRTaXplOwogY2xhc3MgUGFnZTsKIAogY2xh c3MgR0xFUzJDb250ZXh0IDogcHVibGljIE5vbmNvcHlhYmxlIHsKQEAgLTU2LDYgKzU3LDEzIEBA IHB1YmxpYzoKICAgICBib29sIGRlc3Ryb3koKTsKICAgICBib29sIHN3YXBCdWZmZXJzKCk7CiAK KyAgICAvLyBPbmx5IHZhbGlkIGZvciBvZmZzY3JlZW4gY29udGV4dHMuCisgICAgdm9pZCByZXNp emVPZmZzY3JlZW5Db250ZW50KGNvbnN0IEludFNpemUmKTsKKworICAgIC8vIFJldHVybnMgdGhl IElEIG9mIHRoZSB0ZXh0dXJlIHVzZWQgZm9yIG9mZnNjcmVlbiByZW5kZXJpbmcgaW4gdGhlIGNv bnRleHQgb2YgdGhlIHBhcmVudC4KKyAgICAvLyBUaGlzIHRleHR1cmUgaXMgYWNjZXNzaWJsZSBi eSB0aGUgR1BVIHBhZ2UgY29tcG9zaXRvci4KKyAgICB1bnNpZ25lZCBnZXRPZmZzY3JlZW5Db250 ZW50UGFyZW50VGV4dHVyZUlkKCk7CisKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIEdMRVMy Q29udGV4dEludGVybmFsOwogICAgIE93blB0cjxHTEVTMkNvbnRleHRJbnRlcm5hbD4gbV9pbnRl cm5hbDsKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCmluZGV4IGU5ZGQzNjExODM3NDQ1NGFmNzVkYmU4NmJjNDZiYjBiZDU0 MjBjMmMuLmUxNjgzOGI3MTBkNzI4OGM1OGJkNWUyMWUwNTczNmEwYWJjM2ZhNWQgMTAwNjQ0Ci0t LSBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEwLTA3LTA3ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVz ckBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFsbG93IHJlc2l6aW5nIGFuZCBnZXR0aW5nIHRoZSB0ZXh0dXJlIElEIGZyb20gYW4g b2Zmc2NyZWVuIEdMRVMyQ29udGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDE4MjgKKworICAgICAgICBXaGVuIHVzaW5nIGFuIG9mZnNjcmVlbiBH TEVTMkNvbnRleHQgdGhlIGNhbGxlciBuZWVkcyB0byBiZSBhYmxlIHRvIHJlc2l6ZSB0aGUgYmFj a2luZyBzdG9yZQorICAgICAgICBtYW5hZ2VkIGJ5IHRoZSBlbWJlZGRlciBhbmQgZ2V0IGFjY2Vz cyB0byBhIHRleHR1cmUgaWQgdG8gcGFzcyB0byB0aGUgY29tcG9zaXRvci4gIFdlYkdMCisgICAg ICAgIGRvZXMgdGhlc2UgYWN0aW9ucyBpbiBhbiBpbmRpcmVjdCB3YXksIGl0IHdpbGwgYmUgcmVm YWN0b3JlZCB0byB1c2UgdGhpcyBwYXRoLgorCisgICAgICAgICogcHVibGljL1dlYkdMRVMyQ29u dGV4dC5oOgorICAgICAgICAqIHNyYy9HTEVTMkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6R0xFUzJDb250ZXh0OjpyZXNpemVPZmZzY3JlZW5Db250ZW50KToKKyAgICAgICAgKFdlYkNv cmU6OkdMRVMyQ29udGV4dDo6Z2V0T2Zmc2NyZWVuQ29udGVudFBhcmVudFRleHR1cmVJZCk6CisK IDIwMTAtMDctMDcgIEphbWVzIEhhd2tpbnMgIDxqaGF3a2luc0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJHTEVTMkNvbnRleHQuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViR0xFUzJDb250ZXh0LmgKaW5kZXggYTdlOTU2MGUxN2M4ZmNhM2UwNDgxMjFlMTBhZmZhZmUw OTU3OTQ5YS4uYjU5NzMwZmJiNDdkMzk4ZTFmYmU3YWQ0NjZlYTYwODVmYTZjYjM1MCAxMDA2NDQK LS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJHTEVTMkNvbnRleHQuaAorKysgYi9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkdMRVMyQ29udGV4dC5oCkBAIC0zNiw2ICszNiw3IEBACiAK IG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFzcyBXZWJTaXplOwogY2xhc3MgV2ViVmlldzsKIAog Ly8gVGhpcyBpbnRlcmZhY2UgYWJzdHJhY3RzIHRoZSBjcmVhdGlvbiBhbmQgbWFuYWdlbWVudCBv ZiBhbgpAQCAtNDksNiArNTAsMTMgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBtYWtlQ3Vy cmVudCgpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgZGVzdHJveSgpID0gMDsKICAgICB2aXJ0dWFs IGJvb2wgc3dhcEJ1ZmZlcnMoKSA9IDA7CisKKyAgICAvLyBUaGUgZm9sbG93IHR3byBmdW5jdGlv bnMgYXJlIGZvciBtYW5hZ2luZyBhIGNvbnRleHQgdGhhdCByZW5kZXJzIG9mZnNjcmVlbi4KKyAg ICAvLyBSZXNpemVzIHRoZSBiYWNraW5nIHN0b3JlIHVzZWQgZm9yIG9mZnNjcmVlbiByZW5kZXJp bmcuCisgICAgdmlydHVhbCB2b2lkIHJlc2l6ZU9mZnNjcmVlbkNvbnRlbnQoY29uc3QgV2ViU2l6 ZSYpID0gMDsKKworICAgIC8vIFJldHVybnMgdGhlIElEIG9mIHRoZSB0ZXh0dXJlIHVzZWQgZm9y IG9mZnNjcmVlbiByZW5kZXJpbmcgaW4gdGhlIGNvbnRleHQgb2YgdGhlIHBhcmVudC4KKyAgICB2 aXJ0dWFsIHVuc2lnbmVkIGdldE9mZnNjcmVlbkNvbnRlbnRQYXJlbnRUZXh0dXJlSWQoKSA9IDA7 CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1 bS9zcmMvR0xFUzJDb250ZXh0LmNwcCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvR0xFUzJDb250ZXh0 LmNwcAppbmRleCAyYjQ1YTkxOGEzZjJlYWJlOTgzNDhjYTAxNWVmNGYwNDRjNGY1ZDk2Li5mMzQy NDM2MmNjOWZmZGI4MjVjNTE1ZTY0ZWFmOTk2ZDczYzkzMWJmIDEwMDY0NAotLS0gYS9XZWJLaXQv Y2hyb21pdW0vc3JjL0dMRVMyQ29udGV4dC5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9H TEVTMkNvbnRleHQuY3BwCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAK ICNpbmNsdWRlICJHTEVTMkNvbnRleHQuaCIKKyNpbmNsdWRlICJJbnRTaXplLmgiCiAjaW5jbHVk ZSAiV2ViR0xFUzJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV2ViS2l0LmgiCiAjaW5jbHVkZSAiV2Vi S2l0Q2xpZW50LmgiCkBAIC0xNDEsNCArMTQyLDE4IEBAIGJvb2wgR0xFUzJDb250ZXh0Ojpzd2Fw QnVmZmVycygpCiAgICAgcmV0dXJuIHdlYkNvbnRleHQtPnN3YXBCdWZmZXJzKCk7CiB9CiAKK3Zv aWQgR0xFUzJDb250ZXh0OjpyZXNpemVPZmZzY3JlZW5Db250ZW50KGNvbnN0IEludFNpemUmIHNp emUpCit7CisgICAgV2ViR0xFUzJDb250ZXh0KiB3ZWJDb250ZXh0ID0gbV9pbnRlcm5hbC0+Z2V0 V2ViR0xFUzJDb250ZXh0KCk7CisgICAgQVNTRVJUKHdlYkNvbnRleHQpOworICAgIHdlYkNvbnRl eHQtPnJlc2l6ZU9mZnNjcmVlbkNvbnRlbnQoc2l6ZSk7Cit9CisKK3Vuc2lnbmVkIEdMRVMyQ29u dGV4dDo6Z2V0T2Zmc2NyZWVuQ29udGVudFBhcmVudFRleHR1cmVJZCgpCit7CisgICAgV2ViR0xF UzJDb250ZXh0KiB3ZWJDb250ZXh0ID0gbV9pbnRlcm5hbC0+Z2V0V2ViR0xFUzJDb250ZXh0KCk7 CisgICAgQVNTRVJUKHdlYkNvbnRleHQpOworICAgIHJldHVybiB3ZWJDb250ZXh0LT5nZXRPZmZz Y3JlZW5Db250ZW50UGFyZW50VGV4dHVyZUlkKCk7Cit9CisKIH0gIC8vIG5hbWVzcGFjZSBXZWJD b3JlCg==