94945 2012-08-24 09:34:44 -0700 [New Multicolumn] Plumbing to prepare for painting and hit testing implementation 2012-08-24 10:48:54 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt dglazkov eric peter+ews webkit.review.bot oldest_to_newest 704160 0 hyatt 2012-08-24 09:34:44 -0700 Plumbing to prepare for painting and hit testing implementation. 704171 1 160438 hyatt 2012-08-24 09:42:17 -0700 Created attachment 160438 Patch 704174 2 webkit.review.bot 2012-08-24 09:44:02 -0700 Attachment 160438 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/rendering/RenderRegion.h:101: Missing space inside { }. [whitespace/braces] [5] Source/WebCore/rendering/RenderMultiColumnFlowThread.h:42: Missing space inside { }. [whitespace/braces] [5] Source/WebCore/rendering/RenderRegionSet.cpp:27: Found other header before a header this file implements. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] Total errors found: 3 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 704181 3 160438 mitz 2012-08-24 09:50:07 -0700 Comment on attachment 160438 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160438&action=review > Source/WebCore/rendering/RenderMultiColumnSet.cpp:172 > - if (!columnCount()) > + unsigned colCount = columnCount(); > + if (!colCount) ? 704208 4 160438 peter+ews 2012-08-24 10:18:20 -0700 Comment on attachment 160438 Patch Attachment 160438 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/13600200 704217 5 160438 buildbot 2012-08-24 10:27:04 -0700 Comment on attachment 160438 Patch Attachment 160438 did not pass win-ews (win): Output: http://queues.webkit.org/results/13600201 704235 6 hyatt 2012-08-24 10:48:54 -0700 Fixed in r126602. 160438 2012-08-24 09:42:17 -0700 2012-08-24 10:27:04 -0700 Patch patch.txt text/plain 14779 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNjU4OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDY3IEBACisyMDEyLTA4LTI0ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBbTmV3IE11bHRpY29sdW1uXSBQbHVt YmluZyB0byBwcmVwYXJlIGZvciBjb250ZW50cyBwYWludGluZyBhbmQgaGl0IHRlc3RpbmcgaW1w bGVtZW50YXRpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05NDk0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1ha2Ugc29tZSBpbXByb3ZlbWVudHMgdG8gaG93IGNvbHVtbiBzZXRzIGludGVyYWN0IHdp dGggZmxvdyB0aHJlYWRzLiBNYWtlIHN1cmUgdGhlIGxhc3QgY29sdW1uIHNldAorICAgICAgICBh bHdheXMgZXhwYW5kcyB0byBob2xkIGFsbCBvZiB0aGUgcmVtYWluaW5nIGZsb3cgdGhyZWFkIGNv bnRlbnRzIChpbmNsdWRpbmcgb3ZlcmZsb3cpLiBSZW5hbWUgdGhlCisgICAgICAgIGNvbHVtbiBo ZWlnaHQsIGNvdW50IGFuZCB3aWR0aCB2YXJpYWJsZXMgdG8gaGF2ZSAiY29tcHV0ZWQiIGluIGZy b250IG9mIHRoZW0gdG8gaW5kaWNhdGUgdGhhdCB0aGV5CisgICAgICAgIGp1c3QgcmVwcmVzZW50 IHdoYXQgdGhlIG11bHRpLWNvbHVtbiBhbGdvcml0aG0gY29tcHV0ZWQgc28gdGhhdCB0aGVyZSBp cyBubyBjb25mdXNpb24gYmV0d2VlbiB0aGUKKyAgICAgICAgY29tcHV0ZWQgY29sdW1uIGNvdW50 IGFuZCB0aGUgYWN0dWFsIG51bWJlciBvZiBjb2x1bW5zIGluIHRoZSBzZXQuCisgICAgICAgIAor ICAgICAgICBJbXBsZW1lbnQgdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBhY3R1YWwgY29sdW1uIGNv dW50IGJhc2VkIG9mZiB0aGUgbG9naWNhbCBoZWlnaHQgb2YgdGhlIGZsb3cgdGhyZWFkCisgICAg ICAgIHBvcnRpb24gY29udGFpbmVkIHdpdGhpbiB0aGUgY29sdW1uIHNldC4KKyAgICAgICAgCisg ICAgICAgIEZpeCBnYXAgcGFpbnRpbmcgdG8gdXNlIHRoZSBhY3R1YWwgY29sdW1uIGNvdW50IHJh dGhlciB0aGFuIHRoZSBjb21wdXRlZCBjb2x1bW4gY291bnQuCisgCisgICAgICAgIE5vIG5ldyB0 ZXN0cyAoT09QUyEpLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxvd1RocmVhZDo6bGF5b3V0KToKKyAgICAgICAg QWZ0ZXIgYSBmbG93IHRocmVhZCBpcyBkb25lIGxheWluZyBvdXQsIGhhdmUgaXQgdGVsbCB0aGUg bGFzdCByZWdpb24gdG8gZXhwYW5kIHRvCisgICAgICAgIGVuY29tcGFzcyBhbGwgdGhlIHJlbWFp bmluZyBjb250ZW50cyBpZiBpdCB3YW50cyB0byBkbyBzby4gQ29sdW1uIGFuZCBwYWdlIHNldHMg d2lsbCBhbHdheXMgZG8gdGhpcy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNv bHVtbkZsb3dUaHJlYWQuaDoKKyAgICAgICAgKFJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZCk6 CisgICAgICAgIE92ZXJyaWRlIGNvbXB1dGVMb2dpY2FsSGVpZ2h0KCkgdG8gZG8gbm90aGluZy4g V2Ugd2FudCB0aGUgZmxvdyB0aHJlYWQgdG8ganVzdCBrZWVwIGl0cyBpbnRyaW5zaWMKKyAgICAg ICAgaGVpZ2h0LCBzaW5jZXQgdGhlIGxhc3QgY29sdW1uIHNldCBpcyBhbHdheXMgZ29pbmcgdG8g ZXhwYW5kIHRvIGVuY29tcGFzcyB0aGUgZmxvdyB0aHJlYWQncyBjb250ZW50cworICAgICAgICBh bnl3YXkuIFVubGlrZSBDU1MgUmVnaW9ucywgd2UgZG9uJ3QgZXZlciAicnVuIG91dCBvZiByb29t LiIKKyAgICAgICAgCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU2V0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uU2V0OjpSZW5kZXJNdWx0aUNv bHVtblNldCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNdWx0aUNvbHVtblNldDo6Y29tcHV0 ZUxvZ2ljYWxXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNdWx0aUNvbHVtblNldDo6 Y29tcHV0ZUxvZ2ljYWxIZWlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1 bW5TZXQ6OmNvbHVtbkNvdW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1u U2V0Ojpjb2x1bW5SZWN0QXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5T ZXQ6OnBhaW50Q29sdW1uUnVsZXMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1 bW5TZXQ6OnBhaW50Q29sdW1uQ29udGVudHMpOgorICAgICAgICBSZW5hbWUgY291bnQsIHdpZHRo IGFuZCBoZWlnaHQgZm9yIGNvbHVtbnMgdG8gaGF2ZSAiY29tcHV0ZWQiIGluIGZyb250IG9mIHRo ZSBtZW1iZXJzIGFuZCBmdW5jdGlvbnMuCisgICAgICAgIEluIHBhcnRpY3VsYXIsIHRoaXMgbGV0 cyB1cyBkaXN0aW5ndWlzaCB0aGUgY29tcHV0ZWQgY29sdW1uIGNvdW50IGZyb20gdGhlIGFjdHVh bCBjb2x1bW4gY291bnQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5T ZXQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uU2V0Ojpjb21wdXRlZENv bHVtbkNvdW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uU2V0Ojpjb21w dXRlZENvbHVtbldpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uU2V0 Ojpjb21wdXRlZENvbHVtbkhlaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNdWx0aUNv bHVtblNldDo6c2V0Q29tcHV0ZWRDb2x1bW5XaWR0aEFuZENvdW50KToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlck11bHRpQ29sdW1uU2V0OjpzZXRDb21wdXRlZENvbHVtbkhlaWdodCk6CisgICAg ICAgIFJlbmFtZSBjb3VudCwgd2lkdGggYW5kIGhlaWdodCBmb3IgY29sdW1ucyB0byBoYXZlICJj b21wdXRlZCIgaW4gZnJvbnQgb2YgdGhlIG1lbWJlcnMgYW5kIGZ1bmN0aW9ucy4KKyAgICAgICAg SW4gcGFydGljdWxhciwgdGhpcyBsZXRzIHVzIGRpc3Rpbmd1aXNoIHRoZSBjb21wdXRlZCBjb2x1 bW4gY291bnQgZnJvbSB0aGUgYWN0dWFsIGNvbHVtbiBjb3VudC4KKyAgICAgICAgCisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlclJlZ2lvbi5oOgorICAgICAgICAoUmVuZGVyUmVnaW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclJlZ2lvbjo6ZXhwYW5kVG9FbmNvbXBhc3NGbG93VGhyZWFk Q29udGVudHNJZk5lZWRlZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJlZ2lvblNldC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZWdpb25TZXQ6OmV4cGFuZFRvRW5jb21wYXNz Rmxvd1RocmVhZENvbnRlbnRzSWZOZWVkZWQpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlclJlZ2lvblNldC5oOgorICAgICAgICAoUmVuZGVyUmVnaW9uU2V0 KToKKyAgICAgICAgTWFrZSBzdXJlIHJlZ2lvbiBzZXRzIGV4cGFuZCB0byBlbmNvbXBhc3MgYWxs IHRoZSByZW1haW5pbmcgZmxvdyB0aHJlYWQgY29udGVudHMuIFdlIGFyZSBhbHdheXMKKyAgICAg ICAgYWJsZSB0byBnZW5lcmF0ZSBtb3JlIGNvbHVtbnMgb3IgcGFnZXMsIHNvIGluIGVmZmVjdCB0 aGUgYW1vdW50IG9mIHRoZSBmbG93IHRocmVhZCB3ZSBjYW4KKyAgICAgICAgY29uc3VtZSBpcyB1 bmxpbWl0ZWQuCisKKwogMjAxMi0wOC0yNCAgSm9zaHVhIE5ldHRlcmZpZWxkICA8am5ldHRlcmZp ZWxkQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEV4dGVuZCBMYXllckZpbHRlclJl bmRlcmVyIGluIHByZXBhcmF0aW9uIGZvciBDU1MgU2hhZGVycwpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcAkocmV2aXNpb24gMTI2MDUzKQor KysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMDgsNiArMjA4LDkgQEAgdm9pZCBSZW5kZXJGbG93VGhyZWFkOjpsYXlvdXQo KQogICAgIAogICAgIGlmIChzaG91bGREaXNwYXRjaFJlZ2lvbkxheW91dFVwZGF0ZUV2ZW50KCkp CiAgICAgICAgIGRpc3BhdGNoUmVnaW9uTGF5b3V0VXBkYXRlRXZlbnQoKTsKKyAgICAgICAgCisg ICAgaWYgKGxhc3RSZWdpb24oKSkKKyAgICAgICAgbGFzdFJlZ2lvbigpLT5leHBhbmRUb0VuY29t cGFzc0Zsb3dUaHJlYWRDb250ZW50c0lmTmVlZGVkKCk7CiB9CiAKIHZvaWQgUmVuZGVyRmxvd1Ro cmVhZDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aCgpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5oCShyZXZpc2lvbiAx MjYwNTMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93 VGhyZWFkLmgJKHdvcmtpbmcgY29weSkKQEAgLTM4LDYgKzM4LDggQEAgcHVibGljOgogCiBwcml2 YXRlOgogICAgIHZpcnR1YWwgY29uc3QgY2hhciogcmVuZGVyTmFtZSgpIGNvbnN0IE9WRVJSSURF OworICAgIAorICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlTG9naWNhbEhlaWdodCgpIE9WRVJSSURF IHt9OyAvLyBXZSBzaW1wbHkgcmVtYWluIGF0IG91ciBpbnRyaW5zaWMgaGVpZ2h0LgogfTsKIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck11bHRpQ29sdW1uU2V0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwCShyZXZpc2lvbiAxMjYxNzcpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zMyw5ICszMyw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogUmVuZGVyTXVsdGlD b2x1bW5TZXQ6OlJlbmRlck11bHRpQ29sdW1uU2V0KE5vZGUqIG5vZGUsIFJlbmRlckZsb3dUaHJl YWQqIGZsb3dUaHJlYWQpCiAgICAgOiBSZW5kZXJSZWdpb25TZXQobm9kZSwgZmxvd1RocmVhZCkK LSAgICAsIG1fY29sdW1uQ291bnQoMSkKLSAgICAsIG1fY29sdW1uV2lkdGgoWkVST19MQVlPVVRf VU5JVCkKLSAgICAsIG1fY29sdW1uSGVpZ2h0KFpFUk9fTEFZT1VUX1VOSVQpCisgICAgLCBtX2Nv bXB1dGVkQ29sdW1uQ291bnQoMSkKKyAgICAsIG1fY29tcHV0ZWRDb2x1bW5XaWR0aChaRVJPX0xB WU9VVF9VTklUKQorICAgICwgbV9jb21wdXRlZENvbHVtbkhlaWdodChaRVJPX0xBWU9VVF9VTklU KQogewogfQogCkBAIC00OSwxNyArNDksMTcgQEAgdm9pZCBSZW5kZXJNdWx0aUNvbHVtblNldDo6 Y29tcHV0ZUxvZ2ljYQogICAgIHNldExvZ2ljYWxXaWR0aChwYXJlbnRCb3goKS0+Y29udGVudExv Z2ljYWxXaWR0aCgpKTsKICAgICAKICAgICBSZW5kZXJNdWx0aUNvbHVtbkJsb2NrKiBwYXJlbnRC bG9jayA9IHRvUmVuZGVyTXVsdGlDb2x1bW5CbG9jayhwYXJlbnQoKSk7Ci0gICAgc2V0Q29sdW1u V2lkdGhBbmRDb3VudChwYXJlbnRCbG9jay0+Y29sdW1uV2lkdGgoKSwgcGFyZW50QmxvY2stPmNv bHVtbkNvdW50KCkpOyAvLyBGSVhNRTogVGhpcyB3aWxsIGV2ZW50dWFsbHkgdmFyeSBpZiB3ZSBh cmUgY29udGFpbmVkIGluc2lkZSByZWdpb25zLgorICAgIHNldENvbXB1dGVkQ29sdW1uV2lkdGhB bmRDb3VudChwYXJlbnRCbG9jay0+Y29sdW1uV2lkdGgoKSwgcGFyZW50QmxvY2stPmNvbHVtbkNv dW50KCkpOyAvLyBGSVhNRTogVGhpcyB3aWxsIGV2ZW50dWFsbHkgdmFyeSBpZiB3ZSBhcmUgY29u dGFpbmVkIGluc2lkZSByZWdpb25zLgogfQogCiB2b2lkIFJlbmRlck11bHRpQ29sdW1uU2V0Ojpj b21wdXRlTG9naWNhbEhlaWdodCgpCiB7CiAgICAgLy8gTWFrZSBzdXJlIG91ciBjb2x1bW4gaGVp Z2h0IGlzIHVwIHRvIGRhdGUuCiAgICAgUmVuZGVyTXVsdGlDb2x1bW5CbG9jayogcGFyZW50Qmxv Y2sgPSB0b1JlbmRlck11bHRpQ29sdW1uQmxvY2socGFyZW50KCkpOwotICAgIHNldENvbHVtbkhl aWdodChwYXJlbnRCbG9jay0+Y29sdW1uSGVpZ2h0KCkpOyAvLyBGSVhNRTogT25jZSB3ZSBtYWtl IG1vcmUgdGhhbiBvbmUgY29sdW1uIHNldCwgdGhpcyB3aWxsIGJlY29tZSB2YXJpYWJsZS4KKyAg ICBzZXRDb21wdXRlZENvbHVtbkhlaWdodChwYXJlbnRCbG9jay0+Y29sdW1uSGVpZ2h0KCkpOyAv LyBGSVhNRTogT25jZSB3ZSBtYWtlIG1vcmUgdGhhbiBvbmUgY29sdW1uIHNldCwgdGhpcyB3aWxs IGJlY29tZSB2YXJpYWJsZS4KICAgICAKICAgICAvLyBPdXIgbG9naWNhbCBoZWlnaHQgaXMgYWx3 YXlzIGp1c3QgdGhlIGhlaWdodCBvZiBvdXIgY29sdW1ucy4KLSAgICBzZXRMb2dpY2FsSGVpZ2h0 KGNvbHVtbkhlaWdodCgpKTsKKyAgICBzZXRMb2dpY2FsSGVpZ2h0KGNvbXB1dGVkQ29sdW1uSGVp Z2h0KCkpOwogfQogCiBMYXlvdXRVbml0IFJlbmRlck11bHRpQ29sdW1uU2V0Ojpjb2x1bW5HYXAo KSBjb25zdApAQCAtNjksMTAgKzY5LDIwIEBAIExheW91dFVuaXQgUmVuZGVyTXVsdGlDb2x1bW5T ZXQ6OmNvbHVtbkcKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8aW50PihzdHlsZSgpLT5jb2x1bW5H YXAoKSk7CiB9CiAKK3Vuc2lnbmVkIFJlbmRlck11bHRpQ29sdW1uU2V0Ojpjb2x1bW5Db3VudCgp IGNvbnN0Cit7CisgICAgaWYgKCFjb21wdXRlZENvbHVtbkhlaWdodCgpKQorICAgICAgICByZXR1 cm4gMDsKKyAgICAKKyAgICAvLyBPdXIgcmVnaW9uIHJlY3QgZGV0ZXJtaW5lcyBvdXIgY29sdW1u IGNvdW50LiBXZSBoYXZlIGFzIG1hbnkgY29sdW1ucyBhcyBuZWVkZWQgdG8gZml0IGFsbCB0aGUg Y29udGVudC4KKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRJbkNvbHVtbnMgPSBmbG93VGhy ZWFkKCktPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyByZWdpb25SZWN0KCkuaGVpZ2h0KCkg OiByZWdpb25SZWN0KCkud2lkdGgoKTsKKyAgICByZXR1cm4gY2VpbChsb2dpY2FsSGVpZ2h0SW5D b2x1bW5zIC8gY29tcHV0ZWRDb2x1bW5IZWlnaHQoKSk7Cit9CisKIExheW91dFJlY3QgUmVuZGVy TXVsdGlDb2x1bW5TZXQ6OmNvbHVtblJlY3RBdCh1bnNpZ25lZCBpbmRleCkgY29uc3QKIHsKLSAg ICBMYXlvdXRVbml0IGNvbExvZ2ljYWxXaWR0aCA9IGNvbHVtbldpZHRoKCk7Ci0gICAgTGF5b3V0 VW5pdCBjb2xMb2dpY2FsSGVpZ2h0ID0gY29sdW1uSGVpZ2h0KCk7CisgICAgTGF5b3V0VW5pdCBj b2xMb2dpY2FsV2lkdGggPSBjb21wdXRlZENvbHVtbldpZHRoKCk7CisgICAgTGF5b3V0VW5pdCBj b2xMb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZWRDb2x1bW5IZWlnaHQoKTsKICAgICBMYXlvdXRVbml0 IGNvbExvZ2ljYWxUb3AgPSBib3JkZXJCZWZvcmUoKSArIHBhZGRpbmdCZWZvcmUoKTsKICAgICBM YXlvdXRVbml0IGNvbExvZ2ljYWxMZWZ0ID0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxMZWZ0KCk7 CiAgICAgaW50IGNvbEdhcCA9IGNvbHVtbkdhcCgpOwpAQCAtMTE2LDYgKzEyNiw4IEBAIHZvaWQg UmVuZGVyTXVsdGlDb2x1bW5TZXQ6OnBhaW50Q29sdW1uUnUKICAgICAgICAgcmV0dXJuOwogCiAg ICAgdW5zaWduZWQgY29sQ291bnQgPSBjb2x1bW5Db3VudCgpOworICAgIGlmIChjb2xDb3VudCA8 PSAxKQorICAgICAgICByZXR1cm47CiAKICAgICBib29sIGFudGlhbGlhcyA9IHNob3VsZEFudGlh bGlhc0xpbmVzKHBhaW50SW5mby5jb250ZXh0KTsKIApAQCAtMTIzLDcgKzEzNSw3IEBAIHZvaWQg UmVuZGVyTXVsdGlDb2x1bW5TZXQ6OnBhaW50Q29sdW1uUnUKICAgICBMYXlvdXRVbml0IGN1cnJM b2dpY2FsTGVmdE9mZnNldCA9IGxlZnRUb1JpZ2h0ID8gWkVST19MQVlPVVRfVU5JVCA6IGNvbnRl bnRMb2dpY2FsV2lkdGgoKTsKICAgICBMYXlvdXRVbml0IHJ1bGVBZGQgPSBib3JkZXJBbmRQYWRk aW5nTG9naWNhbExlZnQoKTsKICAgICBMYXlvdXRVbml0IHJ1bGVMb2dpY2FsTGVmdCA9IGxlZnRU b1JpZ2h0ID8gWkVST19MQVlPVVRfVU5JVCA6IGNvbnRlbnRMb2dpY2FsV2lkdGgoKTsKLSAgICBM YXlvdXRVbml0IGlubGluZURpcmVjdGlvblNpemUgPSBjb2x1bW5XaWR0aCgpOworICAgIExheW91 dFVuaXQgaW5saW5lRGlyZWN0aW9uU2l6ZSA9IGNvbXB1dGVkQ29sdW1uV2lkdGgoKTsKICAgICBC b3hTaWRlIGJveFNpZGUgPSBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpCiAgICAgICAgID8gbGVm dFRvUmlnaHQgPyBCU0xlZnQgOiBCU1JpZ2h0CiAgICAgICAgIDogbGVmdFRvUmlnaHQgPyBCU1Rv cCA6IEJTQm90dG9tOwpAQCAtMTUyLDEzICsxNjQsMTQgQEAgdm9pZCBSZW5kZXJNdWx0aUNvbHVt blNldDo6cGFpbnRDb2x1bW5SdQogICAgIH0KIH0KIAotdm9pZCBSZW5kZXJNdWx0aUNvbHVtblNl dDo6cGFpbnRDb2x1bW5Db250ZW50cyhQYWludEluZm8mIC8qIHBhaW50SW5mbyAqLywgY29uc3Qg TGF5b3V0UG9pbnQmIC8qIHBhaW50T2Zmc2V0ICovKQordm9pZCBSZW5kZXJNdWx0aUNvbHVtblNl dDo6cGFpbnRDb2x1bW5Db250ZW50cyhQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0 UG9pbnQmIHBhaW50T2Zmc2V0KQogewogICAgIC8vIEZvciBlYWNoIHJlY3RhbmdsZSwgc2V0IGl0 IGFzIHRoZSByZWdpb24gcmVjdGFuZ2xlIGFuZCB0aGVuIGxldCBmbG93IHRocmVhZCBwYWludGlu ZyBkbyB0aGUgcmVzdC4KICAgICAvLyBXZSBtYWtlIG11bHRpcGxlIGNhbGxzIHRvIHBhaW50SW50 b1JlZ2lvbiwgY2hhbmdpbmcgdGhlIHJlY3RhbmdsZXMgZWFjaCB0aW1lLgotICAgIGlmICghY29s dW1uQ291bnQoKSkKKyAgICB1bnNpZ25lZCBjb2xDb3VudCA9IGNvbHVtbkNvdW50KCk7CisgICAg aWYgKCFjb2xDb3VudCkKICAgICAgICAgcmV0dXJuOwotICAgICAgICAKKwogICAgIC8vIEZJWE1F OiBJbXBsZW1lbnQuCiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJN dWx0aUNvbHVtblNldC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJNdWx0aUNvbHVtblNldC5oCShyZXZpc2lvbiAxMjYxNzcpCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuaAkod29ya2luZyBjb3B5KQpAQCAtNDcs MTggKzQ3LDE4IEBAIHB1YmxpYzoKICAgICAKICAgICB2aXJ0dWFsIGJvb2wgaXNSZW5kZXJNdWx0 aUNvbHVtblNldCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIHRydWU7IH0KIAotICAgIHVuc2ln bmVkIGNvbHVtbkNvdW50KCkgY29uc3QgeyByZXR1cm4gbV9jb2x1bW5Db3VudDsgfQotICAgIExh eW91dFVuaXQgY29sdW1uV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2NvbHVtbldpZHRoOyB9Ci0g ICAgTGF5b3V0VW5pdCBjb2x1bW5IZWlnaHQoKSBjb25zdCB7IHJldHVybiBtX2NvbHVtbkhlaWdo dDsgfQorICAgIHVuc2lnbmVkIGNvbXB1dGVkQ29sdW1uQ291bnQoKSBjb25zdCB7IHJldHVybiBt X2NvbXB1dGVkQ29sdW1uQ291bnQ7IH0KKyAgICBMYXlvdXRVbml0IGNvbXB1dGVkQ29sdW1uV2lk dGgoKSBjb25zdCB7IHJldHVybiBtX2NvbXB1dGVkQ29sdW1uV2lkdGg7IH0KKyAgICBMYXlvdXRV bml0IGNvbXB1dGVkQ29sdW1uSGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV9jb21wdXRlZENvbHVt bkhlaWdodDsgfQogCi0gICAgdm9pZCBzZXRDb2x1bW5XaWR0aEFuZENvdW50KExheW91dFVuaXQg d2lkdGgsIHVuc2lnbmVkIGNvdW50KQorICAgIHZvaWQgc2V0Q29tcHV0ZWRDb2x1bW5XaWR0aEFu ZENvdW50KExheW91dFVuaXQgd2lkdGgsIHVuc2lnbmVkIGNvdW50KQogICAgIHsKLSAgICAgICAg bV9jb2x1bW5XaWR0aCA9IHdpZHRoOwotICAgICAgICBtX2NvbHVtbkNvdW50ID0gY291bnQ7Cisg ICAgICAgIG1fY29tcHV0ZWRDb2x1bW5XaWR0aCA9IHdpZHRoOworICAgICAgICBtX2NvbXB1dGVk Q29sdW1uQ291bnQgPSBjb3VudDsKICAgICB9Ci0gICAgdm9pZCBzZXRDb2x1bW5IZWlnaHQoTGF5 b3V0VW5pdCBoZWlnaHQpCisgICAgdm9pZCBzZXRDb21wdXRlZENvbHVtbkhlaWdodChMYXlvdXRV bml0IGhlaWdodCkKICAgICB7Ci0gICAgICAgIG1fY29sdW1uSGVpZ2h0ID0gaGVpZ2h0OworICAg ICAgICBtX2NvbXB1dGVkQ29sdW1uSGVpZ2h0ID0gaGVpZ2h0OwogICAgIH0KIAogcHJpdmF0ZToK QEAgLTY3LDggKzY3LDggQEAgcHJpdmF0ZToKIAogICAgIHZpcnR1YWwgdm9pZCBwYWludFJlcGxh Y2VkKFBhaW50SW5mbyYsIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkgT1ZFUlJJREU7 CiAKLSAgICB2aXJ0dWFsIExheW91dFVuaXQgbG9naWNhbFdpZHRoRm9yRmxvd1RocmVhZENvbnRl bnQoKSBjb25zdCBPVkVSUklERSB7IHJldHVybiBtX2NvbHVtbldpZHRoOyB9Ci0gICAgdmlydHVh bCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRGb3JGbG93VGhyZWFkQ29udGVudCgpIGNvbnN0IE9W RVJSSURFIHsgcmV0dXJuIG1fY29sdW1uSGVpZ2h0OyB9IC8vIEZJWE1FOiBXaWxsIGJlIHdyb25n IG9uY2Ugd2UgaGF2ZSBtdWx0aXBsZSBzZXRzLgorICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBsb2dp Y2FsV2lkdGhGb3JGbG93VGhyZWFkQ29udGVudCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIG1f Y29tcHV0ZWRDb2x1bW5XaWR0aDsgfQorICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBsb2dpY2FsSGVp Z2h0Rm9yRmxvd1RocmVhZENvbnRlbnQoKSBjb25zdCBPVkVSUklERSB7IHJldHVybiBtX2NvbXB1 dGVkQ29sdW1uSGVpZ2h0OyB9IC8vIEZJWE1FOiBXaWxsIGJlIHdyb25nIG9uY2Ugd2UgaGF2ZSBt dWx0aXBsZSBzZXRzLgogCiAgICAgdmlydHVhbCBjb25zdCBjaGFyKiByZW5kZXJOYW1lKCkgY29u c3Q7CiAgICAgCkBAIC03NiwxMSArNzYsMTIgQEAgcHJpdmF0ZToKICAgICB2b2lkIHBhaW50Q29s dW1uQ29udGVudHMoUGFpbnRJbmZvJiwgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0KTsK IAogICAgIExheW91dFVuaXQgY29sdW1uR2FwKCkgY29uc3Q7Ci0gICAgTGF5b3V0UmVjdCBjb2x1 bW5SZWN0QXQoIHVuc2lnbmVkIGluZGV4KSBjb25zdDsKLSAgICAKLSAgICB1bnNpZ25lZCBtX2Nv bHVtbkNvdW50OwotICAgIExheW91dFVuaXQgbV9jb2x1bW5XaWR0aDsKLSAgICBMYXlvdXRVbml0 IG1fY29sdW1uSGVpZ2h0OworICAgIExheW91dFJlY3QgY29sdW1uUmVjdEF0KHVuc2lnbmVkIGlu ZGV4KSBjb25zdDsKKyAgICB1bnNpZ25lZCBjb2x1bW5Db3VudCgpIGNvbnN0OworCisgICAgdW5z aWduZWQgbV9jb21wdXRlZENvbHVtbkNvdW50OworICAgIExheW91dFVuaXQgbV9jb21wdXRlZENv bHVtbldpZHRoOworICAgIExheW91dFVuaXQgbV9jb21wdXRlZENvbHVtbkhlaWdodDsKIH07CiAK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJSZWdpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyUmVnaW9uLmgJKHJldmlzaW9uIDEyNjE3NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJSZWdpb24uaAkod29ya2luZyBjb3B5KQpAQCAtOTYsMTEgKzk2LDEzIEBAIHB1Ymxp YzoKICAgICAKICAgICB2aXJ0dWFsIExheW91dFVuaXQgbG9naWNhbFdpZHRoRm9yRmxvd1RocmVh ZENvbnRlbnQoKSBjb25zdDsKICAgICB2aXJ0dWFsIExheW91dFVuaXQgbG9naWNhbEhlaWdodEZv ckZsb3dUaHJlYWRDb250ZW50KCkgY29uc3Q7CisgICAgICAgIAorICAgIHZpcnR1YWwgdm9pZCBl eHBhbmRUb0VuY29tcGFzc0Zsb3dUaHJlYWRDb250ZW50c0lmTmVlZGVkKCkge307CiAKIHByb3Rl Y3RlZDoKICAgICB2b2lkIHNldFJlZ2lvbk9iamVjdHNSZWdpb25TdHlsZSgpOwogICAgIHZvaWQg cmVzdG9yZVJlZ2lvbk9iamVjdHNPcmlnaW5hbFN0eWxlKCk7Ci0gICAgCisKIHByaXZhdGU6CiAg ICAgdmlydHVhbCBjb25zdCBjaGFyKiByZW5kZXJOYW1lKCkgY29uc3QgeyByZXR1cm4gIlJlbmRl clJlZ2lvbiI7IH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlZ2lv blNldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJl Z2lvblNldC5jcHAJKHJldmlzaW9uIDEyNjE3NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJSZWdpb25TZXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNCw2ICsyNCw3IEBACiAg Ki8KIAogI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIlJlbmRlckZsb3dUaHJlYWQuaCIK ICNpbmNsdWRlICJSZW5kZXJSZWdpb25TZXQuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAt MzksNCArNDAsMjMgQEAgdm9pZCBSZW5kZXJSZWdpb25TZXQ6Omluc3RhbGxGbG93VGhyZWFkKAog ICAgIC8vIGluIHRoZSBjb25zdHJ1Y3Rvci4KIH0KIAordm9pZCBSZW5kZXJSZWdpb25TZXQ6OmV4 cGFuZFRvRW5jb21wYXNzRmxvd1RocmVhZENvbnRlbnRzSWZOZWVkZWQoKQoreworICAgIC8vIFdo ZW5ldmVyIHRoZSBsYXN0IHJlZ2lvbiBpcyBhIHNldCwgaXQgYWx3YXlzIGV4cGFuZHMgaXRzIHJl Z2lvbiByZWN0IHRvIGNvbnN1bWUgYWxsCisgICAgLy8gb2YgdGhlIGZsb3cgdGhyZWFkIGNvbnRl bnQuIFRoaXMgaXMgYmVjYXVzZSBpdCBpcyBhbHdheXMgY2FwYWJsZSBvZiBnZW5lcmF0aW5nIGFu CisgICAgLy8gaW5maW5pdGUgbnVtYmVyIG9mIGJveGVzIGluIG9yZGVyIHRvIGhvbGQgYWxsIG9m IHRoZSByZW1haW5pbmcgY29udGVudC4KKyAgICBMYXlvdXRSZWN0IHJlY3QocmVnaW9uUmVjdCgp KTsKKyAgICAKKyAgICAvLyBHZXQgdGhlIG9mZnNldCB3aXRoaW4gdGhlIGZsb3cgdGhyZWFkIGlu IGl0cyBibG9jayBwcm9ncmVzc2lvbiBkaXJlY3Rpb24uIFRoZW4gZ2V0IHRoZQorICAgIC8vIGZs b3cgdGhyZWFkJ3MgcmVtYWluaW5nIGxvZ2ljYWwgaGVpZ2h0IGluY2x1ZGluZyBpdHMgb3ZlcmZs b3cgYW5kIGV4cGFuZCBvdXIgcmVjdAorICAgIC8vIHRvIGVuY29tcGFzcyB0aGF0IHJlbWFpbmlu ZyBoZWlnaHQgYW5kIG92ZXJmbG93LiBUaGUgaWRlYSBpcyB0aGF0IHdlIHdpbGwgZ2VuZXJhdGUK KyAgICAvLyBhZGRpdGlvbmFsIGNvbHVtbnMgYW5kIHBhZ2VzIHRvIGhvbGQgdGhhdCBvdmVyZmxv dywgc2luY2UgcGVvcGxlIGRvIHdyaXRlIGJhZAorICAgIC8vIGNvbnRlbnQgbGlrZSA8Ym9keSBz dHlsZT0iaGVpZ2h0OjBweCI+IGluIG11bHRpLWNvbHVtbiBsYXlvdXRzLgorICAgIGJvb2wgaXNI b3Jpem9udGFsID0gZmxvd1RocmVhZCgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpOworICAg IExheW91dFVuaXQgbG9naWNhbFRvcE9mZnNldCA9IGlzSG9yaXpvbnRhbCA/IHJlY3QueSgpIDog cmVjdC54KCk7CisgICAgTGF5b3V0UmVjdCBsYXlvdXRSZWN0ID0gZmxvd1RocmVhZCgpLT5sYXlv dXRPdmVyZmxvd1JlY3QoKTsKKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRXaXRoT3ZlcmZs b3cgPSAoaXNIb3Jpem9udGFsID8gbGF5b3V0UmVjdC5tYXhZKCkgLSBmbG93VGhyZWFkKCktPnko KSA6IGxheW91dFJlY3QubWF4WCgpIC0gZmxvd1RocmVhZCgpLT54KCkpIC0gbG9naWNhbFRvcE9m ZnNldDsKKyAgICBzZXRSZWdpb25SZWN0KExheW91dFJlY3QocmVjdC54KCksIHJlY3QueSgpLCBp c0hvcml6b250YWwgPyByZWN0LndpZHRoKCkgOiBsb2dpY2FsSGVpZ2h0V2l0aE92ZXJmbG93LCBp c0hvcml6b250YWwgPyBsb2dpY2FsSGVpZ2h0V2l0aE92ZXJmbG93IDogcmVjdC5oZWlnaHQoKSkp OworfQorCiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVnaW9uU2V0 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlZ2lvblNl dC5oCShyZXZpc2lvbiAxMjYxNzcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy UmVnaW9uU2V0LmgJKHdvcmtpbmcgY29weSkKQEAgLTUyLDYgKzUyLDggQEAgcHVibGljOgogcHJp dmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgaW5zdGFsbEZsb3dUaHJlYWQoKSBPVkVSUklERTsKIAor ICAgIHZpcnR1YWwgdm9pZCBleHBhbmRUb0VuY29tcGFzc0Zsb3dUaHJlYWRDb250ZW50c0lmTmVl ZGVkKCkgT1ZFUlJJREU7CisKICAgICB2aXJ0dWFsIGNvbnN0IGNoYXIqIHJlbmRlck5hbWUoKSBj b25zdCA9IDA7CiB9OwogCg==