227894 2021-07-12 20:50:43 -0700 [GPUP] RemoteMediaPlayerProxy may not send the latest "naturalSize" to MediaPlayerPrivateRemote 2021-07-13 14:08:37 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 peng.liu6 peng.liu6 eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1776537 0 peng.liu6 2021-07-12 20:50:43 -0700 [GPUP] RemoteMediaPlayerProxy may not send the latest “naturalSize” to MediaPlayerPrivateRemote 1776538 1 webkit-bug-importer 2021-07-12 20:51:46 -0700 <rdar://problem/80498060> 1776539 2 433385 peng.liu6 2021-07-12 21:12:42 -0700 Created attachment 433385 Patch 1776628 3 433385 eric.carlson 2021-07-13 08:09:04 -0700 Comment on attachment 433385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433385&action=review > Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:843 > + m_cachedState.startDate = m_player->getStartDate(); Why should we query this every time when it can only change when readyState changes? > Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:844 > + m_cachedState.startTime = m_player->startTime(); Ditto > Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:853 > + m_cachedState.networkState = m_player->networkState(); > + m_cachedState.readyState = m_player->readyState(); Why should we query these every time when each has a specific callback? > Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:854 > + m_cachedState.movieLoadType = m_player->movieLoadType(); Why should we query this every time when it can only change when readyState changes? > Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:868 > + m_cachedState.wouldTaintDocumentSecurityOrigin = m_player->wouldTaintOrigin(m_configuration.documentSecurityOrigin.securityOrigin()); Ditto > Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:870 > + m_cachedState.canSaveMediaData = m_player->canSaveMediaData(); Ditto > Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:875 > + m_cachedState.hasAvailableVideoFrame = m_player->hasAvailableVideoFrame(); This will never change from `true` to `false`. > Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:877 > + m_cachedState.wirelessVideoPlaybackDisabled = m_player->wirelessVideoPlaybackDisabled(); This won't change unless the readyState changes, except if `RemoteMediaPlayerProxy::setWirelessVideoPlaybackDisabled` is called. > Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:880 > + m_cachedState.hasSingleSecurityOrigin = m_player->hasSingleSecurityOrigin(); > + m_cachedState.didPassCORSAccessCheck = m_player->didPassCORSAccessCheck(); These won't change unless the readyState changes > Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerState.h:64 > + String languageOfPrimaryAudioTrack; Won't moving this into the middle of a bunch of bools increase the size of the struct unnecessarily? 1776658 4 433414 peng.liu6 2021-07-13 10:03:37 -0700 Created attachment 433414 Patch 1776662 5 jer.noble 2021-07-13 10:07:53 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=433385&action=review >> Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:843 >> + m_cachedState.startDate = m_player->getStartDate(); > > Why should we query this every time when it can only change when readyState changes? I don't think that's necessarily true; or at least, there's no guarantee that's true. >> Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:875 >> + m_cachedState.hasAvailableVideoFrame = m_player->hasAvailableVideoFrame(); > > This will never change from `true` to `false`. I don't think this is true; MSE can definitely set this to false. Generally, for all of these properties, there should not be a problem querying them more often; IMO, if it's expensive, we should add caching at the MediaPlayerPrivate level, and not bake in assumptions about when they change into RemoteMediaPlayerProxy. 1776663 6 433385 peng.liu6 2021-07-13 10:09:37 -0700 Comment on attachment 433385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433385&action=review >> Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:843 >> + m_cachedState.startDate = m_player->getStartDate(); > > Why should we query this every time when it can only change when readyState changes? The intention of this patch was to refresh most fields of m_cachedState in updateCachedState(). But that seems a bad idea because many fields are related to readyState changes. I have uploaded a new patch. Ditto to other comments. Thanks for the review! 1776752 7 ews-feeder 2021-07-13 14:08:34 -0700 Committed r279891 (239642@main): <https://commits.webkit.org/239642@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 433414. 433385 2021-07-12 21:12:42 -0700 2021-07-13 10:03:34 -0700 Patch bug-227894-20210712211241.patch text/plain 11083 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5ODM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZlNmExZjVlMTk4ZWZiNDU5 MWM4ZmEwYWI2YWY4MDUxMWY1ZjZlNWIuLjg2MDNlYzllMWE3NTkyZmVjNmZkODA0YWE2ZWMzODJk NzZhNmY3ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEtMDctMTIgIFBlbmcgTGl1 ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBbR1BVUF0gUmVtb3RlTWVkaWFQbGF5 ZXJQcm94eSBtYXkgbm90IHNlbmQgdGhlIGxhdGVzdCAibmF0dXJhbFNpemUiIHRvIE1lZGlhUGxh eWVyUHJpdmF0ZVJlbW90ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI3ODk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2hlbiBhIGBNZWRpYVBsYXllclByaXZhdGUqYCBpbiB0aGUgR1BVIHByb2Nlc3Mg Y2hhbmdlcyBpdHMgYG5hdHVyYWxTaXplYCwgdGhlIG5ldworICAgICAgICB2YWx1ZSBtYXkgbm90 IGJlIHNlbnQgdG8gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4gVGhlIHJvb3QgY2F1c2UgaXMgdGhh dCBvbmx5CisgICAgICAgIGBtZWRpYVBsYXllclJlYWR5U3RhdGVDaGFuZ2VkKClgIHVwZGF0ZXMg bWFueSBmaWVsZHMgb2YgYG1fY2FjaGVkU3RhdGVgIChpbmNsdWRpbmcgYG5hdHVyYWxTaXplYCku CisgICAgICAgIEZ1bmN0aW9uIGBSZW1vdGVNZWRpYVBsYXllclByb3h5Ojp1cGRhdGVDYWNoZWRT dGF0ZSgpYCBvbmx5IHVwZGF0ZXMgYSBmZXcgZmllbGRzLgorICAgICAgICBUaGVyZWZvcmUsIGBS ZW1vdGVNZWRpYVBsYXllclByb3h5OjpzZW5kQ2FjaGVkU3RhdGUoKWAgbWF5IHNlbmQgYSBjYWNo ZWQgc3RhdGUKKyAgICAgICAgd2l0aCBzdGFsZSBpbmZvcm1hdGlvbiB0byB0aGUgV2ViQ29udGVu dCBwcm9jZXNzLgorCisgICAgICAgIFRoaXMgcGF0Y2ggbW92ZXMgYSBjb2RlIHNuaXBwZXQgZnJv bSBgbWVkaWFQbGF5ZXJSZWFkeVN0YXRlQ2hhbmdlZCgpYCB0bworICAgICAgICBgdXBkYXRlQ2Fj aGVkU3RhdGUoKWAgdG8gbWFrZSBzdXJlIGFsbCBmaWVsZHMgb2YgYG1fY2FjaGVkU3RhdGVgIGFy ZSB1cGRhdGVkLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWxzbyByZW9yZ2FuaXplcyB0aGUgZmll bGRzIG9mIGBSZW1vdGVNZWRpYVBsYXllclN0YXRlYCB0byBwdXQgcmVsYXRlZCBmaWVsZHMgdG9n ZXRoZXIuCisKKyAgICAgICAgKiBHUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJv eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVNZWRpYVBsYXllclByb3h5OjptZWRpYVBs YXllclJlYWR5U3RhdGVDaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5 ZXJQcm94eTo6dXBkYXRlQ2FjaGVkU3RhdGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL21l ZGlhL1JlbW90ZU1lZGlhUGxheWVyU3RhdGUuaDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVk aWFQbGF5ZXJTdGF0ZTo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVk aWFQbGF5ZXJTdGF0ZTo6ZGVjb2RlKToKKwogMjAyMS0wNy0xMiAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZ3Jlc3Npb24ocjI3OTYwMSkgUHJvY2Vzc0Fzc2Vy dGlvbiBtYXkgZ2V0IGRlc3Ryb3llZCBvbiBhIGJhY2tncm91bmQgdGhyZWFkCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5j cHAgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94 eS5jcHAKaW5kZXggZTM3YTc2YTFjZGZmMjkwZTA1N2E1ZjNkZTIyY2M4NTEyNTA1NzViNC4uZmYy OWNhMjJhNThkOWVhZTkyOWM5MjU4MTUyZTAzM2Y5ZmFjNWY1OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmNw cApAQCAtMzUwLDI4ICszNTAsNiBAQCB2b2lkIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6Om1lZGlh UGxheWVyUmVhZHlTdGF0ZUNoYW5nZWQoKQogewogICAgIHVwZGF0ZUNhY2hlZFZpZGVvTWV0cmlj cygpOwogICAgIHVwZGF0ZUNhY2hlZFN0YXRlKHRydWUpOwotICAgIG1fY2FjaGVkU3RhdGUucmVh ZHlTdGF0ZSA9IG1fcGxheWVyLT5yZWFkeVN0YXRlKCk7Ci0gICAgbV9jYWNoZWRTdGF0ZS5uZXR3 b3JrU3RhdGUgPSBtX3BsYXllci0+bmV0d29ya1N0YXRlKCk7Ci0gICAgbV9jYWNoZWRTdGF0ZS5k dXJhdGlvbiA9IG1fcGxheWVyLT5kdXJhdGlvbigpOwotCi0gICAgbV9jYWNoZWRTdGF0ZS5tb3Zp ZUxvYWRUeXBlID0gbV9wbGF5ZXItPm1vdmllTG9hZFR5cGUoKTsKLSAgICBtX2NhY2hlZFN0YXRl Lm1pblRpbWVTZWVrYWJsZSA9IG1fcGxheWVyLT5taW5UaW1lU2Vla2FibGUoKTsKLSAgICBtX2Nh Y2hlZFN0YXRlLm1heFRpbWVTZWVrYWJsZSA9IG1fcGxheWVyLT5tYXhUaW1lU2Vla2FibGUoKTsK LSAgICBtX2NhY2hlZFN0YXRlLnN0YXJ0RGF0ZSA9IG1fcGxheWVyLT5nZXRTdGFydERhdGUoKTsK LSAgICBtX2NhY2hlZFN0YXRlLnN0YXJ0VGltZSA9IG1fcGxheWVyLT5zdGFydFRpbWUoKTsKLSAg ICBtX2NhY2hlZFN0YXRlLm5hdHVyYWxTaXplID0gbV9wbGF5ZXItPm5hdHVyYWxTaXplKCk7Ci0g ICAgbV9jYWNoZWRTdGF0ZS5tYXhGYXN0Rm9yd2FyZFJhdGUgPSBtX3BsYXllci0+bWF4RmFzdEZv cndhcmRSYXRlKCk7Ci0gICAgbV9jYWNoZWRTdGF0ZS5taW5GYXN0UmV2ZXJzZVJhdGUgPSBtX3Bs YXllci0+bWluRmFzdFJldmVyc2VSYXRlKCk7Ci0gICAgbV9jYWNoZWRTdGF0ZS5zZWVrYWJsZVRp bWVSYW5nZXNMYXN0TW9kaWZpZWRUaW1lID0gbV9wbGF5ZXItPnNlZWthYmxlVGltZVJhbmdlc0xh c3RNb2RpZmllZFRpbWUoKTsKLSAgICBtX2NhY2hlZFN0YXRlLmxpdmVVcGRhdGVJbnRlcnZhbCA9 IG1fcGxheWVyLT5saXZlVXBkYXRlSW50ZXJ2YWwoKTsKLSAgICBtX2NhY2hlZFN0YXRlLmhhc0F2 YWlsYWJsZVZpZGVvRnJhbWUgPSBtX3BsYXllci0+aGFzQXZhaWxhYmxlVmlkZW9GcmFtZSgpOwot I2lmIEVOQUJMRShXSVJFTEVTU19QTEFZQkFDS19UQVJHRVQpCi0gICAgbV9jYWNoZWRTdGF0ZS53 aXJlbGVzc1ZpZGVvUGxheWJhY2tEaXNhYmxlZCA9IG1fcGxheWVyLT53aXJlbGVzc1ZpZGVvUGxh eWJhY2tEaXNhYmxlZCgpOwotI2VuZGlmCi0gICAgbV9jYWNoZWRTdGF0ZS5jYW5TYXZlTWVkaWFE YXRhID0gbV9wbGF5ZXItPmNhblNhdmVNZWRpYURhdGEoKTsKLSAgICBtX2NhY2hlZFN0YXRlLmhh c1NpbmdsZVNlY3VyaXR5T3JpZ2luID0gbV9wbGF5ZXItPmhhc1NpbmdsZVNlY3VyaXR5T3JpZ2lu KCk7Ci0gICAgbV9jYWNoZWRTdGF0ZS5kaWRQYXNzQ09SU0FjY2Vzc0NoZWNrID0gbV9wbGF5ZXIt PmRpZFBhc3NDT1JTQWNjZXNzQ2hlY2soKTsKLSAgICBtX2NhY2hlZFN0YXRlLndvdWxkVGFpbnRE b2N1bWVudFNlY3VyaXR5T3JpZ2luID0gbV9wbGF5ZXItPndvdWxkVGFpbnRPcmlnaW4obV9jb25m aWd1cmF0aW9uLmRvY3VtZW50U2VjdXJpdHlPcmlnaW4uc2VjdXJpdHlPcmlnaW4oKSk7CiAKICAg ICBtX3dlYlByb2Nlc3NDb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpNZWRpYVBsYXllclByaXZh dGVSZW1vdGU6OlJlYWR5U3RhdGVDaGFuZ2VkKG1fY2FjaGVkU3RhdGUpLCBtX2lkKTsKIH0KQEAg LTg1OSwxMyArODM3LDQ3IEBAIHZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6dXBkYXRlQ2Fj aGVkU3RhdGUoYm9vbCBmb3JjZUN1cnJlbnRUaW1lVXBkYXRlKQogICAgIGlmICghbV9vYnNlcnZp bmdUaW1lQ2hhbmdlcyB8fCBmb3JjZUN1cnJlbnRUaW1lVXBkYXRlKQogICAgICAgICBjdXJyZW50 VGltZUNoYW5nZWQobV9wbGF5ZXItPmN1cnJlbnRUaW1lKCkpOwogCi0gICAgbV9jYWNoZWRTdGF0 ZS5wYXVzZWQgPSBtX3BsYXllci0+cGF1c2VkKCk7Ci0gICAgbWF5YmVVcGRhdGVDYWNoZWRWaWRl b01ldHJpY3MoKTsKKyAgICBtX2NhY2hlZFN0YXRlLmR1cmF0aW9uID0gbV9wbGF5ZXItPmR1cmF0 aW9uKCk7CisgICAgbV9jYWNoZWRTdGF0ZS5taW5UaW1lU2Vla2FibGUgPSBtX3BsYXllci0+bWlu VGltZVNlZWthYmxlKCk7CisgICAgbV9jYWNoZWRTdGF0ZS5tYXhUaW1lU2Vla2FibGUgPSBtX3Bs YXllci0+bWF4VGltZVNlZWthYmxlKCk7CisgICAgbV9jYWNoZWRTdGF0ZS5zdGFydERhdGUgPSBt X3BsYXllci0+Z2V0U3RhcnREYXRlKCk7CisgICAgbV9jYWNoZWRTdGF0ZS5zdGFydFRpbWUgPSBt X3BsYXllci0+c3RhcnRUaW1lKCk7CisKICAgICBpZiAobV9idWZmZXJlZENoYW5nZWQpIHsKICAg ICAgICAgbV9idWZmZXJlZENoYW5nZWQgPSBmYWxzZTsKICAgICAgICAgaWYgKG1fZW5naW5lSWRl bnRpZmllciAhPSBNZWRpYVBsYXllckVudW1zOjpNZWRpYUVuZ2luZUlkZW50aWZpZXI6OkFWRm91 bmRhdGlvbk1TRSkKICAgICAgICAgICAgIG1fY2FjaGVkU3RhdGUuYnVmZmVyZWRSYW5nZXMgPSAq bV9wbGF5ZXItPmJ1ZmZlcmVkKCk7CiAgICAgfQorCisgICAgbV9jYWNoZWRTdGF0ZS5uZXR3b3Jr U3RhdGUgPSBtX3BsYXllci0+bmV0d29ya1N0YXRlKCk7CisgICAgbV9jYWNoZWRTdGF0ZS5yZWFk eVN0YXRlID0gbV9wbGF5ZXItPnJlYWR5U3RhdGUoKTsKKyAgICBtX2NhY2hlZFN0YXRlLm1vdmll TG9hZFR5cGUgPSBtX3BsYXllci0+bW92aWVMb2FkVHlwZSgpOworICAgIC8vIHdpcmVsZXNzUGxh eWJhY2tUYXJnZXROYW1lCisgICAgLy8gd2lyZWxlc3NQbGF5YmFja1RhcmdldFR5cGUKKyAgICBt X2NhY2hlZFN0YXRlLm5hdHVyYWxTaXplID0gbV9wbGF5ZXItPm5hdHVyYWxTaXplKCk7CisgICAg bV9jYWNoZWRTdGF0ZS5tYXhGYXN0Rm9yd2FyZFJhdGUgPSBtX3BsYXllci0+bWF4RmFzdEZvcndh cmRSYXRlKCk7CisgICAgbV9jYWNoZWRTdGF0ZS5taW5GYXN0UmV2ZXJzZVJhdGUgPSBtX3BsYXll ci0+bWluRmFzdFJldmVyc2VSYXRlKCk7CisgICAgbV9jYWNoZWRTdGF0ZS5zZWVrYWJsZVRpbWVS YW5nZXNMYXN0TW9kaWZpZWRUaW1lID0gbV9wbGF5ZXItPnNlZWthYmxlVGltZVJhbmdlc0xhc3RN b2RpZmllZFRpbWUoKTsKKyAgICBtX2NhY2hlZFN0YXRlLmxpdmVVcGRhdGVJbnRlcnZhbCA9IG1f cGxheWVyLT5saXZlVXBkYXRlSW50ZXJ2YWwoKTsKKworICAgIC8vIHRvdGFsQnl0ZXMKKworICAg IC8vIHZpZGVvTWV0cmljcworICAgIG1heWJlVXBkYXRlQ2FjaGVkVmlkZW9NZXRyaWNzKCk7CisK KyAgICBtX2NhY2hlZFN0YXRlLndvdWxkVGFpbnREb2N1bWVudFNlY3VyaXR5T3JpZ2luID0gbV9w bGF5ZXItPndvdWxkVGFpbnRPcmlnaW4obV9jb25maWd1cmF0aW9uLmRvY3VtZW50U2VjdXJpdHlP cmlnaW4uc2VjdXJpdHlPcmlnaW4oKSk7CisgICAgbV9jYWNoZWRTdGF0ZS5wYXVzZWQgPSBtX3Bs YXllci0+cGF1c2VkKCk7CisgICAgbV9jYWNoZWRTdGF0ZS5jYW5TYXZlTWVkaWFEYXRhID0gbV9w bGF5ZXItPmNhblNhdmVNZWRpYURhdGEoKTsKKyAgICAvLyBoYXNBdWRpbworICAgIC8vIGhhc1Zp ZGVvCisgICAgLy8gaGFzQ2xvc2VkQ2FwdGlvbgorICAgIC8vIGxhbmd1YWdlT2ZQcmltYXJ5QXVk aW9UcmFjaworICAgIG1fY2FjaGVkU3RhdGUuaGFzQXZhaWxhYmxlVmlkZW9GcmFtZSA9IG1fcGxh eWVyLT5oYXNBdmFpbGFibGVWaWRlb0ZyYW1lKCk7CisjaWYgRU5BQkxFKFdJUkVMRVNTX1BMQVlC QUNLX1RBUkdFVCkKKyAgICBtX2NhY2hlZFN0YXRlLndpcmVsZXNzVmlkZW9QbGF5YmFja0Rpc2Fi bGVkID0gbV9wbGF5ZXItPndpcmVsZXNzVmlkZW9QbGF5YmFja0Rpc2FibGVkKCk7CisjZW5kaWYK KyAgICBtX2NhY2hlZFN0YXRlLmhhc1NpbmdsZVNlY3VyaXR5T3JpZ2luID0gbV9wbGF5ZXItPmhh c1NpbmdsZVNlY3VyaXR5T3JpZ2luKCk7CisgICAgbV9jYWNoZWRTdGF0ZS5kaWRQYXNzQ09SU0Fj Y2Vzc0NoZWNrID0gbV9wbGF5ZXItPmRpZFBhc3NDT1JTQWNjZXNzQ2hlY2soKTsKIH0KIAogdm9p ZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjpzZW5kQ2FjaGVkU3RhdGUoKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclN0YXRl LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZU1lZGlhUGxheWVy U3RhdGUuaAppbmRleCBkYjM0OGExOGVhZWE3ZDk5YmYzYzE3MmViZGY2OGZkZDNhMWJhYzFiLi4z MmU4YWRiNjM0MDI2MjZhN2IzZDFlNDljNzZjODZkZmU4YjY1MzA1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyU3RhdGUuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZU1lZGlhUGxheWVy U3RhdGUuaApAQCAtNDIsMTIgKzQyLDExIEBAIHN0cnVjdCBSZW1vdGVNZWRpYVBsYXllclN0YXRl IHsKICAgICBNZWRpYVRpbWUgbWF4VGltZVNlZWthYmxlOwogICAgIE1lZGlhVGltZSBzdGFydERh dGU7CiAgICAgTWVkaWFUaW1lIHN0YXJ0VGltZTsKLSAgICBTdHJpbmcgbGFuZ3VhZ2VPZlByaW1h cnlBdWRpb1RyYWNrOwotICAgIFN0cmluZyB3aXJlbGVzc1BsYXliYWNrVGFyZ2V0TmFtZTsKICAg ICBXZWJDb3JlOjpQbGF0Zm9ybVRpbWVSYW5nZXMgYnVmZmVyZWRSYW5nZXM7CiAgICAgV2ViQ29y ZTo6TWVkaWFQbGF5ZXJFbnVtczo6TmV0d29ya1N0YXRlIG5ldHdvcmtTdGF0ZSB7IFdlYkNvcmU6 Ok1lZGlhUGxheWVyRW51bXM6Ok5ldHdvcmtTdGF0ZTo6RW1wdHkgfTsKICAgICBXZWJDb3JlOjpN ZWRpYVBsYXllckVudW1zOjpSZWFkeVN0YXRlIHJlYWR5U3RhdGUgeyBXZWJDb3JlOjpNZWRpYVBs YXllckVudW1zOjpSZWFkeVN0YXRlOjpIYXZlTm90aGluZyB9OwogICAgIFdlYkNvcmU6Ok1lZGlh UGxheWVyRW51bXM6Ok1vdmllTG9hZFR5cGUgbW92aWVMb2FkVHlwZSB7IFdlYkNvcmU6Ok1lZGlh UGxheWVyRW51bXM6Ok1vdmllTG9hZFR5cGU6OlVua25vd24gfTsKKyAgICBTdHJpbmcgd2lyZWxl c3NQbGF5YmFja1RhcmdldE5hbWU7CiAgICAgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6V2ly ZWxlc3NQbGF5YmFja1RhcmdldFR5cGUgd2lyZWxlc3NQbGF5YmFja1RhcmdldFR5cGUgeyBXZWJD b3JlOjpNZWRpYVBsYXllckVudW1zOjpXaXJlbGVzc1BsYXliYWNrVGFyZ2V0VHlwZTo6VGFyZ2V0 VHlwZU5vbmUgfTsKICAgICBXZWJDb3JlOjpGbG9hdFNpemUgbmF0dXJhbFNpemU7CiAgICAgZG91 YmxlIG1heEZhc3RGb3J3YXJkUmF0ZSB7IDAgfTsKQEAgLTYyLDYgKzYxLDcgQEAgc3RydWN0IFJl bW90ZU1lZGlhUGxheWVyU3RhdGUgewogICAgIGJvb2wgaGFzQXVkaW8geyBmYWxzZSB9OwogICAg IGJvb2wgaGFzVmlkZW8geyBmYWxzZSB9OwogICAgIGJvb2wgaGFzQ2xvc2VkQ2FwdGlvbnMgeyBm YWxzZSB9OworICAgIFN0cmluZyBsYW5ndWFnZU9mUHJpbWFyeUF1ZGlvVHJhY2s7CiAgICAgYm9v bCBoYXNBdmFpbGFibGVWaWRlb0ZyYW1lIHsgZmFsc2UgfTsKICAgICBib29sIHdpcmVsZXNzVmlk ZW9QbGF5YmFja0Rpc2FibGVkIHsgZmFsc2UgfTsKICAgICBib29sIGhhc1NpbmdsZVNlY3VyaXR5 T3JpZ2luIHsgZmFsc2UgfTsKQEAgLTc1LDEyICs3NSwxMSBAQCBzdHJ1Y3QgUmVtb3RlTWVkaWFQ bGF5ZXJTdGF0ZSB7CiAgICAgICAgIGVuY29kZXIgPDwgbWF4VGltZVNlZWthYmxlOwogICAgICAg ICBlbmNvZGVyIDw8IHN0YXJ0RGF0ZTsKICAgICAgICAgZW5jb2RlciA8PCBzdGFydFRpbWU7Ci0g ICAgICAgIGVuY29kZXIgPDwgbGFuZ3VhZ2VPZlByaW1hcnlBdWRpb1RyYWNrOwotICAgICAgICBl bmNvZGVyIDw8IHdpcmVsZXNzUGxheWJhY2tUYXJnZXROYW1lOwogICAgICAgICBlbmNvZGVyIDw8 IGJ1ZmZlcmVkUmFuZ2VzOwogICAgICAgICBlbmNvZGVyIDw8IG5ldHdvcmtTdGF0ZTsKICAgICAg ICAgZW5jb2RlciA8PCByZWFkeVN0YXRlOwogICAgICAgICBlbmNvZGVyIDw8IG1vdmllTG9hZFR5 cGU7CisgICAgICAgIGVuY29kZXIgPDwgd2lyZWxlc3NQbGF5YmFja1RhcmdldE5hbWU7CiAgICAg ICAgIGVuY29kZXIgPDwgd2lyZWxlc3NQbGF5YmFja1RhcmdldFR5cGU7CiAgICAgICAgIGVuY29k ZXIgPDwgbmF0dXJhbFNpemU7CiAgICAgICAgIGVuY29kZXIgPDwgbWF4RmFzdEZvcndhcmRSYXRl OwpAQCAtOTUsNiArOTQsNyBAQCBzdHJ1Y3QgUmVtb3RlTWVkaWFQbGF5ZXJTdGF0ZSB7CiAgICAg ICAgIGVuY29kZXIgPDwgaGFzQXVkaW87CiAgICAgICAgIGVuY29kZXIgPDwgaGFzVmlkZW87CiAg ICAgICAgIGVuY29kZXIgPDwgaGFzQ2xvc2VkQ2FwdGlvbnM7CisgICAgICAgIGVuY29kZXIgPDwg bGFuZ3VhZ2VPZlByaW1hcnlBdWRpb1RyYWNrOwogICAgICAgICBlbmNvZGVyIDw8IGhhc0F2YWls YWJsZVZpZGVvRnJhbWU7CiAgICAgICAgIGVuY29kZXIgPDwgd2lyZWxlc3NWaWRlb1BsYXliYWNr RGlzYWJsZWQ7CiAgICAgICAgIGVuY29kZXIgPDwgaGFzU2luZ2xlU2VjdXJpdHlPcmlnaW47CkBA IC0xMjksMTYgKzEyOSw2IEBAIHN0cnVjdCBSZW1vdGVNZWRpYVBsYXllclN0YXRlIHsKICAgICAg ICAgaWYgKCFzdGFydFRpbWUpCiAgICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogCi0g ICAgICAgIHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiBsYW5ndWFnZU9mUHJpbWFyeUF1ZGlvVHJhY2s7 Ci0gICAgICAgIGRlY29kZXIgPj4gbGFuZ3VhZ2VPZlByaW1hcnlBdWRpb1RyYWNrOwotICAgICAg ICBpZiAoIWxhbmd1YWdlT2ZQcmltYXJ5QXVkaW9UcmFjaykKLSAgICAgICAgICAgIHJldHVybiBz dGQ6Om51bGxvcHQ7Ci0KLSAgICAgICAgc3RkOjpvcHRpb25hbDxTdHJpbmc+IHdpcmVsZXNzUGxh eWJhY2tUYXJnZXROYW1lOwotICAgICAgICBkZWNvZGVyID4+IHdpcmVsZXNzUGxheWJhY2tUYXJn ZXROYW1lOwotICAgICAgICBpZiAoIXdpcmVsZXNzUGxheWJhY2tUYXJnZXROYW1lKQotICAgICAg ICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKLQogICAgICAgICBzdGQ6Om9wdGlvbmFsPFdlYkNv cmU6OlBsYXRmb3JtVGltZVJhbmdlcz4gYnVmZmVyZWRSYW5nZXM7CiAgICAgICAgIGRlY29kZXIg Pj4gYnVmZmVyZWRSYW5nZXM7CiAgICAgICAgIGlmICghYnVmZmVyZWRSYW5nZXMpCkBAIC0xNTYs NiArMTQ2LDExIEBAIHN0cnVjdCBSZW1vdGVNZWRpYVBsYXllclN0YXRlIHsKICAgICAgICAgaWYg KCFkZWNvZGVyLmRlY29kZShtb3ZpZUxvYWRUeXBlKSkKICAgICAgICAgICAgIHJldHVybiBzdGQ6 Om51bGxvcHQ7CiAKKyAgICAgICAgc3RkOjpvcHRpb25hbDxTdHJpbmc+IHdpcmVsZXNzUGxheWJh Y2tUYXJnZXROYW1lOworICAgICAgICBkZWNvZGVyID4+IHdpcmVsZXNzUGxheWJhY2tUYXJnZXRO YW1lOworICAgICAgICBpZiAoIXdpcmVsZXNzUGxheWJhY2tUYXJnZXROYW1lKQorICAgICAgICAg ICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKKwogICAgICAgICBXZWJDb3JlOjpNZWRpYVBsYXllckVu dW1zOjpXaXJlbGVzc1BsYXliYWNrVGFyZ2V0VHlwZSB3aXJlbGVzc1BsYXliYWNrVGFyZ2V0VHlw ZTsKICAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZSh3aXJlbGVzc1BsYXliYWNrVGFyZ2V0VHlw ZSkpCiAgICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwpAQCAtMjI1LDYgKzIyMCwxMSBA QCBzdHJ1Y3QgUmVtb3RlTWVkaWFQbGF5ZXJTdGF0ZSB7CiAgICAgICAgIGlmICghaGFzQ2xvc2Vk Q2FwdGlvbnMpCiAgICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogCisgICAgICAgIHN0 ZDo6b3B0aW9uYWw8U3RyaW5nPiBsYW5ndWFnZU9mUHJpbWFyeUF1ZGlvVHJhY2s7CisgICAgICAg IGRlY29kZXIgPj4gbGFuZ3VhZ2VPZlByaW1hcnlBdWRpb1RyYWNrOworICAgICAgICBpZiAoIWxh bmd1YWdlT2ZQcmltYXJ5QXVkaW9UcmFjaykKKyAgICAgICAgICAgIHJldHVybiBzdGQ6Om51bGxv cHQ7CisKICAgICAgICAgc3RkOjpvcHRpb25hbDxib29sPiBoYXNBdmFpbGFibGVWaWRlb0ZyYW1l OwogICAgICAgICBkZWNvZGVyID4+IGhhc0F2YWlsYWJsZVZpZGVvRnJhbWU7CiAgICAgICAgIGlm ICghaGFzQXZhaWxhYmxlVmlkZW9GcmFtZSkKQEAgLTI1MSwxMiArMjUxLDExIEBAIHN0cnVjdCBS ZW1vdGVNZWRpYVBsYXllclN0YXRlIHsKICAgICAgICAgICAgIFdURk1vdmUoKm1heFRpbWVTZWVr YWJsZSksCiAgICAgICAgICAgICBXVEZNb3ZlKCpzdGFydERhdGUpLAogICAgICAgICAgICAgV1RG TW92ZSgqc3RhcnRUaW1lKSwKLSAgICAgICAgICAgIFdURk1vdmUoKmxhbmd1YWdlT2ZQcmltYXJ5 QXVkaW9UcmFjayksCi0gICAgICAgICAgICBXVEZNb3ZlKCp3aXJlbGVzc1BsYXliYWNrVGFyZ2V0 TmFtZSksCiAgICAgICAgICAgICBXVEZNb3ZlKCpidWZmZXJlZFJhbmdlcyksCiAgICAgICAgICAg ICBuZXR3b3JrU3RhdGUsCiAgICAgICAgICAgICByZWFkeVN0YXRlLAogICAgICAgICAgICAgbW92 aWVMb2FkVHlwZSwKKyAgICAgICAgICAgIFdURk1vdmUoKndpcmVsZXNzUGxheWJhY2tUYXJnZXRO YW1lKSwKICAgICAgICAgICAgIHdpcmVsZXNzUGxheWJhY2tUYXJnZXRUeXBlLAogICAgICAgICAg ICAgV1RGTW92ZSgqbmF0dXJhbFNpemUpLAogICAgICAgICAgICAgKm1heEZhc3RGb3J3YXJkUmF0 ZSwKQEAgLTI3MSw2ICsyNzAsNyBAQCBzdHJ1Y3QgUmVtb3RlTWVkaWFQbGF5ZXJTdGF0ZSB7CiAg ICAgICAgICAgICAqaGFzQXVkaW8sCiAgICAgICAgICAgICAqaGFzVmlkZW8sCiAgICAgICAgICAg ICAqaGFzQ2xvc2VkQ2FwdGlvbnMsCisgICAgICAgICAgICBXVEZNb3ZlKCpsYW5ndWFnZU9mUHJp bWFyeUF1ZGlvVHJhY2spLAogICAgICAgICAgICAgKmhhc0F2YWlsYWJsZVZpZGVvRnJhbWUsCiAg ICAgICAgICAgICAqd2lyZWxlc3NWaWRlb1BsYXliYWNrRGlzYWJsZWQsCiAgICAgICAgICAgICAq aGFzU2luZ2xlU2VjdXJpdHlPcmlnaW4sCg== 433414 2021-07-13 10:03:37 -0700 2021-07-13 14:08:36 -0700 Patch bug-227894-20210713100336.patch text/plain 2153 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5ODM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZlNmExZjVlMTk4ZWZiNDU5 MWM4ZmEwYWI2YWY4MDUxMWY1ZjZlNWIuLjBlNWU0ODU5Yjc3ZWY5ODg3NDJkOTM4Y2NhYWEwOTc4 YmE4Y2ViN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDctMTIgIFBlbmcgTGl1 ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBbR1BVUF0gUmVtb3RlTWVkaWFQbGF5 ZXJQcm94eSBtYXkgbm90IHNlbmQgdGhlIGxhdGVzdCAibmF0dXJhbFNpemUiIHRvIE1lZGlhUGxh eWVyUHJpdmF0ZVJlbW90ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI3ODk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2hlbiBhIGBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakNgIGlu IHRoZSBHUFUgcHJvY2VzcyBjaGFuZ2VzIGl0cyBgbmF0dXJhbFNpemVgLAorICAgICAgICB0aGUg bmV3IHZhbHVlIHdpbGwgYmUgc2VudCB0byB0aGUgV2ViQ29udGVudCBwcm9jZXNzIGluIHRoZSBJ UEMgbWVzc2FnZQorICAgICAgICBgTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpTaXplQ2hhbmdl ZGAuIEhvd2V2ZXIsIGBSZW1vdGVNZWRpYVBsYXllclByb3h5YCB3b24ndCB1cGRhdGUKKyAgICAg ICAgYG1fY2FjaGVkU3RhdGUubmF0dXJhbFNpemVgLiBTbyB0aGUgbmV4dCBgTWVkaWFQbGF5ZXJQ cml2YXRlUmVtb3RlOjpVcGRhdGVDYWNoZWRTdGF0ZWAKKyAgICAgICAgbWVzc2FnZSB3aWxsIHVz ZSB0aGUgb2xkIGBuYXR1cmFsU2l6ZWAgYW5kIHRoZSBXZWJDb250ZW50IHByb2Nlc3Mgd2lsbCBk cm9wIHRoZSBjb3JyZWN0IHZhbHVlCisgICAgICAgIGFmdGVyIHJlY2VpdmluZyB0aGUgbWVzc2Fn ZS4KKworICAgICAgICAqIEdQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5j cHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZU1lZGlhUGxheWVyUHJveHk6Om1lZGlhUGxheWVy U2l6ZUNoYW5nZWQpOgorCiAyMDIxLTA3LTEyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CiAKICAgICAgICAgUmVncmVzc2lvbihyMjc5NjAxKSBQcm9jZXNzQXNzZXJ0aW9uIG1heSBn ZXQgZGVzdHJveWVkIG9uIGEgYmFja2dyb3VuZCB0aHJlYWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmNwcCBiL1NvdXJj ZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmNwcAppbmRl eCBlMzdhNzZhMWNkZmYyOTBlMDU3YTVmM2RlMjJjYzg1MTI1MDU3NWI0Li4wMzlhMGU2MDE5YWM3 ZTY3MTk5MGRkMzNlMWY5OGY3ZTYwY2U3ZDc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQ VVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHkuY3BwCkBAIC02NTks NyArNjU5LDggQEAgdm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjptZWRpYVBsYXllclJlc291 cmNlTm90U3VwcG9ydGVkKCkKIAogdm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjptZWRpYVBs YXllclNpemVDaGFuZ2VkKCkKIHsKLSAgICBtX3dlYlByb2Nlc3NDb25uZWN0aW9uLT5zZW5kKE1l c3NhZ2VzOjpNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OlNpemVDaGFuZ2VkKG1fcGxheWVyLT5u YXR1cmFsU2l6ZSgpKSwgbV9pZCk7CisgICAgbV9jYWNoZWRTdGF0ZS5uYXR1cmFsU2l6ZSA9IG1f cGxheWVyLT5uYXR1cmFsU2l6ZSgpOworICAgIG1fd2ViUHJvY2Vzc0Nvbm5lY3Rpb24tPnNlbmQo TWVzc2FnZXM6Ok1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6U2l6ZUNoYW5nZWQobV9jYWNoZWRT dGF0ZS5uYXR1cmFsU2l6ZSksIG1faWQpOwogfQogCiB2b2lkIFJlbW90ZU1lZGlhUGxheWVyUHJv eHk6Om1lZGlhUGxheWVyQWN0aXZlU291cmNlQnVmZmVyc0NoYW5nZWQoKQo=