24409 2009-03-05 15:37:34 -0800 re-work layer destruction to clear m_renderer and m_layer after destruction 2009-03-06 11:39:33 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned oldest_to_newest 112466 0 eric 2009-03-05 15:37:34 -0800 re-work layer destruction to clear m_renderer and m_layer after destruction This work was initially inspired by: http://code.google.com/p/chromium/issues/detail?id=7829 I don't know that this will actually help us track down that crash, but I do think that it is cleanup worth doing. 112467 1 28332 eric 2009-03-05 15:37:49 -0800 Created attachment 28332 Changes to RenderLayer destruction to hopefully help catch an ellusive crasher WebCore/ChangeLog | 26 ++++++++++++++++++++++++++ WebCore/rendering/RenderBox.cpp | 2 +- WebCore/rendering/RenderBoxModelObject.cpp | 20 +++++++++++++++----- WebCore/rendering/RenderBoxModelObject.h | 5 ++++- WebCore/rendering/RenderLayer.cpp | 17 ++++++++--------- WebCore/rendering/RenderLayer.h | 6 ++++-- WebCore/rendering/RenderObject.cpp | 5 ++--- WebCore/rendering/RenderWidget.cpp | 17 ++++++++--------- 8 files changed, 68 insertions(+), 30 deletions(-) 112502 2 28332 hyatt 2009-03-05 18:26:20 -0800 Comment on attachment 28332 Changes to RenderLayer destruction to hopefully help catch an ellusive crasher r=me. Make sure to test thoroughly, though, since you have changed the timing of stuff (especially in RenderWidget). 112505 3 eric 2009-03-05 18:33:25 -0800 (In reply to comment #2) > (From update of attachment 28332 [review]) > r=me. Make sure to test thoroughly, though, since you have changed the timing > of stuff (especially in RenderWidget). I've run all of the layout tests, full pass. 112636 4 eric 2009-03-06 11:39:33 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/rendering/RenderBox.cpp M WebCore/rendering/RenderBoxModelObject.cpp M WebCore/rendering/RenderBoxModelObject.h M WebCore/rendering/RenderLayer.cpp M WebCore/rendering/RenderLayer.h M WebCore/rendering/RenderObject.cpp M WebCore/rendering/RenderWidget.cpp Committed r41469 28332 2009-03-05 15:37:49 -0800 2009-03-05 18:26:20 -0800 Changes to RenderLayer destruction to hopefully help catch an ellusive crasher Changes-to-RenderLayer-destruction-to-hopefully-help-catch-an-ellusive-crasher.patch text/plain 9169 eric ZmI3YmZjMTk2Yzk0ZjMwMTJlMTY1YzBhMDc3OWEyY2EzZGZkMWZjNQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3ZTBlZGE4Li45MjAwZDcw IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDI5IEBACisyMDA5LTAzLTA1ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFu Z2VzIHRvIFJlbmRlckxheWVyIGRlc3RydWN0aW9uIHRvIGhvcGVmdWxseSBoZWxwIGNhdGNoIGFu IGVsbHVzaXZlIGNyYXNoZXIKKworICAgICAgICBXQVJOSU5HOiBOTyBURVNUIENBU0VTIEFEREVE IE9SIENIQU5HRUQKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQm94OjpjYWxjQWJzb2x1dGVIb3Jpem9udGFsUmVwbGFjZWQpOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6flJlbmRlckJveE1vZGVsT2JqZWN0KToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpkZXN0cm95TGF5ZXIpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OmRlc3Ryb3kpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OnN0eWxlRGlkQ2hhbmdlKToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaDoKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnN0YWNraW5n Q29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6ZGVzdHJveSk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cmVtb3ZlT25seVRoaXNMYXllcik6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9i amVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmRlc3Ryb3kpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJXaWRnZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyV2lkZ2V0OjpkZXN0cm95KToKKwogMjAwOS0wMy0wNSAgU3RldmUgRmFsa2VuYnVyZyAgPHNm YWxrZW5AYXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NjUxMTEyPiBTYWZh cmkgYXNrcyBhYm91dCByZS1wb3N0aW5nIGEgZm9ybSBldmVuIHdoZW4gcGFnZSBpcyBjYWNoZWQK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGVhYTM2MjYuLjcxMDgxYWQgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94LmNwcApAQCAtMjM1NCw3ICsyMzU0LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNhbGNB YnNvbHV0ZUhvcml6b250YWxSZXBsYWNlZCgpCiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICBSZW5kZXJPYmplY3QqIHBvID0gcGFyZW50KCk7CiAgICAgICAgICAgICAvLyAnc3RhdGljWCcg c2hvdWxkIGFscmVhZHkgaGF2ZSBiZWVuIHNldCB0aHJvdWdoIGxheW91dCBvZiB0aGUgcGFyZW50 LgotICAgICAgICAgICAgaW50IHN0YXRpY1Bvc2l0aW9uID0gbGF5ZXIoKS0+c3RhdGljWCgpICsg Y29udGFpbmVyV2lkdGggKyB0b1JlbmRlckJveE1vZGVsT2JqZWN0KGNvbnRhaW5lckJsb2NrKS0+ Ym9yZGVyUmlnaHQoKTsKKyAgICAgICAgICAgIGludCBzdGF0aWNQb3NpdGlvbiA9IGxheWVyKCkt PnN0YXRpY1goKSArIGNvbnRhaW5lcldpZHRoICsgY29udGFpbmVyQmxvY2stPmJvcmRlclJpZ2h0 KCk7CiAgICAgICAgICAgICBmb3IgKCA7IHBvICYmIHBvICE9IGNvbnRhaW5lckJsb2NrOyBwbyA9 IHBvLT5wYXJlbnQoKSkgewogICAgICAgICAgICAgICAgIGlmIChwby0+aXNCb3goKSkKICAgICAg ICAgICAgICAgICAgICAgc3RhdGljUG9zaXRpb24gKz0gdG9SZW5kZXJCb3gocG8pLT54KCk7CmRp ZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAgYi9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKaW5kZXggZmY5MWZhOC4u NTQyODBlZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmpl Y3QuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApA QCAtNTAsNiArNTAsMTggQEAgUmVuZGVyQm94TW9kZWxPYmplY3Q6OlJlbmRlckJveE1vZGVsT2Jq ZWN0KE5vZGUqIG5vZGUpCiAKIFJlbmRlckJveE1vZGVsT2JqZWN0Ojp+UmVuZGVyQm94TW9kZWxP YmplY3QoKQogeworICAgIC8vIE91ciBsYXllciBzaG91bGQgaGF2ZSBiZWVuIGRlc3Ryb3llZCBh bmQgY2xlYXJlZCBieSBub3cKKyAgICBBU1NFUlQoIWhhc0xheWVyKCkpOworICAgIEFTU0VSVCgh bV9sYXllcik7Cit9CisKK3ZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmRlc3Ryb3lMYXllcigp Cit7CisgICAgQVNTRVJUKGhhc0xheWVyKCkpOworICAgIEFTU0VSVChtX2xheWVyKTsKKyAgICBt X2xheWVyLT5kZXN0cm95KHJlbmRlckFyZW5hKCkpOworICAgIG1fbGF5ZXIgPSAwOworICAgIHNl dEhhc0xheWVyKGZhbHNlKTsKIH0KIAogdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6ZGVzdHJv eSgpCkBAIC01Nyw2ICs2OSw4IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmRlc3Ryb3ko KQogICAgIC8vIFRoaXMgbXVzdCBiZSBkb25lIGJlZm9yZSB3ZSBkZXN0cm95IHRoZSBSZW5kZXJP YmplY3QuCiAgICAgaWYgKG1fbGF5ZXIpCiAgICAgICAgIG1fbGF5ZXItPmNsZWFyQ2xpcFJlY3Rz KCk7CisKKyAgICAvLyBSZW5kZXJPYmplY3Q6OmRlc3Ryb3kgY2FsbHMgYmFjayB0byBkZXN0cm95 TGF5ZXIoKSBmb3IgbGF5ZXIgZGVzdHJ1Y3Rpb24KICAgICBSZW5kZXJPYmplY3Q6OmRlc3Ryb3ko KTsKIH0KIApAQCAtMTAwLDEzICsxMTQsOSBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0Ojpz dHlsZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bAogICAg ICAgICAgICAgICAgIG1fbGF5ZXItPnVwZGF0ZUxheWVyUG9zaXRpb25zKCk7CiAgICAgICAgIH0K ICAgICB9IGVsc2UgaWYgKGxheWVyKCkgJiYgbGF5ZXIoKS0+cGFyZW50KCkpIHsKLSAgICAgICAg Ci0gICAgICAgIFJlbmRlckxheWVyKiBsYXllciA9IG1fbGF5ZXI7Ci0gICAgICAgIG1fbGF5ZXIg PSAwOwotICAgICAgICBzZXRIYXNMYXllcihmYWxzZSk7CiAgICAgICAgIHNldEhhc1RyYW5zZm9y bShmYWxzZSk7IC8vIEVpdGhlciBhIHRyYW5zZm9ybSB3YXNuJ3Qgc3BlY2lmaWVkIG9yIHRoZSBv YmplY3QgZG9lc24ndCBzdXBwb3J0IHRyYW5zZm9ybXMsIHNvIGp1c3QgbnVsbCBvdXQgdGhlIGJp dC4KICAgICAgICAgc2V0SGFzUmVmbGVjdGlvbihmYWxzZSk7Ci0gICAgICAgIGxheWVyLT5yZW1v dmVPbmx5VGhpc0xheWVyKCk7CisgICAgICAgIG1fbGF5ZXItPnJlbW92ZU9ubHlUaGlzTGF5ZXIo KTsgLy8gY2FsbHMgZGVzdHJveUxheWVyKCkgd2hpY2ggY2xlYXJzIG1fbGF5ZXIKICAgICAgICAg aWYgKHNfd2FzRmxvYXRpbmcgJiYgaXNGbG9hdGluZygpKQogICAgICAgICAgICAgc2V0Q2hpbGRO ZWVkc0xheW91dCh0cnVlKTsKICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3hNb2RlbE9iamVjdC5oIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxP YmplY3QuaAppbmRleCA4ZWYwYjRhLi4xNjFlNWQyIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveE1vZGVsT2JqZWN0LmgKQEAgLTk2LDYgKzk2LDkgQEAgcHVibGljOgogICAgIC8vIFRoZSBk aWZmZXJlbmNlIGJldHdlZW4gdGhpcyBpbmxpbmUncyBiYXNlbGluZSBwb3NpdGlvbiBhbmQgdGhl IGxpbmUncyBiYXNlbGluZSBwb3NpdGlvbi4KICAgICBpbnQgdmVydGljYWxQb3NpdGlvbihib29s IGZpcnN0TGluZSkgY29uc3Q7CiAKKyAgICAvLyBDYWxsZWQgYnkgUmVuZGVyT2JqZWN0OjpkZXN0 cm95KCkgKGFuZCBSZW5kZXJXaWRnZXQ6OmRlc3Ryb3koKSkgYW5kIGlzIHRoZSBvbmx5IHdheSBs YXllcnMgc2hvdWxkIGV2ZXIgYmUgZGVzdHJveWVkCisgICAgdm9pZCBkZXN0cm95TGF5ZXIoKTsK KwogcHJvdGVjdGVkOgogICAgIHZvaWQgY2FsY3VsYXRlQmFja2dyb3VuZEltYWdlR2VvbWV0cnko Y29uc3QgRmlsbExheWVyKiwgaW50IHR4LCBpbnQgdHksIGludCB3LCBpbnQgaCwgSW50UmVjdCYg ZGVzdFJlY3QsIEludFBvaW50JiBwaGFzZSwgSW50U2l6ZSYgdGlsZVNpemUpOwogICAgIEludFNp emUgY2FsY3VsYXRlQmFja2dyb3VuZFNpemUoY29uc3QgRmlsbExheWVyKiwgaW50IHNjYWxlZFdp ZHRoLCBpbnQgc2NhbGVkSGVpZ2h0KSBjb25zdDsKQEAgLTEyMyw3ICsxMjYsNyBAQCBpbmxpbmUg Y29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QqIHRvUmVuZGVyQm94TW9kZWxPYmplY3QoY29uc3Qg UmVuZGVyT2JqZWN0KiBvKQogfQogCiAvLyBUaGlzIHdpbGwgY2F0Y2ggYW55b25lIGRvaW5nIGFu IHVubmVjZXNzYXJ5IGNhc3QuCi12b2lkIHRvUmVuZGVyQm94TW9kZWxPYmplY3QoY29uc3QgUmVu ZGVyQm94Kik7Cit2b2lkIHRvUmVuZGVyQm94TW9kZWxPYmplY3QoY29uc3QgUmVuZGVyQm94TW9k ZWxPYmplY3QqKTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAKaW5kZXggZGQxNmI0NC4uN2M0YjAwMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcApAQCAtNjEwLDEzICs2MTAsMTIgQEAgRmxvYXRQb2ludCBSZW5kZXJMYXllcjo6cGVyc3Bl Y3RpdmVPcmlnaW4oKSBjb25zdAogICAgICAgICAgICAgICAgICAgICAgIHN0eWxlLT5wZXJzcGVj dGl2ZU9yaWdpblkoKS5jYWxjRmxvYXRWYWx1ZShib3JkZXJCb3guaGVpZ2h0KCkpKTsKIH0KIAot UmVuZGVyTGF5ZXIgKlJlbmRlckxheWVyOjpzdGFja2luZ0NvbnRleHQoKSBjb25zdAorUmVuZGVy TGF5ZXIqIFJlbmRlckxheWVyOjpzdGFja2luZ0NvbnRleHQoKSBjb25zdAogewotICAgIFJlbmRl ckxheWVyKiBjdXJyID0gcGFyZW50KCk7Ci0gICAgZm9yICggOyBjdXJyICYmICFjdXJyLT5yZW5k ZXJlcigpLT5pc1JlbmRlclZpZXcoKSAmJiAhY3Vyci0+cmVuZGVyZXIoKS0+aXNSb290KCkgJiYK LSAgICAgICAgICBjdXJyLT5yZW5kZXJlcigpLT5zdHlsZSgpLT5oYXNBdXRvWkluZGV4KCk7Ci0g ICAgICAgICAgY3VyciA9IGN1cnItPnBhcmVudCgpKSB7IH0KLSAgICByZXR1cm4gY3VycjsKKyAg ICBSZW5kZXJMYXllciogbGF5ZXIgPSBwYXJlbnQoKTsKKyAgICB3aGlsZSAobGF5ZXIgJiYgIWxh eWVyLT5yZW5kZXJlcigpLT5pc1JlbmRlclZpZXcoKSAmJiAhbGF5ZXItPnJlbmRlcmVyKCktPmlz Um9vdCgpICYmIGxheWVyLT5yZW5kZXJlcigpLT5zdHlsZSgpLT5oYXNBdXRvWkluZGV4KCkpCisg ICAgICAgIGxheWVyID0gbGF5ZXItPnBhcmVudCgpOworICAgIHJldHVybiBsYXllcjsKIH0KIAog UmVuZGVyTGF5ZXIqIFJlbmRlckxheWVyOjplbmNsb3NpbmdQb3NpdGlvbmVkQW5jZXN0b3IoKSBj b25zdApAQCAtNzcwLDcgKzc2OSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6Om9wZXJhdG9yIGRlbGV0 ZSh2b2lkKiBwdHIsIHNpemVfdCBzeikKIH0KIAogdm9pZCBSZW5kZXJMYXllcjo6ZGVzdHJveShS ZW5kZXJBcmVuYSogcmVuZGVyQXJlbmEpCi17ICAgIAorewogICAgIGRlbGV0ZSB0aGlzOwogCiAg ICAgLy8gUmVjb3ZlciB0aGUgc2l6ZSBsZWZ0IHRoZXJlIGZvciB1cyBieSBvcGVyYXRvciBkZWxl dGUgYW5kIGZyZWUgdGhlIG1lbW9yeS4KQEAgLTg4MCw4ICs4NzksOCBAQCB2b2lkIFJlbmRlckxh eWVyOjpyZW1vdmVPbmx5VGhpc0xheWVyKCkKICAgICAgICAgY3VycmVudC0+dXBkYXRlTGF5ZXJQ b3NpdGlvbnMoKTsKICAgICAgICAgY3VycmVudCA9IG5leHQ7CiAgICAgfQotICAgIAotICAgIGRl c3Ryb3kocmVuZGVyZXIoKS0+cmVuZGVyQXJlbmEoKSk7CisKKyAgICBtX3JlbmRlcmVyLT5kZXN0 cm95TGF5ZXIoKTsKIH0KIAogdm9pZCBSZW5kZXJMYXllcjo6aW5zZXJ0T25seVRoaXNMYXllcigp CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAppbmRleCAwZjM1Mzk4Li5mYzE0YmE5IDEwMDY0NAotLS0g YS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmgKQEAgLTQxNCw4ICs0MTQsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBwcmVz ZXJ2ZXMzRCgpIGNvbnN0IHsgcmV0dXJuIHJlbmRlcmVyKCktPnN0eWxlKCktPnRyYW5zZm9ybVN0 eWxlM0QoKSA9PSBUcmFuc2Zvcm1TdHlsZTNEUHJlc2VydmUzRDsgfQogICAgIGJvb2wgaGFzM0RU cmFuc2Zvcm0oKSBjb25zdCB7IHJldHVybiBtX3RyYW5zZm9ybSAmJiAhbV90cmFuc2Zvcm0tPmlz QWZmaW5lKCk7IH0KIAotICAgIHZvaWQgZGVzdHJveShSZW5kZXJBcmVuYSopOwotCiAgICAgIC8v IE92ZXJsb2FkZWQgbmV3IG9wZXJhdG9yLiAgRGVyaXZlZCBjbGFzc2VzIG11c3Qgb3ZlcnJpZGUg b3BlcmF0b3IgbmV3CiAgICAgLy8gaW4gb3JkZXIgdG8gYWxsb2NhdGUgb3V0IG9mIHRoZSBSZW5k ZXJBcmVuYS4KICAgICB2b2lkKiBvcGVyYXRvciBuZXcoc2l6ZV90LCBSZW5kZXJBcmVuYSopIHRo cm93KCk7CkBAIC01MTksNiArNTE3LDEwIEBAIHByaXZhdGU6CiBwcml2YXRlOgogICAgIGZyaWVu ZCBjbGFzcyBSZW5kZXJMYXllckJhY2tpbmc7CiAgICAgZnJpZW5kIGNsYXNzIFJlbmRlckxheWVy Q29tcG9zaXRvcjsKKyAgICBmcmllbmQgY2xhc3MgUmVuZGVyQm94TW9kZWxPYmplY3Q7CisKKyAg ICAvLyBPbmx5IHNhZmUgdG8gY2FsbCBmcm9tIFJlbmRlckJveE1vZGVsT2JqZWN0OjpkZXN0cm95 TGF5ZXIoUmVuZGVyQXJlbmEqKQorICAgIHZvaWQgZGVzdHJveShSZW5kZXJBcmVuYSopOwogCiBw cm90ZWN0ZWQ6CiAgICAgUmVuZGVyQm94TW9kZWxPYmplY3QqIG1fcmVuZGVyZXI7CmRpZmYgLS1n aXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCBlYjE5Nzc1Li5jZTkxZjdlIDEwMDY0NAotLS0gYS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5jcHAKQEAgLTE4MzksMTAgKzE4MzksOSBAQCB2b2lkIFJlbmRlck9iamVj dDo6ZGVzdHJveSgpCiAKICAgICAvLyBGSVhNRTogV291bGQgbGlrZSB0byBkbyB0aGlzIGluIFJl bmRlckJveE1vZGVsT2JqZWN0LCBidXQgdGhlIHRpbWluZyBpcyBzbyBjb21wbGljYXRlZCB0aGF0 IHRoaXMgY2FuJ3QgZWFzaWx5CiAgICAgLy8gYmUgbW92ZWQgaW50byBSZW5kZXJCb3hNb2RlbE9i amVjdDo6ZGVzdHJveS4KLSAgICBSZW5kZXJBcmVuYSogYXJlbmEgPSByZW5kZXJBcmVuYSgpOwog ICAgIGlmIChoYXNMYXllcigpKQotICAgICAgICB0b1JlbmRlckJveE1vZGVsT2JqZWN0KHRoaXMp LT5sYXllcigpLT5kZXN0cm95KGFyZW5hKTsKLSAgICBhcmVuYURlbGV0ZShhcmVuYSwgdGhpcyk7 CisgICAgICAgIHRvUmVuZGVyQm94TW9kZWxPYmplY3QodGhpcyktPmRlc3Ryb3lMYXllcigpOwor ICAgIGFyZW5hRGVsZXRlKHJlbmRlckFyZW5hKCksIHRoaXMpOwogfQogCiB2b2lkIFJlbmRlck9i amVjdDo6YXJlbmFEZWxldGUoUmVuZGVyQXJlbmEqIGFyZW5hLCB2b2lkKiBiYXNlKQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcCBiL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlcldpZGdldC5jcHAKaW5kZXggNTAwZTdkMS4uMjU0NDFhNyAxMDA2NDQKLS0tIGEv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJXaWRnZXQuY3BwCkBAIC05MSwxOSArOTEsMTggQEAgdm9pZCBSZW5kZXJXaWRnZXQ6 OmRlc3Ryb3koKQogICAgIGlmIChoYXNPdmVycmlkZVNpemUoKSkKICAgICAgICAgc2V0T3ZlcnJp ZGVTaXplKC0xKTsKIAotICAgIFJlbmRlckFyZW5hKiBhcmVuYSA9IHJlbmRlckFyZW5hKCk7Ci0K LSAgICBpZiAoaGFzTGF5ZXIoKSkKLSAgICAgICAgbGF5ZXIoKS0+Y2xlYXJDbGlwUmVjdHMoKTsK LQogICAgIGlmIChzdHlsZSgpICYmIChzdHlsZSgpLT5oZWlnaHQoKS5pc1BlcmNlbnQoKSB8fCBz dHlsZSgpLT5taW5IZWlnaHQoKS5pc1BlcmNlbnQoKSB8fCBzdHlsZSgpLT5tYXhIZWlnaHQoKS5p c1BlcmNlbnQoKSkpCiAgICAgICAgIFJlbmRlckJsb2NrOjpyZW1vdmVQZXJjZW50SGVpZ2h0RGVz Y2VuZGFudCh0aGlzKTsKIAotICAgIHNldE5vZGUoMCk7Ci0KLSAgICBpZiAoaGFzTGF5ZXIoKSkK LSAgICAgICAgbGF5ZXIoKS0+ZGVzdHJveShhcmVuYSk7CisgICAgaWYgKGhhc0xheWVyKCkpIHsK KyAgICAgICAgbGF5ZXIoKS0+Y2xlYXJDbGlwUmVjdHMoKTsKKyAgICAgICAgZGVzdHJveUxheWVy KCk7CisgICAgfQogCisgICAgLy8gR3JhYiB0aGUgYXJlbmEgZnJvbSBub2RlKCktPmRvY3VtZW50 KCktPnJlbmRlckFyZW5hKCkgYmVmb3JlIGNsZWFyaW5nIHRoZSBub2RlIHBvaW50ZXIuCisgICAg Ly8gQ2xlYXIgdGhlIG5vZGUgYmVmb3JlIGRlcmVmLWluZywgYXMgdGhpcyBtYXkgYmUgZGVsZXRl ZCB3aGVuIGRlcmVmIGlzIGNhbGxlZC4KKyAgICBSZW5kZXJBcmVuYSogYXJlbmEgPSByZW5kZXJB cmVuYSgpOworICAgIHNldE5vZGUoMCk7CiAgICAgZGVyZWYoYXJlbmEpOwogfQogCg==