184656 2018-04-16 10:00:56 -0700 Disable backward and forward navigation swipes while in fullscreen. 2018-04-21 14:52:58 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 184857 1 jeremyj-wk jeremyj-wk cdumez commit-queue simon.fraser thorton webkit-bug-importer oldest_to_newest 1414810 0 jeremyj-wk 2018-04-16 10:00:56 -0700 Disable backward and forward navigation swipes while in fullscreen. 1414811 1 jeremyj-wk 2018-04-16 10:01:56 -0700 rdar://problem/36057535 1414826 2 338015 jeremyj-wk 2018-04-16 11:03:53 -0700 Created attachment 338015 Patch 1414829 3 338015 simon.fraser 2018-04-16 11:11:33 -0700 Comment on attachment 338015 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338015&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:334 > BOOL _allowsBackForwardNavigationGestures; > + BOOL _disableBackForwardNavigationGestures; This is really confusing. At least add a comment saying which one wins. > Source/WebKit/UIProcess/Cocoa/WebViewImpl.h:706 > bool m_allowsBackForwardNavigationGestures { false }; > + bool m_disableBackForwardNavigationGestures { false }; Same here. 1416325 4 338015 jeremyj-wk 2018-04-20 10:57:01 -0700 Comment on attachment 338015 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338015&action=review >> Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:334 >> + BOOL _disableBackForwardNavigationGestures; > > This is really confusing. At least add a comment saying which one wins. // Back-forward navigation requires both _allowsBackForwardNavigationGestures and not _disableBackForwardNavigationGestures. 1416511 5 338486 jeremyj-wk 2018-04-20 16:40:21 -0700 Created attachment 338486 Patch 1416573 6 338486 commit-queue 2018-04-20 18:32:23 -0700 Comment on attachment 338486 Patch Clearing flags on attachment: 338486 Committed r230873: <https://trac.webkit.org/changeset/230873> 1416574 7 commit-queue 2018-04-20 18:32:24 -0700 All reviewed patches have been landed. Closing bug. 1416588 8 338486 cdumez 2018-04-20 19:21:24 -0700 Comment on attachment 338486 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338486&action=review > Source/WebKit/UIProcess/Cocoa/ViewGestureController.cpp:119 > + if (m_webPageProxy.fullScreenManager() && m_webPageProxy.fullScreenManager()->isFullScreen()) This seems to have broken the iOS build: /Volumes/Data/slave/ios-simulator-11-release/build/Source/WebKit/UIProcess/Cocoa/ViewGestureController.cpp:119:24: error: no member named 'fullScreenManager' in 'WebKit::WebPageProxy' if (m_webPageProxy.fullScreenManager() && m_webPageProxy.fullScreenManager()->isFullScreen()) ~~~~~~~~~~~~~~ ^ /Volumes/Data/slave/ios-simulator-11-release/build/Source/WebKit/UIProcess/Cocoa/ViewGestureController.cpp:119:62: error: no member named 'fullScreenManager' in 'WebKit::WebPageProxy' if (m_webPageProxy.fullScreenManager() && m_webPageProxy.fullScreenManager()->isFullScreen()) ~~~~~~~~~~~~~~ ^ 2 errors generated. https://build.webkit.org/builders/Apple%20iOS%2011%20Simulator%20Release%20%28Build%29/builds/5257/steps/compile-webkit/logs/stdio 1416592 9 commit-queue 2018-04-20 19:23:56 -0700 Re-opened since this is blocked by bug 184857 1416660 10 338526 jeremyj-wk 2018-04-21 10:18:19 -0700 Created attachment 338526 Patch for landing 1416710 11 338526 commit-queue 2018-04-21 14:52:57 -0700 Comment on attachment 338526 Patch for landing Clearing flags on attachment: 338526 Committed r230896: <https://trac.webkit.org/changeset/230896> 1416711 12 commit-queue 2018-04-21 14:52:58 -0700 All reviewed patches have been landed. Closing bug. 338015 2018-04-16 11:03:53 -0700 2018-04-20 16:40:19 -0700 Patch bug-184656-20180416110352.patch text/plain 14935 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU4ZjQ5MWExZGNhZjMwMzZk Yjg1ZTI1NDFhZmRhZDdlZGJmNTkxMTEuLmQyNTY3MGFlOTdjOTM2YTY3ZjQ5Y2ZiMDI3NjJmMmMz NmNjNGY1MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQgQEAKKzIwMTgtMDQtMTYgIEplcmVteSBK b25lcyAgPGplcmVteWpAYXBwbGUuY29tPgorCisgICAgICAgIERpc2FibGUgYmFja3dhcmQgYW5k IGZvcndhcmQgbmF2aWdhdGlvbiBzd2lwZXMgd2hpbGUgaW4gZnVsbHNjcmVlbi4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDY1NgorICAgICAgICBy ZGFyOi8vcHJvYmxlbS8zNjA1NzUzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgYWRkcyB0aGUgcHJvcGVydHkgX2Rpc2FibGVCYWNrRm9yd2Fy ZE5hdmlnYXRpb25HZXN0dXJlcyB0byBXS1dlYlZpZXcvV2ViVmlld0ltcGwvV0tWaWV3LAorICAg ICAgICB3aGljaCBvdmVycmlkZXMgYWxsb3dzQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdXRyZXMu CisKKyAgICAgICAgTWFjIGFuZCBpT1MgZGlzYWJsZSBuYXZpZ2F0aW9uIHN3aXBlcyBkdXJpbmcg ZnVsbHNjcmVlbiBieSBzZXR0aW5nIHRoaXMgcHJvcGVydHkgb24gCisgICAgICAgIFdLV2ViVmll dy9XZWJWaWV3SW1wbC9XS1ZpZXcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IHNldEFsbG93c0JhY2tGb3J3YXJkTmF2 aWdhdGlvbkdlc3R1cmVzOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgYWxsb3dzQmFja0Zvcndh cmROYXZpZ2F0aW9uR2VzdHVyZXNdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9kaXNhYmxlQmFj a0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXNdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9zZXRE aXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXM6XSk6CisgICAgICAgICgtW1dLV2Vi VmlldyB1cGRhdGVHZXN0dXJlQ29udHJvbGxlcl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9X S1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBfc2V0RGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdh dGlvbkdlc3R1cmVzOl0pOgorICAgICAgICAoLVtXS1ZpZXcgX2Rpc2FibGVCYWNrRm9yd2FyZE5h dmlnYXRpb25HZXN0dXJlc10pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1w bC5oOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZGlzYWJsZUJhY2tGb3J3YXJkTmF2 aWdhdGlvbkdlc3R1cmVzIGNvbnN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmll d0ltcGwubW06CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZXRBbGxvd3NCYWNrRm9y d2FyZE5hdmlnYXRpb25HZXN0dXJlcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpz ZXREaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXMpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6dXBkYXRlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZSk6CisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9mdWxsc2NyZWVuL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xs ZXJJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldLV2ViVmlld1N0YXRlOjphcHBseVRvKToKKyAg ICAgICAgKFdlYktpdDo6V0tXZWJWaWV3U3RhdGU6OnN0b3JlKToKKyAgICAgICAgKC1bV0tGdWxs U2NyZWVuV2luZG93Q29udHJvbGxlciBlbnRlckZ1bGxTY3JlZW5dKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dL RnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgaW5pdFdpdGhXaW5kb3c6d2ViVmlldzpwYWdlOl0p OgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGVudGVyRnVsbFNjcmVl bjpdKToKKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBmaW5pc2hlZEVu dGVyRnVsbFNjcmVlbkFuaW1hdGlvbjpdKToKKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93 Q29udHJvbGxlciBmaW5pc2hlZEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uOl0pOgorCiAyMDE4LTA0 LTA0ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBSZW5h bWUgV0tQREZWaWV3IHRvIFdLTGVnYWN5UERGVmlldwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMWNjYzA4NWY4YjQ3NzQ1Yzg4MmRlZDM3 NzhmMDI3MmQ4ZjcyOWZjMi4uOGIzMzk1MzRhNGEyYWYwMGM2ZDY0NjE0YWNkZThhMzk3ZjE0MTk4 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t CkBAIC0zMzEsNiArMzMxLDcgQEAgQGltcGxlbWVudGF0aW9uIFdLV2ViVmlldyB7CiAKICAgICBz dGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI+IF9nZXN0dXJlQ29u dHJvbGxlcjsKICAgICBCT09MIF9hbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlczsK KyAgICBCT09MIF9kaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXM7CiAKICAgICBS ZXRhaW5QdHI8VUlWaWV3IDxXS1dlYlZpZXdDb250ZW50UHJvdmlkZXI+PiBfY3VzdG9tQ29udGVu dFZpZXc7CiAgICAgUmV0YWluUHRyPFVJVmlldz4gX2N1c3RvbUNvbnRlbnRGaXhlZE92ZXJsYXlW aWV3OwpAQCAtMjk0NSw3ICsyOTQ2LDMyIEBAIC0gKHZvaWQpc2V0QWxsb3dzQmFja0ZvcndhcmRO YXZpZ2F0aW9uR2VzdHVyZXM6KEJPT0wpYWxsb3dzQmFja0ZvcndhcmROYXZpZ2F0aW9uCiAKICAg ICBfYWxsb3dzQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXMgPSBhbGxvd3NCYWNrRm9yd2Fy ZE5hdmlnYXRpb25HZXN0dXJlczsKIAotICAgIGlmIChhbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRp b25HZXN0dXJlcykgeworICAgIFtzZWxmIHVwZGF0ZUdlc3R1cmVDb250cm9sbGVyXTsKK30KKwor LSAoQk9PTClhbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlcworeworICAgIHJldHVy biBfYWxsb3dzQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXM7Cit9CisKKy0gKEJPT0wpX2Rp c2FibGVCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlcworeworICAgIHJldHVybiBfZGlzYWJs ZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzOworfQorCistICh2b2lkKV9zZXREaXNhYmxl QmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXM6KEJPT0wpZGlzYWJsZUJhY2tGb3J3YXJkTmF2 aWdhdGlvbkdlc3R1cmVzCit7CisgICAgaWYgKF9kaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9u R2VzdHVyZXMgPT0gZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzKQorICAgICAg ICByZXR1cm47CisKKyAgICBfZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzID0g ZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzOworCisgICAgW3NlbGYgdXBkYXRl R2VzdHVyZUNvbnRyb2xsZXJdOworfQorCistICh2b2lkKXVwZGF0ZUdlc3R1cmVDb250cm9sbGVy Cit7CisgICAgaWYgKF9hbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlcyAmJiAhX2Rp c2FibGVCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlcykgewogICAgICAgICBpZiAoIV9nZXN0 dXJlQ29udHJvbGxlcikgewogICAgICAgICAgICAgX2dlc3R1cmVDb250cm9sbGVyID0gc3RkOjpt YWtlX3VuaXF1ZTxXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcj4oKl9wYWdlKTsKICAgICAg ICAgICAgIF9nZXN0dXJlQ29udHJvbGxlci0+aW5zdGFsbFN3aXBlSGFuZGxlcihzZWxmLCBbc2Vs ZiBzY3JvbGxWaWV3XSk7CkBAIC0yOTU1LDEyICsyOTgxLDcgQEAgLSAodm9pZClzZXRBbGxvd3NC YWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlczooQk9PTClhbGxvd3NCYWNrRm9yd2FyZE5hdmln YXRpb24KICAgICB9IGVsc2UKICAgICAgICAgX2dlc3R1cmVDb250cm9sbGVyID0gbnVsbHB0cjsK IAotICAgIF9wYWdlLT5zZXRTaG91bGRSZWNvcmROYXZpZ2F0aW9uU25hcHNob3RzKGFsbG93c0Jh Y2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzKTsKLX0KLQotLSAoQk9PTClhbGxvd3NCYWNrRm9y d2FyZE5hdmlnYXRpb25HZXN0dXJlcwotewotICAgIHJldHVybiBfYWxsb3dzQmFja0ZvcndhcmRO YXZpZ2F0aW9uR2VzdHVyZXM7CisgICAgX3BhZ2UtPnNldFNob3VsZFJlY29yZE5hdmlnYXRpb25T bmFwc2hvdHMoX2FsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzICYmICFfZGlzYWJs ZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzKTsKIH0KIAogLSAoQk9PTClfaXNOYXZpZ2F0 aW9uU3dpcGVHZXN0dXJlUmVjb2duaXplcjooVUlHZXN0dXJlUmVjb2duaXplciAqKXJlY29nbml6 ZXIKQEAgLTM3NjQsNiArMzc4NSwxNiBAQCAtIChCT09MKWFsbG93c0JhY2tGb3J3YXJkTmF2aWdh dGlvbkdlc3R1cmVzCiAgICAgcmV0dXJuIF9pbXBsLT5hbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRp b25HZXN0dXJlcygpOwogfQogCistICh2b2lkKV9zZXREaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0 aW9uR2VzdHVyZXM6KEJPT0wpZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzCit7 CisgICAgX2ltcGwtPnNldERpc2FibGVCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlcyhkaXNh YmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXMpOworfQorCistIChCT09MKV9kaXNhYmxl QmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXMKK3sKKyAgICByZXR1cm4gX2ltcGwtPmRpc2Fi bGVCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlcygpOworfQorCiAtICh2b2lkKXNtYXJ0TWFn bmlmeVdpdGhFdmVudDooTlNFdmVudCAqKWV2ZW50CiB7CiAgICAgX2ltcGwtPnNtYXJ0TWFnbmlm eVdpdGhFdmVudChldmVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCmluZGV4IDAzNWYzZjA4OTc2MjY4ZTc2ODU2OTIy ZTQxOTUxZTllYzhlYjQ5YmQuLmY5ZmFkYWI5MTk5ZDI3ZjY3OWQxYzRlMTBjZDMzNjg0YmFiNWEz OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXdJbnRlcm5hbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXdJbnRlcm5hbC5oCkBAIC0xMTksNiArMTE5LDcgQEAgc3RydWN0IFByaW50SW5mbzsKIC0g KHZvaWQpX25hdmlnYXRpb25HZXN0dXJlRGlkQmVnaW47CiAtICh2b2lkKV9uYXZpZ2F0aW9uR2Vz dHVyZURpZEVuZDsKIC0gKEJPT0wpX2lzTmF2aWdhdGlvblN3aXBlR2VzdHVyZVJlY29nbml6ZXI6 KFVJR2VzdHVyZVJlY29nbml6ZXIgKilyZWNvZ25pemVyOworQHByb3BlcnR5IChub25hdG9taWMs IHNldHRlcj1fc2V0RGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzOikgQk9PTCBf ZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzOwogCiAtICh2b2lkKV9zaG93UGFz c3dvcmRWaWV3V2l0aERvY3VtZW50TmFtZTooTlNTdHJpbmcgKilkb2N1bWVudE5hbWUgcGFzc3dv cmRIYW5kbGVyOih2b2lkICheKShOU1N0cmluZyAqKSlwYXNzd29yZEhhbmRsZXI7CiAtICh2b2lk KV9oaWRlUGFzc3dvcmRWaWV3OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL21hYy9XS1ZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmll dy5tbQppbmRleCA5ZThkMDE2ZDZkMmQ5ZTIzODQ3NGEyNmE4MGUzZGM4ODM2NTQ5ODFmLi44MzMx ZjE4ZTcwYTA0OTNiNTJlYTAxN2UwYWNiZjIyM2U2NTdiNTM5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpAQCAtOTI3LDYgKzkyNywxNiBAQCAtIChfV0tUaHVt Ym5haWxWaWV3ICopX3RodW1ibmFpbFZpZXcKIH0KICNlbmRpZiAvLyBXS19BUElfRU5BQkxFRAog CistICh2b2lkKV9zZXREaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXM6KEJPT0wp ZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzCit7CisgICAgX2RhdGEtPl9pbXBs LT5zZXREaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXMoZGlzYWJsZUJhY2tGb3J3 YXJkTmF2aWdhdGlvbkdlc3R1cmVzKTsKK30KKworLSAoQk9PTClfZGlzYWJsZUJhY2tGb3J3YXJk TmF2aWdhdGlvbkdlc3R1cmVzCit7CisgICAgcmV0dXJuIF9kYXRhLT5faW1wbC0+ZGlzYWJsZUJh Y2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzKCk7Cit9CisKIC0gKE5TVGV4dElucHV0Q29udGV4 dCAqKV93ZWJfc3VwZXJJbnB1dENvbnRleHQKIHsKICAgICByZXR1cm4gW3N1cGVyIGlucHV0Q29u dGV4dF07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3 SW1wbC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaAppbmRl eCAzODA2YjhmMDQyMDRkNDBjYTI4ZWY3OTc1ZjljOTgyNGJlMDQ5NWQ1Li5iMDBhMWRmYjllNWEy OTIxZmQ5NjI3ZmIxNzkzMzU3MGJlNzhlNzc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1dlYlZpZXdJbXBsLmgKQEAgLTY5LDYgKzY5LDkgQEAgT0JKQ19DTEFTUyBXZWJQbGF5 YmFja0NvbnRyb2xzTWFuYWdlcjsKIAogQHByb3RvY29sIFdlYlZpZXdJbXBsRGVsZWdhdGUKIAor LSAoQk9PTClfZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzOworLSAodm9pZClf c2V0RGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzOihCT09MKWRpc2FibGVCYWNr Rm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlczsKKwogLSAoTlNUZXh0SW5wdXRDb250ZXh0ICopX3dl Yl9zdXBlcklucHV0Q29udGV4dDsKIC0gKHZvaWQpX3dlYl9zdXBlclF1aWNrTG9va1dpdGhFdmVu dDooTlNFdmVudCAqKWV2ZW50OwogLSAodm9pZClfd2ViX3N1cGVyUmVtb3ZlVHJhY2tpbmdSZWN0 OihOU1RyYWNraW5nUmVjdFRhZyl0YWc7CkBAIC00MjYsNiArNDI5LDkgQEAgcHVibGljOgogICAg IFZpZXdHZXN0dXJlQ29udHJvbGxlciYgZW5zdXJlR2VzdHVyZUNvbnRyb2xsZXIoKTsKICAgICB2 b2lkIHNldEFsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzKGJvb2wpOwogICAgIGJv b2wgYWxsb3dzQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXMoKSBjb25zdCB7IHJldHVybiBt X2FsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzOyB9CisgICAgdm9pZCBzZXREaXNh YmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXMoYm9vbCk7CisgICAgYm9vbCBkaXNhYmxl QmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXMoKSBjb25zdCB7IHJldHVybiBtX2Rpc2FibGVC YWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlczsgfQorICAgIHZvaWQgdXBkYXRlQmFja0Zvcndh cmROYXZpZ2F0aW9uR2VzdHVyZSgpOwogICAgIHZvaWQgc2V0QWxsb3dzTWFnbmlmaWNhdGlvbihi b29sKTsKICAgICBib29sIGFsbG93c01hZ25pZmljYXRpb24oKSBjb25zdCB7IHJldHVybiBtX2Fs bG93c01hZ25pZmljYXRpb247IH0KIApAQCAtNjk3LDYgKzcwMyw3IEBAIHByaXZhdGU6CiAKICAg ICBzdGQ6OnVuaXF1ZV9wdHI8Vmlld0dlc3R1cmVDb250cm9sbGVyPiBtX2dlc3R1cmVDb250cm9s bGVyOwogICAgIGJvb2wgbV9hbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlcyB7IGZh bHNlIH07CisgICAgYm9vbCBtX2Rpc2FibGVCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlcyB7 IGZhbHNlIH07CiAgICAgYm9vbCBtX2FsbG93c01hZ25pZmljYXRpb24geyBmYWxzZSB9OwogCiAg ICAgUmV0YWluUHRyPE5TQWNjZXNzaWJpbGl0eVJlbW90ZVVJRWxlbWVudD4gbV9yZW1vdGVBY2Nl c3NpYmlsaXR5Q2hpbGQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv YS9XZWJWaWV3SW1wbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJ bXBsLm1tCmluZGV4IGRiMTRmOWMzZDQzNzk2OGNlMmJmZTExZmEwM2NjZDg3MmQzNDgwYjEuLjI1 ZDE5ZTUzZWQyODQ2YmM2ZjkzZjkyZDgxZGI5MTU0MzQyOWU3NGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCkBAIC00MDM0LDggKzQwMzQsMTkgQEAg Vmlld0dlc3R1cmVDb250cm9sbGVyJiBXZWJWaWV3SW1wbDo6ZW5zdXJlR2VzdHVyZUNvbnRyb2xs ZXIoKQogdm9pZCBXZWJWaWV3SW1wbDo6c2V0QWxsb3dzQmFja0ZvcndhcmROYXZpZ2F0aW9uR2Vz dHVyZXMoYm9vbCBhbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlcykKIHsKICAgICBt X2FsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzID0gYWxsb3dzQmFja0ZvcndhcmRO YXZpZ2F0aW9uR2VzdHVyZXM7Ci0gICAgbV9wYWdlLT5zZXRTaG91bGRSZWNvcmROYXZpZ2F0aW9u U25hcHNob3RzKGFsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzKTsKLSAgICBtX3Bh Z2UtPnNldFNob3VsZFVzZUltcGxpY2l0UnViYmVyQmFuZENvbnRyb2woYWxsb3dzQmFja0Zvcndh cmROYXZpZ2F0aW9uR2VzdHVyZXMpOworICAgIHVwZGF0ZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdl c3R1cmUoKTsKK30KKwordm9pZCBXZWJWaWV3SW1wbDo6c2V0RGlzYWJsZUJhY2tGb3J3YXJkTmF2 aWdhdGlvbkdlc3R1cmVzKGJvb2wgZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVz KQoreworICAgIG1fZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzID0gZGlzYWJs ZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzOworICAgIHVwZGF0ZUJhY2tGb3J3YXJkTmF2 aWdhdGlvbkdlc3R1cmUoKTsKK30KKwordm9pZCBXZWJWaWV3SW1wbDo6dXBkYXRlQmFja0Zvcndh cmROYXZpZ2F0aW9uR2VzdHVyZSgpCit7CisgICAgbV9wYWdlLT5zZXRTaG91bGRSZWNvcmROYXZp Z2F0aW9uU25hcHNob3RzKG1fYWxsb3dzQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXMgJiYg IW1fZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzKTsKKyAgICBtX3BhZ2UtPnNl dFNob3VsZFVzZUltcGxpY2l0UnViYmVyQmFuZENvbnRyb2wobV9hbGxvd3NCYWNrRm9yd2FyZE5h dmlnYXRpb25HZXN0dXJlcyAmJiAhbV9kaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVy ZXMpOwogfQogCiB2b2lkIFdlYlZpZXdJbXBsOjpzZXRBbGxvd3NNYWduaWZpY2F0aW9uKGJvb2wg YWxsb3dzTWFnbmlmaWNhdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9mdWxsc2NyZWVuL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXJJT1MubW0gYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZnVsbHNjcmVlbi9XS0Z1bGxTY3JlZW5XaW5kb3dDb250 cm9sbGVySU9TLm1tCmluZGV4IDIzOWFmMmZlM2Y5MzVhZTA3YzE2Yzg4ZmQ5NDJhMGViMjJjN2Yx ODcuLmVlODZiMzBmZjk2ZThiZmYzMzM4ODAwOWVjNjcwNTJlYjA3OWExMWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mdWxsc2NyZWVuL1dLRnVsbFNjcmVlbldpbmRv d0NvbnRyb2xsZXJJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Z1bGxz Y3JlZW4vV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlcklPUy5tbQpAQCAtODgsNiArODgsNyBA QCBzdHJ1Y3QgV0tXZWJWaWV3U3RhdGUgewogICAgIFVJRWRnZUluc2V0cyBfc2F2ZWRPYnNjdXJl ZEluc2V0cyA9IFVJRWRnZUluc2V0c1plcm87CiAgICAgVUlFZGdlSW5zZXRzIF9zYXZlZFNjcm9s bEluZGljYXRvckluc2V0cyA9IFVJRWRnZUluc2V0c1plcm87CiAgICAgQ0dQb2ludCBfc2F2ZWRD b250ZW50T2Zmc2V0ID0gQ0dQb2ludFplcm87CisgICAgQk9PTCBfZGlzYWJsZUJhY2tGb3J3YXJk TmF2aWdhdGlvbkdlc3R1cmVzID0gWUVTOwogCiAgICAgdm9pZCBhcHBseVRvKFdLV2ViVmlldyog d2ViVmlldykKICAgICB7CkBAIC05OSwxMCArMTAwLDEyIEBAIHN0cnVjdCBXS1dlYlZpZXdTdGF0 ZSB7CiAgICAgICAgIFt3ZWJWaWV3IF9wYWdlXS0+c2V0VG9wQ29udGVudEluc2V0KF9zYXZlZFRv cENvbnRlbnRJbnNldCk7CiAgICAgICAgIFt3ZWJWaWV3IF9zZXRWaWV3U2NhbGU6X3NhdmVkVmll d1NjYWxlXTsKICAgICAgICAgW1t3ZWJWaWV3IHNjcm9sbFZpZXddIHNldFpvb21TY2FsZTpfc2F2 ZWRab29tU2NhbGVdOworICAgICAgICBbd2ViVmlldyBfc2V0RGlzYWJsZUJhY2tGb3J3YXJkTmF2 aWdhdGlvbkdlc3R1cmVzOl9kaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXNdOwog ICAgIH0KICAgICAKICAgICB2b2lkIHN0b3JlKFdLV2ViVmlldyogd2ViVmlldykKICAgICB7Cisg ICAgICAgIF9kaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXMgPSBbd2ViVmlldyBf ZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzXTsKICAgICAgICAgX3NhdmVkUGFn ZVNjYWxlID0gW3dlYlZpZXcgX3BhZ2VTY2FsZV07CiAgICAgICAgIF9zYXZlZE9ic2N1cmVkSW5z ZXRzID0gW3dlYlZpZXcgX29ic2N1cmVkSW5zZXRzXTsKICAgICAgICAgX3NhdmVkRWRnZUluc2V0 ID0gW1t3ZWJWaWV3IHNjcm9sbFZpZXddIGNvbnRlbnRJbnNldF07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIu aAppbmRleCAzNTQyNmQ1ZjQ2ZjI4ZWJkZTMzNTkyYzM0ZTA5YWE2ZjI3OGEyYTM2Li40NjUyMzNj OTM5ZWJkNWU5MzlkMzMwOTRkN2YwZThmMjg3Y2ZjZjNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLmgK QEAgLTM5LDEyICszOSwxMyBAQCBjbGFzcyBJbnRSZWN0OwogCiBAY2xhc3MgV0tWaWV3OwogQGNs YXNzIFdlYkNvcmVGdWxsU2NyZWVuUGxhY2Vob2xkZXJWaWV3OworQHByb3RvY29sIFdlYlZpZXdJ bXBsRGVsZWdhdGU7CiAKIHR5cGVkZWYgZW51bSBGdWxsU2NyZWVuU3RhdGUgOiBOU0ludGVnZXIg RnVsbFNjcmVlblN0YXRlOwogCiBAaW50ZXJmYWNlIFdLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xs ZXIgOiBOU1dpbmRvd0NvbnRyb2xsZXI8TlNXaW5kb3dEZWxlZ2F0ZT4gewogQHByaXZhdGUKLSAg ICBOU1ZpZXcgKl93ZWJWaWV3OyAvLyBDYW5ub3QgYmUgcmV0YWluZWQsIHNlZSA8cmRhcjovL3By b2JsZW0vMTQ4ODQ2NjY+LgorICAgIE5TVmlldzxXZWJWaWV3SW1wbERlbGVnYXRlPiAqX3dlYlZp ZXc7IC8vIENhbm5vdCBiZSByZXRhaW5lZCwgc2VlIDxyZGFyOi8vcHJvYmxlbS8xNDg4NDY2Nj4u CiAgICAgV2ViS2l0OjpXZWJQYWdlUHJveHkqIF9wYWdlOwogICAgIFJldGFpblB0cjxXZWJDb3Jl RnVsbFNjcmVlblBsYWNlaG9sZGVyVmlldz4gX3dlYlZpZXdQbGFjZWhvbGRlcjsKICAgICBSZXRh aW5QdHI8TlNWaWV3PiBfY2xpcFZpZXc7CkBAIC02Niw3ICs2Nyw3IEBAIHR5cGVkZWYgZW51bSBG dWxsU2NyZWVuU3RhdGUgOiBOU0ludGVnZXIgRnVsbFNjcmVlblN0YXRlOwogQHByb3BlcnR5IChy ZWFkb25seSkgTlNSZWN0IGZpbmFsRnJhbWU7CiBAcHJvcGVydHkgKGFzc2lnbikgTlNBcnJheSAq c2F2ZWRDb25zdHJhaW50czsKIAotLSAoaWQpaW5pdFdpdGhXaW5kb3c6KE5TV2luZG93ICopd2lu ZG93IHdlYlZpZXc6KE5TVmlldyAqKXdlYlZpZXcgcGFnZTooV2ViS2l0OjpXZWJQYWdlUHJveHkm KXBhZ2U7CistIChpZClpbml0V2l0aFdpbmRvdzooTlNXaW5kb3cgKil3aW5kb3cgd2ViVmlldzoo TlNWaWV3PFdlYlZpZXdJbXBsRGVsZWdhdGU+ICopd2ViVmlldyBwYWdlOihXZWJLaXQ6OldlYlBh Z2VQcm94eSYpcGFnZTsKIAogLSAoV2ViQ29yZUZ1bGxTY3JlZW5QbGFjZWhvbGRlclZpZXcqKXdl YlZpZXdQbGFjZWhvbGRlcjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv bWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbQppbmRleCBhYWRlOTc0ZWYx MTRkN2UxOGY3OTlkNmEwZjU3ZWZiNmY4MGE2ZTU4Li4wNjk0M2FlMzc2OGRlZjYzOTdkNzg3NTg2 ZGY3ZmY1ZDU4OTg4MDFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMv V0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbQpAQCAtMzUsNiArMzUsNyBA QAogI2ltcG9ydCAiV0tWaWV3UHJpdmF0ZS5oIgogI2ltcG9ydCAiV2ViRnVsbFNjcmVlbk1hbmFn ZXJQcm94eS5oIgogI2ltcG9ydCAiV2ViUGFnZVByb3h5LmgiCisjaW1wb3J0ICJXZWJWaWV3SW1w bC5oIgogI2ltcG9ydCA8UXVhcnR6Q29yZS9RdWFydHpDb3JlLmg+CiAjaW1wb3J0IDxXZWJDb3Jl L0Zsb2F0UmVjdC5oPgogI2ltcG9ydCA8V2ViQ29yZS9HZW9tZXRyeVV0aWxpdGllcy5oPgpAQCAt ODYsNyArODcsNyBAQCBAaW1wbGVtZW50YXRpb24gV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxl cgogCiAjcHJhZ21hIG1hcmsgLQogI3ByYWdtYSBtYXJrIEluaXRpYWxpemF0aW9uCi0tIChpZClp bml0V2l0aFdpbmRvdzooTlNXaW5kb3cgKil3aW5kb3cgd2ViVmlldzooTlNWaWV3ICopd2ViVmll dyBwYWdlOihXZWJQYWdlUHJveHkmKXBhZ2UKKy0gKGlkKWluaXRXaXRoV2luZG93OihOU1dpbmRv dyAqKXdpbmRvdyB3ZWJWaWV3OihOU1ZpZXc8V2ViVmlld0ltcGxEZWxlZ2F0ZT4gKil3ZWJWaWV3 IHBhZ2U6KFdlYlBhZ2VQcm94eSYpcGFnZQogewogICAgIHNlbGYgPSBbc3VwZXIgaW5pdFdpdGhX aW5kb3c6d2luZG93XTsKICAgICBpZiAoIXNlbGYpCkBAIC0yMzMsNiArMjM0LDcgQEAgLSAodm9p ZCllbnRlckZ1bGxTY3JlZW46KE5TU2NyZWVuICopc2NyZWVuCiAjcHJhZ21hIGNsYW5nIGRpYWdu b3N0aWMgcG9wCiAKICAgICBbc2VsZiBfbWFuYWdlcl0tPnNhdmVTY3JvbGxQb3NpdGlvbigpOwor ICAgIFtfd2ViVmlldyBfc2V0RGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzOllF U107CiAgICAgX3NhdmVkVG9wQ29udGVudEluc2V0ID0gX3BhZ2UtPnRvcENvbnRlbnRJbnNldCgp OwogICAgIF9wYWdlLT5zZXRUb3BDb250ZW50SW5zZXQoMCk7CiAgICAgW1tzZWxmIHdpbmRvd10g c2V0RnJhbWU6c2NyZWVuRnJhbWUgZGlzcGxheTpOT107CkBAIC0zMjQsNiArMzI2LDcgQEAgLSAo dm9pZClmaW5pc2hlZEVudGVyRnVsbFNjcmVlbkFuaW1hdGlvbjooYm9vbCljb21wbGV0ZWQKICAg ICAgICAgX3BhZ2UtPnNjYWxlUGFnZShfc2F2ZWRTY2FsZSwgSW50UG9pbnQoKSk7CiAgICAgICAg IFtzZWxmIF9tYW5hZ2VyXS0+cmVzdG9yZVNjcm9sbFBvc2l0aW9uKCk7CiAgICAgICAgIF9wYWdl LT5zZXRUb3BDb250ZW50SW5zZXQoX3NhdmVkVG9wQ29udGVudEluc2V0KTsKKyAgICAgICAgW193 ZWJWaWV3IF9zZXREaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXM6Tk9dOwogICAg ICAgICBbc2VsZiBfbWFuYWdlcl0tPmRpZEV4aXRGdWxsU2NyZWVuKCk7CiAgICAgICAgIFtzZWxm IF9tYW5hZ2VyXS0+c2V0QW5pbWF0aW5nRnVsbFNjcmVlbihmYWxzZSk7CiAgICAgfQpAQCAtNDQz LDYgKzQ0Niw3IEBAIC0gKHZvaWQpZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbjooYm9v bCljb21wbGV0ZWQKICAgICBfcGFnZS0+c2NhbGVQYWdlKF9zYXZlZFNjYWxlLCBJbnRQb2ludCgp KTsKICAgICBbc2VsZiBfbWFuYWdlcl0tPnJlc3RvcmVTY3JvbGxQb3NpdGlvbigpOwogICAgIF9w YWdlLT5zZXRUb3BDb250ZW50SW5zZXQoX3NhdmVkVG9wQ29udGVudEluc2V0KTsKKyAgICBbX3dl YlZpZXcgX3NldERpc2FibGVCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlczpOT107CiAKICAg ICBpZiAoX3JlcGFpbnRDYWxsYmFjaykgewogICAgICAgICBfcmVwYWludENhbGxiYWNrLT5pbnZh bGlkYXRlKFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvcjo6T3duZXJXYXNJbnZhbGlkYXRlZCk7 Cg== 338486 2018-04-20 16:40:21 -0700 2018-04-20 18:32:23 -0700 Patch bug-184656-20180420164020.patch text/plain 2026 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU4ZjQ5MWExZGNhZjMwMzZk Yjg1ZTI1NDFhZmRhZDdlZGJmNTkxMTEuLjExMjU1MzM2YzI3ZGUxOTI5NDE5NWI2OTVjYmY5N2Q1 ZDRiMGE2ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTgtMDQtMjAgIEplcmVteSBK b25lcyAgPGplcmVteWpAYXBwbGUuY29tPgorCisgICAgICAgIERpc2FibGUgYmFja3dhcmQgYW5k IGZvcndhcmQgbmF2aWdhdGlvbiBzd2lwZXMgd2hpbGUgaW4gZnVsbHNjcmVlbi4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDY1NgorICAgICAgICBy ZGFyOi8vcHJvYmxlbS8zNjA1NzUzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIERpc2FibGUgbmF2aWdhdGlvbiBzd2lwZXMgd2hpbGUgaW4gZnVsbHNj cmVlbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9WaWV3R2VzdHVyZUNvbnRyb2xsZXIu Y3BwOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmNhblN3aXBlSW5E aXJlY3Rpb24gY29uc3QpOgorCiAyMDE4LTA0LTA0ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxl LmNvbT4KIAogICAgICAgICBbaU9TXSBSZW5hbWUgV0tQREZWaWV3IHRvIFdLTGVnYWN5UERGVmll dwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVmlld0dlc3R1cmVD b250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZpZXdHZXN0dXJl Q29udHJvbGxlci5jcHAKaW5kZXggZThkYjE1YzlkM2Y5N2JiY2VmZmMwODk3NWYyNjAyMzI3Mzc0 NzZmNC4uZjZlMmEwNTM4MDNmYWY0OTEyMWRjZjExOTEwZmRiZWE0ZTU5NjIwYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVmlld0dlc3R1cmVDb250cm9sbGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WaWV3R2VzdHVyZUNvbnRyb2xs ZXIuY3BwCkBAIC0zMCw2ICszMCw3IEBACiAjaW1wb3J0ICJSZW1vdGVMYXllclRyZWVEcmF3aW5n QXJlYVByb3h5LmgiCiAjaW1wb3J0ICJWaWV3R2VzdHVyZUNvbnRyb2xsZXJNZXNzYWdlcy5oIgog I2ltcG9ydCAiV2ViQmFja0ZvcndhcmRMaXN0LmgiCisjaW1wb3J0ICJXZWJGdWxsU2NyZWVuTWFu YWdlclByb3h5LmgiCiAjaW1wb3J0ICJXZWJQYWdlUHJveHkuaCIKICNpbXBvcnQgIldlYlByb2Nl c3NQcm94eS5oIgogI2ltcG9ydCA8d3RmL01hdGhFeHRyYXMuaD4KQEAgLTExNSw2ICsxMTYsOCBA QCB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6c2V0QWx0ZXJuYXRlQmFja0ZvcndhcmRMaXN0 U291cmNlUGFnZShXZWJQYWdlUHJveHkqCiAgICAgCiBib29sIFZpZXdHZXN0dXJlQ29udHJvbGxl cjo6Y2FuU3dpcGVJbkRpcmVjdGlvbihTd2lwZURpcmVjdGlvbiBkaXJlY3Rpb24pIGNvbnN0CiB7 CisgICAgaWYgKG1fd2ViUGFnZVByb3h5LmZ1bGxTY3JlZW5NYW5hZ2VyKCkgJiYgbV93ZWJQYWdl UHJveHkuZnVsbFNjcmVlbk1hbmFnZXIoKS0+aXNGdWxsU2NyZWVuKCkpCisgICAgICAgIHJldHVy biBmYWxzZTsKICAgICBSZWZQdHI8V2ViUGFnZVByb3h5PiBhbHRlcm5hdGVCYWNrRm9yd2FyZExp c3RTb3VyY2VQYWdlID0gbV9hbHRlcm5hdGVCYWNrRm9yd2FyZExpc3RTb3VyY2VQYWdlLmdldCgp OwogICAgIGF1dG8mIGJhY2tGb3J3YXJkTGlzdCA9IGFsdGVybmF0ZUJhY2tGb3J3YXJkTGlzdFNv dXJjZVBhZ2UgPyBhbHRlcm5hdGVCYWNrRm9yd2FyZExpc3RTb3VyY2VQYWdlLT5iYWNrRm9yd2Fy ZExpc3QoKSA6IG1fd2ViUGFnZVByb3h5LmJhY2tGb3J3YXJkTGlzdCgpOwogICAgIGlmIChkaXJl Y3Rpb24gPT0gU3dpcGVEaXJlY3Rpb246OkJhY2spCg== 338526 2018-04-21 10:18:19 -0700 2018-04-21 14:52:57 -0700 Patch for landing bug-184656-20180421101819.patch text/plain 2059 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU4ZjQ5MWExZGNhZjMwMzZk Yjg1ZTI1NDFhZmRhZDdlZGJmNTkxMTEuLjQ5YmEyYjFlOGIxNGRhYjA4NjYzYmVkNTdmNmMyZGRm MzZiMzYwNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTgtMDQtMjAgIEplcmVteSBK b25lcyAgPGplcmVteWpAYXBwbGUuY29tPgorCisgICAgICAgIERpc2FibGUgYmFja3dhcmQgYW5k IGZvcndhcmQgbmF2aWdhdGlvbiBzd2lwZXMgd2hpbGUgaW4gZnVsbHNjcmVlbi4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDY1NgorICAgICAgICBy ZGFyOi8vcHJvYmxlbS8zNjA1NzUzNQorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24u CisKKyAgICAgICAgRGlzYWJsZSBuYXZpZ2F0aW9uIHN3aXBlcyB3aGlsZSBpbiBmdWxsc2NyZWVu LgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6Y2FuU3dpcGVJbkRpcmVj dGlvbiBjb25zdCk6CisKIDIwMTgtMDQtMDQgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29t PgogCiAgICAgICAgIFtpT1NdIFJlbmFtZSBXS1BERlZpZXcgdG8gV0tMZWdhY3lQREZWaWV3CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WaWV3R2VzdHVyZUNvbnRy b2xsZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVmlld0dlc3R1cmVDb250 cm9sbGVyLmNwcAppbmRleCBlOGRiMTVjOWQzZjk3YmJjZWZmYzA4OTc1ZjI2MDIzMjczNzQ3NmY0 Li44YzIxYzI0NjZhMmRiMjQ0NmMzZGQwMGJlMjE0ZmUwOWU5M2RjMmFjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5j cHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbXBvcnQgIlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh UHJveHkuaCIKICNpbXBvcnQgIlZpZXdHZXN0dXJlQ29udHJvbGxlck1lc3NhZ2VzLmgiCiAjaW1w b3J0ICJXZWJCYWNrRm9yd2FyZExpc3QuaCIKKyNpbXBvcnQgIldlYkZ1bGxTY3JlZW5NYW5hZ2Vy UHJveHkuaCIKICNpbXBvcnQgIldlYlBhZ2VQcm94eS5oIgogI2ltcG9ydCAiV2ViUHJvY2Vzc1By b3h5LmgiCiAjaW1wb3J0IDx3dGYvTWF0aEV4dHJhcy5oPgpAQCAtMTE1LDYgKzExNiwxMCBAQCB2 b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6c2V0QWx0ZXJuYXRlQmFja0ZvcndhcmRMaXN0U291 cmNlUGFnZShXZWJQYWdlUHJveHkqCiAgICAgCiBib29sIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6 Y2FuU3dpcGVJbkRpcmVjdGlvbihTd2lwZURpcmVjdGlvbiBkaXJlY3Rpb24pIGNvbnN0CiB7Cisj aWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQorICAgIGlmIChtX3dlYlBhZ2VQcm94eS5mdWxsU2Ny ZWVuTWFuYWdlcigpICYmIG1fd2ViUGFnZVByb3h5LmZ1bGxTY3JlZW5NYW5hZ2VyKCktPmlzRnVs bFNjcmVlbigpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKICAgICBSZWZQdHI8V2Vi UGFnZVByb3h5PiBhbHRlcm5hdGVCYWNrRm9yd2FyZExpc3RTb3VyY2VQYWdlID0gbV9hbHRlcm5h dGVCYWNrRm9yd2FyZExpc3RTb3VyY2VQYWdlLmdldCgpOwogICAgIGF1dG8mIGJhY2tGb3J3YXJk TGlzdCA9IGFsdGVybmF0ZUJhY2tGb3J3YXJkTGlzdFNvdXJjZVBhZ2UgPyBhbHRlcm5hdGVCYWNr Rm9yd2FyZExpc3RTb3VyY2VQYWdlLT5iYWNrRm9yd2FyZExpc3QoKSA6IG1fd2ViUGFnZVByb3h5 LmJhY2tGb3J3YXJkTGlzdCgpOwogICAgIGlmIChkaXJlY3Rpb24gPT0gU3dpcGVEaXJlY3Rpb246 OkJhY2spCg==