121707 2013-09-20 13:08:04 -0700 Refactoring LineBreaker and RenderTextInfo out of RenderBlock.h 2013-09-20 14:16:47 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 121261 1 zoltan zoltan commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 931542 0 zoltan 2013-09-20 13:08:04 -0700 LineBreaker and RenderTextInfo are defined in RenderBlock.h, but only used in RenderBlockLineLayout.cpp. Moving them there (LineBreaker needs to be a friend class of RenderBlock) in the first step in the process of refactoring LineBreaker::NextSegmentBreak into more manageable chunks. 931545 1 212211 zoltan 2013-09-20 13:14:30 -0700 Created attachment 212211 proposed patch 931571 2 212211 hyatt 2013-09-20 13:53:45 -0700 Comment on attachment 212211 proposed patch r=me 931582 3 212211 commit-queue 2013-09-20 14:16:45 -0700 Comment on attachment 212211 proposed patch Clearing flags on attachment: 212211 Committed r156199: <http://trac.webkit.org/changeset/156199> 931583 4 commit-queue 2013-09-20 14:16:47 -0700 All reviewed patches have been landed. Closing bug. 212211 2013-09-20 13:14:30 -0700 2013-09-20 14:16:45 -0700 proposed patch linebreaker.patch text/plain 10309 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2MTE4NTYzLi40Mzc1ZjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTMtMDktMjAgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgUmVmYWN0b3JpbmcgTGluZUJyZWFrZXIgYW5kIFJlbmRlclRleHRJbmZvIG91dCBvZiBS ZW5kZXJCbG9jay5oCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjE3MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBMaW5lQnJlYWtlciBhbmQgUmVuZGVyVGV4dEluZm8gYXJlIGRlZmluZWQgaW4gUmVuZGVy QmxvY2suaCwgYnV0IG9ubHkgdXNlZCBpbiBSZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwLgorICAg ICAgICBNb3ZpbmcgdGhlbSB0aGVyZSAoTGluZUJyZWFrZXIgbmVlZHMgdG8gYmUgYSBmcmllbmQg Y2xhc3Mgb2YgUmVuZGVyQmxvY2spIGluIHRoZSBmaXJzdCBzdGVwIGluIHRoZSBwcm9jZXNzCisg ICAgICAgIG9mIHJlZmFjdG9yaW5nIExpbmVCcmVha2VyOjpOZXh0U2VnbWVudEJyZWFrIGludG8g bW9yZSBtYW5hZ2VhYmxlIGNodW5rcy4KKworICAgICAgICBUaGlzIGNoYW5nZSB3YXMgcmV2aWV3 ZWQgYW5kIGxhbmRlZCBpbiBCbGluazoKKyAgICAgICAgaHR0cHM6Ly9zcmMuY2hyb21pdW0ub3Jn L3ZpZXd2Yy9ibGluaz9yZXZpc2lvbj0xNTc0MDImdmlldz1yZXZpc2lvbgorCisgICAgICAgIE5v IG5ldyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGluZUJyZWFrZXI6OkxpbmVCcmVha2VyKToKKyAgICAgICAgKFdlYkNvcmU6OkxpbmVCcmVh a2VyOjpsaW5lV2FzSHlwaGVuYXRlZCk6CisgICAgICAgIChXZWJDb3JlOjpMaW5lQnJlYWtlcjo6 cG9zaXRpb25lZE9iamVjdHMpOgorICAgICAgICAoV2ViQ29yZTo6TGluZUJyZWFrZXI6OmNsZWFy KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRJbmZvOjpSZW5kZXJUZXh0SW5mbyk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0SW5mbzo6flJlbmRlclRleHRJbmZvKToKKyAgICAg ICAgKFdlYkNvcmU6OkxpbmVCcmVha2VyOjpza2lwVHJhaWxpbmdXaGl0ZXNwYWNlKToKKyAgICAg ICAgKFdlYkNvcmU6OkxpbmVCcmVha2VyOjpza2lwTGVhZGluZ1doaXRlc3BhY2UpOgorICAgICAg ICAoV2ViQ29yZTo6TGluZUJyZWFrZXI6OnJlc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OkxpbmVC cmVha2VyOjpuZXh0TGluZUJyZWFrKToKKyAgICAgICAgKFdlYkNvcmU6OkxpbmVCcmVha2VyOjpu ZXh0U2VnbWVudEJyZWFrKToKKwogMjAxMy0wOS0yMCAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJv Z2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBGaXggdGhlIGJ1aWxkIGFmdGVyIHIxNTYxNDQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKaW5kZXggNWM2OGQ1YS4uZDU5YjNjNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTUzLDYgKzUzLDcgQEAg Y2xhc3MgUmVuZGVyVGV4dDsKIAogc3RydWN0IEJpZGlSdW47CiBzdHJ1Y3QgUGFpbnRJbmZvOwor Y2xhc3MgTGluZUJyZWFrZXI7CiBjbGFzcyBMaW5lSW5mbzsKIGNsYXNzIFJlbmRlclJ1YnlSdW47 CiAjaWYgRU5BQkxFKENTU19TSEFQRVMpCkBAIC02MzQsNDQgKzYzNSw2IEBAIHByaXZhdGU6CiAK ICAgICBMYXlvdXRQb2ludCBjb21wdXRlTG9naWNhbExvY2F0aW9uRm9yRmxvYXQoY29uc3QgRmxv YXRpbmdPYmplY3QqLCBMYXlvdXRVbml0IGxvZ2ljYWxUb3BPZmZzZXQpIGNvbnN0OwogCi0gICAg Ly8gVGhlIGZvbGxvd2luZyBmdW5jdGlvbnMnIGltcGxlbWVudGF0aW9ucyBhcmUgaW4gUmVuZGVy QmxvY2tMaW5lTGF5b3V0LmNwcC4KLSAgICBzdHJ1Y3QgUmVuZGVyVGV4dEluZm8gewotICAgICAg ICAvLyBEZXN0cnVjdGlvbiBvZiBtX2xheW91dCByZXF1aXJlcyBUZXh0TGF5b3V0IHRvIGJlIGEg Y29tcGxldGUgdHlwZSwgc28gdGhlIGNvbnN0cnVjdG9yIGFuZCBkZXN0cnVjdG9yIGFyZSBtYWRl IG5vbi1pbmxpbmUgdG8gYXZvaWQgY29tcGlsYXRpb24gZXJyb3JzLgotICAgICAgICBSZW5kZXJU ZXh0SW5mbygpOwotICAgICAgICB+UmVuZGVyVGV4dEluZm8oKTsKLQotICAgICAgICBSZW5kZXJU ZXh0KiBtX3RleHQ7Ci0gICAgICAgIE93blB0cjxUZXh0TGF5b3V0PiBtX2xheW91dDsKLSAgICAg ICAgTGF6eUxpbmVCcmVha0l0ZXJhdG9yIG1fbGluZUJyZWFrSXRlcmF0b3I7Ci0gICAgICAgIGNv bnN0IEZvbnQqIG1fZm9udDsKLSAgICB9OwotCi0gICAgY2xhc3MgTGluZUJyZWFrZXIgewotICAg IHB1YmxpYzoKLSAgICAgICAgTGluZUJyZWFrZXIoUmVuZGVyQmxvY2sqIGJsb2NrKQotICAgICAg ICAgICAgOiBtX2Jsb2NrKGJsb2NrKQotICAgICAgICB7Ci0gICAgICAgICAgICByZXNldCgpOwot ICAgICAgICB9Ci0KLSAgICAgICAgSW5saW5lSXRlcmF0b3IgbmV4dExpbmVCcmVhayhJbmxpbmVC aWRpUmVzb2x2ZXImLCBMaW5lSW5mbyYsIFJlbmRlclRleHRJbmZvJiwgRmxvYXRpbmdPYmplY3Qq IGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUsIHVuc2lnbmVkIGNvbnNlY3V0aXZlSHlwaGVuYXRl ZExpbmVzLCBXb3JkTWVhc3VyZW1lbnRzJik7Ci0KLSAgICAgICAgYm9vbCBsaW5lV2FzSHlwaGVu YXRlZCgpIHsgcmV0dXJuIG1faHlwaGVuYXRlZDsgfQotICAgICAgICBjb25zdCBWZWN0b3I8UmVu ZGVyQm94Kj4mIHBvc2l0aW9uZWRPYmplY3RzKCkgeyByZXR1cm4gbV9wb3NpdGlvbmVkT2JqZWN0 czsgfQotICAgICAgICBFQ2xlYXIgY2xlYXIoKSB7IHJldHVybiBtX2NsZWFyOyB9Ci0gICAgcHJp dmF0ZToKLSAgICAgICAgdm9pZCByZXNldCgpOwotICAgICAgICAKLSAgICAgICAgSW5saW5lSXRl cmF0b3IgbmV4dFNlZ21lbnRCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImLCBMaW5lSW5mbyYsIFJl bmRlclRleHRJbmZvJiwgRmxvYXRpbmdPYmplY3QqIGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUs IHVuc2lnbmVkIGNvbnNlY3V0aXZlSHlwaGVuYXRlZExpbmVzLCBXb3JkTWVhc3VyZW1lbnRzJik7 Ci0gICAgICAgIHZvaWQgc2tpcFRyYWlsaW5nV2hpdGVzcGFjZShJbmxpbmVJdGVyYXRvciYsIGNv bnN0IExpbmVJbmZvJik7Ci0gICAgICAgIHZvaWQgc2tpcExlYWRpbmdXaGl0ZXNwYWNlKElubGlu ZUJpZGlSZXNvbHZlciYsIExpbmVJbmZvJiwgRmxvYXRpbmdPYmplY3QqIGxhc3RGbG9hdEZyb21Q cmV2aW91c0xpbmUsIExpbmVXaWR0aCYpOwotICAgICAgICAKLSAgICAgICAgUmVuZGVyQmxvY2sq IG1fYmxvY2s7Ci0gICAgICAgIGJvb2wgbV9oeXBoZW5hdGVkOwotICAgICAgICBFQ2xlYXIgbV9j bGVhcjsKLSAgICAgICAgVmVjdG9yPFJlbmRlckJveCo+IG1fcG9zaXRpb25lZE9iamVjdHM7Ci0g ICAgfTsKLQogICAgIHZvaWQgY2hlY2tGbG9hdHNJbkNsZWFuTGluZShSb290SW5saW5lQm94Kiwg VmVjdG9yPEZsb2F0V2l0aFJlY3Q+Jiwgc2l6ZV90JiBmbG9hdEluZGV4LCBib29sJiBlbmNvdW50 ZXJlZE5ld0Zsb2F0LCBib29sJiBkaXJ0aWVkQnlGbG9hdCk7CiAgICAgUm9vdElubGluZUJveCog ZGV0ZXJtaW5lU3RhcnRQb3NpdGlvbihMaW5lTGF5b3V0U3RhdGUmLCBJbmxpbmVCaWRpUmVzb2x2 ZXImKTsKICAgICB2b2lkIGRldGVybWluZUVuZFBvc2l0aW9uKExpbmVMYXlvdXRTdGF0ZSYsIFJv b3RJbmxpbmVCb3gqIHN0YXJ0Qm94LCBJbmxpbmVJdGVyYXRvciYgY2xlYW5MaW5lU3RhcnQsIEJp ZGlTdGF0dXMmIGNsZWFuTGluZUJpZGlTdGF0dXMpOwpAQCAtOTMxLDYgKzg5NCw3IEBAIHByb3Rl Y3RlZDoKICAgICAvLyBSZW5kZXJSdWJ5QmFzZSBvYmplY3RzIG5lZWQgdG8gYmUgYWJsZSB0byBz cGxpdCBhbmQgbWVyZ2UsIG1vdmluZyB0aGVpciBjaGlsZHJlbiBhcm91bmQKICAgICAvLyAoY2Fs bGluZyBtb3ZlQ2hpbGRUbywgbW92ZUFsbENoaWxkcmVuVG8sIGFuZCBtYWtlQ2hpbGRyZW5Ob25J bmxpbmUpLgogICAgIGZyaWVuZCBjbGFzcyBSZW5kZXJSdWJ5QmFzZTsKKyAgICBmcmllbmQgY2xh c3MgTGluZUJyZWFrZXI7CiAgICAgZnJpZW5kIGNsYXNzIExpbmVXaWR0aDsgLy8gTmVlZHMgdG8g a25vdyBGbG9hdGluZ09iamVjdAogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRleCA4NWQ5MWZmLi5lYTViNTU0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5 b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5 b3V0LmNwcApAQCAtNjksNiArNjksNDMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogLy8gV2UgZG9u J3QgbGV0IG91ciBsaW5lIGJveCB0cmVlIGZvciBhIHNpbmdsZSBsaW5lIGdldCBhbnkgZGVlcGVy IHRoYW4gdGhpcy4KIGNvbnN0IHVuc2lnbmVkIGNNYXhMaW5lRGVwdGggPSAyMDA7CiAKK3N0cnVj dCBSZW5kZXJUZXh0SW5mbyB7CisgICAgLy8gRGVzdHJ1Y3Rpb24gb2YgbV9sYXlvdXQgcmVxdWly ZXMgVGV4dExheW91dCB0byBiZSBhIGNvbXBsZXRlIHR5cGUsIHNvIHRoZSBjb25zdHJ1Y3RvciBh bmQgZGVzdHJ1Y3RvciBhcmUgbWFkZSBub24taW5saW5lIHRvIGF2b2lkIGNvbXBpbGF0aW9uIGVy cm9ycy4KKyAgICBSZW5kZXJUZXh0SW5mbygpOworICAgIH5SZW5kZXJUZXh0SW5mbygpOworCisg ICAgUmVuZGVyVGV4dCogbV90ZXh0OworICAgIE93blB0cjxUZXh0TGF5b3V0PiBtX2xheW91dDsK KyAgICBMYXp5TGluZUJyZWFrSXRlcmF0b3IgbV9saW5lQnJlYWtJdGVyYXRvcjsKKyAgICBjb25z dCBGb250KiBtX2ZvbnQ7Cit9OworCitjbGFzcyBMaW5lQnJlYWtlciB7CitwdWJsaWM6CisgICAg TGluZUJyZWFrZXIoUmVuZGVyQmxvY2sqIGJsb2NrKQorICAgICAgICA6IG1fYmxvY2soYmxvY2sp CisgICAgeworICAgICAgICByZXNldCgpOworICAgIH0KKworICAgIElubGluZUl0ZXJhdG9yIG5l eHRMaW5lQnJlYWsoSW5saW5lQmlkaVJlc29sdmVyJiwgTGluZUluZm8mLCBSZW5kZXJUZXh0SW5m byYsIEZsb2F0aW5nT2JqZWN0KiBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLCB1bnNpZ25lZCBj b25zZWN1dGl2ZUh5cGhlbmF0ZWRMaW5lcywgV29yZE1lYXN1cmVtZW50cyYpOworCisgICAgYm9v bCBsaW5lV2FzSHlwaGVuYXRlZCgpIHsgcmV0dXJuIG1faHlwaGVuYXRlZDsgfQorICAgIGNvbnN0 IFZlY3RvcjxSZW5kZXJCb3gqPiYgcG9zaXRpb25lZE9iamVjdHMoKSB7IHJldHVybiBtX3Bvc2l0 aW9uZWRPYmplY3RzOyB9CisgICAgRUNsZWFyIGNsZWFyKCkgeyByZXR1cm4gbV9jbGVhcjsgfQor cHJpdmF0ZToKKyAgICB2b2lkIHJlc2V0KCk7CisKKyAgICBJbmxpbmVJdGVyYXRvciBuZXh0U2Vn bWVudEJyZWFrKElubGluZUJpZGlSZXNvbHZlciYsIExpbmVJbmZvJiwgUmVuZGVyVGV4dEluZm8m LCBGbG9hdGluZ09iamVjdCogbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwgdW5zaWduZWQgY29u c2VjdXRpdmVIeXBoZW5hdGVkTGluZXMsIFdvcmRNZWFzdXJlbWVudHMmKTsKKyAgICB2b2lkIHNr aXBUcmFpbGluZ1doaXRlc3BhY2UoSW5saW5lSXRlcmF0b3ImLCBjb25zdCBMaW5lSW5mbyYpOwor ICAgIHZvaWQgc2tpcExlYWRpbmdXaGl0ZXNwYWNlKElubGluZUJpZGlSZXNvbHZlciYsIExpbmVJ bmZvJiwgRmxvYXRpbmdPYmplY3QqIGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUsIExpbmVXaWR0 aCYpOworCisgICAgUmVuZGVyQmxvY2sqIG1fYmxvY2s7CisgICAgYm9vbCBtX2h5cGhlbmF0ZWQ7 CisgICAgRUNsZWFyIG1fY2xlYXI7CisgICAgVmVjdG9yPFJlbmRlckJveCo+IG1fcG9zaXRpb25l ZE9iamVjdHM7Cit9OworCiAjaWYgRU5BQkxFKENTU19TSEFQRVMpCiBTaGFwZUluc2lkZUluZm8q IFJlbmRlckJsb2NrOjpsYXlvdXRTaGFwZUluc2lkZUluZm8oKSBjb25zdAogewpAQCAtMTI3OCwx MyArMTMxNSwxMyBAQCB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRzKExpbmVM YXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGJvb2wgaGFzSW5saQogICAgIHJlcGFpbnREaXJ0eUZs b2F0cyhsYXlvdXRTdGF0ZS5mbG9hdHMoKSk7CiB9CiAKLVJlbmRlckJsb2NrOjpSZW5kZXJUZXh0 SW5mbzo6UmVuZGVyVGV4dEluZm8oKQorUmVuZGVyVGV4dEluZm86OlJlbmRlclRleHRJbmZvKCkK ICAgICA6IG1fdGV4dCgwKQogICAgICwgbV9mb250KDApCiB7CiB9CiAKLVJlbmRlckJsb2NrOjpS ZW5kZXJUZXh0SW5mbzo6flJlbmRlclRleHRJbmZvKCkKK1JlbmRlclRleHRJbmZvOjp+UmVuZGVy VGV4dEluZm8oKQogewogfQogCkBAIC0yMjQyLDcgKzIyNzksNyBAQCBib29sIFJlbmRlckJsb2Nr OjpnZW5lcmF0ZXNMaW5lQm94ZXNGb3JJbmxpbmVDaGlsZChSZW5kZXJPYmplY3QqIGlubGluZU9i aikKIC8vIG9iamVjdCBpdGVyYXRpb24gcHJvY2Vzcy4KIC8vIE5CLiB0aGlzIGZ1bmN0aW9uIHdp bGwgaW5zZXJ0IGFueSBmbG9hdGluZyBlbGVtZW50cyB0aGF0IHdvdWxkIG90aGVyd2lzZQogLy8g YmUgc2tpcHBlZCBidXQgaXQgd2lsbCBub3QgcG9zaXRpb24gdGhlbS4KLXZvaWQgUmVuZGVyQmxv Y2s6OkxpbmVCcmVha2VyOjpza2lwVHJhaWxpbmdXaGl0ZXNwYWNlKElubGluZUl0ZXJhdG9yJiBp dGVyYXRvciwgY29uc3QgTGluZUluZm8mIGxpbmVJbmZvKQordm9pZCBMaW5lQnJlYWtlcjo6c2tp cFRyYWlsaW5nV2hpdGVzcGFjZShJbmxpbmVJdGVyYXRvciYgaXRlcmF0b3IsIGNvbnN0IExpbmVJ bmZvJiBsaW5lSW5mbykKIHsKICAgICB3aGlsZSAoIWl0ZXJhdG9yLmF0RW5kKCkgJiYgIXJlcXVp cmVzTGluZUJveChpdGVyYXRvciwgbGluZUluZm8sIFRyYWlsaW5nV2hpdGVzcGFjZSkpIHsKICAg ICAgICAgUmVuZGVyT2JqZWN0KiBvYmplY3QgPSBpdGVyYXRvci5tX29iajsKQEAgLTIyNTQsNyAr MjI5MSw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OkxpbmVCcmVha2VyOjpza2lwVHJhaWxpbmdXaGl0 ZXNwYWNlKElubGluZUl0ZXJhdG9yJiBpdGVyYXRvciwKICAgICB9CiB9CiAKLXZvaWQgUmVuZGVy QmxvY2s6OkxpbmVCcmVha2VyOjpza2lwTGVhZGluZ1doaXRlc3BhY2UoSW5saW5lQmlkaVJlc29s dmVyJiByZXNvbHZlciwgTGluZUluZm8mIGxpbmVJbmZvLAordm9pZCBMaW5lQnJlYWtlcjo6c2tp cExlYWRpbmdXaGl0ZXNwYWNlKElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIExpbmVJbmZv JiBsaW5lSW5mbywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgRmxvYXRpbmdPYmplY3QqIGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUsIExpbmVX aWR0aCYgd2lkdGgpCiB7CiAgICAgd2hpbGUgKCFyZXNvbHZlci5wb3NpdGlvbigpLmF0RW5kKCkg JiYgIXJlcXVpcmVzTGluZUJveChyZXNvbHZlci5wb3NpdGlvbigpLCBsaW5lSW5mbywgTGVhZGlu Z1doaXRlc3BhY2UpKSB7CkBAIC0yNDcwLDE0ICsyNTA3LDE0IEBAIHZvaWQgVHJhaWxpbmdPYmpl Y3RzOjp1cGRhdGVNaWRwb2ludHNGb3JUcmFpbGluZ0JveGVzKExpbmVNaWRwb2ludFN0YXRlJiBs aW5lTWlkCiAgICAgfQogfQogCi12b2lkIFJlbmRlckJsb2NrOjpMaW5lQnJlYWtlcjo6cmVzZXQo KQordm9pZCBMaW5lQnJlYWtlcjo6cmVzZXQoKQogewogICAgIG1fcG9zaXRpb25lZE9iamVjdHMu Y2xlYXIoKTsKICAgICBtX2h5cGhlbmF0ZWQgPSBmYWxzZTsKICAgICBtX2NsZWFyID0gQ05PTkU7 CiB9CiAKLUlubGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpMaW5lQnJlYWtlcjo6bmV4dExpbmVC cmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVyLCBMaW5lSW5mbyYgbGluZUluZm8sIFJl bmRlclRleHRJbmZvJiByZW5kZXJUZXh0SW5mbywgRmxvYXRpbmdPYmplY3QqIGxhc3RGbG9hdEZy b21QcmV2aW91c0xpbmUsIHVuc2lnbmVkIGNvbnNlY3V0aXZlSHlwaGVuYXRlZExpbmVzLCBXb3Jk TWVhc3VyZW1lbnRzJiB3b3JkTWVhc3VyZW1lbnRzKQorSW5saW5lSXRlcmF0b3IgTGluZUJyZWFr ZXI6Om5leHRMaW5lQnJlYWsoSW5saW5lQmlkaVJlc29sdmVyJiByZXNvbHZlciwgTGluZUluZm8m IGxpbmVJbmZvLCBSZW5kZXJUZXh0SW5mbyYgcmVuZGVyVGV4dEluZm8sIEZsb2F0aW5nT2JqZWN0 KiBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLCB1bnNpZ25lZCBjb25zZWN1dGl2ZUh5cGhlbmF0 ZWRMaW5lcywgV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cykKIHsKICNpZiAhRU5B QkxFKENTU19TSEFQRVMpCiAgICAgcmV0dXJuIG5leHRTZWdtZW50QnJlYWsocmVzb2x2ZXIsIGxp bmVJbmZvLCByZW5kZXJUZXh0SW5mbywgbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwgY29uc2Vj dXRpdmVIeXBoZW5hdGVkTGluZXMsIHdvcmRNZWFzdXJlbWVudHMpOwpAQCAtMjYxNyw3ICsyNjU0 LDcgQEAgc3RhdGljIHZvaWQgdXBkYXRlU2VnbWVudHNGb3JTaGFwZXMoUmVuZGVyQmxvY2sqIGJs b2NrLCBjb25zdCBGbG9hdGluZ09iamVjdCogbGEKIH0KICNlbmRpZgogCi1JbmxpbmVJdGVyYXRv ciBSZW5kZXJCbG9jazo6TGluZUJyZWFrZXI6Om5leHRTZWdtZW50QnJlYWsoSW5saW5lQmlkaVJl c29sdmVyJiByZXNvbHZlciwgTGluZUluZm8mIGxpbmVJbmZvLCBSZW5kZXJUZXh0SW5mbyYgcmVu ZGVyVGV4dEluZm8sIEZsb2F0aW5nT2JqZWN0KiBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLCB1 bnNpZ25lZCBjb25zZWN1dGl2ZUh5cGhlbmF0ZWRMaW5lcywgV29yZE1lYXN1cmVtZW50cyYgd29y ZE1lYXN1cmVtZW50cykKK0lubGluZUl0ZXJhdG9yIExpbmVCcmVha2VyOjpuZXh0U2VnbWVudEJy ZWFrKElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIExpbmVJbmZvJiBsaW5lSW5mbywgUmVu ZGVyVGV4dEluZm8mIHJlbmRlclRleHRJbmZvLCBGbG9hdGluZ09iamVjdCogbGFzdEZsb2F0RnJv bVByZXZpb3VzTGluZSwgdW5zaWduZWQgY29uc2VjdXRpdmVIeXBoZW5hdGVkTGluZXMsIFdvcmRN ZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMpCiB7CiAgICAgcmVzZXQoKTsKIApAQCAtMjg5 OSw3ICsyOTM2LDcgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OkxpbmVCcmVha2VyOjpu ZXh0U2VnbWVudEJyZWFrKElubGluZUJpZGlSZXNvbHZlciYgcmUKICAgICAgICAgICAgIC8vIE5v bi16ZXJvIG9ubHkgd2hlbiBrZXJuaW5nIGlzIGVuYWJsZWQgYW5kIFRleHRMYXlvdXQgaXNuJ3Qg dXNlZCwgaW4gd2hpY2ggY2FzZSB3ZSBtZWFzdXJlCiAgICAgICAgICAgICAvLyB3b3JkcyB3aXRo IHRoZWlyIHRyYWlsaW5nIHNwYWNlLCB0aGVuIHN1YnRyYWN0IGl0cyB3aWR0aC4KICAgICAgICAg ICAgIEhhc2hTZXQ8Y29uc3QgU2ltcGxlRm9udERhdGEqPiBmYWxsYmFja0ZvbnRzOwotICAgICAg ICAgICAgZmxvYXQgd29yZFRyYWlsaW5nU3BhY2VXaWR0aCA9IChmLnR5cGVzZXR0aW5nRmVhdHVy ZXMoKSAmIEtlcm5pbmcpICYmICF0ZXh0TGF5b3V0ID8gZi53aWR0aChjb25zdHJ1Y3RUZXh0UnVu KHQsIGYsICZzcGFjZSwgMSwgc3R5bGUpLCAmZmFsbGJhY2tGb250cykgKyB3b3JkU3BhY2luZyA6 IDA7CisgICAgICAgICAgICBmbG9hdCB3b3JkVHJhaWxpbmdTcGFjZVdpZHRoID0gKGYudHlwZXNl dHRpbmdGZWF0dXJlcygpICYgS2VybmluZykgJiYgIXRleHRMYXlvdXQgPyBmLndpZHRoKFJlbmRl ckJsb2NrOjpjb25zdHJ1Y3RUZXh0UnVuKHQsIGYsICZzcGFjZSwgMSwgc3R5bGUpLCAmZmFsbGJh Y2tGb250cykgKyB3b3JkU3BhY2luZyA6IDA7CiAKICAgICAgICAgICAgIFVDaGFyIGxhc3RDaGFy YWN0ZXIgPSByZW5kZXJUZXh0SW5mby5tX2xpbmVCcmVha0l0ZXJhdG9yLmxhc3RDaGFyYWN0ZXIo KTsKICAgICAgICAgICAgIFVDaGFyIHNlY29uZFRvTGFzdENoYXJhY3RlciA9IHJlbmRlclRleHRJ bmZvLm1fbGluZUJyZWFrSXRlcmF0b3Iuc2Vjb25kVG9MYXN0Q2hhcmFjdGVyKCk7Cg==