132392 2014-04-30 11:40:34 -0700 [New Multicolumn] ASSERTs in fast/dynamic/continuation-detach-crash.html 2014-04-30 14:28:21 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 131825 1 hyatt hyatt commit-queue esprehn+autocc glenn kondapallykalyan WebkitBugTracker oldest_to_newest 1005444 0 hyatt 2014-04-30 11:40:34 -0700 The render tree construction is going horribly wrong (nested columns and dynamic spans) in this test case. 1005497 1 230517 hyatt 2014-04-30 13:46:09 -0700 Created attachment 230517 Patch 1005498 2 commit-queue 2014-04-30 13:48:38 -0700 Attachment 230517 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp:39: RenderMultiColumnFlowThread::g_shiftingSpanner is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] ERROR: Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp:304: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/rendering/RenderMultiColumnFlowThread.h:153: g_shiftingSpanner is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 3 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1005521 3 hyatt 2014-04-30 14:28:21 -0700 Fixed in r168043. 230517 2014-04-30 13:46:09 -0700 2014-04-30 14:24:12 -0700 Patch patch.txt text/plain 12104 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODA0MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ1IEBACisyMDE0LTA0LTMwICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBbTmV3IE11bHRpY29sdW1uXSBBU1NF UlRzIGluIGZhc3QvZHluYW1pYy9jb250aW51YXRpb24tZGV0YWNoLWNyYXNoLmh0bWwKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjM5MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbG93 VGhyZWFkOjpzZXRSZWdpb25SYW5nZUZvckJveCk6CisgICAgICAgIEFkZCBBU1NFUlRzIGluIGNh c2Ugd2UgZXZlciB0cnkgdG8gc2V0IHJlZ2lvbnMgZnJvbSB0aGUgd3JvbmcgZmxvdyB0aHJlYWQK KyAgICAgICAgYXMgcGFydCBvZiB0aGUgYm94J3MgcmVnaW9uIHJhbmdlLgorCisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6OmZsb3dUaHJlYWREZXNjZW5kYW50SW5z ZXJ0ZWQpOgorICAgICAgICBBZGQgYSBidW5jaCBvZiBjb2RlIHRoYXQgaGFuZGxlcyB0aGUgZGlz Y292ZXJ5IG9mIGEgc3BhbiBmcm9tIGFuIG91dGVyIGZsb3cgdGhyZWFkCisgICAgICAgIGJlaW5n IGluc2VydGVkIGludG8gYW4gaW5uZXIgZmxvdyB0aHJlYWQuIFRoaXMgZm9yY2VzIHVzIHRvIGRl bGV0ZSB0aGF0IHBsYWNlaG9sZGVyCisgICAgICAgIGFuZCBzaGlmdCB0aGUgb3V0ZXIgc3Bhbm5p bmcgY29udGVudCBpbnRvIHRoZSBpbm5lciBmbG93IHRocmVhZCBpbiBvcmRlciB0byBnZXQgYSBu ZXcKKyAgICAgICAgbWFwcGluZy9wbGFjZWhvbGRlciBjcmVhdGVkIGluIHRoZSBpbm5lciBmbG93 IHRocmVhZC4KKworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFk OjpmbG93VGhyZWFkUmVsYXRpdmVXaWxsQmVSZW1vdmVkKToKKyAgICAgICAgVGlnaHRlbiB0aGlz IGNvZGUgdG8gdXNlIHRoZSBwYXJlbnQoKSBqdXN0IGluIGNhc2Ugd2UgY2hhbmdlIHRoZSBpbnZh cmlhbnQgb2YKKyAgICAgICAgcGFyZW50ID0gY29udGFpbmluZ0Jsb2NrIGxhdGVyLgorCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5oOgorICAgICAgICBB ZGQgYSBzdGF0aWMgZ3VhcmQgd2hlbiBzaGlmdGluZyBhIHNwYW5uZXIgdG8gcHJldmVudCB0aGUg b3V0ZXIgZmxvdyB0aHJlYWQgZnJvbQorICAgICAgICB0aGlua2luZyB0aGUgc3Bhbm5lciBiZWxv bmdzIHRvIGl0IHdoZW4gaXQgZ2V0cyBwdW50ZWQgb3V0IG9mIHRoZSBpbm5lciBmbG93IHRocmVh ZC4KKyAgICAgICAgQSBiZXR0ZXIgbG9uZy10ZXJtIHNvbHV0aW9uIG1pZ2h0IGJlIHRvIG1ha2Ug dGhlIHNwYW5uZXIgbWFwIGdsb2JhbCBpbnN0ZWFkIG9mCisgICAgICAgIHBlci1mbG93IHRocmVh ZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNwYW5uZXJQbGFjZWhv bGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNdWx0aUNvbHVtblNwYW5uZXJQbGFj ZWhvbGRlcjo6UmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNwYW5uZXJQbGFjZWhvbGRlci5oOgorICAgICAg ICBDYWNoZSB0aGUgZmxvdyB0aHJlYWQgc28gdGhhdCB3ZSBjYW4gZ2V0IGJhY2sgdG8gaXQgaW4g b3JkZXIgdG8gZGV0ZWN0IGlmIHRoZQorICAgICAgICBwbGFjZWhvbGRlciBiZWxvbmdzIHRvIHVz IG9yIG5vdC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjppbnNlcnRlZEludG9UcmVlKToKKyAgICAgICAgTm90 aWZpY2F0aW9ucyBmcm9tIGluc2VydGVkSW50b1RyZWUgYXJlIHByb2JsZW1hdGljLCBzaW5jZSB0 aGlzIGNhbiBiZSBjYWxsZWQgZHVyaW5nCisgICAgICAgIHRoZSBsYXlvdXQgb2YgdGhlIG91dGVy IGZsb3cgdGhyZWFkIGZvciBjb250ZW50IGluc2lkZSBhbiBpbm5lciBmbG93IHRocmVhZCB0aGF0 IGlzCisgICAgICAgIG5vdCBnZXR0aW5nIGEgbGF5b3V0IHlldC4gVGhpcyBtYWtlcyB0aGUgY3Vy cmVudEZsb3dUaHJlYWQgaW4gdGhlIGZsb3cgdGhyZWFkIGNvbnRyb2xsZXIKKyAgICAgICAgaW5h Y2N1cmF0ZSwgc28gd2UgaGF2ZSB0byBhZGQgY29kZSB0byBjbGVhciBpdCBvdXQgYW5kIHB1dCBp dCBiYWNrLgorCiAyMDE0LTA0LTMwICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgogCiAgICAgICAgIFtNYWMsIGlPU10gU3VwcG9ydCBjYXB0aW9uIGFjdGl2YXRpb24gdmlhIEpT IHdlYmtpdEhhc0Nsb3NlZENhcHRpb25zIG1ldGhvZApJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcAkocmV2aXNpb24gMTY3OTY0KQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC03MzAsNyArNzMwLDcgQEAgdm9pZCBSZW5kZXJGbG93VGhyZWFkOjpjbGVhclJlbmRlckJv eFJlZwogdm9pZCBSZW5kZXJGbG93VGhyZWFkOjpzZXRSZWdpb25SYW5nZUZvckJveChjb25zdCBS ZW5kZXJCb3gqIGJveCwgUmVuZGVyUmVnaW9uKiBzdGFydFJlZ2lvbiwgUmVuZGVyUmVnaW9uKiBl bmRSZWdpb24pCiB7CiAgICAgQVNTRVJUKGhhc1JlZ2lvbnMoKSk7Ci0gICAgQVNTRVJUKHN0YXJ0 UmVnaW9uICYmIGVuZFJlZ2lvbik7CisgICAgQVNTRVJUKHN0YXJ0UmVnaW9uICYmIGVuZFJlZ2lv biAmJiBzdGFydFJlZ2lvbi0+Zmxvd1RocmVhZCgpID09IHRoaXMgJiYgZW5kUmVnaW9uLT5mbG93 VGhyZWFkKCkgPT0gdGhpcyk7CiAKICAgICBhdXRvIGl0ID0gbV9yZWdpb25SYW5nZU1hcC5maW5k KGJveCk7CiAgICAgaWYgKGl0ID09IG1fcmVnaW9uUmFuZ2VNYXAuZW5kKCkpIHsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZs b3dUaHJlYWQuY3BwCShyZXZpc2lvbiAxNjgwMjQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYs NiArMzYsOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2Jvb2wgUmVuZGVyTXVsdGlDb2x1 bW5GbG93VGhyZWFkOjpnX3NoaWZ0aW5nU3Bhbm5lciA9IGZhbHNlOworCiBSZW5kZXJNdWx0aUNv bHVtbkZsb3dUaHJlYWQ6OlJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZChEb2N1bWVudCYgZG9j dW1lbnQsIFBhc3NSZWY8UmVuZGVyU3R5bGU+IHN0eWxlKQogICAgIDogUmVuZGVyRmxvd1RocmVh ZChkb2N1bWVudCwgc3RkOjptb3ZlKHN0eWxlKSkKICAgICAsIG1fbGFzdFNldFdvcmtlZE9uKG51 bGxwdHIpCkBAIC0yNzQsNyArMjc2LDcgQEAgc3RhdGljIGJvb2wgaXNWYWxpZENvbHVtblNwYW5u ZXIoUmVuZGVyTQogCiB2b2lkIFJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZDo6Zmxvd1RocmVh ZERlc2NlbmRhbnRJbnNlcnRlZChSZW5kZXJPYmplY3QqIGRlc2NlbmRhbnQpCiB7Ci0gICAgaWYg KG1fYmVpbmdFdmFjdWF0ZWQgfHwgZGVzY2VuZGFudC0+aXNJbkZsb3dSZW5kZXJGbG93VGhyZWFk KCkpCisgICAgaWYgKGdfc2hpZnRpbmdTcGFubmVyIHx8IG1fYmVpbmdFdmFjdWF0ZWQgfHwgZGVz Y2VuZGFudC0+aXNJbkZsb3dSZW5kZXJGbG93VGhyZWFkKCkpCiAgICAgICAgIHJldHVybjsKICAg ICBSZW5kZXJPYmplY3QqIHN1YnRyZWVSb290ID0gZGVzY2VuZGFudDsKICAgICBmb3IgKDsgZGVz Y2VuZGFudDsgZGVzY2VuZGFudCA9IGRlc2NlbmRhbnQtPm5leHRJblByZU9yZGVyKHN1YnRyZWVS b290KSkgewpAQCAtMjgzLDYgKzI4NSw0MSBAQCB2b2lkIFJlbmRlck11bHRpQ29sdW1uRmxvd1Ro cmVhZDo6Zmxvd1RoCiAgICAgICAgICAgICAvLyB3aGVyZSBpdCB3b3VsZCBvdGhlcndpc2Ugb2Nj dXIgKGlmIGl0IHdlcmVuJ3QgYSBzcGFubmVyKSB0byBiZWNvbWluZyBhIHNpYmxpbmcgb2YgdGhl CiAgICAgICAgICAgICAvLyBjb2x1bW4gc2V0cy4KICAgICAgICAgICAgIFJlbmRlck11bHRpQ29s dW1uU3Bhbm5lclBsYWNlaG9sZGVyKiBwbGFjZWhvbGRlciA9IHRvUmVuZGVyTXVsdGlDb2x1bW5T cGFubmVyUGxhY2Vob2xkZXIoZGVzY2VuZGFudCk7CisgICAgICAgICAgICBpZiAocGxhY2Vob2xk ZXItPmZsb3dUaHJlYWQoKSAhPSB0aGlzKSB7CisgICAgICAgICAgICAgICAgLy8gVGhpcyBpc24n dCBvdXIgc3Bhbm5lciEgSXQgc2hpZnRlZCBoZXJlIGZyb20gYW4gYW5jZXN0b3IgbXVsdGljb2x1 bW4gYmxvY2suIEl0J3MgZ29pbmcgdG8gZW5kIHVwCisgICAgICAgICAgICAgICAgLy8gYmVjb21p bmcgb3VyIHNwYW5uZXIgaW5zdGVhZCwgYnV0IGZvciBpdCB0byBkbyB0aGF0IHdlIGZpcnN0IGhh dmUgdG8gbnVrZSB0aGUgb3JpZ2luYWwgc3Bhbm5lciwKKyAgICAgICAgICAgICAgICAvLyBhbmQg Z2V0IHRoZSBzcGFubmVyIGNvbnRlbnQgYmFjayBpbnRvIHRoaXMgZmxvdyB0aHJlYWQuCisgICAg ICAgICAgICAgICAgUmVuZGVyQm94KiBzcGFubmVyID0gcGxhY2Vob2xkZXItPnNwYW5uZXIoKTsK KworICAgICAgICAgICAgICAgIC8vIEFkdmFuY2UsIHNpbmNlIHdlJ3JlIGFib3V0IHRvIGRlbGV0 ZSB0aGUgZGVzY2VuZGFudC4KKyAgICAgICAgICAgICAgICBkZXNjZW5kYW50ID0gZGVzY2VuZGFu dC0+bmV4dEluUHJlT3JkZXIoc3VidHJlZVJvb3QpOworICAgICAgICAgICAgICAgIAorICAgICAg ICAgICAgICAgIC8vIEdldCBpbmZvIGZvciB0aGUgbW92ZSBvZiB0aGUgb3JpZ2luYWwgY29udGVu dCBiYWNrIGludG8gb3VyIGZsb3cgdGhyZWFkLgorICAgICAgICAgICAgICAgIFJlbmRlckJveE1v ZGVsT2JqZWN0KiBwbGFjZWhvbGRlclBhcmVudCA9IHRvUmVuZGVyQm94TW9kZWxPYmplY3QocGxh Y2Vob2xkZXItPnBhcmVudCgpKTsKKyAgICAgICAgICAgICAgICBSZW5kZXJPYmplY3QqIHBsYWNl aG9sZGVyTmV4dFNpYmxpbmcgPSBwbGFjZWhvbGRlci0+bmV4dFNpYmxpbmcoKTsKKyAgICAgICAg ICAgIAorICAgICAgICAgICAgICAgIC8vIFdlIGhhdmUgdG8gbnVrZSB0aGUgcGxhY2Vob2xkZXIs IHNpbmNlIHRoZSBhbmNlc3RvciBhbHJlYWR5IGxvc3QgdGhlIG1hcHBpbmcgdG8gaXQgd2hlbgor ICAgICAgICAgICAgICAgIC8vIHdlIHNoaWZ0ZWQgdGhlIHBsYWNlaG9sZGVyIGRvd24gaW50byB0 aGlzIGZsb3cgdGhyZWFkLgorICAgICAgICAgICAgICAgIHBsYWNlaG9sZGVyLT5wYXJlbnQoKS0+ cmVtb3ZlQ2hpbGQoKnBsYWNlaG9sZGVyKTsKKyAgICAgICAgICAgICAgIAorICAgICAgICAgICAg ICAgIC8vIEdldCB0aGUgYW5jZXN0b3IgbXVsdGljb2x1bW4gZmxvdyB0aHJlYWQgdG8gY2xlYW4g dXAgaXRzIG1lc3MuCisgICAgICAgICAgICAgICAgUmVuZGVyQmxvY2tGbG93KiBhbmNlc3RvckJs b2NrID0gdG9SZW5kZXJCbG9ja0Zsb3coc3Bhbm5lci0+cGFyZW50KCkpOworICAgICAgICAgICAg ICAgIGFuY2VzdG9yQmxvY2stPm11bHRpQ29sdW1uRmxvd1RocmVhZCgpLT5mbG93VGhyZWFkUmVs YXRpdmVXaWxsQmVSZW1vdmVkKHNwYW5uZXIpOworICAgICAgICAgICAgICAgIAorICAgICAgICAg ICAgICAgIC8vIE5vdyBtb3ZlIHRoZSBvcmlnaW5hbCBjb250ZW50IGludG8gb3VyIGZsb3cgdGhy ZWFkLiBJdCB3aWxsIGVuZCB1cCBjYWxsaW5nIGZsb3dUaHJlYWREZXNjZW5kYW50SW5zZXJ0ZWQK KyAgICAgICAgICAgICAgICAvLyBvbiB0aGUgbmV3IGNvbnRlbnQgb25seSwgYW5kIGV2ZXJ5dGhp bmcgd2lsbCBnZXQgc2V0IHVwIHByb3Blcmx5LgorICAgICAgICAgICAgICAgIGFuY2VzdG9yQmxv Y2stPm1vdmVDaGlsZFRvKHBsYWNlaG9sZGVyUGFyZW50LCBzcGFubmVyLCBwbGFjZWhvbGRlck5l eHRTaWJsaW5nLCB0cnVlKTsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAvLyBJ ZiB0aGUgc3Bhbm5lciB3YXMgdGhlIHN1YnRyZWUgcm9vdCwgdGhlbiB3ZSdyZSBkb25lLCBzaW5j ZSB0aGVyZSBpcyBub3RoaW5nIGVsc2UgbGVmdCB0byBpbnNlcnQuCisgICAgICAgICAgICAgICAg aWYgKCFkZXNjZW5kYW50KQorICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICAgICAgCisgICAgICAgICAgICAgICAgLy8gTm93IHRoYXQgd2UgaGF2ZSBkb25lIHRoaXMsIHdl IGNhbiBjb250aW51ZSBwYXN0IHRoZSBzcGFubmluZyBjb250ZW50LCBzaW5jZSB3ZSBhZHZhbmNl ZAorICAgICAgICAgICAgICAgIC8vIGRlc2NlbmRhbnQgYWxyZWFkeS4KKyAgICAgICAgICAgICAg ICBkZXNjZW5kYW50ID0gZGVzY2VuZGFudC0+cHJldmlvdXNJblByZU9yZGVyKHN1YnRyZWVSb290 KTsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAg IAogICAgICAgICAgICAgQVNTRVJUKCFtX3NwYW5uZXJNYXAuZ2V0KHBsYWNlaG9sZGVyLT5zcGFu bmVyKCkpKTsKICAgICAgICAgICAgIG1fc3Bhbm5lck1hcC5hZGQocGxhY2Vob2xkZXItPnNwYW5u ZXIoKSwgcGxhY2Vob2xkZXIpOwogICAgICAgICAgICAgQVNTRVJUKCFwbGFjZWhvbGRlci0+Zmly c3RDaGlsZCgpKTsgLy8gVGhlcmUgc2hvdWxkIGJlIG5vIGNoaWxkcmVuIGhlcmUsIGJ1dCBpZiB0 aGVyZSBhcmUsIHdlIG91Z2h0IHRvIHNraXAgdGhlbS4KQEAgLTMxNSw4ICszNTIsMTIgQEAgdm9p ZCBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6OmZsb3dUaAogICAgICAgICAgICAgUmVuZGVy TXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIqIHBsYWNlaG9sZGVyID0gUmVuZGVyTXVsdGlD b2x1bW5TcGFubmVyUGxhY2Vob2xkZXI6OmNyZWF0ZUFub255bW91cyh0aGlzLCB0b1JlbmRlckJv eChkZXNjZW5kYW50KSwgJmNvbnRhaW5lci0+c3R5bGUoKSk7CiAgICAgICAgICAgICBjb250YWlu ZXItPmFkZENoaWxkKHBsYWNlaG9sZGVyLCBkZXNjZW5kYW50LT5uZXh0U2libGluZygpKTsKICAg ICAgICAgICAgIGNvbnRhaW5lci0+cmVtb3ZlQ2hpbGQoKmRlc2NlbmRhbnQpOworICAgICAgICAg ICAgCisgICAgICAgICAgICAvLyBUaGlzIGlzIGEgZ3VhcmQgdG8gc3RvcCBhbiBhbmNlc3RvciBm bG93IHRocmVhZCBmcm9tIHByb2Nlc3NpbmcgdGhlIHNwYW5uZXIuCisgICAgICAgICAgICBnX3No aWZ0aW5nU3Bhbm5lciA9IHRydWU7CiAgICAgICAgICAgICBtdWx0aWNvbENvbnRhaW5lci0+UmVu ZGVyQmxvY2s6OmFkZENoaWxkKGRlc2NlbmRhbnQsIGluc2VydEJlZm9yZU11bHRpY29sQ2hpbGQp OwotCisgICAgICAgICAgICBnX3NoaWZ0aW5nU3Bhbm5lciA9IGZhbHNlOworICAgICAgICAgICAg CiAgICAgICAgICAgICAvLyBUaGUgc3Bhbm5lciBoYXMgbm93IGJlZW4gbW92ZWQgb3V0IGZyb20g dGhlIGZsb3cgdGhyZWFkLCBidXQgd2UgZG9uJ3Qgd2FudCB0bwogICAgICAgICAgICAgLy8gZXhh bWluZSBpdHMgY2hpbGRyZW4gYW55d2F5LiBUaGV5IGFyZSBhbGwgcGFydCBvZiB0aGUgc3Bhbm5l ciBhbmQgc2hvdWxkbid0IHRyaWdnZXIKICAgICAgICAgICAgIC8vIGNyZWF0aW9uIG9mIGNvbHVt biBzZXRzIG9yIGFueXRoaW5nIGxpa2UgdGhhdC4gQ29udGludWUgYXQgaXRzIG9yaWdpbmFsIHBv c2l0aW9uIGluCkBAIC0zNzksNyArNDIwLDcgQEAgdm9pZCBSZW5kZXJNdWx0aUNvbHVtbkZsb3dU aHJlYWQ6OmZsb3dUaAogCiAgICAgICAgIC8vIFRoZSBwbGFjZWhvbGRlciBtYXkgYWxyZWFkeSBo YXZlIGJlZW4gcmVtb3ZlZCwgYnV0IGlmIGl0IGhhc24ndCwgZG8gc28gbm93LgogICAgICAgICBp ZiAoUmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIqIHBsYWNlaG9sZGVyID0gbV9z cGFubmVyTWFwLmdldCh0b1JlbmRlckJveChyZWxhdGl2ZSkpKSB7Ci0gICAgICAgICAgICBwbGFj ZWhvbGRlci0+Y29udGFpbmluZ0Jsb2NrKCktPlJlbmRlckJsb2NrOjpyZW1vdmVDaGlsZCgqcGxh Y2Vob2xkZXIpOworICAgICAgICAgICAgcGxhY2Vob2xkZXItPnBhcmVudCgpLT5yZW1vdmVDaGls ZCgqcGxhY2Vob2xkZXIpOwogICAgICAgICAgICAgbV9zcGFubmVyTWFwLnJlbW92ZSh0b1JlbmRl ckJveChyZWxhdGl2ZSkpOwogICAgICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkLmgJKHJldmlzaW9u IDE2Nzk4MikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZs b3dUaHJlYWQuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ5LDYgKzE0OSw4IEBAIHByaXZhdGU6CiAg ICAgYm9vbCBtX3Byb2dyZXNzaW9uSXNJbmxpbmU7CiAgICAgYm9vbCBtX3Byb2dyZXNzaW9uSXNS ZXZlcnNlZDsKICAgICBib29sIG1fYmVpbmdFdmFjdWF0ZWQ7CisgICAgCisgICAgc3RhdGljIGJv b2wgZ19zaGlmdGluZ1NwYW5uZXI7CiB9OwogCiBSRU5ERVJfT0JKRUNUX1RZUEVfQ0FTVFMoUmVu ZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkLCBpc1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZCgp KQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU3Bhbm5l clBsYWNlaG9sZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIuY3BwCShyZXZpc2lvbiAxNjc5NjQp CisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxh Y2Vob2xkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Niw2ICs0Niw3IEBAIFJlbmRlck11bHRp Q29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyKiBSZW4KIFJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBs YWNlaG9sZGVyOjpSZW5kZXJNdWx0aUNvbHVtblNwYW5uZXJQbGFjZWhvbGRlcihSZW5kZXJNdWx0 aUNvbHVtbkZsb3dUaHJlYWQqIGZsb3dUaHJlYWQsIFJlbmRlckJveCogc3Bhbm5lciwgUGFzc1Jl ZjxSZW5kZXJTdHlsZT4gc3R5bGUpCiAgICAgOiBSZW5kZXJCb3goZmxvd1RocmVhZC0+ZG9jdW1l bnQoKSwgc3RkOjptb3ZlKHN0eWxlKSwgUmVuZGVyQm94TW9kZWxPYmplY3RGbGFnKQogICAgICwg bV9zcGFubmVyKHNwYW5uZXIpCisgICAgLCBtX2Zsb3dUaHJlYWQoZmxvd1RocmVhZCkKIHsKIH0K IApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU3Bhbm5l clBsYWNlaG9sZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyLmgJKHJldmlzaW9uIDE2Nzk2NCkKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNwYW5uZXJQbGFjZWhv bGRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00Miw2ICs0Miw3IEBAIHB1YmxpYzoKIAogICAgIHZp cnR1YWwgYm9vbCBpc1JlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyKCkgY29uc3Qg b3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQogICAgIFJlbmRlckJveCogc3Bhbm5lcigpIGNvbnN0 IHsgcmV0dXJuIG1fc3Bhbm5lcjsgfQorICAgIFJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZCog Zmxvd1RocmVhZCgpIGNvbnN0IHsgcmV0dXJuIG1fZmxvd1RocmVhZDsgfQogCiBwcml2YXRlOgog ICAgIFJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyKFJlbmRlck11bHRpQ29sdW1u Rmxvd1RocmVhZCosIFJlbmRlckJveCogc3Bhbm5lciwgUGFzc1JlZjxSZW5kZXJTdHlsZT4pOwpA QCAtNTEsNiArNTIsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgY29uc3QgY2hhciogcmVuZGVy TmFtZSgpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgUmVuZGVyQm94KiBtX3NwYW5uZXI7CisgICAg UmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkKiBtX2Zsb3dUaHJlYWQ7CiB9OwogCiBSRU5ERVJf T0JKRUNUX1RZUEVfQ0FTVFMoUmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIsIGlz UmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIoKSkKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCShyZXZpc2lvbiAxNjc5NjQpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTkyNSwxMCArMTkyNSwxNiBAQCB2b2lkIFJlbmRlck9iamVjdDo6aW5zZXJ0ZWRJbnRvVHJlZSgp CiAgICAgaWYgKCFpc0Zsb2F0aW5nKCkgJiYgcGFyZW50KCktPmNoaWxkcmVuSW5saW5lKCkpCiAg ICAgICAgIHBhcmVudCgpLT5kaXJ0eUxpbmVzRnJvbUNoYW5nZWRDaGlsZCh0aGlzKTsKICAgICAK KyAgICAvLyBXZSBoYXZlIHRvIHVuc2V0IHRoZSBjdXJyZW50IGxheW91dCBSZW5kZXJGbG93VGhy ZWFkIGhlcmUsIHNpbmNlIGluc2VydGVkSW50b1RyZWUoKSBjYW4gaGFwcGVuIGluCisgICAgLy8g dGhlIG1pZGRsZSBvZiBsYXlvdXQgYnV0IGZvciBvYmplY3RzIGluc2lkZSBhIG5lc3RlZCBmbG93 IHRocmVhZCB0aGF0IGlzIHN0aWxsIGJlaW5nIHBvcHVsYXRlZC4gVGhpcworICAgIC8vIHdpbGwg Y2F1c2UgYW4gYWNjdXJhdGUgY3Jhd2wgdG8gaGFwcGVuIGluIG9yZGVyIHRvIGVuc3VyZSB0aGF0 IHRoZSByaWdodCBmbG93IHRocmVhZCBpcyBub3RpZmllZC4KKyAgICBSZW5kZXJGbG93VGhyZWFk KiBwcmV2aW91c1RocmVhZCA9IHZpZXcoKS5mbG93VGhyZWFkQ29udHJvbGxlcigpLmN1cnJlbnRS ZW5kZXJGbG93VGhyZWFkKCk7CisgICAgdmlldygpLmZsb3dUaHJlYWRDb250cm9sbGVyKCkuc2V0 Q3VycmVudFJlbmRlckZsb3dUaHJlYWQobnVsbHB0cik7CiAgICAgaWYgKHBhcmVudCgpLT5pc1Jl bmRlckZsb3dUaHJlYWQoKSkKICAgICAgICAgdG9SZW5kZXJGbG93VGhyZWFkKHBhcmVudCgpKS0+ Zmxvd1RocmVhZERlc2NlbmRhbnRJbnNlcnRlZCh0aGlzKTsKICAgICBlbHNlIGlmIChSZW5kZXJG bG93VGhyZWFkKiBmbG93VGhyZWFkID0gcGFyZW50KCktPmZsb3dUaHJlYWRDb250YWluaW5nQmxv Y2soKSkKICAgICAgICAgZmxvd1RocmVhZC0+Zmxvd1RocmVhZERlc2NlbmRhbnRJbnNlcnRlZCh0 aGlzKTsKKyAgICB2aWV3KCkuZmxvd1RocmVhZENvbnRyb2xsZXIoKS5zZXRDdXJyZW50UmVuZGVy Rmxvd1RocmVhZChwcmV2aW91c1RocmVhZCk7CiB9CiAKIHZvaWQgUmVuZGVyT2JqZWN0Ojp3aWxs QmVSZW1vdmVkRnJvbVRyZWUoKQo=