189481 2018-09-10 13:33:31 -0700 Regression(PSON): WebView is blank when navigating back cross-process on iOS 2018-09-14 10:11:32 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 189587 1 cdumez cdumez commit-queue ggaren koivisto realdawei ryanhaddad simon.fraser thorton tsavell webkit-bug-importer oldest_to_newest 1458196 0 cdumez 2018-09-10 13:33:31 -0700 WebView is blank when navigating back cross-process on iOS (due to process swap on navigation being enabled). 1458197 1 webkit-bug-importer 2018-09-10 13:34:00 -0700 <rdar://problem/44315010> 1458210 2 349325 cdumez 2018-09-10 13:57:45 -0700 Created attachment 349325 Patch 1458213 3 349325 thorton 2018-09-10 14:01:24 -0700 Comment on attachment 349325 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349325&action=review > Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp:526 > + if (auto* drawingArea = m_page.drawingArea()) I bet these aren't the only null checks we need. > Source/WebKit/WebProcess/WebPage/WebPage.cpp:6003 > + if (m_isSuspended == suspended) > + return; Suspended just means PSON-y suspension, not e.g. normal process suspension? 1458228 4 cdumez 2018-09-10 14:18:13 -0700 (In reply to Tim Horton from comment #3) > Comment on attachment 349325 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=349325&action=review > > > Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp:526 > > + if (auto* drawingArea = m_page.drawingArea()) > > I bet these aren't the only null checks we need. Chances are you are right. Those are the only ones I hit on on Mac and iOS so far though. > > > Source/WebKit/WebProcess/WebPage/WebPage.cpp:6003 > > + if (m_isSuspended == suspended) > > + return; > > Suspended just means PSON-y suspension, not e.g. normal process suspension? PSON-y suspension. 1458233 5 thorton 2018-09-10 14:20:51 -0700 (In reply to Chris Dumez from comment #4) > (In reply to Tim Horton from comment #3) > > Comment on attachment 349325 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=349325&action=review > > > > > Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp:526 > > > + if (auto* drawingArea = m_page.drawingArea()) > > > > I bet these aren't the only null checks we need. > > Chances are you are right. Those are the only ones I hit on on Mac and iOS > so far though. > > > > > > Source/WebKit/WebProcess/WebPage/WebPage.cpp:6003 > > > + if (m_isSuspended == suspended) > > > + return; > > > > Suspended just means PSON-y suspension, not e.g. normal process suspension? > > PSON-y suspension. Very mysterious, we should probably think about naming these things more independently. 1458235 6 cdumez 2018-09-10 14:22:14 -0700 (In reply to Tim Horton from comment #5) > (In reply to Chris Dumez from comment #4) > > (In reply to Tim Horton from comment #3) > > > Comment on attachment 349325 [details] > > > Patch > > > > > > View in context: > > > https://bugs.webkit.org/attachment.cgi?id=349325&action=review > > > > > > > Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp:526 > > > > + if (auto* drawingArea = m_page.drawingArea()) > > > > > > I bet these aren't the only null checks we need. > > > > Chances are you are right. Those are the only ones I hit on on Mac and iOS > > so far though. > > > > > > > > > Source/WebKit/WebProcess/WebPage/WebPage.cpp:6003 > > > > + if (m_isSuspended == suspended) > > > > + return; > > > > > > Suspended just means PSON-y suspension, not e.g. normal process suspension? > > > > PSON-y suspension. > > Very mysterious, we should probably think about naming these things more > independently. I agree, Brady added this and I am not quite sure what he had in mind at the time. I'll clarify the naming in a follow-up. 1458255 7 349325 commit-queue 2018-09-10 15:18:08 -0700 Comment on attachment 349325 Patch Clearing flags on attachment: 349325 Committed r235867: <https://trac.webkit.org/changeset/235867> 1458256 8 commit-queue 2018-09-10 15:18:10 -0700 All reviewed patches have been landed. Closing bug. 1458316 9 realdawei 2018-09-10 16:51:27 -0700 (In reply to WebKit Commit Bot from comment #7) > Comment on attachment 349325 [details] > Patch > > Clearing flags on attachment: 349325 > > Committed r235867: <https://trac.webkit.org/changeset/235867> Seeing API failures on macOS and iOS after this revision sample output: https://build.webkit.org/builders/Apple%20High%20Sierra%20Release%20WK1%20(Tests)/builds/7888/steps/run-api-tests/logs/stdio TestWebKitAPI.ProcessSwap.ProcessReuse Received data during response processing, queuing it. WARNING: The option to always keep swapped web processes alive is active. This is meant for debugging and testing only. Received data during response processing, queuing it. Received data during response processing, queuing it. /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1375 Expected equality of these values: 2u Which is: 2 seenPIDs.size() Which is: 3 /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1378 Expected equality of these values: pid1 Which is: 76466 pid3 Which is: 76470 TestWebKitAPI.ProcessSwap.ProcessReuseeTLDPlus2 Received data during response processing, queuing it. WARNING: The option to always keep swapped web processes alive is active. This is meant for debugging and testing only. Received data during response processing, queuing it. Received data during response processing, queuing it. /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1422 Expected equality of these values: 2u Which is: 2 seenPIDs.size() Which is: 3 /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1425 Expected equality of these values: pid1 Which is: 76472 pid3 1458327 10 cdumez 2018-09-10 17:19:28 -0700 (In reply to Dawei Fenton (:realdawei) from comment #9) > (In reply to WebKit Commit Bot from comment #7) > > Comment on attachment 349325 [details] > > Patch > > > > Clearing flags on attachment: 349325 > > > > Committed r235867: <https://trac.webkit.org/changeset/235867> > > Seeing API failures on macOS and iOS after this revision > > sample output: > https://build.webkit.org/builders/ > Apple%20High%20Sierra%20Release%20WK1%20(Tests)/builds/7888/steps/run-api- > tests/logs/stdio > > TestWebKitAPI.ProcessSwap.ProcessReuse > Received data during response processing, queuing it. > WARNING: The option to always keep swapped web processes alive is > active. This is meant for debugging and testing only. > Received data during response processing, queuing it. > Received data during response processing, queuing it. > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > WebKitCocoa/ProcessSwapOnNavigation.mm:1375 > Expected equality of these values: > 2u > Which is: 2 > seenPIDs.size() > Which is: 3 > > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > WebKitCocoa/ProcessSwapOnNavigation.mm:1378 > Expected equality of these values: > pid1 > Which is: 76466 > pid3 > Which is: 76470 > > > TestWebKitAPI.ProcessSwap.ProcessReuseeTLDPlus2 > Received data during response processing, queuing it. > WARNING: The option to always keep swapped web processes alive is > active. This is meant for debugging and testing only. > Received data during response processing, queuing it. > Received data during response processing, queuing it. > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > WebKitCocoa/ProcessSwapOnNavigation.mm:1422 > Expected equality of these values: > 2u > Which is: 2 > seenPIDs.size() > Which is: 3 > > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > WebKitCocoa/ProcessSwapOnNavigation.mm:1425 > Expected equality of these values: > pid1 > Which is: 76472 > pid3 Odd, I will investigate shortly. 1458359 11 cdumez 2018-09-10 18:36:06 -0700 (In reply to Dawei Fenton (:realdawei) from comment #9) > (In reply to WebKit Commit Bot from comment #7) > > Comment on attachment 349325 [details] > > Patch > > > > Clearing flags on attachment: 349325 > > > > Committed r235867: <https://trac.webkit.org/changeset/235867> > > Seeing API failures on macOS and iOS after this revision > > sample output: > https://build.webkit.org/builders/ > Apple%20High%20Sierra%20Release%20WK1%20(Tests)/builds/7888/steps/run-api- > tests/logs/stdio > > TestWebKitAPI.ProcessSwap.ProcessReuse > Received data during response processing, queuing it. > WARNING: The option to always keep swapped web processes alive is > active. This is meant for debugging and testing only. > Received data during response processing, queuing it. > Received data during response processing, queuing it. > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > WebKitCocoa/ProcessSwapOnNavigation.mm:1375 > Expected equality of these values: > 2u > Which is: 2 > seenPIDs.size() > Which is: 3 > > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > WebKitCocoa/ProcessSwapOnNavigation.mm:1378 > Expected equality of these values: > pid1 > Which is: 76466 > pid3 > Which is: 76470 > > > TestWebKitAPI.ProcessSwap.ProcessReuseeTLDPlus2 > Received data during response processing, queuing it. > WARNING: The option to always keep swapped web processes alive is > active. This is meant for debugging and testing only. > Received data during response processing, queuing it. > Received data during response processing, queuing it. > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > WebKitCocoa/ProcessSwapOnNavigation.mm:1422 > Expected equality of these values: > 2u > Which is: 2 > seenPIDs.size() > Which is: 3 > > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > WebKitCocoa/ProcessSwapOnNavigation.mm:1425 > Expected equality of these values: > pid1 > Which is: 76472 > pid3 Follow-up fix in <https://trac.webkit.org/changeset/235880>. 1459767 12 cdumez 2018-09-14 09:52:49 -0700 (In reply to Chris Dumez from comment #11) > (In reply to Dawei Fenton (:realdawei) from comment #9) > > (In reply to WebKit Commit Bot from comment #7) > > > Comment on attachment 349325 [details] > > > Patch > > > > > > Clearing flags on attachment: 349325 > > > > > > Committed r235867: <https://trac.webkit.org/changeset/235867> > > > > Seeing API failures on macOS and iOS after this revision > > > > sample output: > > https://build.webkit.org/builders/ > > Apple%20High%20Sierra%20Release%20WK1%20(Tests)/builds/7888/steps/run-api- > > tests/logs/stdio > > > > TestWebKitAPI.ProcessSwap.ProcessReuse > > Received data during response processing, queuing it. > > WARNING: The option to always keep swapped web processes alive is > > active. This is meant for debugging and testing only. > > Received data during response processing, queuing it. > > Received data during response processing, queuing it. > > > > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > > WebKitCocoa/ProcessSwapOnNavigation.mm:1375 > > Expected equality of these values: > > 2u > > Which is: 2 > > seenPIDs.size() > > Which is: 3 > > > > > > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > > WebKitCocoa/ProcessSwapOnNavigation.mm:1378 > > Expected equality of these values: > > pid1 > > Which is: 76466 > > pid3 > > Which is: 76470 > > > > > > TestWebKitAPI.ProcessSwap.ProcessReuseeTLDPlus2 > > Received data during response processing, queuing it. > > WARNING: The option to always keep swapped web processes alive is > > active. This is meant for debugging and testing only. > > Received data during response processing, queuing it. > > Received data during response processing, queuing it. > > > > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > > WebKitCocoa/ProcessSwapOnNavigation.mm:1422 > > Expected equality of these values: > > 2u > > Which is: 2 > > seenPIDs.size() > > Which is: 3 > > > > > > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > > WebKitCocoa/ProcessSwapOnNavigation.mm:1425 > > Expected equality of these values: > > pid1 > > Which is: 76472 > > pid3 > > Follow-up fix in <https://trac.webkit.org/changeset/235880>. Dawei, do you still see failures after the fix? I see that you just cc'd a few more people. 1459777 13 realdawei 2018-09-14 10:11:32 -0700 (In reply to Chris Dumez from comment #12) > (In reply to Chris Dumez from comment #11) > > (In reply to Dawei Fenton (:realdawei) from comment #9) > > > (In reply to WebKit Commit Bot from comment #7) > > > > Comment on attachment 349325 [details] > > > > Patch > > > > > > > > Clearing flags on attachment: 349325 > > > > > > > > Committed r235867: <https://trac.webkit.org/changeset/235867> > > > > > > Seeing API failures on macOS and iOS after this revision > > > > > > sample output: > > > https://build.webkit.org/builders/ > > > Apple%20High%20Sierra%20Release%20WK1%20(Tests)/builds/7888/steps/run-api- > > > tests/logs/stdio > > > > > > TestWebKitAPI.ProcessSwap.ProcessReuse > > > Received data during response processing, queuing it. > > > WARNING: The option to always keep swapped web processes alive is > > > active. This is meant for debugging and testing only. > > > Received data during response processing, queuing it. > > > Received data during response processing, queuing it. > > > > > > > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > > > WebKitCocoa/ProcessSwapOnNavigation.mm:1375 > > > Expected equality of these values: > > > 2u > > > Which is: 2 > > > seenPIDs.size() > > > Which is: 3 > > > > > > > > > > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > > > WebKitCocoa/ProcessSwapOnNavigation.mm:1378 > > > Expected equality of these values: > > > pid1 > > > Which is: 76466 > > > pid3 > > > Which is: 76470 > > > > > > > > > TestWebKitAPI.ProcessSwap.ProcessReuseeTLDPlus2 > > > Received data during response processing, queuing it. > > > WARNING: The option to always keep swapped web processes alive is > > > active. This is meant for debugging and testing only. > > > Received data during response processing, queuing it. > > > Received data during response processing, queuing it. > > > > > > > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > > > WebKitCocoa/ProcessSwapOnNavigation.mm:1422 > > > Expected equality of these values: > > > 2u > > > Which is: 2 > > > seenPIDs.size() > > > Which is: 3 > > > > > > > > > > > > /Volumes/Data/slave/highsierra-release/build/Tools/TestWebKitAPI/Tests/ > > > WebKitCocoa/ProcessSwapOnNavigation.mm:1425 > > > Expected equality of these values: > > > pid1 > > > Which is: 76472 > > > pid3 > > > > Follow-up fix in <https://trac.webkit.org/changeset/235880>. > > Dawei, do you still see failures after the fix? I see that you just cc'd a > few more people. Sorry about that, we generally cc each other to facilitate tracking...I had forgotten to cc earlier :) 349325 2018-09-10 13:57:45 -0700 2018-09-10 15:18:08 -0700 Patch bug-189481-20180910135745.patch text/plain 6127 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJlNzk3MDc5OGY1MmZiMjYz ZGQ1Mjc4MDk2MGVkZTlmNThjODBjNWQuLmQ5MGJiNmRiYzIyZGRjZDg0ODM4ODhlZDhlNmViYThh MzRkZmYxODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMgQEAKKzIwMTgtMDktMTAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZWdyZXNzaW9uKFBTT04pOiBXZWJW aWV3IGlzIGJsYW5rIHdoZW4gbmF2aWdhdGluZyBiYWNrIGNyb3NzLXByb2Nlc3Mgb24gaU9TCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODk0ODEKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ0MzE1MDEwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gcHJvY2VzcyBzd2FwcGluZyBvbiBuYXZpZ2F0 aW9uLCB0aGUgV2ViUGFnZVByb3h5IHdvdWxkIGRldGFjaCBmcm9tIHRoZSBvbGQgV2ViUHJvY2Vz cyBhbmQgZGVzdHJveQorICAgICAgICBpdHMgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94 eS4gSXQgd291bGQgdGhlbiBjcmVhdGUgYSBuZXcgcHJvY2VzcyBhbmQgYSBuZXcgUmVtb3RlTGF5 ZXJUcmVlRHJhd2luZ0FyZWFQcm94eQorICAgICAgICB0byBsaXN0ZW4gZm9yIElQQyBmcm9tIHRo aXMgbmV3IHByb2Nlc3MuIFdoZW4gbmF2aWdhdGluZyBiYWNrIHRvIHRoZSBvcmlnaW5hbCBwcm9j ZXNzLCB3ZSB3b3VsZCBkbyB0aGUKKyAgICAgICAgc2FtZSBpbiB0aGUgb3Bwb3NpdGUgZGlyZWN0 aW9uLiBIb3dldmVyLCB0aGUgaXNzdWUgd2FzIHRoYXQgdGhlIG9sZCBXZWJQcm9jZXNzJ3MgV2Vi UGFnZSB3b3VsZCBub3QgZGVzdHJveSBpdHMKKyAgICAgICAgZHJhd2luZyBhcmVhIGFuZCBzb21l IHN0YXRlIHdvdWxkIHBlcnNpc3QgYW5kIGNhdXNlIGlzc3Vlcy4gRm9yIGV4YW1wbGUsIHRoZSBE cmF3aW5nQXJlYSB3b3VsZCBzZW5kIGEKKyAgICAgICAgQ29tbWl0TGF5ZXJUcmVlIElQQyB0byB0 aGUgVUlQcm9jZXNzIGFuZCBzZXQgbV93YWl0aW5nRm9yQmFja2luZ1N0b3JlU3dhcCB0byB0cnVl LiBJdCBub3JtYWxseSByZXNldHMKKyAgICAgICAgbV93YWl0aW5nRm9yQmFja2luZ1N0b3JlU3dh cCB0byBmYWxzZSB3aGVuIGdldHRpbmcgdGhlIERpZFVwZGF0ZSBJUEMgZnJvbSB0aGUgVUlQcm9j ZXNzLiBIb3dldmVyLCB3aGVuIHRoZQorICAgICAgICBXZWJQYWdlIGlzIGRldGFjaGVkIGZyb20g aXRzIFdlYlBhZ2VQcm94eSAoaS5lLiBzdXNwZW5kZWQgZHVlIHRvIFBTT04pLCB0aGUgVUlQcm9j ZXNzIHdvdWxkIG5vdCByZXNwb25kIHRvCisgICAgICAgIElQQyBmcm9tIHRoZSBvbGQgV2ViUHJv Y2VzcyBhbmQgbV93YWl0aW5nRm9yQmFja2luZ1N0b3JlU3dhcCB3b3VsZCBuZXZlciBnZXQgcmVz ZXQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KToKKyAg ICAgICAgTWFrZSBzdXJlIHdlIHNlbmQgdGhlIFNldElzU3VzcGVuZGVkIElQQyB0byB0aGUgV2Vi UHJvY2VzcyB3aXRoIGZhbHNlIHZhbHVlIHdoZW4KKyAgICAgICAgdGhlIFN1c3BlbmRlZFBhZ2VQ cm94eSBnZXRzIGRlc3Ryb3llZCwgc28gdGhhdCB0aGUgV2ViUHJvY2VzcyBjYW4gdXBkYXRlIGl0 cworICAgICAgICBtX2lzU3VzcGVuZGVkIGZsYWcuIFByZXZpb3VzLCBpdCB3YXMgc2V0IHRvIHRy dWUgd2hlbiBjb25zdHJ1Y3RpbmcgdGhlCisgICAgICAgIFN1c3BlbmRlZFBhZ2VQcm94eSBidXQg bmV2ZXIgcmVzZXQgdG8gZmFsc2UuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkNocm9tZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNocm9tZUNsaWVu dDo6aW52YWxpZGF0ZUNvbnRlbnRzQW5kUm9vdFZpZXcpOgorICAgICAgICAoV2ViS2l0OjpXZWJD aHJvbWVDbGllbnQ6OmludmFsaWRhdGVDb250ZW50c0ZvclNsb3dTY3JvbGwpOgorICAgICAgICBB ZGQgbnVsbCBjaGVja3MgZm9yIHRoZSBkcmF3aW5nIGFyZWEgbm93IHRoYXQgaXQgY2FuIGJlIG51 bGwgd2hpbGUgc3VzcGVuZGVkLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZWluaXRpYWxpemVXZWJQYWdlKToK KyAgICAgICAgV2hlbiBhIFdlYlBhZ2UgZ2V0cyByZWF0dGFjaGVkIHRvIGEgV2ViUGFnZVByb3h5 LCB0aGlzIG1ldGhvZCBpcyBjYWxsZWQuIFNpbmNlIHdlIG5vdworICAgICAgICBkZXN0cm95IHRo ZSBkcmF3aW5nIGFyZWEgdXBvbiBzdXNwZW5zaW9uIChXZWJQYWdlIGdldHMgZGV0YWNoZWQgZnJv bSBXZWJQYWdlUHJveHkpLCB3ZQorICAgICAgICBuZWVkIHRvIG1ha2Ugc3VyZSB3ZSByZWNyZWF0 ZSB0aGUgZHJhd2luZyBhcmVhIHdoZW4gcmVhdHRhY2hpbmcuCisKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6c2V0SXNTdXNwZW5kZWQpOgorICAgICAgICBEZXN0cm95IHRoZSBkcmF3aW5nIGFy ZWEgd2hlbiB0aGUgV2ViUGFnZSBpcyBzdXNwZW5kZWQsIG1lYW5pbmcgdGhhdCB0aGlzIFdlYlBh Z2UKKyAgICAgICAgaXMgbm8gbG9uZ2VyIGFzc29jaWF0ZWQgd2l0aCBhIFdlYlBhZ2VQcm94eS4K KwogMjAxOC0wOS0wNyAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkIHN5bnRheCBmaXggYWZ0ZXIgcjIzNTc4MQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKaW5kZXggZjlhNTAxMTk4NzgxMzQ3 ZDQ2YjQ0NjhmZmE1YmE5MWZlNTk5ZDU5Yy4uODA3MTg5MjU4ZjZkMDg0MzIxYzUyM2YxNDZmYmYx ZDNjNWE1YTA4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVk UGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdl UHJveHkuY3BwCkBAIC04Nyw2ICs4Nyw3IEBAIFN1c3BlbmRlZFBhZ2VQcm94eTo6U3VzcGVuZGVk UGFnZVByb3h5KFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jCiBTdXNw ZW5kZWRQYWdlUHJveHk6On5TdXNwZW5kZWRQYWdlUHJveHkoKQogewogICAgIGlmIChhdXRvIHBy b2Nlc3MgPSBtYWtlUmVmUHRyKG1fcHJvY2VzcykpIHsKKyAgICAgICAgcHJvY2Vzcy0+c2VuZChN ZXNzYWdlczo6V2ViUGFnZTo6U2V0SXNTdXNwZW5kZWQoZmFsc2UpLCBtX3BhZ2UucGFnZUlEKCkp OwogICAgICAgICBwcm9jZXNzLT5zdXNwZW5kZWRQYWdlV2FzRGVzdHJveWVkKCp0aGlzKTsKICAg ICAgICAgcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS51bnJlZ2lzdGVyU3VzcGVuZGVkUGFnZVByb3h5 KCp0aGlzKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCmluZGV4IDA4ZDAyM2IwZTM4YzQ4 OTFkZmIxNDFlMDljZWJlYWNmNWY1MTVkN2MuLjNlOWZjOWNjMTAxMjExYjk2YTg2NWJiMzY2M2Ew NzVmODIwMmI0NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCkBAIC01MjMsNyArNTIzLDggQEAg dm9pZCBXZWJDaHJvbWVDbGllbnQ6OmludmFsaWRhdGVDb250ZW50c0FuZFJvb3RWaWV3KGNvbnN0 IEludFJlY3QmIHJlY3QpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgbV9wYWdl LmRyYXdpbmdBcmVhKCktPnNldE5lZWRzRGlzcGxheUluUmVjdChyZWN0KTsKKyAgICBpZiAoYXV0 byogZHJhd2luZ0FyZWEgPSBtX3BhZ2UuZHJhd2luZ0FyZWEoKSkKKyAgICAgICAgZHJhd2luZ0Fy ZWEtPnNldE5lZWRzRGlzcGxheUluUmVjdChyZWN0KTsKIH0KIAogdm9pZCBXZWJDaHJvbWVDbGll bnQ6OmludmFsaWRhdGVDb250ZW50c0ZvclNsb3dTY3JvbGwoY29uc3QgSW50UmVjdCYgcmVjdCkK QEAgLTU0MSw3ICs1NDIsOCBAQCB2b2lkIFdlYkNocm9tZUNsaWVudDo6aW52YWxpZGF0ZUNvbnRl bnRzRm9yU2xvd1Njcm9sbChjb25zdCBJbnRSZWN0JiByZWN0KQogICAgICAgICByZXR1cm47CiAg ICAgfQogI2VuZGlmCi0gICAgbV9wYWdlLmRyYXdpbmdBcmVhKCktPnNldE5lZWRzRGlzcGxheUlu UmVjdChyZWN0KTsKKyAgICBpZiAoYXV0byogZHJhd2luZ0FyZWEgPSBtX3BhZ2UuZHJhd2luZ0Fy ZWEoKSkKKyAgICAgICAgZHJhd2luZ0FyZWEtPnNldE5lZWRzRGlzcGxheUluUmVjdChyZWN0KTsK IH0KIAogdm9pZCBXZWJDaHJvbWVDbGllbnQ6OnNjcm9sbChjb25zdCBJbnRTaXplJiBzY3JvbGxE ZWx0YSwgY29uc3QgSW50UmVjdCYgc2Nyb2xsUmVjdCwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3Qp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDQ0 ZGVmZjEzNDBmNTlhZDk3MDFlOTNiMzJhOTRkNGY2ZDc2MWE2NDAuLmQ4N2M3YThhMTEzZDI2NTlk ZWQ4YTJiOTc0MjYyNDhhZTZlZmVmYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC02NTIsNyArNjUyLDEzIEBAIHZvaWQgV2ViUGFnZTo6ZW5h YmxlRW51bWVyYXRpbmdBbGxOZXR3b3JrSW50ZXJmYWNlcygpCiAKIHZvaWQgV2ViUGFnZTo6cmVp bml0aWFsaXplV2ViUGFnZShXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykK IHsKLSAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7CisgICAgaWYgKCFtX2RyYXdpbmdBcmVhKSB7 CisgICAgICAgIG1fZHJhd2luZ0FyZWEgPSBEcmF3aW5nQXJlYTo6Y3JlYXRlKCp0aGlzLCBwYXJh bWV0ZXJzKTsKKyAgICAgICAgbV9kcmF3aW5nQXJlYS0+c2V0UGFpbnRpbmdFbmFibGVkKGZhbHNl KTsKKyAgICAgICAgbV9kcmF3aW5nQXJlYS0+c2V0U2hvdWxkU2NhbGVWaWV3VG9GaXREb2N1bWVu dChwYXJhbWV0ZXJzLnNob3VsZFNjYWxlVmlld1RvRml0RG9jdW1lbnQpOworICAgICAgICBtX2Ry YXdpbmdBcmVhLT51cGRhdGVQcmVmZXJlbmNlcyhwYXJhbWV0ZXJzLnN0b3JlKTsKKyAgICAgICAg bV9kcmF3aW5nQXJlYS0+c2V0UGFpbnRpbmdFbmFibGVkKHRydWUpOworICAgIH0KICAgICBtX2Ry YXdpbmdBcmVhLT5hdHRhY2hEcmF3aW5nQXJlYSgpOwogCiAgICAgaWYgKG1fYWN0aXZpdHlTdGF0 ZSAhPSBwYXJhbWV0ZXJzLmFjdGl2aXR5U3RhdGUpCkBAIC01OTkzLDcgKzU5OTksMTIgQEAgdm9p ZCBXZWJQYWdlOjp1cmxTY2hlbWVUYXNrRGlkQ29tcGxldGUodWludDY0X3QgaGFuZGxlcklkZW50 aWZpZXIsIHVpbnQ2NF90IHRhc2sKIAogdm9pZCBXZWJQYWdlOjpzZXRJc1N1c3BlbmRlZChib29s IHN1c3BlbmRlZCkKIHsKKyAgICBpZiAobV9pc1N1c3BlbmRlZCA9PSBzdXNwZW5kZWQpCisgICAg ICAgIHJldHVybjsKKwogICAgIG1faXNTdXNwZW5kZWQgPSBzdXNwZW5kZWQ7CisgICAgaWYgKG1f aXNTdXNwZW5kZWQpCisgICAgICAgIG1fZHJhd2luZ0FyZWEgPSBudWxscHRyOwogfQogCiB2b2lk IFdlYlBhZ2U6OmZyYW1lQmVjYW1lUmVtb3RlKHVpbnQ2NF90IGZyYW1lSUQsIEdsb2JhbEZyYW1l SWRlbnRpZmllciYmIHJlbW90ZUZyYW1lSWRlbnRpZmllciwgR2xvYmFsV2luZG93SWRlbnRpZmll ciYmIHJlbW90ZVdpbmRvd0lkZW50aWZpZXIpCg==