93398 2012-08-07 14:49:01 -0700 [chromium] Use WebCompositor interface in Platform API instead of CCProxy to query threaded compositor status 2012-08-07 15:01:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr abarth andersca cc-bugs dglazkov enne eric.carlson feature-media-reviews fischman fishd nduca piman tkent+wkapi tonikitoo webkit.review.bot oldest_to_newest 689420 0 jamesr 2012-08-07 14:49:01 -0700 [chromium] Use WebCompositor interface in Platform API instead of CCProxy to query threaded compositor status 689422 1 157013 jamesr 2012-08-07 14:50:49 -0700 Created attachment 157013 Patch 689427 2 157013 jamesr 2012-08-07 14:52:12 -0700 Comment on attachment 157013 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=157013&action=review > Source/Platform/chromium/public/WebCompositor.h:53 > + // Debug only - always returns true in release builds. > + // Returns whether we're currently running on the compositor thread. > + WEBKIT_EXPORT static bool onCompositorThread(); this feels a little bit skeevy. The implementation code is currently all guarded by #ifndef NDEBUG, and the only caller to this is doing an ASSERT(). One option would be to hide the API itself behind debug-only compile time guards, or decide that the callsite isn't really worth having the API (it's in WebMediaPlayerClientImpl if you want to take a look). 689428 3 webkit.review.bot 2012-08-07 14:52:32 -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. 689437 4 157013 abarth 2012-08-07 14:54:43 -0700 Comment on attachment 157013 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=157013&action=review >> Source/Platform/chromium/public/WebCompositor.h:53 >> + WEBKIT_EXPORT static bool onCompositorThread(); > > this feels a little bit skeevy. The implementation code is currently all guarded by #ifndef NDEBUG, and the only caller to this is doing an ASSERT(). One option would be to hide the API itself behind debug-only compile time guards, or decide that the callsite isn't really worth having the API (it's in WebMediaPlayerClientImpl if you want to take a look). I'd probably just remove it. 689447 5 jamesr 2012-08-07 14:59:47 -0700 Sounds reasonable to me. +cc as an FYI 689453 6 jamesr 2012-08-07 15:01:55 -0700 Committed r124925: <http://trac.webkit.org/changeset/124925> 157013 2012-08-07 14:50:49 -0700 2012-08-07 14:54:43 -0700 Patch bug-93398-20120807145024.patch text/plain 13215 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0OTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCAzNDNjMjExYTJkMzdk M2YwOWRmZTVkZWRiODY1NmVlNTIxMWUxZTEwLi5kMTIxYmFhOWNiMzhlYzBiYjc5NDJiNzBhNjVh ZGU0NDUwOGQ4MWIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOCBAQAogMjAxMi0wOC0wNyAg SmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFtjaHJvbWl1 bV0gVXNlIFdlYkNvbXBvc2l0b3IgaW50ZXJmYWNlIGluIFBsYXRmb3JtIEFQSSBpbnN0ZWFkIG9m IENDUHJveHkgdG8gcXVlcnkgdGhyZWFkZWQgY29tcG9zaXRvciBzdGF0dXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzMzk4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyB0aHJlYWQgc3RhdHVzIHF1 ZXJ5IGludGVyZmFjZXMgdG8gV2ViQ29tcG9zaXRvciBmb3IgV2ViS2l0IGNvZGUgdGhhdCB3YW50 cyB0byBrbm93IGlmIHdlIGFyZSBpbiB0aHJlYWRlZAorICAgICAgICBtb2RlLgorCisgICAgICAg ICogY2hyb21pdW0vcHVibGljL1dlYkNvbXBvc2l0b3IuaDoKKyAgICAgICAgKFdlYkNvbXBvc2l0 b3IpOgorCisyMDEyLTA4LTA3ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+ CisKICAgICAgICAgW2Nocm9taXVtXSBNb3ZlIFdlYkNvbXBvc2l0b3IgaW50ZXJmYWNlIGludG8g UGxhdGZvcm0gQVBJCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05MzM5MQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGE1NWU5ZjUyYWUyNmQxYjU4ZDAwZjkwYjk5MzA4 OWNmMGRkNTAwYi4uZGFjNGEzMjZhZjBhOTlhMGNiOGEwODllMDQzYzExNzM5OTlhZDcxYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEyLTA4LTA3ICBKYW1lcyBSb2JpbnNvbiAgPGph bWVzckBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgW2Nocm9taXVtXSBVc2UgV2ViQ29tcG9zaXRv ciBpbnRlcmZhY2UgaW4gUGxhdGZvcm0gQVBJIGluc3RlYWQgb2YgQ0NQcm94eSB0byBxdWVyeSB0 aHJlYWRlZCBjb21wb3NpdG9yIHN0YXR1cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTMzOTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDb252ZXJ0cyBub24tY29tcG9zaXRvciBjb2RlIHRoYXQgY2FyZXMg YWJvdXQgdGhyZWFkZWQgY29tcG9zaXRpbmcgc3RhdHVzIG92ZXIgdG8gcXVlcnkgV2ViQ29tcG9z aXRvciBpbnN0ZWFkIG9mCisgICAgICAgIENDUHJveHkuCisKKyAgICAgICAgKiBwYWdlL3Njcm9s bGluZy9jaHJvbWl1bS9TY3JvbGxpbmdDb29yZGluYXRvckNocm9taXVtLmNwcDoKKyAgICAgICAg KiBwbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYkNvbXBvc2l0b3JJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdCk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBvc2l0b3I6OnRocmVhZGluZ0Vu YWJsZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb21wb3NpdG9yOjpvbkNvbXBvc2l0b3JUaHJl YWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb21wb3NpdG9ySW1wbDo6dGhyZWFkaW5nRW5hYmxl ZCk6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJDb21wb3NpdG9ySW1w bC5oOgorICAgICAgICAoV2ViQ29tcG9zaXRvckltcGwpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJCcmlkZ2UuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q2FudmFzMkRMYXllckJyaWRnZTo6Q2FudmFzMkRMYXllckJyaWRnZSk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OkRyYXdpbmdCdWZmZXIpOgorCisyMDEyLTA4 LTA3ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgW2No cm9taXVtXSBNb3ZlIFdlYkNvbXBvc2l0b3IgaW50ZXJmYWNlIGludG8gUGxhdGZvcm0gQVBJCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzM5MQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDJiNDc3NTlmN2JhNzBiNGUzNTM5ZWFhMWIzNTJj ZWQ1ZmEwNDI5NGEuLjE3ZDAyOGEzZDQxYWUwOTRkNjU2MTJlMGYwMjk2MmQ2M2ViYTc0MjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjIgQEAKIDIwMTItMDgtMDcgIEph bWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAorICAgICAgICBbY2hyb21pdW1d IFVzZSBXZWJDb21wb3NpdG9yIGludGVyZmFjZSBpbiBQbGF0Zm9ybSBBUEkgaW5zdGVhZCBvZiBD Q1Byb3h5IHRvIHF1ZXJ5IHRocmVhZGVkIGNvbXBvc2l0b3Igc3RhdHVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzM5OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbnZlcnRzIG5vbi1jb21wb3NpdG9y IGNvZGUgdGhhdCBjYXJlcyBhYm91dCB0aHJlYWRlZCBjb21wb3NpdGluZyBzdGF0dXMgb3ZlciB0 byBxdWVyeSBXZWJDb21wb3NpdG9yIGluc3RlYWQgb2YKKyAgICAgICAgQ0NQcm94eS4KKworICAg ICAgICAqIHNyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OnN1cHBvcnRzVHlwZSk6CisgICAgICAgICogc3Jj L1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmNvbXBvc2l0 ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzY2hlZHVsZUFuaW1hdGlvbik6Cisg ICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzY2hlZHVsZUNvbXBvc2l0ZSk6CisKKzIwMTIt MDgtMDcgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKwogICAgICAgICBb Y2hyb21pdW1dIE1vdmUgV2ViQ29tcG9zaXRvciBpbnRlcmZhY2UgaW50byBQbGF0Zm9ybSBBUAog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMzOTEKIApk aWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdG9y LmggYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkNvbXBvc2l0b3IuaAppbmRl eCBjNWQyOTM0YTc1MGE5Njk2ODk2NDE5NDFmMDExMGM2NWExZmZmMzZkLi4yZDY3YjFlYTNkMTNk ODBkZWRhMGIxZjk4YmIwZTU4ZGZmYzNhOGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0v Y2hyb21pdW0vcHVibGljL1dlYkNvbXBvc2l0b3IuaAorKysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hy b21pdW0vcHVibGljL1dlYkNvbXBvc2l0b3IuaApAQCAtNDUsNiArNDUsMTMgQEAgcHVibGljOgog ICAgIC8vIHByaW9yIHRvIGNhbGxpbmcgaW5pdGlhbGl6ZS4KICAgICBXRUJLSVRfRVhQT1JUIHN0 YXRpYyB2b2lkIGluaXRpYWxpemUoV2ViVGhyZWFkKik7CiAKKyAgICAvLyBSZXR1cm5zIHdoZXRo ZXIgdGhlIGNvbXBvc2l0b3Igd2FzIGluaXRpYWxpemVkIHdpdGggdGhyZWFkaW5nIGVuYWJsZWQu CisgICAgV0VCS0lUX0VYUE9SVCBzdGF0aWMgYm9vbCB0aHJlYWRpbmdFbmFibGVkKCk7CisKKyAg ICAvLyBEZWJ1ZyBvbmx5IC0gYWx3YXlzIHJldHVybnMgdHJ1ZSBpbiByZWxlYXNlIGJ1aWxkcy4K KyAgICAvLyBSZXR1cm5zIHdoZXRoZXIgd2UncmUgY3VycmVudGx5IHJ1bm5pbmcgb24gdGhlIGNv bXBvc2l0b3IgdGhyZWFkLgorICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIGJvb2wgb25Db21wb3Np dG9yVGhyZWFkKCk7CisKICAgICAvLyBTaHV0cyBkb3duIHRoZSBjb21wb3NpdG9yLiBUaGlzIG11 c3QgYmUgY2FsbGVkIHdoZW4gYWxsIGNvbXBvc2l0b3IgZGF0YQogICAgIC8vIHR5cGVzIGhhdmUg YmVlbiBkZWxldGVkLiBObyBjb21wb3NpdG9yIGNsYXNzZXMgb3IgbWV0aG9kcyBzaG91bGQgYmUg dXNlZAogICAgIC8vIGFmdGVyIHNodXRkb3duLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvY2hyb21pdW0vU2Nyb2xsaW5nQ29vcmRpbmF0b3JDaHJvbWl1bS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jaHJvbWl1bS9TY3JvbGxpbmdDb29yZGlu YXRvckNocm9taXVtLmNwcAppbmRleCBlMmZjNzYxODdlNGY5ZDBjMzc1MGNiNmRkNzg4M2ZmNDUw NGUzZDE5Li44OGJhY2VhNTkxZjY5MjYxNjYwODllOGEwOTRhNDMxZGE4ODMyMTcxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jaHJvbWl1bS9TY3JvbGxpbmdDb29y ZGluYXRvckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9j aHJvbWl1bS9TY3JvbGxpbmdDb29yZGluYXRvckNocm9taXVtLmNwcApAQCAtMzUsNyArMzUsNiBA QAogI2luY2x1ZGUgIlJlbmRlclZpZXcuaCIKICNpbmNsdWRlICJTY3JvbGxiYXJUaGVtZUNvbXBv c2l0ZS5oIgogI2luY2x1ZGUgIldlYlNjcm9sbGJhclRoZW1lR2VvbWV0cnlOYXRpdmUuaCIKLSNp bmNsdWRlICJjYy9DQ1Byb3h5LmgiCiAjaW5jbHVkZSA8cHVibGljL1dlYlNjcm9sbGFibGVMYXll ci5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJTY3JvbGxiYXIuaD4KICNpbmNsdWRlIDxwdWJsaWMv V2ViU2Nyb2xsYmFyTGF5ZXIuaD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL3N1cHBvcnQvV2ViQ29tcG9zaXRvckltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJDb21wb3NpdG9ySW1wbC5jcHAKaW5kZXggMTNk NTI4MjMwMTY3OTkxZmFjNTY2OTNkNGRhNDNjOTYzYjhkMjM2My4uZDdjZDA2NDk0NGQ5ZTE3NTNh OTM4ODMxMGI0NDc0YmQzY2RkNWZmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vc3VwcG9ydC9XZWJDb21wb3NpdG9ySW1wbC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJDb21wb3NpdG9ySW1wbC5jcHAKQEAg LTQ2LDYgKzQ2LDIxIEBAIHZvaWQgV2ViQ29tcG9zaXRvcjo6aW5pdGlhbGl6ZShXZWJUaHJlYWQq IGltcGxUaHJlYWQpCiB7CiAgICAgV2ViQ29tcG9zaXRvckltcGw6OmluaXRpYWxpemUoaW1wbFRo cmVhZCk7CiB9CisKK2Jvb2wgV2ViQ29tcG9zaXRvcjo6dGhyZWFkaW5nRW5hYmxlZCgpCit7Cisg ICAgcmV0dXJuIFdlYkNvbXBvc2l0b3JJbXBsOjp0aHJlYWRpbmdFbmFibGVkKCk7Cit9CisKK2Jv b2wgV2ViQ29tcG9zaXRvcjo6b25Db21wb3NpdG9yVGhyZWFkKCkKK3sKKyNpZm5kZWYgTkRFQlVH CisgICAgcmV0dXJuIENDUHJveHk6OmlzSW1wbFRocmVhZCgpOworI2Vsc2UKKyAgICByZXR1cm4g dHJ1ZTsKKyNlbmRpZgorfQorCiB2b2lkIFdlYkNvbXBvc2l0b3I6OnNodXRkb3duKCkKIHsKICAg ICBXZWJDb21wb3NpdG9ySW1wbDo6c2h1dGRvd24oKTsKQEAgLTg0LDYgKzk5LDExIEBAIHZvaWQg V2ViQ29tcG9zaXRvckltcGw6OmluaXRpYWxpemUoV2ViVGhyZWFkKiBpbXBsVGhyZWFkKQogICAg ICAgICBDQ1Byb3h5OjpzZXRJbXBsVGhyZWFkKDApOwogfQogCitib29sIFdlYkNvbXBvc2l0b3JJ bXBsOjp0aHJlYWRpbmdFbmFibGVkKCkKK3sKKyAgICByZXR1cm4gc19pbXBsVGhyZWFkOworfQor CiBib29sIFdlYkNvbXBvc2l0b3JJbXBsOjppbml0aWFsaXplZCgpCiB7CiAgICAgcmV0dXJuIHNf aW5pdGlhbGl6ZWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1 bS9zdXBwb3J0L1dlYkNvbXBvc2l0b3JJbXBsLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9zdXBwb3J0L1dlYkNvbXBvc2l0b3JJbXBsLmgKaW5kZXggMzRjNmJkMGZkYzY3NjRk YjNhZGVkMmUyZTgzOTUzNjgzNGZhYTM3ZS4uZjg5MWI5NDlkY2ZmNDIzODM2OWYwNjZkZTcxNTYw MThiODVlOTA2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0v c3VwcG9ydC9XZWJDb21wb3NpdG9ySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL3N1cHBvcnQvV2ViQ29tcG9zaXRvckltcGwuaApAQCAtNDksNiArNDksNyBAQCBw cml2YXRlOgogCiAgICAgZnJpZW5kIGNsYXNzIFdlYkNvbXBvc2l0b3I7CiAgICAgc3RhdGljIHZv aWQgaW5pdGlhbGl6ZShXZWJUaHJlYWQqIGltcGxUaHJlYWQpOworICAgIHN0YXRpYyBib29sIHRo cmVhZGluZ0VuYWJsZWQoKTsKICAgICBzdGF0aWMgdm9pZCBzaHV0ZG93bigpOwogCiAgICAgc3Rh dGljIGJvb2wgc19pbml0aWFsaXplZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJCcmlkZ2UuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRMYXllckJyaWRnZS5jcHAK aW5kZXggMjAwYzgwYTQ3ZmFiODQ3YTkzYjJjZWM0NWYyY2EyZGRiNzM2MWYxNS4uNDI2NDI2N2E1 NTRkYmU0Yzk4YzY4OWQyODY2YmE3ZmQzZDVjMjU2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRMYXllckJyaWRnZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRMYXll ckJyaWRnZS5jcHAKQEAgLTM0LDcgKzM0LDcgQEAKICNpbmNsdWRlICJTa0NhbnZhcy5oIgogI2lu Y2x1ZGUgIlNrRGVmZXJyZWRDYW52YXMuaCIKICNpbmNsdWRlICJUcmFjZUV2ZW50LmgiCi0jaW5j bHVkZSAiY2MvQ0NQcm94eS5oIgorI2luY2x1ZGUgPHB1YmxpYy9XZWJDb21wb3NpdG9yLmg+CiAj aW5jbHVkZSA8cHVibGljL1dlYkdyYXBoaWNzQ29udGV4dDNELmg+CiAKIHVzaW5nIFdlYktpdDo6 V2ViRXh0ZXJuYWxUZXh0dXJlTGF5ZXI7CkBAIC03NCw3ICs3NCw3IEBAIENhbnZhczJETGF5ZXJC cmlkZ2U6OkNhbnZhczJETGF5ZXJCcmlkZ2UoUGFzc1JlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4g Y29udGV4dCwKICAgICAvLyBkZWZlcnJlZC4gV2hhdCB3ZSBzaG91bGQgYmUgZG9pbmcgaXMgdG8g dXNlIGEgc21hcnRlciBoZXVyaXN0aWMgYmFzZWQKICAgICAvLyBvbiBHUFUgcmVzb3VyY2UgbW9u aXRvcmluZyBhbmQgb3RoZXIgZmFjdG9ycyB0byBjaG9zZSBiZXR3ZWVuIHNpbmdsZQogICAgIC8v IGFuZCBkb3VibGUgYnVmZmVyaW5nLgotICAgICwgbV91c2VEb3VibGVCdWZmZXJpbmcoQ0NQcm94 eTo6aGFzSW1wbFRocmVhZCgpICYmIGRlZmVycmFsTW9kZSA9PSBOb25EZWZlcnJlZCkKKyAgICAs IG1fdXNlRG91YmxlQnVmZmVyaW5nKFdlYktpdDo6V2ViQ29tcG9zaXRvcjo6dGhyZWFkaW5nRW5h YmxlZCgpICYmIGRlZmVycmFsTW9kZSA9PSBOb25EZWZlcnJlZCkKICAgICAsIG1fZnJvbnRCdWZm ZXJUZXh0dXJlKDApCiAgICAgLCBtX2JhY2tCdWZmZXJUZXh0dXJlKHRleHR1cmVJZCkKICAgICAs IG1fc2l6ZShzaXplKQpAQCAtOTgsNyArOTgsNyBAQCBDYW52YXMyRExheWVyQnJpZGdlOjpDYW52 YXMyRExheWVyQnJpZGdlKFBhc3NSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IGNvbnRleHQsCiAK ICAgICBtX2xheWVyID0gV2ViRXh0ZXJuYWxUZXh0dXJlTGF5ZXI6OmNyZWF0ZSh0aGlzKTsKICAg ICBtX2xheWVyLnNldFRleHR1cmVJZCh0ZXh0dXJlSWQpOwotICAgIG1fbGF5ZXIuc2V0UmF0ZUxp bWl0Q29udGV4dCghQ0NQcm94eTo6aGFzSW1wbFRocmVhZCgpIHx8IG1fdXNlRG91YmxlQnVmZmVy aW5nKTsKKyAgICBtX2xheWVyLnNldFJhdGVMaW1pdENvbnRleHQoIVdlYktpdDo6V2ViQ29tcG9z aXRvcjo6dGhyZWFkaW5nRW5hYmxlZCgpIHx8IG1fdXNlRG91YmxlQnVmZmVyaW5nKTsKIH0KIAog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9E cmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcAppbmRleCAyZmRhZWU2YjY2OWRj ZTVmZDEyNWZmMjZmMWE5YjE1NDFiZjY3MTFlLi4zMzMxYWZiOGUzZjJkOGMwOTZjM2JmYTJiMmEy OTQ1OGE0YWFjOTgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAKQEAg LTM2LDggKzM2LDggQEAKICNpbmNsdWRlICJFeHRlbnNpb25zM0RDaHJvbWl1bS5oIgogI2luY2x1 ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0M0RQcml2 YXRlLmgiCi0jaW5jbHVkZSAiY2MvQ0NQcm94eS5oIgogI2luY2x1ZGUgPGFsZ29yaXRobT4KKyNp bmNsdWRlIDxwdWJsaWMvV2ViQ29tcG9zaXRvci5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJFeHRl cm5hbFRleHR1cmVMYXllci5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJFeHRlcm5hbFRleHR1cmVM YXllckNsaWVudC5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJHcmFwaGljc0NvbnRleHQzRC5oPgpA QCAtODEsNyArODEsNyBAQCBEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKEdyYXBoaWNzQ29u dGV4dDNEKiBjb250ZXh0LAogICAgICwgbV9mYm8oMCkKICAgICAsIG1fY29sb3JCdWZmZXIoMCkK ICAgICAsIG1fZnJvbnRDb2xvckJ1ZmZlcigwKQotICAgICwgbV9zZXBhcmF0ZUZyb250VGV4dHVy ZShtX3ByZXNlcnZlRHJhd2luZ0J1ZmZlciA9PSBQcmVzZXJ2ZSB8fCBDQ1Byb3h5OjppbXBsVGhy ZWFkKCkpCisgICAgLCBtX3NlcGFyYXRlRnJvbnRUZXh0dXJlKG1fcHJlc2VydmVEcmF3aW5nQnVm ZmVyID09IFByZXNlcnZlIHx8IFdlYktpdDo6V2ViQ29tcG9zaXRvcjo6dGhyZWFkaW5nRW5hYmxl ZCgpKQogICAgICwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIoMCkKICAgICAsIG1fZGVwdGhCdWZmZXIo MCkKICAgICAsIG1fc3RlbmNpbEJ1ZmZlcigwKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHAKaW5kZXggM2NhOWY1ZDBm ZTBkZmI5NzA4ZjA1NDQyYmE1ZTI1MWUzNTE1MmMyZC4uNzQ1NGY0MjY1ODk5YjI4OGEyNjc2M2Q0 NDE5YmM1ZDA1MzQ3ODdjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwCkBAIC0yNiwxNSArMjYsMTUgQEAKICNp bmNsdWRlICJXZWJLaXQuaCIKICNpbmNsdWRlICJXZWJNZWRpYVBsYXllci5oIgogI2luY2x1ZGUg IldlYlZpZXdJbXBsLmgiCi0jaW5jbHVkZSAiY2MvQ0NQcm94eS5oIgotI2luY2x1ZGUgInBsYXRm b3JtL1dlYkNTdHJpbmcuaCIKLSNpbmNsdWRlICJwbGF0Zm9ybS9XZWJDYW52YXMuaCIKLSNpbmNs dWRlICJwbGF0Zm9ybS9XZWJLaXRQbGF0Zm9ybVN1cHBvcnQuaCIKLSNpbmNsdWRlICJwbGF0Zm9y bS9XZWJSZWN0LmgiCi0jaW5jbHVkZSAicGxhdGZvcm0vV2ViU2l6ZS5oIgotI2luY2x1ZGUgInBs YXRmb3JtL1dlYlN0cmluZy5oIgotI2luY2x1ZGUgInBsYXRmb3JtL1dlYlVSTC5oIgorI2luY2x1 ZGUgPHB1YmxpYy9QbGF0Zm9ybS5oPgorI2luY2x1ZGUgPHB1YmxpYy9XZWJDU3RyaW5nLmg+Cisj aW5jbHVkZSA8cHVibGljL1dlYkNhbnZhcy5oPgorI2luY2x1ZGUgPHB1YmxpYy9XZWJDb21wb3Np dG9yLmg+CiAjaW5jbHVkZSA8cHVibGljL1dlYk1pbWVSZWdpc3RyeS5oPgorI2luY2x1ZGUgPHB1 YmxpYy9XZWJSZWN0Lmg+CisjaW5jbHVkZSA8cHVibGljL1dlYlNpemUuaD4KKyNpbmNsdWRlIDxw dWJsaWMvV2ViU3RyaW5nLmg+CisjaW5jbHVkZSA8cHVibGljL1dlYlVSTC5oPgogCiAjaWYgVVNF KEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogI2luY2x1ZGUgIlJlbmRlckxheWVyQ29tcG9zaXRv ci5oIgpAQCAtODQxLDE0ICs4NDEsMTQgQEAgdm9pZCBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6 OnN0YXJ0RGVsYXllZExvYWQoKQogdm9pZCBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmRpZFJl Y2VpdmVGcmFtZSgpCiB7CiAgICAgLy8gTm8gbG9jayBzaW5jZSB0aGlzIGdldHMgY2FsbGVkIG9u IHRoZSBjbGllbnQncyB0aHJlYWQuCi0gICAgQVNTRVJUKENDUHJveHk6OmlzSW1wbFRocmVhZCgp KTsKKyAgICBBU1NFUlQoV2ViQ29tcG9zaXRvcjo6b25Db21wb3NpdG9yVGhyZWFkKCkpOwogICAg IG1fdmlkZW9GcmFtZVByb3ZpZGVyQ2xpZW50LT5kaWRSZWNlaXZlRnJhbWUoKTsKIH0KIAogdm9p ZCBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmRpZFVwZGF0ZU1hdHJpeChjb25zdCBmbG9hdCog bWF0cml4KQogewogICAgIC8vIE5vIGxvY2sgc2luY2UgdGhpcyBnZXRzIGNhbGxlZCBvbiB0aGUg Y2xpZW50J3MgdGhyZWFkLgotICAgIEFTU0VSVChDQ1Byb3h5Ojppc0ltcGxUaHJlYWQoKSk7Cisg ICAgQVNTRVJUKFdlYkNvbXBvc2l0b3I6Om9uQ29tcG9zaXRvclRocmVhZCgpKTsKICAgICBtX3Zp ZGVvRnJhbWVQcm92aWRlckNsaWVudC0+ZGlkVXBkYXRlTWF0cml4KG1hdHJpeCk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCAzZGU2ZjMwYTFk ZTgwYzJhZTk1NTQ0Njk3OWYzZDZhOGZlNjcyMjE3Li5iOTUwZTBlMDI2ZTdiNmFjNWZkYTcwYzg3 ODk4NzFiMWMxNzU4MGUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuY3BwCkBAIC0xNDgsMTMgKzE0OCwxMCBAQAogI2luY2x1ZGUgIldlYlRvdWNoQ2FuZGlkYXRl c0luZm8uaCIKICNpbmNsdWRlICJXZWJWaWV3Q2xpZW50LmgiCiAjaW5jbHVkZSAiV2hlZWxFdmVu dC5oIgotI2luY2x1ZGUgImNjL0NDUHJveHkuaCIKICNpbmNsdWRlICJjYy9DQ1NldHRpbmdzLmgi CiAjaW5jbHVkZSAicGFpbnRpbmcvR3JhcGhpY3NDb250ZXh0QnVpbGRlci5oIgotI2luY2x1ZGUg InBsYXRmb3JtL1dlYktpdFBsYXRmb3JtU3VwcG9ydC5oIgotI2luY2x1ZGUgInBsYXRmb3JtL1dl YlN0cmluZy5oIgotI2luY2x1ZGUgInBsYXRmb3JtL1dlYlZlY3Rvci5oIgogI2luY2x1ZGUgPHB1 YmxpYy9QbGF0Zm9ybS5oPgorI2luY2x1ZGUgPHB1YmxpYy9XZWJDb21wb3NpdG9yLmg+CiAjaW5j bHVkZSA8cHVibGljL1dlYkRyYWdEYXRhLmg+CiAjaW5jbHVkZSA8cHVibGljL1dlYkZsb2F0UG9p bnQuaD4KICNpbmNsdWRlIDxwdWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaD4KQEAgLTE2Myw2 ICsxNjAsOCBAQAogI2luY2x1ZGUgPHB1YmxpYy9XZWJMYXllclRyZWVWaWV3Lmg+CiAjaW5jbHVk ZSA8cHVibGljL1dlYlBvaW50Lmg+CiAjaW5jbHVkZSA8cHVibGljL1dlYlJlY3QuaD4KKyNpbmNs dWRlIDxwdWJsaWMvV2ViU3RyaW5nLmg+CisjaW5jbHVkZSA8cHVibGljL1dlYlZlY3Rvci5oPgog I2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5oPgogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+ CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgpAQCAtMTcyNiw3ICsxNzI1LDcgQEAgdm9pZCBXZWJW aWV3SW1wbDo6dGhlbWVDaGFuZ2VkKCkKIHZvaWQgV2ViVmlld0ltcGw6OmNvbXBvc2l0ZShib29s KQogewogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLSAgICBpZiAoQ0NQcm94eTo6 aGFzSW1wbFRocmVhZCgpKQorICAgIGlmIChXZWJDb21wb3NpdG9yOjp0aHJlYWRpbmdFbmFibGVk KCkpCiAgICAgICAgIG1fbGF5ZXJUcmVlVmlldy5zZXROZWVkc1JlZHJhdygpOwogICAgIGVsc2Ug ewogICAgICAgICBBU1NFUlQoaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKCkpOwpAQCAt MzU4Niw3ICszNTg1LDcgQEAgV2ViQ29yZTo6R3JhcGhpY3NMYXllciogV2ViVmlld0ltcGw6OnJv b3RHcmFwaGljc0xheWVyKCkKIHZvaWQgV2ViVmlld0ltcGw6OnNjaGVkdWxlQW5pbWF0aW9uKCkK IHsKICAgICBpZiAoaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKCkpIHsKLSAgICAgICAg aWYgKENDUHJveHk6Omhhc0ltcGxUaHJlYWQoKSkgeworICAgICAgICBpZiAoV2ViQ29tcG9zaXRv cjo6dGhyZWFkaW5nRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICBBU1NFUlQoIW1fbGF5ZXJUcmVl Vmlldy5pc051bGwoKSk7CiAgICAgICAgICAgICBtX2xheWVyVHJlZVZpZXcuc2V0TmVlZHNBbmlt YXRlKCk7CiAgICAgICAgIH0gZWxzZQpAQCAtMzgwMCw3ICszNzk5LDcgQEAgdm9pZCBXZWJWaWV3 SW1wbDo6ZGlkUmViaW5kR3JhcGhpY3NDb250ZXh0KGJvb2wgc3VjY2VzcykKIAogdm9pZCBXZWJW aWV3SW1wbDo6c2NoZWR1bGVDb21wb3NpdGUoKQogewotICAgIEFTU0VSVCghQ0NQcm94eTo6aGFz SW1wbFRocmVhZCgpKTsKKyAgICBBU1NFUlQoIVdlYkNvbXBvc2l0b3I6OnRocmVhZGluZ0VuYWJs ZWQoKSk7CiAgICAgbV9jbGllbnQtPnNjaGVkdWxlQ29tcG9zaXRlKCk7CiB9CiAK