133664 2014-06-09 16:38:26 -0700 [iOS] Clear UIProcess visual state after WebProcess crash 2014-06-11 15:50:09 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhock mhock benjamin thorton oldest_to_newest 1014278 0 mhock 2014-06-09 16:38:26 -0700 [iOS] Clear UIProcess visual state after WebProcess crash 1014279 1 232747 mhock 2014-06-09 16:40:49 -0700 Created attachment 232747 patch 1014280 2 mhock 2014-06-09 16:42:11 -0700 <rdar://problem/16952742> 1014313 3 232747 benjamin 2014-06-09 19:25:42 -0700 Comment on attachment 232747 patch View in context: https://bugs.webkit.org/attachment.cgi?id=232747&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:641 > + _overridesMinimumLayoutSize = NO; > + _minimumLayoutSizeOverride = {0, 0}; > + _overridesMinimumLayoutSizeForMinimalUI = NO; > + _minimumLayoutSizeOverrideForMinimalUI = {0, 0}; > + _overridesMaximumUnobscuredSize = NO; > + _maximumUnobscuredSizeOverride = {0, 0}; > + _usesMinimalUI = NO; > + _needsToNotifyDelegateAboutMinimalUI = NO; > + _inputViewBounds = {{0, 0}, {0, 0}}; Most of those are defined by external factors, they should not be reset on crash! > Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm:147 > + for (auto& idLayer : m_layers) { > + m_animationDelegates.remove(idLayer.key); > + asLayer(idLayer.value.get()).contents = nullptr; > + } Shouldn't we remove the sublayers before clearing the root? 1014893 4 232898 mhock 2014-06-11 13:56:20 -0700 Created attachment 232898 address comments 1014894 5 mhock 2014-06-11 13:58:58 -0700 (In reply to comment #3) > (From update of attachment 232747 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=232747&action=review > > > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:641 > > + _overridesMinimumLayoutSize = NO; > > + _minimumLayoutSizeOverride = {0, 0}; > > + _overridesMinimumLayoutSizeForMinimalUI = NO; > > + _minimumLayoutSizeOverrideForMinimalUI = {0, 0}; > > + _overridesMaximumUnobscuredSize = NO; > > + _maximumUnobscuredSizeOverride = {0, 0}; > > + _usesMinimalUI = NO; > > + _needsToNotifyDelegateAboutMinimalUI = NO; > > + _inputViewBounds = {{0, 0}, {0, 0}}; > > Most of those are defined by external factors, they should not be reset on crash! Yes, I should be pushing instead. Fixed. > > Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm:147 > > + for (auto& idLayer : m_layers) { > > + m_animationDelegates.remove(idLayer.key); > > + asLayer(idLayer.value.get()).contents = nullptr; > > + } > > Shouldn't we remove the sublayers before clearing the root? I followed the same order as updateLayerTree which implies that the root is updated before the layers, but changed this anyway as the custom is to destroy in opposite order of creation. 1014916 6 232898 benjamin 2014-06-11 14:25:36 -0700 Comment on attachment 232898 address comments View in context: https://bugs.webkit.org/attachment.cgi?id=232898&action=review > Source/WebKit2/UIProcess/ios/WKContentView.mm:387 > + [_webView _didRelaunchProcess]; You should do this from the iOS's PageClient instead. No need to push ContentView->WebView here. 1014934 7 232908 mhock 2014-06-11 14:53:12 -0700 Created attachment 232908 address comment + fix mac build 1014966 8 mhock 2014-06-11 15:50:09 -0700 Committed r169851: <http://trac.webkit.org/changeset/169851> 232747 2014-06-09 16:40:49 -0700 2014-06-11 13:56:20 -0700 patch clearuistate.01.diff text/plain 3607 mhock ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0OGJmNzVjLi4yMDQyMjRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTQtMDYtMDkgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAg IFtpT1NdIENsZWFyIFVJUHJvY2VzcyB2aXN1YWwgc3RhdGUgYWZ0ZXIgV2ViUHJvY2VzcyBjcmFz aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzNjY0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9wcm9j ZXNzRGlkRXhpdF0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9z dC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5tbToKKyAg ICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlSG9zdDo6flJlbW90ZUxheWVyVHJlZUhvc3Qp OgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVIb3N0OjpjbGVhckxheWVycyk6Cisg ICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorCiAyMDE0LTA2LTA5 ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBGbGFzaCB2aWRlbyBj b250cm9scyBoaXQtdGVzdCBpbmNvcnJlY3RseSBhZnRlciBjaGFuZ2luZyB0b3BDb250ZW50SW5z ZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0K aW5kZXggMjFkYTk4Yy4uODk5ZTI0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTYzMCw2ICs2MzAsMTUgQEAgc3RhdGljIENHRmxv YXQgY29udGVudFpvb21TY2FsZShXS1dlYlZpZXcqIHdlYlZpZXcpCiAgICAgX3Njcm9sbFZpZXdC YWNrZ3JvdW5kQ29sb3IgPSBXZWJDb3JlOjpDb2xvcigpOwogICAgIF9kZWxheVVwZGF0ZVZpc2li bGVDb250ZW50UmVjdHMgPSBOTzsKICAgICBfaGFkRGVsYXllZFVwZGF0ZVZpc2libGVDb250ZW50 UmVjdHMgPSBOTzsKKyAgICBfb3ZlcnJpZGVzTWluaW11bUxheW91dFNpemUgPSBOTzsKKyAgICBf bWluaW11bUxheW91dFNpemVPdmVycmlkZSA9IHswLCAwfTsKKyAgICBfb3ZlcnJpZGVzTWluaW11 bUxheW91dFNpemVGb3JNaW5pbWFsVUkgPSBOTzsKKyAgICBfbWluaW11bUxheW91dFNpemVPdmVy cmlkZUZvck1pbmltYWxVSSA9IHswLCAwfTsKKyAgICBfb3ZlcnJpZGVzTWF4aW11bVVub2JzY3Vy ZWRTaXplID0gTk87CisgICAgX21heGltdW1Vbm9ic2N1cmVkU2l6ZU92ZXJyaWRlID0gezAsIDB9 OworICAgIF91c2VzTWluaW1hbFVJID0gTk87CisgICAgX25lZWRzVG9Ob3RpZnlEZWxlZ2F0ZUFi b3V0TWluaW1hbFVJID0gTk87CisgICAgX2lucHV0Vmlld0JvdW5kcyA9IHt7MCwgMH0sIHswLCAw fX07CiB9CiAKIC0gKHZvaWQpX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0LmgKaW5kZXggNDk0 MzM3ZS4uNTEwMzY1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9S ZW1vdGVMYXllclRyZWVIb3N0LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9S ZW1vdGVMYXllclRyZWVIb3N0LmgKQEAgLTYxLDYgKzYxLDggQEAgcHVibGljOgogCiAgICAgdm9p ZCBhbmltYXRpb25EaWRTdGFydChXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVy SUQsIENBQW5pbWF0aW9uICosIGRvdWJsZSBzdGFydFRpbWUpOwogCisgICAgdm9pZCBjbGVhckxh eWVycygpOworCiBwcml2YXRlOgogICAgIExheWVyT3JWaWV3ICpjcmVhdGVMYXllcihjb25zdCBS ZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJDcmVhdGlvblByb3BlcnRpZXMmLCBjb25z dCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJQcm9wZXJ0aWVzKik7CiAgICAgc3Rh dGljIHZvaWQgc2V0TGF5ZXJJRChDQUxheWVyICosIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OlBs YXRmb3JtTGF5ZXJJRCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFj L1JlbW90ZUxheWVyVHJlZUhvc3QubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1Jl bW90ZUxheWVyVHJlZUhvc3QubW0KaW5kZXggMDY2ZjVkNy4uZTI3MDBjNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lm1tCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5tbQpAQCAt NTEsNiArNTEsNyBAQCBSZW1vdGVMYXllclRyZWVIb3N0OjpSZW1vdGVMYXllclRyZWVIb3N0KFJl bW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkmIGRyYXdpbgogCiBSZW1vdGVMYXllclRyZWVI b3N0Ojp+UmVtb3RlTGF5ZXJUcmVlSG9zdCgpCiB7CisgICAgY2xlYXJMYXllcnMoKTsKIH0KIAog Ym9vbCBSZW1vdGVMYXllclRyZWVIb3N0Ojp1cGRhdGVMYXllclRyZWUoY29uc3QgUmVtb3RlTGF5 ZXJUcmVlVHJhbnNhY3Rpb24mIHRyYW5zYWN0aW9uLCBmbG9hdCBpbmRpY2F0b3JTY2FsZUZhY3Rv cikKQEAgLTEzNSw2ICsxMzYsMTkgQEAgdm9pZCBSZW1vdGVMYXllclRyZWVIb3N0OjphbmltYXRp b25EaWRTdGFydChXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWUKICAgICBtX2Ry YXdpbmdBcmVhLmFjY2VsZXJhdGVkQW5pbWF0aW9uRGlkU3RhcnQobGF5ZXJJRCwgYW5pbWF0aW9u S2V5LCBzdGFydFRpbWUpOwogfQogCit2b2lkIFJlbW90ZUxheWVyVHJlZUhvc3Q6OmNsZWFyTGF5 ZXJzKCkKK3sKKyAgICBpZiAobV9yb290TGF5ZXIpCisgICAgICAgIG1fcm9vdExheWVyID0gbnVs bHB0cjsKKworICAgIGZvciAoYXV0byYgaWRMYXllciA6IG1fbGF5ZXJzKSB7CisgICAgICAgIG1f YW5pbWF0aW9uRGVsZWdhdGVzLnJlbW92ZShpZExheWVyLmtleSk7CisgICAgICAgIGFzTGF5ZXIo aWRMYXllci52YWx1ZS5nZXQoKSkuY29udGVudHMgPSBudWxscHRyOworICAgIH0KKworICAgIG1f bGF5ZXJzLmNsZWFyKCk7Cit9CisKIHN0YXRpYyBOU1N0cmluZyogY29uc3QgV0tMYXllcklEUHJv cGVydHlLZXkgPSBAIldLTGF5ZXJJRCI7CiAKIHZvaWQgUmVtb3RlTGF5ZXJUcmVlSG9zdDo6c2V0 TGF5ZXJJRChDQUxheWVyICpsYXllciwgV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6UGxhdGZvcm1M YXllcklEIGxheWVySUQpCg== 232898 2014-06-11 13:56:20 -0700 2014-06-11 14:53:12 -0700 address comments clearuistate.02.diff text/plain 5162 mhock ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyNDgzZjlhLi4yNzRmYTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTQtMDYtMTEgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAg IFtpT1NdIENsZWFyIFVJUHJvY2VzcyB2aXN1YWwgc3RhdGUgYWZ0ZXIgV2ViUHJvY2VzcyBjcmFz aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzNjY0 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjk1Mjc0Mj4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZFJlbGF1bmNoUHJvY2Vzc10pOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tWaWV3IF9kaWRSZWxh dW5jaFByb2Nlc3NdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpk aWRTdGFydFVzZXJUcmlnZ2VyZWRab29taW5nKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXcubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2RpZFJlbGF1bmNoUHJv Y2Vzc10pOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5tbToKKyAgICAgICAg KFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlSG9zdDo6flJlbW90ZUxheWVyVHJlZUhvc3QpOgorICAg ICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVIb3N0OjpjbGVhckxheWVycyk6CisKIDIwMTQt MDYtMTEgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAg ICAgIE1ha2UgaXQgcG9zc2libGUgZm9yIHdhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5IHRv IGJhaWwgaWYgYSBzeW5jIG1lc3NhZ2UgY29tZXMgaW4gZnJvbSB0aGUgb3RoZXIgZGlyZWN0aW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmlu ZGV4IDQ4YjQ3MmUuLjMzMjQ3YjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC0xNDI1LDYgKzE0MjUsMTQgQEAgc3RhdGljIFdlYkNv cmU6OkZsb2F0UG9pbnQgY29uc3RyYWluQ29udGVudE9mZnNldChXZWJDb3JlOjpGbG9hdFBvaW50 IGNvbnRlbnRPZmYKICAgICBfcGFnZS0+cHJvY2VzcygpLnRlcm1pbmF0ZSgpOwogfQogCistICh2 b2lkKV9kaWRSZWxhdW5jaFByb2Nlc3MKK3sKKyAgICBXZWJDb3JlOjpGbG9hdFNpemUgYm91bmRz U2l6ZShzZWxmLmJvdW5kcy5zaXplKTsKKyAgICBfcGFnZS0+c2V0Vmlld3BvcnRDb25maWd1cmF0 aW9uTWluaW11bUxheW91dFNpemUoX292ZXJyaWRlc01pbmltdW1MYXlvdXRTaXplID8gV2ViQ29y ZTo6RmxvYXRTaXplKF9taW5pbXVtTGF5b3V0U2l6ZU92ZXJyaWRlKSA6IGJvdW5kc1NpemUpOwor ICAgIF9wYWdlLT5zZXRWaWV3cG9ydENvbmZpZ3VyYXRpb25NaW5pbXVtTGF5b3V0U2l6ZUZvck1p bmltYWxVSShfb3ZlcnJpZGVzTWluaW11bUxheW91dFNpemVGb3JNaW5pbWFsVUkgPyBXZWJDb3Jl OjpGbG9hdFNpemUoX21pbmltdW1MYXlvdXRTaXplT3ZlcnJpZGVGb3JNaW5pbWFsVUkpIDogYm91 bmRzU2l6ZSk7CisgICAgX3BhZ2UtPnNldE1heGltdW1Vbm9ic2N1cmVkU2l6ZShfb3ZlcnJpZGVz TWF4aW11bVVub2JzY3VyZWRTaXplID8gV2ViQ29yZTo6RmxvYXRTaXplKF9tYXhpbXVtVW5vYnNj dXJlZFNpemVPdmVycmlkZSkgOiBib3VuZHNTaXplKTsKK30KKwogLSAoTlNEYXRhICopX3Nlc3Np b25TdGF0ZQogewogICAgIHJldHVybiBbd3JhcHBlcigqX3BhZ2UtPnNlc3Npb25TdGF0ZURhdGEo bnVsbHB0ciwgbnVsbHB0cikubGVha1JlZigpKSBhdXRvcmVsZWFzZV07CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCmluZGV4 IGI3ZDJlNjAuLmU5NTkxMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCkBAIC0xNDQsNiArMTQ0LDcgQEAgdHlwZWRl ZiBOU19PUFRJT05TKE5TVUludGVnZXIsIF9XS0ZpbmRPcHRpb25zKSB7CiAtICh2b2lkKV9zZXRP dmVybGFpZEFjY2Vzc29yeVZpZXdzSW5zZXQ6KENHU2l6ZSlpbnNldDsKIAogLSAodm9pZClfa2ls bFdlYkNvbnRlbnRQcm9jZXNzOworLSAodm9pZClfZGlkUmVsYXVuY2hQcm9jZXNzOwogCiAjZWxz ZQogQHByb3BlcnR5IChyZWFkb25seSkgTlNDb2xvciAqX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRD b2xvcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQpp bmRleCBiNmZkNzYxLi4xMGY4MWQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3Lm1tCkBAIC0zODQsNiArMzg0LDcgQEAgcHJpdmF0ZToKIAogLSAodm9p ZClfZGlkUmVsYXVuY2hQcm9jZXNzCiB7CisgICAgW193ZWJWaWV3IF9kaWRSZWxhdW5jaFByb2Nl c3NdOwogICAgIFtzZWxmIF9hY2Nlc3NpYmlsaXR5UmVnaXN0ZXJVSVByb2Nlc3NUb2tlbnNdOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVy VHJlZUhvc3QuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVl SG9zdC5oCmluZGV4IDQ5NDMzN2UuLjUxMDM2NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5oCkBAIC02MSw2ICs2MSw4IEBAIHB1 YmxpYzoKIAogICAgIHZvaWQgYW5pbWF0aW9uRGlkU3RhcnQoV2ViQ29yZTo6R3JhcGhpY3NMYXll cjo6UGxhdGZvcm1MYXllcklELCBDQUFuaW1hdGlvbiAqLCBkb3VibGUgc3RhcnRUaW1lKTsKIAor ICAgIHZvaWQgY2xlYXJMYXllcnMoKTsKKwogcHJpdmF0ZToKICAgICBMYXllck9yVmlldyAqY3Jl YXRlTGF5ZXIoY29uc3QgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyQ3JlYXRpb25Q cm9wZXJ0aWVzJiwgY29uc3QgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyUHJvcGVy dGllcyopOwogICAgIHN0YXRpYyB2b2lkIHNldExheWVySUQoQ0FMYXllciAqLCBXZWJDb3JlOjpH cmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lm1tIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lm1tCmluZGV4IDA2NmY1ZDcuLjg1ODgx MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJU cmVlSG9zdC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVy VHJlZUhvc3QubW0KQEAgLTUxLDYgKzUxLDcgQEAgUmVtb3RlTGF5ZXJUcmVlSG9zdDo6UmVtb3Rl TGF5ZXJUcmVlSG9zdChSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5JiBkcmF3aW4KIAog UmVtb3RlTGF5ZXJUcmVlSG9zdDo6flJlbW90ZUxheWVyVHJlZUhvc3QoKQogeworICAgIGNsZWFy TGF5ZXJzKCk7CiB9CiAKIGJvb2wgUmVtb3RlTGF5ZXJUcmVlSG9zdDo6dXBkYXRlTGF5ZXJUcmVl KGNvbnN0IFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbiwgZmxvYXQgaW5k aWNhdG9yU2NhbGVGYWN0b3IpCkBAIC0xMzUsNiArMTM2LDE5IEBAIHZvaWQgUmVtb3RlTGF5ZXJU cmVlSG9zdDo6YW5pbWF0aW9uRGlkU3RhcnQoV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6UGxhdGZv cm1MYXllCiAgICAgbV9kcmF3aW5nQXJlYS5hY2NlbGVyYXRlZEFuaW1hdGlvbkRpZFN0YXJ0KGxh eWVySUQsIGFuaW1hdGlvbktleSwgc3RhcnRUaW1lKTsKIH0KIAordm9pZCBSZW1vdGVMYXllclRy ZWVIb3N0OjpjbGVhckxheWVycygpCit7CisgICAgZm9yIChhdXRvJiBpZExheWVyIDogbV9sYXll cnMpIHsKKyAgICAgICAgbV9hbmltYXRpb25EZWxlZ2F0ZXMucmVtb3ZlKGlkTGF5ZXIua2V5KTsK KyAgICAgICAgYXNMYXllcihpZExheWVyLnZhbHVlLmdldCgpKS5jb250ZW50cyA9IG51bGxwdHI7 CisgICAgfQorCisgICAgbV9sYXllcnMuY2xlYXIoKTsKKworICAgIGlmIChtX3Jvb3RMYXllcikK KyAgICAgICAgbV9yb290TGF5ZXIgPSBudWxscHRyOworfQorCiBzdGF0aWMgTlNTdHJpbmcqIGNv bnN0IFdLTGF5ZXJJRFByb3BlcnR5S2V5ID0gQCJXS0xheWVySUQiOwogCiB2b2lkIFJlbW90ZUxh eWVyVHJlZUhvc3Q6OnNldExheWVySUQoQ0FMYXllciAqbGF5ZXIsIFdlYkNvcmU6OkdyYXBoaWNz TGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRCBsYXllcklEKQo= 232908 2014-06-11 14:53:12 -0700 2014-06-11 14:53:12 -0700 address comment + fix mac build clearuistate.03.diff text/plain 5017 mhock ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyNDgzZjlhLi40OTY5ODM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTQtMDYtMTEgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAg IFtpT1NdIENsZWFyIFVJUHJvY2VzcyB2aXN1YWwgc3RhdGUgYWZ0ZXIgV2ViUHJvY2VzcyBjcmFz aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzNjY0 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjk1Mjc0Mj4KKworICAgICAgICBSZXZpZXdlZCBi eSBCZW5qYW1pbiBQb3VsYWluLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfZGlkUmVsYXVuY2hQcm9jZXNzXSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmg6CisgICAgICAg ICogVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbToKKyAgICAgICAgKFdlYktpdDo6 UGFnZUNsaWVudEltcGw6OmRpZFJlbGF1bmNoUHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNz L21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9SZW1v dGVMYXllclRyZWVIb3N0Lm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVIb3N0 Ojp+UmVtb3RlTGF5ZXJUcmVlSG9zdCk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJl ZUhvc3Q6OmNsZWFyTGF5ZXJzKToKKwogMjAxNC0wNi0xMSAgVGltb3RoeSBIb3J0b24gIDx0aW1v dGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSBmb3Igd2Fp dEZvckFuZERpc3BhdGNoSW1tZWRpYXRlbHkgdG8gYmFpbCBpZiBhIHN5bmMgbWVzc2FnZSBjb21l cyBpbiBmcm9tIHRoZSBvdGhlciBkaXJlY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggNDhiNDcyZS4uOWQ3MGJmOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTE0 MjUsNiArMTQyNSwxNiBAQCBzdGF0aWMgV2ViQ29yZTo6RmxvYXRQb2ludCBjb25zdHJhaW5Db250 ZW50T2Zmc2V0KFdlYkNvcmU6OkZsb2F0UG9pbnQgY29udGVudE9mZgogICAgIF9wYWdlLT5wcm9j ZXNzKCkudGVybWluYXRlKCk7CiB9CiAKKy0gKHZvaWQpX2RpZFJlbGF1bmNoUHJvY2Vzcworewor I2lmIFBMQVRGT1JNKElPUykKKyAgICBXZWJDb3JlOjpGbG9hdFNpemUgYm91bmRzU2l6ZShzZWxm LmJvdW5kcy5zaXplKTsKKyAgICBfcGFnZS0+c2V0Vmlld3BvcnRDb25maWd1cmF0aW9uTWluaW11 bUxheW91dFNpemUoX292ZXJyaWRlc01pbmltdW1MYXlvdXRTaXplID8gV2ViQ29yZTo6RmxvYXRT aXplKF9taW5pbXVtTGF5b3V0U2l6ZU92ZXJyaWRlKSA6IGJvdW5kc1NpemUpOworICAgIF9wYWdl LT5zZXRWaWV3cG9ydENvbmZpZ3VyYXRpb25NaW5pbXVtTGF5b3V0U2l6ZUZvck1pbmltYWxVSShf b3ZlcnJpZGVzTWluaW11bUxheW91dFNpemVGb3JNaW5pbWFsVUkgPyBXZWJDb3JlOjpGbG9hdFNp emUoX21pbmltdW1MYXlvdXRTaXplT3ZlcnJpZGVGb3JNaW5pbWFsVUkpIDogYm91bmRzU2l6ZSk7 CisgICAgX3BhZ2UtPnNldE1heGltdW1Vbm9ic2N1cmVkU2l6ZShfb3ZlcnJpZGVzTWF4aW11bVVu b2JzY3VyZWRTaXplID8gV2ViQ29yZTo6RmxvYXRTaXplKF9tYXhpbXVtVW5vYnNjdXJlZFNpemVP dmVycmlkZSkgOiBib3VuZHNTaXplKTsKKyNlbmRpZgorfQorCiAtIChOU0RhdGEgKilfc2Vzc2lv blN0YXRlCiB7CiAgICAgcmV0dXJuIFt3cmFwcGVyKCpfcGFnZS0+c2Vzc2lvblN0YXRlRGF0YShu dWxscHRyLCBudWxscHRyKS5sZWFrUmVmKCkpIGF1dG9yZWxlYXNlXTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKaW5kZXgg YjdkMmU2MC4uZTk1OTEyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKQEAgLTE0NCw2ICsxNDQsNyBAQCB0eXBlZGVm IE5TX09QVElPTlMoTlNVSW50ZWdlciwgX1dLRmluZE9wdGlvbnMpIHsKIC0gKHZvaWQpX3NldE92 ZXJsYWlkQWNjZXNzb3J5Vmlld3NJbnNldDooQ0dTaXplKWluc2V0OwogCiAtICh2b2lkKV9raWxs V2ViQ29udGVudFByb2Nlc3M7CistICh2b2lkKV9kaWRSZWxhdW5jaFByb2Nlc3M7CiAKICNlbHNl CiBAcHJvcGVydHkgKHJlYWRvbmx5KSBOU0NvbG9yICpfcGFnZUV4dGVuZGVkQmFja2dyb3VuZENv bG9yOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50 SW1wbElPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJ T1MubW0KaW5kZXggZDRkOWExNS4uZmVkMjgzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tCkBAIC0xNTEsNiArMTUxLDcgQEAgdm9p ZCBQYWdlQ2xpZW50SW1wbDo6cHJvY2Vzc0RpZEV4aXQoKQogdm9pZCBQYWdlQ2xpZW50SW1wbDo6 ZGlkUmVsYXVuY2hQcm9jZXNzKCkKIHsKICAgICBbbV9jb250ZW50VmlldyBfZGlkUmVsYXVuY2hQ cm9jZXNzXTsKKyAgICBbbV93ZWJWaWV3IF9kaWRSZWxhdW5jaFByb2Nlc3NdOwogfQogCiB2b2lk IFBhZ2VDbGllbnRJbXBsOjpwYWdlQ2xvc2VkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5oIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0LmgKaW5kZXggNDk0MzM3ZS4uNTEwMzY1YiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVI b3N0LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVI b3N0LmgKQEAgLTYxLDYgKzYxLDggQEAgcHVibGljOgogCiAgICAgdm9pZCBhbmltYXRpb25EaWRT dGFydChXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQsIENBQW5pbWF0aW9u ICosIGRvdWJsZSBzdGFydFRpbWUpOwogCisgICAgdm9pZCBjbGVhckxheWVycygpOworCiBwcml2 YXRlOgogICAgIExheWVyT3JWaWV3ICpjcmVhdGVMYXllcihjb25zdCBSZW1vdGVMYXllclRyZWVU cmFuc2FjdGlvbjo6TGF5ZXJDcmVhdGlvblByb3BlcnRpZXMmLCBjb25zdCBSZW1vdGVMYXllclRy ZWVUcmFuc2FjdGlvbjo6TGF5ZXJQcm9wZXJ0aWVzKik7CiAgICAgc3RhdGljIHZvaWQgc2V0TGF5 ZXJJRChDQUxheWVyICosIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJl ZUhvc3QubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZUhv c3QubW0KaW5kZXggMDY2ZjVkNy4uODU4ODEyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5tbQpAQCAtNTEsNiArNTEsNyBAQCBS ZW1vdGVMYXllclRyZWVIb3N0OjpSZW1vdGVMYXllclRyZWVIb3N0KFJlbW90ZUxheWVyVHJlZURy YXdpbmdBcmVhUHJveHkmIGRyYXdpbgogCiBSZW1vdGVMYXllclRyZWVIb3N0Ojp+UmVtb3RlTGF5 ZXJUcmVlSG9zdCgpCiB7CisgICAgY2xlYXJMYXllcnMoKTsKIH0KIAogYm9vbCBSZW1vdGVMYXll clRyZWVIb3N0Ojp1cGRhdGVMYXllclRyZWUoY29uc3QgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rp b24mIHRyYW5zYWN0aW9uLCBmbG9hdCBpbmRpY2F0b3JTY2FsZUZhY3RvcikKQEAgLTEzNSw2ICsx MzYsMTkgQEAgdm9pZCBSZW1vdGVMYXllclRyZWVIb3N0OjphbmltYXRpb25EaWRTdGFydChXZWJD b3JlOjpHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWUKICAgICBtX2RyYXdpbmdBcmVhLmFjY2Vs ZXJhdGVkQW5pbWF0aW9uRGlkU3RhcnQobGF5ZXJJRCwgYW5pbWF0aW9uS2V5LCBzdGFydFRpbWUp OwogfQogCit2b2lkIFJlbW90ZUxheWVyVHJlZUhvc3Q6OmNsZWFyTGF5ZXJzKCkKK3sKKyAgICBm b3IgKGF1dG8mIGlkTGF5ZXIgOiBtX2xheWVycykgeworICAgICAgICBtX2FuaW1hdGlvbkRlbGVn YXRlcy5yZW1vdmUoaWRMYXllci5rZXkpOworICAgICAgICBhc0xheWVyKGlkTGF5ZXIudmFsdWUu Z2V0KCkpLmNvbnRlbnRzID0gbnVsbHB0cjsKKyAgICB9CisKKyAgICBtX2xheWVycy5jbGVhcigp OworCisgICAgaWYgKG1fcm9vdExheWVyKQorICAgICAgICBtX3Jvb3RMYXllciA9IG51bGxwdHI7 Cit9CisKIHN0YXRpYyBOU1N0cmluZyogY29uc3QgV0tMYXllcklEUHJvcGVydHlLZXkgPSBAIldL TGF5ZXJJRCI7CiAKIHZvaWQgUmVtb3RlTGF5ZXJUcmVlSG9zdDo6c2V0TGF5ZXJJRChDQUxheWVy ICpsYXllciwgV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklEIGxheWVySUQp Cg==