207683 2020-02-12 23:08:51 -0800 Replace the usages of (IPC::Attachment fencePort) with IPC::MachPort 2020-09-25 15:10:20 -0700 1 1 1 Unclassified WebKit WebKit Misc. Safari 13 Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 peng.liu6 peng.liu6 cdumez dbates eric.carlson ews-watchlist glenn jer.noble philipj sergio thorton webkit-bug-importer oldest_to_newest 1618407 0 peng.liu6 2020-02-12 23:08:51 -0800 Some IPC messages use IPC::Attachment to carry fence ports, we need to use the class MachPort instead. 1690469 1 409310 peng.liu6 2020-09-21 13:13:05 -0700 Created attachment 409310 Patch 1690496 2 409310 dbates 2020-09-21 13:44:24 -0700 Comment on attachment 409310 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=409310&action=review This patch looks good. > Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:795 > + if (DrawingAreaProxy* drawingArea = m_page->drawingArea()) OK as-is. auto* could be used here too. > Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:799 > + m_page->send(Messages::VideoFullscreenManager::SetVideoLayerFrameFenced(contextId, frame, fenceSendRight)); OK as-is. > Source/WebKit/WebProcess/WebPage/WebPage.cpp:3176 > +void WebPage::setTopContentInsetFenced(float contentInset, const WTF::MachSendRight& machSendRight) OK as-is. Could be improved a tiny bit by taking by rvalue reference then need to patch up other places in this patch though. The param name sounds a bit ambiguous too and same comment for same param in WebProcess code. > Source/WebKit/WebProcess/WebPage/WebPage.cpp:3178 > + m_drawingArea->addFence(machSendRight); OK as-is. If ^^^ taken then could patch up addFence to take by rvalue reference and move into. 1692056 3 ews-feeder 2020-09-25 15:09:34 -0700 Committed r267599: <https://trac.webkit.org/changeset/267599> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409310. 1692057 4 webkit-bug-importer 2020-09-25 15:10:20 -0700 <rdar://problem/69596514> 409310 2020-09-21 13:13:05 -0700 2020-09-25 15:09:35 -0700 Patch bug-207683-20200921131304.patch text/plain 11302 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRhZGZjMzM1NmEzMzk3NmU4 YmE5Mzk2YmJhOTM0ZThmNGMzODhmM2EuLjNmMWYyZTk5OTRiZjJhZTg4YmZmZjNiM2VkYjE2OTY5 MWQwNTRiODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDktMjEgIFBlbmcgTGl1 ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBSZXBsYWNlIHRoZSB1c2FnZXMgb2Yg KElQQzo6QXR0YWNobWVudCBmZW5jZVBvcnQpIHdpdGggSVBDOjpNYWNoUG9ydAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3NjgzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBm dW5jdGlvbmFsIGNoYW5nZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxz Y3JlZW5NYW5hZ2VyUHJveHkubW06CisgICAgICAgIChXZWJLaXQ6OlZpZGVvRnVsbHNjcmVlbk1h bmFnZXJQcm94eTo6c2V0VmlkZW9MYXllckZyYW1lKTogUmVwbGFjZSB0aGUKKyAgICAgICAgSVBD OjpBdHRhY2htZW50IGFyZ3VtZW50IHdpdGggYSBNYWNoU2VuZFJpZ2h0LgorICAgICAgICAqIFdl YlByb2Nlc3MvY29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlci5oOgorICAgICAgICAqIFdlYlBy b2Nlc3MvY29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlci5tZXNzYWdlcy5pbjoKKyAgICAgICAg KiBXZWJQcm9jZXNzL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXIubW06CisgICAgICAgIChX ZWJLaXQ6OlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OnNldFZpZGVvTGF5ZXJGcmFtZUZlbmNlZCk6 CisgICAgICAgIHIyMzI0NTEgYWRkcyBhIGNoZWNrIGZvciBtYWNoIHBvcnQgZGlzcG9zaXRpb24s IHdoaWNoIGlzIG5vdCBuZWNlc3Nhcnkgbm93LgorICAgICAgICBCZWNhdXNlIEFyZ3VtZW50Q29k ZXI8TWFjaFNlbmRSaWdodD46OmRlY29kZSgpIHByb3ZpZGVzIHRoZSBjaGVjay4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OnNldFRvcENvbnRlbnRJbnNldCk6IFJlcGxhY2UgdGhlIElQQzo6QXR0YWNobWVudAor ICAgICAgICBhcmd1bWVudCB3aXRoIGEgTWFjaFNlbmRSaWdodC4KKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldFRv cENvbnRlbnRJbnNldEZlbmNlZCk6IERpdHRvLgorICAgICAgICByMjMyNDUxIGFkZHMgYSBjaGVj ayBmb3IgbWFjaCBwb3J0IGRpc3Bvc2l0aW9uLCB3aGljaCBpcyBub3QgbmVjZXNzYXJ5IG5vdy4K KyAgICAgICAgQmVjYXVzZSBBcmd1bWVudENvZGVyPE1hY2hTZW5kUmlnaHQ+OjpkZWNvZGUoKSBw cm92aWRlcyB0aGUgY2hlY2suCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKwog MjAyMC0wOS0yMSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAog ICAgICAgICBBbGxvdyBhYm91dDpibGFuayBzdWJmcmFtZSBsb2FkcyBmb3Igbm9uIGFwcC1ib3Vu ZCB0b3AgZnJhbWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9W aWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkubW0KaW5kZXggZjBjNWJhZjMzMzZmNTNh ZmFhOTg3MjUyY2VjYWMyZjU4MjUxNDA1NS4uOGNmZThjNWQ3OTczODQ4ODc5MjlhNjA3OTE4NDA0 YTg2Y2NkODFhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVmlk ZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5tbQpAQCAtNzg4LDE4ICs3ODgsMTUg QEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6OmRpZENsZWFudXBGdWxsc2NyZWVu KFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGUKIAogdm9pZCBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2Vy UHJveHk6OnNldFZpZGVvTGF5ZXJGcmFtZShQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpZmll ciBjb250ZXh0SWQsIFdlYkNvcmU6OkZsb2F0UmVjdCBmcmFtZSkKIHsKLSAgICBAYXV0b3JlbGVh c2Vwb29sIHsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgICAgICBtYWNoX3BvcnRfbmFt ZV90IGZlbmNlUG9ydCA9IFtVSVdpbmRvdyBfc3luY2hyb25pemVEcmF3aW5nQWNyb3NzUHJvY2Vz c2VzXTsKKyAgICBhdXRvIGZlbmNlU2VuZFJpZ2h0ID0gTWFjaFNlbmRSaWdodDo6YWRvcHQoW1VJ V2luZG93IF9zeW5jaHJvbml6ZURyYXdpbmdBY3Jvc3NQcm9jZXNzZXNdKTsKICNlbHNlCi0gICAg ICAgIE1hY2hTZW5kUmlnaHQgZmVuY2VTZW5kUmlnaHQ7Ci0gICAgICAgIGlmIChEcmF3aW5nQXJl YVByb3h5KiBkcmF3aW5nQXJlYSA9IG1fcGFnZS0+ZHJhd2luZ0FyZWEoKSkKLSAgICAgICAgICAg IGZlbmNlU2VuZFJpZ2h0ID0gZHJhd2luZ0FyZWEtPmNyZWF0ZUZlbmNlKCk7Ci0gICAgICAgIG1h Y2hfcG9ydF9uYW1lX3QgZmVuY2VQb3J0ID0gZmVuY2VTZW5kUmlnaHQubGVha1NlbmRSaWdodCgp OworICAgIE1hY2hTZW5kUmlnaHQgZmVuY2VTZW5kUmlnaHQ7CisgICAgaWYgKERyYXdpbmdBcmVh UHJveHkqIGRyYXdpbmdBcmVhID0gbV9wYWdlLT5kcmF3aW5nQXJlYSgpKQorICAgICAgICBmZW5j ZVNlbmRSaWdodCA9IGRyYXdpbmdBcmVhLT5jcmVhdGVGZW5jZSgpOwogI2VuZGlmCiAKLSAgICAg ICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjpTZXRWaWRl b0xheWVyRnJhbWVGZW5jZWQoY29udGV4dElkLCBmcmFtZSwgSVBDOjpBdHRhY2htZW50KGZlbmNl UG9ydCwgTUFDSF9NU0dfVFlQRV9NT1ZFX1NFTkQpKSk7Ci0gICAgfQorICAgIG1fcGFnZS0+c2Vu ZChNZXNzYWdlczo6VmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6U2V0VmlkZW9MYXllckZyYW1lRmVu Y2VkKGNvbnRleHRJZCwgZnJhbWUsIGZlbmNlU2VuZFJpZ2h0KSk7CiB9CiAKIHZvaWQgVmlkZW9G dWxsc2NyZWVuTWFuYWdlclByb3h5OjpzZXRWaWRlb0xheWVyR3Jhdml0eShQbGF5YmFja1Nlc3Np b25Db250ZXh0SWRlbnRpZmllciBjb250ZXh0SWQsIFdlYkNvcmU6Ok1lZGlhUGxheWVyRW51bXM6 OlZpZGVvR3Jhdml0eSBncmF2aXR5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKaW5kZXggZDNiOGMzNTU0MGYzZjI0NTZmNzEwNTVmNWI0ZDdhNzgyMjYwZDM4Ny4uNjFi NDJkMzMzOTZhZGMxMTk5YTI1MTM4NzBmOWIxODY5MGEzNmIwNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xODIxLDEwICsxODIxLDcgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OnNldFRvcENvbnRlbnRJbnNldChmbG9hdCBjb250ZW50SW5zZXQpCiAgICAgaWYg KCFoYXNSdW5uaW5nUHJvY2VzcygpKQogICAgICAgICByZXR1cm47CiAjaWYgUExBVEZPUk0oQ09D T0EpCi0gICAgTWFjaFNlbmRSaWdodCBmZW5jZSA9IG1fZHJhd2luZ0FyZWEtPmNyZWF0ZUZlbmNl KCk7Ci0KLSAgICBhdXRvIGZlbmNlQXR0YWNobWVudCA9IElQQzo6QXR0YWNobWVudChmZW5jZS5s ZWFrU2VuZFJpZ2h0KCksIE1BQ0hfTVNHX1RZUEVfTU9WRV9TRU5EKTsKLSAgICBzZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpTZXRUb3BDb250ZW50SW5zZXRGZW5jZWQoY29udGVudEluc2V0LCBmZW5j ZUF0dGFjaG1lbnQpKTsKKyAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRUb3BDb250ZW50 SW5zZXRGZW5jZWQoY29udGVudEluc2V0LCBtX2RyYXdpbmdBcmVhLT5jcmVhdGVGZW5jZSgpKSk7 CiAjZWxzZQogICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldFRvcENvbnRlbnRJbnNldChj b250ZW50SW5zZXQpKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAppbmRleCBmNGYzMGI1ZmIxY2I3NmFkNDQ4ZGY4NzQ1NjliMjY1OTg1ZTYx OGRkLi5iYzdiMjBiMThjMmE2MDA0MTFjYmQ2MjA4OThjNzlhM2Q5MWYxMTBhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMzE3MywxOCArMzE3 MywxMCBAQCB2b2lkIFdlYlBhZ2U6OnNldEJhY2tncm91bmRDb2xvcihjb25zdCBPcHRpb25hbDxX ZWJDb3JlOjpDb2xvcj4mIGJhY2tncm91bmRDb2xvcgogfQogCiAjaWYgUExBVEZPUk0oQ09DT0Ep Ci12b2lkIFdlYlBhZ2U6OnNldFRvcENvbnRlbnRJbnNldEZlbmNlZChmbG9hdCBjb250ZW50SW5z ZXQsIElQQzo6QXR0YWNobWVudCBmZW5jZVBvcnQpCit2b2lkIFdlYlBhZ2U6OnNldFRvcENvbnRl bnRJbnNldEZlbmNlZChmbG9hdCBjb250ZW50SW5zZXQsIGNvbnN0IFdURjo6TWFjaFNlbmRSaWdo dCYgbWFjaFNlbmRSaWdodCkKIHsKLSAgICBpZiAoZmVuY2VQb3J0LmRpc3Bvc2l0aW9uKCkgIT0g TUFDSF9NU0dfVFlQRV9NT1ZFX1NFTkQpIHsKLSAgICAgICAgTE9HKExheWVycywgIldlYlBhZ2U6 OnNldFRvcENvbnRlbnRJbnNldEZlbmNlZCglZywgZmVuY2VQb3J0KSBSZWNlaXZlZCBhbiBpbnZh bGlkIGZlbmNlIHBvcnQ6ICVkLCBkaXNwb3NpdGlvbjogJWQiLCBjb250ZW50SW5zZXQsIGZlbmNl UG9ydC5wb3J0KCksIGZlbmNlUG9ydC5kaXNwb3NpdGlvbigpKTsKLSAgICAgICAgcmV0dXJuOwot ICAgIH0KLQotICAgIG1fZHJhd2luZ0FyZWEtPmFkZEZlbmNlKE1hY2hTZW5kUmlnaHQ6OmNyZWF0 ZShmZW5jZVBvcnQucG9ydCgpKSk7Ci0KKyAgICBtX2RyYXdpbmdBcmVhLT5hZGRGZW5jZShtYWNo U2VuZFJpZ2h0KTsKICAgICBzZXRUb3BDb250ZW50SW5zZXQoY29udGVudEluc2V0KTsKLQotICAg IGRlYWxsb2NhdGVTZW5kUmlnaHRTYWZlbHkoZmVuY2VQb3J0LnBvcnQoKSk7CiB9CiAjZW5kaWYK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5o IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDJlNDE4 NDYyZDgzOThlY2NjOTRjYzkwNWJlMWIzMzg4YTNiOGI5ZjYuLmYzY2Y5Y2MyYmNjMmQ3Y2U3Y2E0 YTk1ZGY5OTY2OGU2MDdmNjUyMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmgKQEAgLTE1MzEsNyArMTUzMSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRC YWNrZ3JvdW5kQ29sb3IoY29uc3QgT3B0aW9uYWw8V2ViQ29yZTo6Q29sb3I+Jik7CiAKICNpZiBQ TEFURk9STShDT0NPQSkKLSAgICB2b2lkIHNldFRvcENvbnRlbnRJbnNldEZlbmNlZChmbG9hdCwg SVBDOjpBdHRhY2htZW50KTsKKyAgICB2b2lkIHNldFRvcENvbnRlbnRJbnNldEZlbmNlZChmbG9h dCwgY29uc3QgV1RGOjpNYWNoU2VuZFJpZ2h0Jik7CiAjZW5kaWYKICAgICB2b2lkIHNldFRvcENv bnRlbnRJbnNldChmbG9hdCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmluZGV4IDdhODM0M2ZhYTU4ZTUyZTk0MDg4MDZl NDIwMTIzNTQzNmQ1NzYzNDkuLjg3ODAwN2Y1ZDFkYTk2MGNkYjY1NzNlZDY2MmM0Nzc5NWQyZjgw MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu bWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5tZXNzYWdlcy5pbgpAQCAtMzQsNyArMzQsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIExlZ2Fj eVJlY2VpdmVyIHsKICAgICBUZXN0UHJvY2Vzc0luY29taW5nU3luY01lc3NhZ2VzV2hlbldhaXRp bmdGb3JTeW5jUmVwbHkoKSAtPiAoYm9vbCBoYW5kbGVkKSBTeW5jaHJvbm91cwogCiAjaWYgUExB VEZPUk0oQ09DT0EpCi0gICAgU2V0VG9wQ29udGVudEluc2V0RmVuY2VkKGZsb2F0IGNvbnRlbnRJ bnNldCwgSVBDOjpBdHRhY2htZW50IGZlbmNlUG9ydCkKKyAgICBTZXRUb3BDb250ZW50SW5zZXRG ZW5jZWQoZmxvYXQgY29udGVudEluc2V0LCBNYWNoU2VuZFJpZ2h0IG1hY2hTZW5kUmlnaHQpCiAj ZW5kaWYKICAgICBTZXRUb3BDb250ZW50SW5zZXQoZmxvYXQgY29udGVudEluc2V0KQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvVmlkZW9GdWxsc2NyZWVuTWFu YWdlci5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1h bmFnZXIuaAppbmRleCBiOGM3MThlODFhY2Y3M2U2ZGJkNGU4OGEwZDY0NGY1YmU1MTBlODczLi5i MWQ5ZGI4YTFmMzlkZDBhZGRjOTQyMDNiMmZlM2M3MDY3ZmY5OTFiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlci5oCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLmgK QEAgLTQwLDEyICs0MCwxNSBAQAogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAogbmFtZXNwYWNl IElQQyB7Ci1jbGFzcyBBdHRhY2htZW50OwogY2xhc3MgQ29ubmVjdGlvbjsKIGNsYXNzIERlY29k ZXI7CiBjbGFzcyBNZXNzYWdlUmVjZWl2ZXI7CiB9CiAKK25hbWVzcGFjZSBXVEYgeworY2xhc3Mg TWFjaFNlbmRSaWdodDsKK30KKwogbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgRmxvYXRTaXpl OwogY2xhc3MgTm9kZTsKQEAgLTE1MSw3ICsxNTQsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBk aWRFeGl0RnVsbHNjcmVlbihQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpZmllcik7CiAgICAg dm9pZCBkaWRFbnRlckZ1bGxzY3JlZW4oUGxheWJhY2tTZXNzaW9uQ29udGV4dElkZW50aWZpZXIs IE9wdGlvbmFsPFdlYkNvcmU6OkZsb2F0U2l6ZT4pOwogICAgIHZvaWQgZGlkQ2xlYW51cEZ1bGxz Y3JlZW4oUGxheWJhY2tTZXNzaW9uQ29udGV4dElkZW50aWZpZXIpOwotICAgIHZvaWQgc2V0Vmlk ZW9MYXllckZyYW1lRmVuY2VkKFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyLCBXZWJD b3JlOjpGbG9hdFJlY3QgYm91bmRzLCBJUEM6OkF0dGFjaG1lbnQgZmVuY2VQb3J0KTsKKyAgICB2 b2lkIHNldFZpZGVvTGF5ZXJGcmFtZUZlbmNlZChQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRp ZmllciwgV2ViQ29yZTo6RmxvYXRSZWN0IGJvdW5kcywgY29uc3QgV1RGOjpNYWNoU2VuZFJpZ2h0 Jik7CiAgICAgdm9pZCBzZXRWaWRlb0xheWVyR3Jhdml0eUVudW0oUGxheWJhY2tTZXNzaW9uQ29u dGV4dElkZW50aWZpZXIsIHVuc2lnbmVkIGdyYXZpdHkpOwogICAgIHZvaWQgZnVsbHNjcmVlbk1v ZGVDaGFuZ2VkKFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyLCBXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGUpOwogICAgIHZvaWQgZnVsbHNj cmVlbldpbGxSZXR1cm5Ub0lubGluZShQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpZmllciwg Ym9vbCBpc1BhZ2VWaXNpYmxlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXIubWVzc2FnZXMuaW4KaW5k ZXggMzI1YjNjZDJmNDU5MmU0MWM0ZGRkODExOGRiMmI2ZDg5NjhmNWMzNS4uNWQ3ODk4N2EyYzBi Yjk4YTAzNDQ4ZDVhNjUwYjI2ODBmYTIxZTA4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXIubWVzc2FnZXMuaW4KKysrIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXIubWVz c2FnZXMuaW4KQEAgLTMxLDcgKzMxLDcgQEAgbWVzc2FnZXMgLT4gVmlkZW9GdWxsc2NyZWVuTWFu YWdlciB7CiAgICAgRGlkRXhpdEZ1bGxzY3JlZW4oV2ViS2l0OjpQbGF5YmFja1Nlc3Npb25Db250 ZXh0SWRlbnRpZmllciBjb250ZXh0SWQpCiAgICAgRGlkRW50ZXJGdWxsc2NyZWVuKFdlYktpdDo6 UGxheWJhY2tTZXNzaW9uQ29udGV4dElkZW50aWZpZXIgY29udGV4dElkLCBPcHRpb25hbDxXZWJD b3JlOjpGbG9hdFNpemU+IHNpemUpCiAgICAgRGlkQ2xlYW51cEZ1bGxzY3JlZW4oV2ViS2l0OjpQ bGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpZmllciBjb250ZXh0SWQpCi0gICAgU2V0VmlkZW9M YXllckZyYW1lRmVuY2VkKFdlYktpdDo6UGxheWJhY2tTZXNzaW9uQ29udGV4dElkZW50aWZpZXIg Y29udGV4dElkLCBXZWJDb3JlOjpGbG9hdFJlY3QgYm91bmRzLCBJUEM6OkF0dGFjaG1lbnQgZmVu Y2VQb3J0KQorICAgIFNldFZpZGVvTGF5ZXJGcmFtZUZlbmNlZChXZWJLaXQ6OlBsYXliYWNrU2Vz c2lvbkNvbnRleHRJZGVudGlmaWVyIGNvbnRleHRJZCwgV2ViQ29yZTo6RmxvYXRSZWN0IGJvdW5k cywgTWFjaFNlbmRSaWdodCBtYWNoU2VuZFJpZ2h0KQogICAgIFNldFZpZGVvTGF5ZXJHcmF2aXR5 RW51bShXZWJLaXQ6OlBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyIGNvbnRleHRJZCwg dW5zaWduZWQgZ3Jhdml0eSkKICAgICBGdWxsc2NyZWVuTW9kZUNoYW5nZWQoV2ViS2l0OjpQbGF5 YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpZmllciBjb250ZXh0SWQsIFdlYkNvcmU6OkhUTUxNZWRp YUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZSB2aWRlb0Z1bGxzY3JlZW5Nb2RlKQog ICAgIEZ1bGxzY3JlZW5XaWxsUmV0dXJuVG9JbmxpbmUoV2ViS2l0OjpQbGF5YmFja1Nlc3Npb25D b250ZXh0SWRlbnRpZmllciBjb250ZXh0SWQsIGJvb2wgaXNQYWdlVmlzaWJsZSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2Vy Lm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFn ZXIubW0KaW5kZXggM2NjNjY0OWI0MjM0MWNhOTY5NzgwZjFmMGUxMWRhMTZiZTEzNGM3YS4uZjdm YTc1OWU5ZWViMWI2Y2JkMTkyZDY5MDY0ZjY2N2U0OGJhNWNkMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXIubW0KKysrIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXIubW0K QEAgLTU0MywxNSArNTQzLDEwIEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6cmVxdWVz dFJvdXRlU2hhcmluZ1BvbGljeUFuZENvbnRleHRVSUQoUGxheWJhY2tTZXNzCiAgICAgZW5zdXJl TW9kZWwoY29udGV4dElkKS5yZXF1ZXN0Um91dGVTaGFyaW5nUG9saWN5QW5kQ29udGV4dFVJRChX VEZNb3ZlKHJlcGx5KSk7CiB9CiAgICAgCi12b2lkIFZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OnNl dFZpZGVvTGF5ZXJGcmFtZUZlbmNlZChQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpZmllciBj b250ZXh0SWQsIFdlYkNvcmU6OkZsb2F0UmVjdCBib3VuZHMsIElQQzo6QXR0YWNobWVudCBmZW5j ZVBvcnQpCit2b2lkIFZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OnNldFZpZGVvTGF5ZXJGcmFtZUZl bmNlZChQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpZmllciBjb250ZXh0SWQsIFdlYkNvcmU6 OkZsb2F0UmVjdCBib3VuZHMsIGNvbnN0IFdURjo6TWFjaFNlbmRSaWdodCYgbWFjaFNlbmRSaWdo dCkKIHsKICAgICBMT0coRnVsbHNjcmVlbiwgIlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OnNldFZp ZGVvTGF5ZXJGcmFtZUZlbmNlZCglcCwgJXgpIiwgdGhpcywgY29udGV4dElkKTsKIAotICAgIGlm IChmZW5jZVBvcnQuZGlzcG9zaXRpb24oKSAhPSBNQUNIX01TR19UWVBFX01PVkVfU0VORCkgewot ICAgICAgICBMT0coRnVsbHNjcmVlbiwgIlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OnNldFZpZGVv TGF5ZXJGcmFtZUZlbmNlZCglcCwgJXgpIFJlY2VpdmVkIGFuIGludmFsaWQgZmVuY2UgcG9ydDog JWQsIGRpc3Bvc2l0aW9uOiAlZCIsIHRoaXMsIGNvbnRleHRJZCwgZmVuY2VQb3J0LnBvcnQoKSwg ZmVuY2VQb3J0LmRpc3Bvc2l0aW9uKCkpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAg YXV0byBbbW9kZWwsIGludGVyZmFjZV0gPSBlbnN1cmVNb2RlbEFuZEludGVyZmFjZShjb250ZXh0 SWQpOwogCiAgICAgaWYgKHN0ZDo6aXNuYW4oYm91bmRzLngoKSkgfHwgc3RkOjppc25hbihib3Vu ZHMueSgpKSB8fCBzdGQ6OmlzbmFuKGJvdW5kcy53aWR0aCgpKSB8fCBzdGQ6OmlzbmFuKGJvdW5k cy5oZWlnaHQoKSkpIHsKQEAgLTU2MCw5ICs1NTUsOCBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbk1h bmFnZXI6OnNldFZpZGVvTGF5ZXJGcmFtZUZlbmNlZChQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRl bgogICAgIH0KICAgICAKICAgICBpZiAoYXV0byogY29udGV4dCA9IGludGVyZmFjZS0+bGF5ZXJI b3N0aW5nQ29udGV4dCgpKQotICAgICAgICBjb250ZXh0LT5zZXRGZW5jZVBvcnQoZmVuY2VQb3J0 LnBvcnQoKSk7CisgICAgICAgIGNvbnRleHQtPnNldEZlbmNlUG9ydChtYWNoU2VuZFJpZ2h0LnNl bmRSaWdodCgpKTsKICAgICBtb2RlbC0+c2V0VmlkZW9MYXllckZyYW1lKGJvdW5kcyk7Ci0gICAg ZGVhbGxvY2F0ZVNlbmRSaWdodFNhZmVseShmZW5jZVBvcnQucG9ydCgpKTsKIH0KIAogfSAvLyBu YW1lc3BhY2UgV2ViS2l0Cg==