165280 2016-12-01 14:33:46 -0800 Rare crash when preparing to print 2016-12-01 17:31:12 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham commit-queue dino oldest_to_newest 1255487 0 bfulgham 2016-12-01 14:33:46 -0800 Crash trace statistics indicate a certain amount of nullptr dereferencing during some print operations. Inspecting the code revealed a number of places where the FrameView pointer was accessed without null checking, even though we null check this value everywhere else in the Frame class. This patch adds additional checks to this code to try to reduce the cases where users encounter this problem. 1255490 1 295899 bfulgham 2016-12-01 14:38:50 -0800 Created attachment 295899 Patch 1255491 2 bfulgham 2016-12-01 14:39:35 -0800 <rdar://problem/28240254> 1255492 3 295900 bfulgham 2016-12-01 14:39:59 -0800 Created attachment 295900 Patch 1255548 4 295900 thorton 2016-12-01 16:22:03 -0800 Comment on attachment 295900 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=295900&action=review > Source/WebCore/page/Frame.cpp:899 > + view->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOff); Seems a bit odd, since we just created and set the view. And still have a reference to it. 1255554 5 bfulgham 2016-12-01 16:29:24 -0800 (In reply to comment #4) > Comment on attachment 295900 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=295900&action=review > > > Source/WebCore/page/Frame.cpp:899 > > + view->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOff); > > Seems a bit odd, since we just created and set the view. And still have a > reference to it. Oh! You're right. I was just blindly looking for view() calls. I'll remove that. 1255556 6 295912 bfulgham 2016-12-01 16:30:48 -0800 Created attachment 295912 Patch 1255582 7 295912 commit-queue 2016-12-01 17:31:08 -0800 Comment on attachment 295912 Patch Clearing flags on attachment: 295912 Committed r209226: <http://trac.webkit.org/changeset/209226> 1255583 8 commit-queue 2016-12-01 17:31:12 -0800 All reviewed patches have been landed. Closing bug. 295899 2016-12-01 14:38:50 -0800 2016-12-01 14:39:57 -0800 Patch bug-165280-20161201143826.patch text/plain 2980 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwOTIxMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE2LTEyLTAxICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFJhcmUgY3Jhc2ggd2hlbiBw cmVwYXJpbmcgdG8gcHJpbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE2NTI4MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6c2V0 UHJpbnRpbmcpOiBPbmx5IG1hbmlwdWxhdGUgdGhlIEZyYW1lVmlldyBpZiBpdCBpcyBub24tbnVs bC4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpkb2N1bWVudEF0UG9pbnQpOiBEcml2ZS1ieSBm aXggdG8gY2hhbmdlIGEgMCByZXR1cm4gdG8gbnVsbHB0ci4KKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lOjpjcmVhdGVWaWV3KTogT25seSBtYW5pcHVsYXRlIHRoZSBGcmFtZVZpZXcgaWYgaXQgaXMg bm9uLW51bGwuCisKIDIwMTYtMTItMDEgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgog CiAgICAgICAgIEJsYWNrbGlzdCBOZXRmbGl4IGZvciBUb3VjaEJhciBzdXBwb3J0CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lLmNwcAkocmV2aXNpb24gMjA5MTQ0KQorKysgU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY0MywxNSArNjQzLDE3IEBAIHZvaWQgRnJh bWU6OnNldFByaW50aW5nKGJvb2wgcHJpbnRpbmcsIGMKICAgICBSZXNvdXJjZUNhY2hlVmFsaWRh dGlvblN1cHByZXNzb3IgdmFsaWRhdGlvblN1cHByZXNzb3IobV9kb2MtPmNhY2hlZFJlc291cmNl TG9hZGVyKCkpOwogCiAgICAgbV9kb2MtPnNldFByaW50aW5nKHByaW50aW5nKTsKLSAgICB2aWV3 KCktPmFkanVzdE1lZGlhVHlwZUZvclByaW50aW5nKHByaW50aW5nKTsKKyAgICBpZiAoYXV0byog ZnJhbWVWaWV3ID0gdmlldygpKSB7CisgICAgICAgIGZyYW1lVmlldy0+YWRqdXN0TWVkaWFUeXBl Rm9yUHJpbnRpbmcocHJpbnRpbmcpOwogCi0gICAgbV9kb2MtPnN0eWxlU2NvcGUoKS5kaWRDaGFu Z2VTdHlsZVNoZWV0RW52aXJvbm1lbnQoKTsKLSAgICBpZiAoc2hvdWxkVXNlUHJpbnRpbmdMYXlv dXQoKSkgewotICAgICAgICB2aWV3KCktPmZvcmNlTGF5b3V0Rm9yUGFnaW5hdGlvbihwYWdlU2l6 ZSwgb3JpZ2luYWxQYWdlU2l6ZSwgbWF4aW11bVNocmlua1JhdGlvLCBzaG91bGRBZGp1c3RWaWV3 U2l6ZSk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgdmlldygpLT5mb3JjZUxheW91dCgpOwotICAg ICAgICBpZiAoc2hvdWxkQWRqdXN0Vmlld1NpemUgPT0gQWRqdXN0Vmlld1NpemUpCi0gICAgICAg ICAgICB2aWV3KCktPmFkanVzdFZpZXdTaXplKCk7CisgICAgICAgIG1fZG9jLT5zdHlsZVNjb3Bl KCkuZGlkQ2hhbmdlU3R5bGVTaGVldEVudmlyb25tZW50KCk7CisgICAgICAgIGlmIChzaG91bGRV c2VQcmludGluZ0xheW91dCgpKQorICAgICAgICAgICAgZnJhbWVWaWV3LT5mb3JjZUxheW91dEZv clBhZ2luYXRpb24ocGFnZVNpemUsIG9yaWdpbmFsUGFnZVNpemUsIG1heGltdW1TaHJpbmtSYXRp bywgc2hvdWxkQWRqdXN0Vmlld1NpemUpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGZy YW1lVmlldy0+Zm9yY2VMYXlvdXQoKTsKKyAgICAgICAgICAgIGlmIChzaG91bGRBZGp1c3RWaWV3 U2l6ZSA9PSBBZGp1c3RWaWV3U2l6ZSkKKyAgICAgICAgICAgICAgICBmcmFtZVZpZXctPmFkanVz dFZpZXdTaXplKCk7CisgICAgICAgIH0KICAgICB9CiAKICAgICAvLyBTdWJmcmFtZXMgb2YgdGhl IG9uZSB3ZSdyZSBwcmludGluZyBkb24ndCBsYXkgb3V0IHRvIHRoZSBwYWdlIHNpemUuCkBAIC04 MTMsNyArODE1LDcgQEAgVmlzaWJsZVBvc2l0aW9uIEZyYW1lOjp2aXNpYmxlUG9zaXRpb25Gbwog RG9jdW1lbnQqIEZyYW1lOjpkb2N1bWVudEF0UG9pbnQoY29uc3QgSW50UG9pbnQmIHBvaW50KQog ewogICAgIGlmICghdmlldygpKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51 bGxwdHI7CiAKICAgICBJbnRQb2ludCBwdCA9IHZpZXcoKS0+d2luZG93VG9Db250ZW50cyhwb2lu dCk7CiAgICAgSGl0VGVzdFJlc3VsdCByZXN1bHQgPSBIaXRUZXN0UmVzdWx0KHB0KTsKQEAgLTg5 Miw4ICs4OTQsMTAgQEAgdm9pZCBGcmFtZTo6Y3JlYXRlVmlldyhjb25zdCBJbnRTaXplJiB2aQog ICAgIGlmIChvd25lclJlbmRlcmVyKCkpCiAgICAgICAgIG93bmVyUmVuZGVyZXIoKS0+c2V0V2lk Z2V0KGZyYW1lVmlldyk7CiAKLSAgICBpZiAoSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9 IG93bmVyRWxlbWVudCgpKQotICAgICAgICB2aWV3KCktPnNldENhbkhhdmVTY3JvbGxiYXJzKG93 bmVyLT5zY3JvbGxpbmdNb2RlKCkgIT0gU2Nyb2xsYmFyQWx3YXlzT2ZmKTsKKyAgICBpZiAoSFRN TEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IG93bmVyRWxlbWVudCgpKSB7CisgICAgICAgIGlm IChhdXRvKiB2aWV3ID0gdGhpcy0+dmlldygpKQorICAgICAgICAgICAgdmlldy0+c2V0Q2FuSGF2 ZVNjcm9sbGJhcnMob3duZXItPnNjcm9sbGluZ01vZGUoKSAhPSBTY3JvbGxiYXJBbHdheXNPZmYp OworICAgIH0KIH0KIAogU3RyaW5nIEZyYW1lOjpsYXllclRyZWVBc1RleHQoTGF5ZXJUcmVlRmxh Z3MgZmxhZ3MpIGNvbnN0Cg== 295900 2016-12-01 14:39:59 -0800 2016-12-01 16:30:45 -0800 Patch bug-165280-20161201143935.patch text/plain 3015 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwOTIxMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE2LTEyLTAxICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFJhcmUgY3Jhc2ggd2hlbiBw cmVwYXJpbmcgdG8gcHJpbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE2NTI4MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjgyNDAyNTQ+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1l LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpzZXRQcmludGluZyk6IE9ubHkgbWFuaXB1 bGF0ZSB0aGUgRnJhbWVWaWV3IGlmIGl0IGlzIG5vbi1udWxsLgorICAgICAgICAoV2ViQ29yZTo6 RnJhbWU6OmRvY3VtZW50QXRQb2ludCk6IERyaXZlLWJ5IGZpeCB0byBjaGFuZ2UgYSAwIHJldHVy biB0byBudWxscHRyLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OmNyZWF0ZVZpZXcpOiBPbmx5 IG1hbmlwdWxhdGUgdGhlIEZyYW1lVmlldyBpZiBpdCBpcyBub24tbnVsbC4KKwogMjAxNi0xMi0w MSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CiAKICAgICAgICAgQmxhY2tsaXN0IE5l dGZsaXggZm9yIFRvdWNoQmFyIHN1cHBvcnQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCShyZXZp c2lvbiAyMDkxNDQpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjQzLDE1ICs2NDMsMTcgQEAgdm9pZCBGcmFtZTo6c2V0UHJpbnRpbmcoYm9vbCBw cmludGluZywgYwogICAgIFJlc291cmNlQ2FjaGVWYWxpZGF0aW9uU3VwcHJlc3NvciB2YWxpZGF0 aW9uU3VwcHJlc3NvcihtX2RvYy0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKSk7CiAKICAgICBtX2Rv Yy0+c2V0UHJpbnRpbmcocHJpbnRpbmcpOwotICAgIHZpZXcoKS0+YWRqdXN0TWVkaWFUeXBlRm9y UHJpbnRpbmcocHJpbnRpbmcpOworICAgIGlmIChhdXRvKiBmcmFtZVZpZXcgPSB2aWV3KCkpIHsK KyAgICAgICAgZnJhbWVWaWV3LT5hZGp1c3RNZWRpYVR5cGVGb3JQcmludGluZyhwcmludGluZyk7 CiAKLSAgICBtX2RvYy0+c3R5bGVTY29wZSgpLmRpZENoYW5nZVN0eWxlU2hlZXRFbnZpcm9ubWVu dCgpOwotICAgIGlmIChzaG91bGRVc2VQcmludGluZ0xheW91dCgpKSB7Ci0gICAgICAgIHZpZXco KS0+Zm9yY2VMYXlvdXRGb3JQYWdpbmF0aW9uKHBhZ2VTaXplLCBvcmlnaW5hbFBhZ2VTaXplLCBt YXhpbXVtU2hyaW5rUmF0aW8sIHNob3VsZEFkanVzdFZpZXdTaXplKTsKLSAgICB9IGVsc2Ugewot ICAgICAgICB2aWV3KCktPmZvcmNlTGF5b3V0KCk7Ci0gICAgICAgIGlmIChzaG91bGRBZGp1c3RW aWV3U2l6ZSA9PSBBZGp1c3RWaWV3U2l6ZSkKLSAgICAgICAgICAgIHZpZXcoKS0+YWRqdXN0Vmll d1NpemUoKTsKKyAgICAgICAgbV9kb2MtPnN0eWxlU2NvcGUoKS5kaWRDaGFuZ2VTdHlsZVNoZWV0 RW52aXJvbm1lbnQoKTsKKyAgICAgICAgaWYgKHNob3VsZFVzZVByaW50aW5nTGF5b3V0KCkpCisg ICAgICAgICAgICBmcmFtZVZpZXctPmZvcmNlTGF5b3V0Rm9yUGFnaW5hdGlvbihwYWdlU2l6ZSwg b3JpZ2luYWxQYWdlU2l6ZSwgbWF4aW11bVNocmlua1JhdGlvLCBzaG91bGRBZGp1c3RWaWV3U2l6 ZSk7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgZnJhbWVWaWV3LT5mb3JjZUxheW91dCgp OworICAgICAgICAgICAgaWYgKHNob3VsZEFkanVzdFZpZXdTaXplID09IEFkanVzdFZpZXdTaXpl KQorICAgICAgICAgICAgICAgIGZyYW1lVmlldy0+YWRqdXN0Vmlld1NpemUoKTsKKyAgICAgICAg fQogICAgIH0KIAogICAgIC8vIFN1YmZyYW1lcyBvZiB0aGUgb25lIHdlJ3JlIHByaW50aW5nIGRv bid0IGxheSBvdXQgdG8gdGhlIHBhZ2Ugc2l6ZS4KQEAgLTgxMyw3ICs4MTUsNyBAQCBWaXNpYmxl UG9zaXRpb24gRnJhbWU6OnZpc2libGVQb3NpdGlvbkZvCiBEb2N1bWVudCogRnJhbWU6OmRvY3Vt ZW50QXRQb2ludChjb25zdCBJbnRQb2ludCYgcG9pbnQpCiB7CiAgICAgaWYgKCF2aWV3KCkpCi0g ICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIEludFBvaW50 IHB0ID0gdmlldygpLT53aW5kb3dUb0NvbnRlbnRzKHBvaW50KTsKICAgICBIaXRUZXN0UmVzdWx0 IHJlc3VsdCA9IEhpdFRlc3RSZXN1bHQocHQpOwpAQCAtODkyLDggKzg5NCwxMCBAQCB2b2lkIEZy YW1lOjpjcmVhdGVWaWV3KGNvbnN0IEludFNpemUmIHZpCiAgICAgaWYgKG93bmVyUmVuZGVyZXIo KSkKICAgICAgICAgb3duZXJSZW5kZXJlcigpLT5zZXRXaWRnZXQoZnJhbWVWaWV3KTsKIAotICAg IGlmIChIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyID0gb3duZXJFbGVtZW50KCkpCi0gICAg ICAgIHZpZXcoKS0+c2V0Q2FuSGF2ZVNjcm9sbGJhcnMob3duZXItPnNjcm9sbGluZ01vZGUoKSAh PSBTY3JvbGxiYXJBbHdheXNPZmYpOworICAgIGlmIChIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93 bmVyID0gb3duZXJFbGVtZW50KCkpIHsKKyAgICAgICAgaWYgKGF1dG8qIHZpZXcgPSB0aGlzLT52 aWV3KCkpCisgICAgICAgICAgICB2aWV3LT5zZXRDYW5IYXZlU2Nyb2xsYmFycyhvd25lci0+c2Ny b2xsaW5nTW9kZSgpICE9IFNjcm9sbGJhckFsd2F5c09mZik7CisgICAgfQogfQogCiBTdHJpbmcg RnJhbWU6OmxheWVyVHJlZUFzVGV4dChMYXllclRyZWVGbGFncyBmbGFncykgY29uc3QK 295912 2016-12-01 16:30:48 -0800 2016-12-01 17:31:08 -0800 Patch bug-165280-20161201163025.patch text/plain 2392 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwOTIxMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE2LTEyLTAxICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFJhcmUgY3Jhc2ggd2hlbiBw cmVwYXJpbmcgdG8gcHJpbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE2NTI4MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjgyNDAyNTQ+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1l LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpzZXRQcmludGluZyk6IE9ubHkgbWFuaXB1 bGF0ZSB0aGUgRnJhbWVWaWV3IGlmIGl0IGlzIG5vbi1udWxsLgorICAgICAgICAoV2ViQ29yZTo6 RnJhbWU6OmRvY3VtZW50QXRQb2ludCk6IERyaXZlLWJ5IGZpeCB0byBjaGFuZ2UgYSAwIHJldHVy biB0byBudWxscHRyLgorCiAyMDE2LTEyLTAxICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNv bT4KIAogICAgICAgICBCbGFja2xpc3QgTmV0ZmxpeCBmb3IgVG91Y2hCYXIgc3VwcG9ydApJbmRl eDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZS5jcHAJKHJldmlzaW9uIDIwOTE0NCkKKysrIFNvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NDMsMTUgKzY0MywxNyBAQCB2b2lk IEZyYW1lOjpzZXRQcmludGluZyhib29sIHByaW50aW5nLCBjCiAgICAgUmVzb3VyY2VDYWNoZVZh bGlkYXRpb25TdXBwcmVzc29yIHZhbGlkYXRpb25TdXBwcmVzc29yKG1fZG9jLT5jYWNoZWRSZXNv dXJjZUxvYWRlcigpKTsKIAogICAgIG1fZG9jLT5zZXRQcmludGluZyhwcmludGluZyk7Ci0gICAg dmlldygpLT5hZGp1c3RNZWRpYVR5cGVGb3JQcmludGluZyhwcmludGluZyk7CisgICAgaWYgKGF1 dG8qIGZyYW1lVmlldyA9IHZpZXcoKSkgeworICAgICAgICBmcmFtZVZpZXctPmFkanVzdE1lZGlh VHlwZUZvclByaW50aW5nKHByaW50aW5nKTsKIAotICAgIG1fZG9jLT5zdHlsZVNjb3BlKCkuZGlk Q2hhbmdlU3R5bGVTaGVldEVudmlyb25tZW50KCk7Ci0gICAgaWYgKHNob3VsZFVzZVByaW50aW5n TGF5b3V0KCkpIHsKLSAgICAgICAgdmlldygpLT5mb3JjZUxheW91dEZvclBhZ2luYXRpb24ocGFn ZVNpemUsIG9yaWdpbmFsUGFnZVNpemUsIG1heGltdW1TaHJpbmtSYXRpbywgc2hvdWxkQWRqdXN0 Vmlld1NpemUpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIHZpZXcoKS0+Zm9yY2VMYXlvdXQoKTsK LSAgICAgICAgaWYgKHNob3VsZEFkanVzdFZpZXdTaXplID09IEFkanVzdFZpZXdTaXplKQotICAg ICAgICAgICAgdmlldygpLT5hZGp1c3RWaWV3U2l6ZSgpOworICAgICAgICBtX2RvYy0+c3R5bGVT Y29wZSgpLmRpZENoYW5nZVN0eWxlU2hlZXRFbnZpcm9ubWVudCgpOworICAgICAgICBpZiAoc2hv dWxkVXNlUHJpbnRpbmdMYXlvdXQoKSkKKyAgICAgICAgICAgIGZyYW1lVmlldy0+Zm9yY2VMYXlv dXRGb3JQYWdpbmF0aW9uKHBhZ2VTaXplLCBvcmlnaW5hbFBhZ2VTaXplLCBtYXhpbXVtU2hyaW5r UmF0aW8sIHNob3VsZEFkanVzdFZpZXdTaXplKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAg ICBmcmFtZVZpZXctPmZvcmNlTGF5b3V0KCk7CisgICAgICAgICAgICBpZiAoc2hvdWxkQWRqdXN0 Vmlld1NpemUgPT0gQWRqdXN0Vmlld1NpemUpCisgICAgICAgICAgICAgICAgZnJhbWVWaWV3LT5h ZGp1c3RWaWV3U2l6ZSgpOworICAgICAgICB9CiAgICAgfQogCiAgICAgLy8gU3ViZnJhbWVzIG9m IHRoZSBvbmUgd2UncmUgcHJpbnRpbmcgZG9uJ3QgbGF5IG91dCB0byB0aGUgcGFnZSBzaXplLgpA QCAtODEzLDcgKzgxNSw3IEBAIFZpc2libGVQb3NpdGlvbiBGcmFtZTo6dmlzaWJsZVBvc2l0aW9u Rm8KIERvY3VtZW50KiBGcmFtZTo6ZG9jdW1lbnRBdFBvaW50KGNvbnN0IEludFBvaW50JiBwb2lu dCkKIHsKICAgICBpZiAoIXZpZXcoKSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVy biBudWxscHRyOwogCiAgICAgSW50UG9pbnQgcHQgPSB2aWV3KCktPndpbmRvd1RvQ29udGVudHMo cG9pbnQpOwogICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0ID0gSGl0VGVzdFJlc3VsdChwdCk7Cg==