111110 2013-02-28 13:56:35 -0800 [New Multicolumn] Change flow thread containment to be a state 2013-03-01 09:00:41 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt eric esprehn+autocc ojan.autocc WebkitBugTracker webkit.review.bot oldest_to_newest 844453 0 hyatt 2013-02-28 13:56:35 -0800 Instead of a single boolean for inside a flow thread or not, I'm changing it to be a state so that we can know if we're inside an in-flow or out-of-flow flow thread. This is important for distinguishing between the two, since in the in-flow case content can escape, so we're going to have to clear the bit and do some more work to keep it up-to-date. 844518 1 190817 hyatt 2013-02-28 15:04:40 -0800 Created attachment 190817 Patch 845197 2 190817 kling 2013-03-01 08:26:18 -0800 Comment on attachment 190817 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190817&action=review r=me > Source/WebCore/rendering/RenderObject.h:1129 > + unsigned m_flowThreadState : 2; // FlowThreadState There's a comment above about the number of remaining bits that should be updated. 845219 3 hyatt 2013-03-01 09:00:41 -0800 Landed in r144461. 190817 2013-02-28 15:04:40 -0800 2013-03-01 08:26:18 -0800 Patch patch.txt text/plain 12181 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NDM3NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQzIEBACisyMDEzLTAyLTI4ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBbTmV3IE11bHRpY29sdW1uXSBDaGFu Z2UgZmxvdyB0aHJlYWQgY29udGFpbm1lbnQgdG8gYmUgYSBzdGF0ZS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTExMAorCisgICAgICAgIENoYW5n ZSBtX2luUmVuZGVyRmxvd1RocmVhZCBmcm9tIGEgc2luZ2xlIGJpdCB0byBhbiBhY3R1YWwgc3Rh dGUuIFRoaXMKKyAgICAgICAgd2lsbCBsZXQgdXMgdHJhY2sgd2hldGhlciB3ZSdyZSBpbnNpZGUg YSBtdWx0aWNvbHVtbiAoaW4tZmxvdykgZmxvdyB0aHJlYWQKKyAgICAgICAgb3IgYSBuYW1lZCAo b3V0LW9mLWZsb3cpIGZsb3cgdGhyZWFkLiBJbiB0aGUgZm9ybWVyIGNhc2UsIHdlJ3JlIGdvaW5n IHRvIGhhdmUKKyAgICAgICAgdG8gZG8gbW9yZSB3b3JrIHRvIG1haW50YWluIHRoaXMgc3RhdGUs IGJ1dCBmb3Igbm93IEkndmUga2VwdCBhbGwgdGhlIGxvZ2ljCisgICAgICAgIHRoZSBzYW1lIGp1 c3QgZm9yIHRoZSBpbml0aWFsIGxhbmRpbmcuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBkb20vTm9kZVJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Tm9kZVJlbmRlcmluZ0NvbnRleHQ6OmNyZWF0ZVJlbmRlcmVyRm9yRWxl bWVudElmTmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVSZW5kZXJpbmdDb250ZXh0Ojpj cmVhdGVSZW5kZXJlckZvclRleHRJZk5lZWRlZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjbG9uZSk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyRmxvd1RocmVhZDo6UmVuZGVyRmxvd1RocmVhZCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlcklubGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbmxpbmU6OmNsb25l KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZDo6UmVuZGVyTXVs dGlDb2x1bW5GbG93VGhyZWFkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6c2V0Rmxvd1RocmVhZFN0YXRlSW5j bHVkaW5nRGVzY2VuZGFudHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpyZW1v dmVGcm9tUmVuZGVyRmxvd1RocmVhZFJlY3Vyc2l2ZSk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpzZXRQYXJlbnQp OgorICAgICAgICAoUmVuZGVyT2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVj dDo6aW5SZW5kZXJGbG93VGhyZWFkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6 Zmxvd1RocmVhZFN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6c2V0Rmxv d1RocmVhZFN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6UmVuZGVyT2Jq ZWN0Qml0ZmllbGRzOjpSZW5kZXJPYmplY3RCaXRmaWVsZHMpOgorICAgICAgICAoUmVuZGVyT2Jq ZWN0Qml0ZmllbGRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6UmVuZGVyT2Jq ZWN0Qml0ZmllbGRzOjpmbG93VGhyZWFkU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy T2JqZWN0OjpSZW5kZXJPYmplY3RCaXRmaWVsZHM6OnNldEZsb3dUaHJlYWRTdGF0ZSk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Vmlldzo6YWRkQ2hpbGQpOgorICAgICAgICAKIDIwMTMtMDItMjggIEthdXN0dWJoIEF0cmF3YWxr YXIgIDxrYXVzdHViaEBtb3Rvcm9sYS5jb20+CiAKICAgICAgICAgTm90aWZpY2F0aW9uLnJlcXVl c3RQZXJtaXNzaW9uIGNhbGxiYWNrIHNob3VsZCBiZSBvcHRpb25hbApJbmRleDogU291cmNlL1dl YkNvcmUvZG9tL05vZGVSZW5kZXJpbmdDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9kb20vTm9kZVJlbmRlcmluZ0NvbnRleHQuY3BwCShyZXZpc2lvbiAxNDQzNjkpCisr KyBTb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJlbmRlcmluZ0NvbnRleHQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yNjgsNyArMjY4LDcgQEAgdm9pZCBOb2RlUmVuZGVyaW5nQ29udGV4dDo6Y3JlYXRl UmVuZGVyZQogCiAgICAgLy8gTWFrZSBzdXJlIHRoZSBSZW5kZXJPYmplY3QgYWxyZWFkeSBrbm93 cyBpdCBpcyBnb2luZyB0byBiZSBhZGRlZCB0byBhIFJlbmRlckZsb3dUaHJlYWQgYmVmb3JlIHdl IHNldCB0aGUgc3R5bGUKICAgICAvLyBmb3IgdGhlIGZpcnN0IHRpbWUuIE90aGVyd2lzZSBjb2Rl IHVzaW5nIGluUmVuZGVyRmxvd1RocmVhZCgpIGluIHRoZSBzdHlsZVdpbGxDaGFuZ2UgYW5kIHN0 eWxlRGlkQ2hhbmdlIHdpbGwgZmFpbC4KLSAgICBuZXdSZW5kZXJlci0+c2V0SW5SZW5kZXJGbG93 VGhyZWFkKHBhcmVudFJlbmRlcmVyLT5pblJlbmRlckZsb3dUaHJlYWQoKSk7CisgICAgbmV3UmVu ZGVyZXItPnNldEZsb3dUaHJlYWRTdGF0ZShwYXJlbnRSZW5kZXJlci0+Zmxvd1RocmVhZFN0YXRl KCkpOwogCiAgICAgZWxlbWVudC0+c2V0UmVuZGVyZXIobmV3UmVuZGVyZXIpOwogICAgIG5ld1Jl bmRlcmVyLT5zZXRBbmltYXRhYmxlU3R5bGUobV9zdHlsZS5yZWxlYXNlKCkpOyAvLyBzZXRBbmlt YXRhYmxlU3R5bGUoKSBjYW4gZGVwZW5kIG9uIHJlbmRlcmVyKCkgYWxyZWFkeSBiZWluZyBzZXQu CkBAIC0zMTQsNyArMzE0LDcgQEAgdm9pZCBOb2RlUmVuZGVyaW5nQ29udGV4dDo6Y3JlYXRlUmVu ZGVyZQogCiAgICAgLy8gTWFrZSBzdXJlIHRoZSBSZW5kZXJPYmplY3QgYWxyZWFkeSBrbm93cyBp dCBpcyBnb2luZyB0byBiZSBhZGRlZCB0byBhIFJlbmRlckZsb3dUaHJlYWQgYmVmb3JlIHdlIHNl dCB0aGUgc3R5bGUKICAgICAvLyBmb3IgdGhlIGZpcnN0IHRpbWUuIE90aGVyd2lzZSBjb2RlIHVz aW5nIGluUmVuZGVyRmxvd1RocmVhZCgpIGluIHRoZSBzdHlsZVdpbGxDaGFuZ2UgYW5kIHN0eWxl RGlkQ2hhbmdlIHdpbGwgZmFpbC4KLSAgICBuZXdSZW5kZXJlci0+c2V0SW5SZW5kZXJGbG93VGhy ZWFkKHBhcmVudFJlbmRlcmVyLT5pblJlbmRlckZsb3dUaHJlYWQoKSk7CisgICAgbmV3UmVuZGVy ZXItPnNldEZsb3dUaHJlYWRTdGF0ZShwYXJlbnRSZW5kZXJlci0+Zmxvd1RocmVhZFN0YXRlKCkp OwogCiAgICAgUmVuZGVyT2JqZWN0KiBuZXh0UmVuZGVyZXIgPSB0aGlzLT5uZXh0UmVuZGVyZXIo KTsKICAgICB0ZXh0Tm9kZS0+c2V0UmVuZGVyZXIobmV3UmVuZGVyZXIpOwpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiAxNDQzNjkpCisrKyBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBA IC01OTEsNyArNTkxLDcgQEAgUmVuZGVyQmxvY2sqIFJlbmRlckJsb2NrOjpjbG9uZSgpIGNvbnN0 CiAgICAgICAgIC8vIGdlbmVyYXRlZCBjb250ZW50IGFkZGVkIHlldC4KICAgICAgICAgY2xvbmVC bG9jay0+c2V0Q2hpbGRyZW5JbmxpbmUoY2xvbmVCbG9jay0+Zmlyc3RDaGlsZCgpID8gY2xvbmVC bG9jay0+Zmlyc3RDaGlsZCgpLT5pc0lubGluZSgpIDogY2hpbGRyZW5JbmxpbmUoKSk7CiAgICAg fQotICAgIGNsb25lQmxvY2stPnNldEluUmVuZGVyRmxvd1RocmVhZChpblJlbmRlckZsb3dUaHJl YWQoKSk7CisgICAgY2xvbmVCbG9jay0+c2V0Rmxvd1RocmVhZFN0YXRlKGZsb3dUaHJlYWRTdGF0 ZSgpKTsKICAgICByZXR1cm4gY2xvbmVCbG9jazsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcAkocmV2aXNpb24gMTQ0MzY5KQorKysg U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01OSw3ICs1OSw3IEBAIFJlbmRlckZsb3dUaHJlYWQ6OlJlbmRlckZsb3dUaHJlYWQo RG9jdW0KICAgICAsIG1fcGFnZUxvZ2ljYWxTaXplQ2hhbmdlZChmYWxzZSkKIHsKICAgICBBU1NF UlQoZG9jdW1lbnQtPmNzc1JlZ2lvbnNFbmFibGVkKCkpOwotICAgIHNldEluUmVuZGVyRmxvd1Ro cmVhZCgpOworICAgIHNldEZsb3dUaHJlYWRTdGF0ZShJbnNpZGVPdXRPZkZsb3dUaHJlYWQpOwog fQogCiBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBSZW5kZXJGbG93VGhyZWFkOjpjcmVhdGVGbG93 VGhyZWFkU3R5bGUoUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlKQpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAJKHJldmlzaW9uIDE0NDM2OSkKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z MzUsNyArMzM1LDcgQEAgUmVuZGVySW5saW5lKiBSZW5kZXJJbmxpbmU6OmNsb25lKCkgY29ucwog ewogICAgIFJlbmRlcklubGluZSogY2xvbmVJbmxpbmUgPSBuZXcgKHJlbmRlckFyZW5hKCkpIFJl bmRlcklubGluZShub2RlKCkpOwogICAgIGNsb25lSW5saW5lLT5zZXRTdHlsZShzdHlsZSgpKTsK LSAgICBjbG9uZUlubGluZS0+c2V0SW5SZW5kZXJGbG93VGhyZWFkKGluUmVuZGVyRmxvd1RocmVh ZCgpKTsKKyAgICBjbG9uZUlubGluZS0+c2V0Rmxvd1RocmVhZFN0YXRlKGZsb3dUaHJlYWRTdGF0 ZSgpKTsKICAgICByZXR1cm4gY2xvbmVJbmxpbmU7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3Bw CShyZXZpc2lvbiAxNDQzNjkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVs dGlDb2x1bW5GbG93VGhyZWFkLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsNyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6OlJlbmRlck11 bHRpQ29sdW1uRmxvd1RocmVhZChEb2N1bWVudCogZG9jdW1lbnQpCiAgICAgOiBSZW5kZXJGbG93 VGhyZWFkKGRvY3VtZW50KQogeworICAgIHNldEZsb3dUaHJlYWRTdGF0ZShJbnNpZGVJbkZsb3dU aHJlYWQpOwogfQogCiBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6On5SZW5kZXJNdWx0aUNv bHVtbkZsb3dUaHJlYWQoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5jcHAJKHJldmlzaW9uIDE0NDM2OSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNzYsMTMgKzI3NiwxMyBAQCBib29s IFJlbmRlck9iamVjdDo6aXNIVE1MTWFycXVlZSgpIGNvbnN0CiAgICAgcmV0dXJuIG5vZGUoKSAm JiBub2RlKCktPnJlbmRlcmVyKCkgPT0gdGhpcyAmJiBub2RlKCktPmhhc1RhZ05hbWUobWFycXVl ZVRhZyk7CiB9CiAKLXZvaWQgUmVuZGVyT2JqZWN0OjpzZXRJblJlbmRlckZsb3dUaHJlYWRJbmNs dWRpbmdEZXNjZW5kYW50cyhib29sIGIpCit2b2lkIFJlbmRlck9iamVjdDo6c2V0Rmxvd1RocmVh ZFN0YXRlSW5jbHVkaW5nRGVzY2VuZGFudHMoRmxvd1RocmVhZFN0YXRlIHN0YXRlKQogewotICAg IHNldEluUmVuZGVyRmxvd1RocmVhZChiKTsKKyAgICBzZXRGbG93VGhyZWFkU3RhdGUoc3RhdGUp OwogCiAgICAgZm9yIChSZW5kZXJPYmplY3QqIGNoaWxkID0gZmlyc3RDaGlsZCgpOyBjaGlsZDsg Y2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkgewotICAgICAgICBBU1NFUlQoYiAhPSBjaGls ZC0+aW5SZW5kZXJGbG93VGhyZWFkKCkpOwotICAgICAgICBjaGlsZC0+c2V0SW5SZW5kZXJGbG93 VGhyZWFkSW5jbHVkaW5nRGVzY2VuZGFudHMoYik7CisgICAgICAgIEFTU0VSVChzdGF0ZSAhPSBj aGlsZC0+Zmxvd1RocmVhZFN0YXRlKCkpOworICAgICAgICBjaGlsZC0+c2V0Rmxvd1RocmVhZFN0 YXRlSW5jbHVkaW5nRGVzY2VuZGFudHMoc3RhdGUpOwogICAgIH0KIH0KIApAQCAtMjUwNyw3ICsy NTA3LDcgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OnJlbW92ZUZyb21SZW5kZXJGbG93VAogICAgICAg ICAgICAgY2hpbGQtPnJlbW92ZUZyb21SZW5kZXJGbG93VGhyZWFkUmVjdXJzaXZlKHJlbmRlckZs b3dUaHJlYWQpOwogICAgIH0KICAgICByZW5kZXJGbG93VGhyZWFkLT5yZW1vdmVGbG93Q2hpbGRJ bmZvKHRoaXMpOwotICAgIHNldEluUmVuZGVyRmxvd1RocmVhZChmYWxzZSk7CisgICAgc2V0Rmxv d1RocmVhZFN0YXRlKE5vdEluc2lkZUZsb3dUaHJlYWQpOwogfQogCiB2b2lkIFJlbmRlck9iamVj dDo6ZGVzdHJveUFuZENsZWFudXBBbm9ueW1vdXNXcmFwcGVycygpCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCShyZXZpc2lvbiAxNDQzNjkpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTI2NCwx MSArMjY0LDE1IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIHNldFBhcmVudChSZW5kZXJPYmplY3Qq IHBhcmVudCkKICAgICB7CiAgICAgICAgIG1fcGFyZW50ID0gcGFyZW50OwotICAgICAgICBpZiAo cGFyZW50ICYmIHBhcmVudC0+aW5SZW5kZXJGbG93VGhyZWFkKCkgJiYgIWluUmVuZGVyRmxvd1Ro cmVhZCgpKQotICAgICAgICAgICAgc2V0SW5SZW5kZXJGbG93VGhyZWFkSW5jbHVkaW5nRGVzY2Vu ZGFudHModHJ1ZSk7Ci0gICAgICAgIGVsc2UgaWYgKCFwYXJlbnQgJiYgaW5SZW5kZXJGbG93VGhy ZWFkKCkpCi0gICAgICAgICAgICBzZXRJblJlbmRlckZsb3dUaHJlYWRJbmNsdWRpbmdEZXNjZW5k YW50cyhmYWxzZSk7CisgICAgICAgIAorICAgICAgICAvLyBPbmx5IHVwZGF0ZSBpZiBvdXIgZmxv dyB0aHJlYWQgc3RhdGUgaXMgZGlmZmVyZW50IGZyb20gb3VyIG5ldyBwYXJlbnQgYW5kIGlmIHdl J3JlIG5vdCBhIFJlbmRlckZsb3dUaHJlYWQuCisgICAgICAgIC8vIEEgUmVuZGVyRmxvd1RocmVh ZCBpcyBhbHdheXMgY29uc2lkZXJlZCB0byBiZSBpbnNpZGUgaXRzZWxmLCBzbyBpdCBuZXZlciBo YXMgdG8gY2hhbmdlIGl0cyBzdGF0ZQorICAgICAgICAvLyBpbiByZXNwb25zZSB0byBwYXJlbnQg Y2hhbmdlcy4KKyAgICAgICAgRmxvd1RocmVhZFN0YXRlIG5ld1N0YXRlID0gcGFyZW50ID8gcGFy ZW50LT5mbG93VGhyZWFkU3RhdGUoKSA6IE5vdEluc2lkZUZsb3dUaHJlYWQ7CisgICAgICAgIGlm IChuZXdTdGF0ZSAhPSBmbG93VGhyZWFkU3RhdGUoKSAmJiAhaXNSZW5kZXJGbG93VGhyZWFkKCkp CisgICAgICAgICAgICBzZXRGbG93VGhyZWFkU3RhdGVJbmNsdWRpbmdEZXNjZW5kYW50cyhuZXdT dGF0ZSk7CiAgICAgfQorCiAgICAgLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vCiBwcml2YXRlOgogI2lmbmRlZiBOREVCVUcKQEAgLTQzMiwxMCArNDM2LDIyIEBAIHB1 YmxpYzoKICAgICAgICAgfQogICAgIH0KIAotICAgIGJvb2wgaW5SZW5kZXJGbG93VGhyZWFkKCkg Y29uc3QgeyByZXR1cm4gbV9iaXRmaWVsZHMuaW5SZW5kZXJGbG93VGhyZWFkKCk7IH0KLSAgICB2 b2lkIHNldEluUmVuZGVyRmxvd1RocmVhZChib29sIGIgPSB0cnVlKSB7IG1fYml0ZmllbGRzLnNl dEluUmVuZGVyRmxvd1RocmVhZChiKTsgfQorICAgIGVudW0gRmxvd1RocmVhZFN0YXRlIHsKKyAg ICAgICAgTm90SW5zaWRlRmxvd1RocmVhZCA9IDAsCisgICAgICAgIEluc2lkZU91dE9mRmxvd1Ro cmVhZCA9IDEsCisgICAgICAgIEluc2lkZUluRmxvd1RocmVhZCA9IDIsCisgICAgfTsKKworICAg IGJvb2wgaW5SZW5kZXJGbG93VGhyZWFkKCkgY29uc3QKKyAgICB7CisgICAgICAgIEZsb3dUaHJl YWRTdGF0ZSBzdGF0ZSA9IGZsb3dUaHJlYWRTdGF0ZSgpOworICAgICAgICByZXR1cm4gc3RhdGUg IT0gTm90SW5zaWRlRmxvd1RocmVhZDsKKyAgICB9CisKKyAgICB2b2lkIHNldEZsb3dUaHJlYWRT dGF0ZUluY2x1ZGluZ0Rlc2NlbmRhbnRzKEZsb3dUaHJlYWRTdGF0ZSk7CiAKLSAgICB2b2lkIHNl dEluUmVuZGVyRmxvd1RocmVhZEluY2x1ZGluZ0Rlc2NlbmRhbnRzKGJvb2wgPSB0cnVlKTsKKyAg ICBGbG93VGhyZWFkU3RhdGUgZmxvd1RocmVhZFN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9iaXRm aWVsZHMuZmxvd1RocmVhZFN0YXRlKCk7IH0KKyAgICB2b2lkIHNldEZsb3dUaHJlYWRTdGF0ZShG bG93VGhyZWFkU3RhdGUgc3RhdGUpIHsgbV9iaXRmaWVsZHMuc2V0Rmxvd1RocmVhZFN0YXRlKHN0 YXRlKTsgfQogCiAgICAgdmlydHVhbCBib29sIHJlcXVpcmVzRm9yY2VkU3R5bGVSZWNhbGNQcm9w YWdhdGlvbigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKQEAgLTEwNDMsNiArMTA1OSw3IEBA IHByaXZhdGU6CiAgICAgICAgICAgICBJc091dE9mRmxvd1Bvc2l0aW9uZWQgPSAyLAogICAgICAg ICAgICAgSXNTdGlja3lQb3NpdGlvbmVkID0gMwogICAgICAgICB9OworCiAgICAgcHVibGljOgog ICAgICAgICBSZW5kZXJPYmplY3RCaXRmaWVsZHMoTm9kZSogbm9kZSkKICAgICAgICAgICAgIDog bV9uZWVkc0xheW91dChmYWxzZSkKQEAgLTEwNjYsMTEgKzEwODMsMTEgQEAgcHJpdmF0ZToKICAg ICAgICAgICAgICwgbV9oYXNSZWZsZWN0aW9uKGZhbHNlKQogICAgICAgICAgICAgLCBtX2hhc0Nv dW50ZXJOb2RlTWFwKGZhbHNlKQogICAgICAgICAgICAgLCBtX2V2ZXJIYWRMYXlvdXQoZmFsc2Up Ci0gICAgICAgICAgICAsIG1faW5SZW5kZXJGbG93VGhyZWFkKGZhbHNlKQogICAgICAgICAgICAg LCBtX2NoaWxkcmVuSW5saW5lKGZhbHNlKQogICAgICAgICAgICAgLCBtX2hhc0NvbHVtbnMoZmFs c2UpCiAgICAgICAgICAgICAsIG1fcG9zaXRpb25lZFN0YXRlKElzU3RhdGljbHlQb3NpdGlvbmVk KQogICAgICAgICAgICAgLCBtX3NlbGVjdGlvblN0YXRlKFNlbGVjdGlvbk5vbmUpCisgICAgICAg ICAgICAsIG1fZmxvd1RocmVhZFN0YXRlKE5vdEluc2lkZUZsb3dUaHJlYWQpCiAgICAgICAgIHsK ICAgICAgICAgfQogICAgICAgICAKQEAgLTExMDIsMTAgKzExMTksNiBAQCBwcml2YXRlOgogICAg ICAgICBBRERfQk9PTEVBTl9CSVRGSUVMRChoYXNDb3VudGVyTm9kZU1hcCwgSGFzQ291bnRlck5v ZGVNYXApOwogICAgICAgICBBRERfQk9PTEVBTl9CSVRGSUVMRChldmVySGFkTGF5b3V0LCBFdmVy SGFkTGF5b3V0KTsKIAotICAgICAgICAvLyBUaGVzZSBiaXRmaWVsZHMgYXJlIG1vdmVkIGhlcmUg ZnJvbSBzdWJjbGFzc2VzIHRvIHBhY2sgdGhlbSB0b2dldGhlci4KLSAgICAgICAgLy8gZnJvbSBS ZW5kZXJGbG93VGhyZWFkCi0gICAgICAgIEFERF9CT09MRUFOX0JJVEZJRUxEKGluUmVuZGVyRmxv d1RocmVhZCwgSW5SZW5kZXJGbG93VGhyZWFkKTsKLQogICAgICAgICAvLyBmcm9tIFJlbmRlckJs b2NrCiAgICAgICAgIEFERF9CT09MRUFOX0JJVEZJRUxEKGNoaWxkcmVuSW5saW5lLCBDaGlsZHJl bklubGluZSk7CiAgICAgICAgIEFERF9CT09MRUFOX0JJVEZJRUxEKGhhc0NvbHVtbnMsIEhhc0Nv bHVtbnMpOwpAQCAtMTExMyw2ICsxMTI2LDcgQEAgcHJpdmF0ZToKICAgICBwcml2YXRlOgogICAg ICAgICB1bnNpZ25lZCBtX3Bvc2l0aW9uZWRTdGF0ZSA6IDI7IC8vIFBvc2l0aW9uZWRTdGF0ZQog ICAgICAgICB1bnNpZ25lZCBtX3NlbGVjdGlvblN0YXRlIDogMzsgLy8gU2VsZWN0aW9uU3RhdGUK KyAgICAgICAgdW5zaWduZWQgbV9mbG93VGhyZWFkU3RhdGUgOiAyOyAvLyBGbG93VGhyZWFkU3Rh dGUKIAogICAgIHB1YmxpYzoKICAgICAgICAgYm9vbCBpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSBj b25zdCB7IHJldHVybiBtX3Bvc2l0aW9uZWRTdGF0ZSA9PSBJc091dE9mRmxvd1Bvc2l0aW9uZWQ7 IH0KQEAgLTExMjksNiArMTE0Myw5IEBAIHByaXZhdGU6CiAKICAgICAgICAgQUxXQVlTX0lOTElO RSBTZWxlY3Rpb25TdGF0ZSBzZWxlY3Rpb25TdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19j YXN0PFNlbGVjdGlvblN0YXRlPihtX3NlbGVjdGlvblN0YXRlKTsgfQogICAgICAgICBBTFdBWVNf SU5MSU5FIHZvaWQgc2V0U2VsZWN0aW9uU3RhdGUoU2VsZWN0aW9uU3RhdGUgc2VsZWN0aW9uU3Rh dGUpIHsgbV9zZWxlY3Rpb25TdGF0ZSA9IHNlbGVjdGlvblN0YXRlOyB9CisgICAgICAgIAorICAg ICAgICBBTFdBWVNfSU5MSU5FIEZsb3dUaHJlYWRTdGF0ZSBmbG93VGhyZWFkU3RhdGUoKSBjb25z dCB7IHJldHVybiBzdGF0aWNfY2FzdDxGbG93VGhyZWFkU3RhdGU+KG1fZmxvd1RocmVhZFN0YXRl KTsgfQorICAgICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgc2V0Rmxvd1RocmVhZFN0YXRlKEZsb3dU aHJlYWRTdGF0ZSBmbG93VGhyZWFkU3RhdGUpIHsgbV9mbG93VGhyZWFkU3RhdGUgPSBmbG93VGhy ZWFkU3RhdGU7IH0KICAgICB9OwogCiAjdW5kZWYgQUREX0JPT0xFQU5fQklURklFTEQKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAJKHJldmlzaW9uIDE0NDM2OSkK KysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTYzLDcgKzE2Myw3IEBAIHZvaWQgUmVuZGVyVmlldzo6YWRkQ2hpbGQoUmVuZGVyT2Jq ZWN0KiAKICAgICBpZiAobmV3Q2hpbGQgJiYgIW5ld0NoaWxkLT5pc1JlbmRlckZsb3dUaHJlYWQo KSkgewogICAgICAgICBSZW5kZXJCb3gqIHNlYW1sZXNzQm94ID0gZW5jbG9zaW5nU2VhbWxlc3NS ZW5kZXJlcihkb2N1bWVudCgpKTsKICAgICAgICAgaWYgKHNlYW1sZXNzQm94ICYmIHNlYW1sZXNz Qm94LT5pblJlbmRlckZsb3dUaHJlYWQoKSkKLSAgICAgICAgICAgIG5ld0NoaWxkLT5zZXRJblJl bmRlckZsb3dUaHJlYWQoKTsKKyAgICAgICAgICAgIG5ld0NoaWxkLT5zZXRGbG93VGhyZWFkU3Rh dGUoc2VhbWxlc3NCb3gtPmZsb3dUaHJlYWRTdGF0ZSgpKTsKICAgICB9CiAgICAgUmVuZGVyQmxv Y2s6OmFkZENoaWxkKG5ld0NoaWxkLCBiZWZvcmVDaGlsZCk7CiB9Cg==