136634 2014-09-08 09:42:19 -0700 [CSSRegions] Use C++11 range-based loops in FlowThreadController 2014-09-09 00:57:27 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mihnea webkit-unassigned commit-queue esprehn+autocc glenn kondapallykalyan WebkitBugTracker oldest_to_newest 1033871 0 mihnea 2014-09-08 09:42:19 -0700 Use C++11 range-based loops in FlowThreadController 1033872 1 237792 mihnea 2014-09-08 09:45:35 -0700 Created attachment 237792 Patch 1033875 2 237792 abucur 2014-09-08 09:56:27 -0700 Comment on attachment 237792 Patch r=me 1034088 3 237792 commit-queue 2014-09-09 00:57:24 -0700 Comment on attachment 237792 Patch Clearing flags on attachment: 237792 Committed r173422: <http://trac.webkit.org/changeset/173422> 1034089 4 commit-queue 2014-09-09 00:57:27 -0700 All reviewed patches have been landed. Closing bug. 237792 2014-09-08 09:45:35 -0700 2014-09-09 00:57:24 -0700 Patch 136634.patch text/plain 9472 mihnea ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMDcwNDllLi5jZmMzNjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTQtMDktMDggIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CisKKyAg ICAgICAgW0NTU1JlZ2lvbnNdIFVzZSBDKysxMSByYW5nZS1iYXNlZCBsb29wcyBpbiBGbG93VGhy ZWFkQ29udHJvbGxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTM2NjM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIGFzIG5vIG5ldyBmdW5jdGlvbmFsaXR5IHdhcyBpbnRyb2R1Y2Vk LgorCisgICAgICAgICogcmVuZGVyaW5nL0Zsb3dUaHJlYWRDb250cm9sbGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZsb3dUaHJlYWRDb250cm9sbGVyOjplbnN1cmVSZW5kZXJGbG93VGhyZWFk V2l0aE5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6Rmxvd1RocmVhZENvbnRyb2xsZXI6OnN0eWxl RGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkZsb3dUaHJlYWRDb250cm9sbGVyOjpsYXlv dXRSZW5kZXJOYW1lZEZsb3dUaHJlYWRzKToKKyAgICAgICAgKFdlYkNvcmU6OkZsb3dUaHJlYWRD b250cm9sbGVyOjp1cGRhdGVGbG93VGhyZWFkc0NoYWluSWZOZWNlc3NhcnkpOgorICAgICAgICAo V2ViQ29yZTo6Rmxvd1RocmVhZENvbnRyb2xsZXI6OnVwZGF0ZUZsb3dUaHJlYWRzTmVlZGluZ0xh eW91dCk6CisgICAgICAgIChXZWJDb3JlOjpGbG93VGhyZWFkQ29udHJvbGxlcjo6dXBkYXRlRmxv d1RocmVhZHNOZWVkaW5nVHdvU3RlcExheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpGbG93VGhy ZWFkQ29udHJvbGxlcjo6cmVzZXRGbG93VGhyZWFkc1dpdGhBdXRvSGVpZ2h0UmVnaW9ucyk6Cisg ICAgICAgIChXZWJDb3JlOjpGbG93VGhyZWFkQ29udHJvbGxlcjo6dXBkYXRlRmxvd1RocmVhZHNJ bnRvTWVhc3VyZUNvbnRlbnRQaGFzZSk6CisgICAgICAgIChXZWJDb3JlOjpGbG93VGhyZWFkQ29u dHJvbGxlcjo6dXBkYXRlRmxvd1RocmVhZHNMYXllclRvUmVnaW9uTWFwcGluZ3NJZk5lZWRlZCk6 CisgICAgICAgIChXZWJDb3JlOjpGbG93VGhyZWFkQ29udHJvbGxlcjo6dXBkYXRlTmFtZWRGbG93 c0xheWVyTGlzdHNJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpGbG93VGhyZWFkQ29udHJv bGxlcjo6Y29sbGVjdEZpeGVkUG9zaXRpb25lZExheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpG bG93VGhyZWFkQ29udHJvbGxlcjo6aXNBdXRvTG9naWNhbEhlaWdodFJlZ2lvbnNDb3VudENvbnNp c3RlbnQpOgorCiAyMDE0LTA5LTA4ICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3Vu Zy5jb20+CiAKICAgICAgICAgW0VGTFtXSzJdIE1pbmlCcm93c2VyIGNvbWVzIHRvIGNyYXNoIG9u IGRlYnVnIG1vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbG93VGhy ZWFkQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxvd1RocmVhZENv bnRyb2xsZXIuY3BwCmluZGV4IGQ5MGYzYTcuLjQ4ZDRlYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9GbG93VGhyZWFkQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0Zsb3dUaHJlYWRDb250cm9sbGVyLmNwcApAQCAtNTcsOCArNTcsNyBA QCBSZW5kZXJOYW1lZEZsb3dUaHJlYWQmIEZsb3dUaHJlYWRDb250cm9sbGVyOjplbnN1cmVSZW5k ZXJGbG93VGhyZWFkV2l0aE5hbWUoY29ucwogICAgIGlmICghbV9yZW5kZXJOYW1lZEZsb3dUaHJl YWRMaXN0KQogICAgICAgICBtX3JlbmRlck5hbWVkRmxvd1RocmVhZExpc3QgPSBzdGQ6Om1ha2Vf dW5pcXVlPFJlbmRlck5hbWVkRmxvd1RocmVhZExpc3Q+KCk7CiAgICAgZWxzZSB7Ci0gICAgICAg IGZvciAoYXV0byBpdGVyID0gbV9yZW5kZXJOYW1lZEZsb3dUaHJlYWRMaXN0LT5iZWdpbigpLCBl bmQgPSBtX3JlbmRlck5hbWVkRmxvd1RocmVhZExpc3QtPmVuZCgpOyBpdGVyICE9IGVuZDsgKytp dGVyKSB7Ci0gICAgICAgICAgICBSZW5kZXJOYW1lZEZsb3dUaHJlYWQqIGZsb3dSZW5kZXJlciA9 ICppdGVyOworICAgICAgICBmb3IgKGF1dG8mIGZsb3dSZW5kZXJlciA6ICptX3JlbmRlck5hbWVk Rmxvd1RocmVhZExpc3QpIHsKICAgICAgICAgICAgIGlmIChmbG93UmVuZGVyZXItPmZsb3dUaHJl YWROYW1lKCkgPT0gbmFtZSkKICAgICAgICAgICAgICAgICByZXR1cm4gKmZsb3dSZW5kZXJlcjsK ICAgICAgICAgfQpAQCAtODQsMjAgKzgzLDE1IEBAIFJlbmRlck5hbWVkRmxvd1RocmVhZCYgRmxv d1RocmVhZENvbnRyb2xsZXI6OmVuc3VyZVJlbmRlckZsb3dUaHJlYWRXaXRoTmFtZShjb25zCiB2 b2lkIEZsb3dUaHJlYWRDb250cm9sbGVyOjpzdHlsZURpZENoYW5nZSgpCiB7CiAgICAgUmVuZGVy U3R5bGUmIHZpZXdTdHlsZSA9IG1fdmlldy0+c3R5bGUoKTsKLSAgICBmb3IgKGF1dG8gaXRlciA9 IG1fcmVuZGVyTmFtZWRGbG93VGhyZWFkTGlzdC0+YmVnaW4oKSwgZW5kID0gbV9yZW5kZXJOYW1l ZEZsb3dUaHJlYWRMaXN0LT5lbmQoKTsgaXRlciAhPSBlbmQ7ICsraXRlcikgewotICAgICAgICBS ZW5kZXJOYW1lZEZsb3dUaHJlYWQqIGZsb3dSZW5kZXJlciA9ICppdGVyOworICAgIGZvciAoYXV0 byYgZmxvd1JlbmRlcmVyIDogKm1fcmVuZGVyTmFtZWRGbG93VGhyZWFkTGlzdCkKICAgICAgICAg Zmxvd1JlbmRlcmVyLT5zZXRTdHlsZShSZW5kZXJGbG93VGhyZWFkOjpjcmVhdGVGbG93VGhyZWFk U3R5bGUoJnZpZXdTdHlsZSkpOwotICAgIH0KIH0KIAogdm9pZCBGbG93VGhyZWFkQ29udHJvbGxl cjo6bGF5b3V0UmVuZGVyTmFtZWRGbG93VGhyZWFkcygpCiB7CiAgICAgdXBkYXRlRmxvd1RocmVh ZHNDaGFpbklmTmVjZXNzYXJ5KCk7Ci0KLSAgICBmb3IgKGF1dG8gaXRlciA9IG1fcmVuZGVyTmFt ZWRGbG93VGhyZWFkTGlzdC0+YmVnaW4oKSwgZW5kID0gbV9yZW5kZXJOYW1lZEZsb3dUaHJlYWRM aXN0LT5lbmQoKTsgaXRlciAhPSBlbmQ7ICsraXRlcikgewotICAgICAgICBSZW5kZXJOYW1lZEZs b3dUaHJlYWQqIGZsb3dSZW5kZXJlciA9ICppdGVyOworICAgIGZvciAoYXV0byYgZmxvd1JlbmRl cmVyIDogKm1fcmVuZGVyTmFtZWRGbG93VGhyZWFkTGlzdCkKICAgICAgICAgZmxvd1JlbmRlcmVy LT5sYXlvdXRJZk5lZWRlZCgpOwotICAgIH0KIH0KIAogdm9pZCBGbG93VGhyZWFkQ29udHJvbGxl cjo6cmVnaXN0ZXJOYW1lZEZsb3dDb250ZW50RWxlbWVudChFbGVtZW50JiBjb250ZW50RWxlbWVu dCwgUmVuZGVyTmFtZWRGbG93VGhyZWFkJiBuYW1lZEZsb3cpCkBAIC0xMjUsOCArMTE5LDcgQEAg dm9pZCBGbG93VGhyZWFkQ29udHJvbGxlcjo6dXBkYXRlRmxvd1RocmVhZHNDaGFpbklmTmVjZXNz YXJ5KCkKIAogICAgIC8vIFJlbW92ZSB0aGUgbGVmdC1vdmVyIGZsb3cgdGhyZWFkcy4KICAgICBS ZW5kZXJOYW1lZEZsb3dUaHJlYWRMaXN0IHRvUmVtb3ZlTGlzdDsKLSAgICBmb3IgKGF1dG8gaXRl ciA9IG1fcmVuZGVyTmFtZWRGbG93VGhyZWFkTGlzdC0+YmVnaW4oKSwgZW5kID0gbV9yZW5kZXJO YW1lZEZsb3dUaHJlYWRMaXN0LT5lbmQoKTsgaXRlciAhPSBlbmQ7ICsraXRlcikgewotICAgICAg ICBSZW5kZXJOYW1lZEZsb3dUaHJlYWQqIGZsb3dSZW5kZXJlciA9ICppdGVyOworICAgIGZvciAo YXV0byYgZmxvd1JlbmRlcmVyIDogKm1fcmVuZGVyTmFtZWRGbG93VGhyZWFkTGlzdCkgewogICAg ICAgICBpZiAoZmxvd1JlbmRlcmVyLT5pc01hcmtlZEZvckRlc3RydWN0aW9uKCkpCiAgICAgICAg ICAgICB0b1JlbW92ZUxpc3QuYWRkKGZsb3dSZW5kZXJlcik7CiAgICAgfQpAQCAtMTM0LDggKzEy Nyw3IEBAIHZvaWQgRmxvd1RocmVhZENvbnRyb2xsZXI6OnVwZGF0ZUZsb3dUaHJlYWRzQ2hhaW5J Zk5lY2Vzc2FyeSgpCiAgICAgaWYgKHRvUmVtb3ZlTGlzdC5zaXplKCkgPiAwKQogICAgICAgICBz ZXRJc1JlbmRlck5hbWVkRmxvd1RocmVhZE9yZGVyRGlydHkodHJ1ZSk7CiAKLSAgICBmb3IgKGF1 dG8gaXRlciA9IHRvUmVtb3ZlTGlzdC5iZWdpbigpLCBlbmQgPSB0b1JlbW92ZUxpc3QuZW5kKCk7 IGl0ZXIgIT0gZW5kOyArK2l0ZXIpIHsKLSAgICAgICAgUmVuZGVyTmFtZWRGbG93VGhyZWFkKiBm bG93UmVuZGVyZXIgPSAqaXRlcjsKKyAgICBmb3IgKGF1dG8mIGZsb3dSZW5kZXJlciA6IHRvUmVt b3ZlTGlzdCkgewogICAgICAgICBtX3JlbmRlck5hbWVkRmxvd1RocmVhZExpc3QtPnJlbW92ZShm bG93UmVuZGVyZXIpOwogICAgICAgICBmbG93UmVuZGVyZXItPmRlc3Ryb3koKTsKICAgICB9CkBA IC0xNDMsOCArMTM1LDcgQEAgdm9pZCBGbG93VGhyZWFkQ29udHJvbGxlcjo6dXBkYXRlRmxvd1Ro cmVhZHNDaGFpbklmTmVjZXNzYXJ5KCkKICAgICBpZiAoaXNSZW5kZXJOYW1lZEZsb3dUaHJlYWRP cmRlckRpcnR5KCkpIHsKICAgICAgICAgLy8gQXJyYW5nZSB0aGUgdGhyZWFkIGxpc3QgYWNjb3Jk aW5nIHRvIGRlcGVuZGVuY2llcy4KICAgICAgICAgUmVuZGVyTmFtZWRGbG93VGhyZWFkTGlzdCBz b3J0ZWRMaXN0OwotICAgICAgICBmb3IgKGF1dG8gaXRlciA9IG1fcmVuZGVyTmFtZWRGbG93VGhy ZWFkTGlzdC0+YmVnaW4oKSwgZW5kID0gbV9yZW5kZXJOYW1lZEZsb3dUaHJlYWRMaXN0LT5lbmQo KTsgaXRlciAhPSBlbmQ7ICsraXRlcikgewotICAgICAgICAgICAgUmVuZGVyTmFtZWRGbG93VGhy ZWFkKiBmbG93UmVuZGVyZXIgPSAqaXRlcjsKKyAgICAgICAgZm9yIChhdXRvJiBmbG93UmVuZGVy ZXIgOiAqbV9yZW5kZXJOYW1lZEZsb3dUaHJlYWRMaXN0KSB7CiAgICAgICAgICAgICBpZiAoc29y dGVkTGlzdC5jb250YWlucyhmbG93UmVuZGVyZXIpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVl OwogICAgICAgICAgICAgZmxvd1JlbmRlcmVyLT5wdXNoRGVwZW5kZW5jaWVzKHNvcnRlZExpc3Qp OwpAQCAtMTU5LDggKzE1MCw3IEBAIGJvb2wgRmxvd1RocmVhZENvbnRyb2xsZXI6OnVwZGF0ZUZs b3dUaHJlYWRzTmVlZGluZ0xheW91dCgpCiB7CiAgICAgYm9vbCBuZWVkc1R3b1Bhc3NMYXlvdXQg PSBmYWxzZTsKIAotICAgIGZvciAoYXV0byBpdGVyID0gbV9yZW5kZXJOYW1lZEZsb3dUaHJlYWRM aXN0LT5iZWdpbigpLCBlbmQgPSBtX3JlbmRlck5hbWVkRmxvd1RocmVhZExpc3QtPmVuZCgpOyBp dGVyICE9IGVuZDsgKytpdGVyKSB7Ci0gICAgICAgIFJlbmRlck5hbWVkRmxvd1RocmVhZCogZmxv d1JlbmRlcmVyID0gKml0ZXI7CisgICAgZm9yIChhdXRvJiBmbG93UmVuZGVyZXIgOiAqbV9yZW5k ZXJOYW1lZEZsb3dUaHJlYWRMaXN0KSB7CiAgICAgICAgIEFTU0VSVCghZmxvd1JlbmRlcmVyLT5u ZWVkc1R3b1BoYXNlc0xheW91dCgpKTsKICAgICAgICAgQVNTRVJUKGZsb3dSZW5kZXJlci0+aW5N ZWFzdXJlQ29udGVudExheW91dFBoYXNlKCkpOwogICAgICAgICBpZiAoZmxvd1JlbmRlcmVyLT5u ZWVkc0xheW91dCgpICYmIGZsb3dSZW5kZXJlci0+aGFzQXV0b0xvZ2ljYWxIZWlnaHRSZWdpb25z KCkpCkBAIC0xNzcsOCArMTY3LDcgQEAgYm9vbCBGbG93VGhyZWFkQ29udHJvbGxlcjo6dXBkYXRl Rmxvd1RocmVhZHNOZWVkaW5nVHdvU3RlcExheW91dCgpCiB7CiAgICAgYm9vbCBuZWVkc1R3b1Bh c3NMYXlvdXQgPSBmYWxzZTsKIAotICAgIGZvciAoYXV0byBpdGVyID0gbV9yZW5kZXJOYW1lZEZs b3dUaHJlYWRMaXN0LT5iZWdpbigpLCBlbmQgPSBtX3JlbmRlck5hbWVkRmxvd1RocmVhZExpc3Qt PmVuZCgpOyBpdGVyICE9IGVuZDsgKytpdGVyKSB7Ci0gICAgICAgIFJlbmRlck5hbWVkRmxvd1Ro cmVhZCogZmxvd1JlbmRlcmVyID0gKml0ZXI7CisgICAgZm9yIChhdXRvJiBmbG93UmVuZGVyZXIg OiAqbV9yZW5kZXJOYW1lZEZsb3dUaHJlYWRMaXN0KSB7CiAgICAgICAgIGlmIChmbG93UmVuZGVy ZXItPm5lZWRzVHdvUGhhc2VzTGF5b3V0KCkpIHsKICAgICAgICAgICAgIG5lZWRzVHdvUGFzc0xh eW91dCA9IHRydWU7CiAgICAgICAgICAgICBicmVhazsKQEAgLTE5Myw4ICsxODIsNyBAQCBib29s IEZsb3dUaHJlYWRDb250cm9sbGVyOjp1cGRhdGVGbG93VGhyZWFkc05lZWRpbmdUd29TdGVwTGF5 b3V0KCkKIAogdm9pZCBGbG93VGhyZWFkQ29udHJvbGxlcjo6cmVzZXRGbG93VGhyZWFkc1dpdGhB dXRvSGVpZ2h0UmVnaW9ucygpCiB7Ci0gICAgZm9yIChhdXRvIGl0ZXIgPSBtX3JlbmRlck5hbWVk Rmxvd1RocmVhZExpc3QtPmJlZ2luKCksIGVuZCA9IG1fcmVuZGVyTmFtZWRGbG93VGhyZWFkTGlz dC0+ZW5kKCk7IGl0ZXIgIT0gZW5kOyArK2l0ZXIpIHsKLSAgICAgICAgUmVuZGVyTmFtZWRGbG93 VGhyZWFkKiBmbG93UmVuZGVyZXIgPSAqaXRlcjsKKyAgICBmb3IgKGF1dG8mIGZsb3dSZW5kZXJl ciA6ICptX3JlbmRlck5hbWVkRmxvd1RocmVhZExpc3QpIHsKICAgICAgICAgaWYgKGZsb3dSZW5k ZXJlci0+aGFzQXV0b0xvZ2ljYWxIZWlnaHRSZWdpb25zKCkpIHsKICAgICAgICAgICAgIGZsb3dS ZW5kZXJlci0+bWFya0F1dG9Mb2dpY2FsSGVpZ2h0UmVnaW9uc0ZvckxheW91dCgpOwogICAgICAg ICAgICAgZmxvd1JlbmRlcmVyLT5pbnZhbGlkYXRlUmVnaW9ucygpOwpAQCAtMjM3LDggKzIyNSw3 IEBAIHZvaWQgRmxvd1RocmVhZENvbnRyb2xsZXI6OnVwZGF0ZUZsb3dUaHJlYWRzSW50b092ZXJm bG93UGhhc2UoKQogCiB2b2lkIEZsb3dUaHJlYWRDb250cm9sbGVyOjp1cGRhdGVGbG93VGhyZWFk c0ludG9NZWFzdXJlQ29udGVudFBoYXNlKCkKIHsKLSAgICBmb3IgKGF1dG8gaXRlciA9IG1fcmVu ZGVyTmFtZWRGbG93VGhyZWFkTGlzdC0+YmVnaW4oKSwgZW5kID0gbV9yZW5kZXJOYW1lZEZsb3dU aHJlYWRMaXN0LT5lbmQoKTsgaXRlciAhPSBlbmQ7ICsraXRlcikgewotICAgICAgICBSZW5kZXJO YW1lZEZsb3dUaHJlYWQqIGZsb3dSZW5kZXJlciA9ICppdGVyOworICAgIGZvciAoYXV0byYgZmxv d1JlbmRlcmVyIDogKm1fcmVuZGVyTmFtZWRGbG93VGhyZWFkTGlzdCkgewogICAgICAgICBBU1NF UlQoZmxvd1JlbmRlcmVyLT5pbkZpbmFsTGF5b3V0UGhhc2UoKSk7CiAKICAgICAgICAgZmxvd1Jl bmRlcmVyLT5kaXNwYXRjaE5hbWVkRmxvd0V2ZW50cygpOwpAQCAtMjYxLDE4ICsyNDgsMTQgQEAg dm9pZCBGbG93VGhyZWFkQ29udHJvbGxlcjo6dXBkYXRlRmxvd1RocmVhZHNJbnRvRmluYWxQaGFz ZSgpCiAKIHZvaWQgRmxvd1RocmVhZENvbnRyb2xsZXI6OnVwZGF0ZUZsb3dUaHJlYWRzTGF5ZXJU b1JlZ2lvbk1hcHBpbmdzSWZOZWVkZWQoKQogewotICAgIGZvciAoYXV0byBpdGVyID0gbV9yZW5k ZXJOYW1lZEZsb3dUaHJlYWRMaXN0LT5iZWdpbigpLCBlbmQgPSBtX3JlbmRlck5hbWVkRmxvd1Ro cmVhZExpc3QtPmVuZCgpOyBpdGVyICE9IGVuZDsgKytpdGVyKSB7Ci0gICAgICAgIFJlbmRlck5h bWVkRmxvd1RocmVhZCogZmxvd1JlbmRlcmVyID0gKml0ZXI7CisgICAgZm9yIChhdXRvJiBmbG93 UmVuZGVyZXIgOiAqbV9yZW5kZXJOYW1lZEZsb3dUaHJlYWRMaXN0KQogICAgICAgICBmbG93UmVu ZGVyZXItPnVwZGF0ZUFsbExheWVyVG9SZWdpb25NYXBwaW5nc0lmTmVlZGVkKCk7Ci0gICAgfQog fQogCiB2b2lkIEZsb3dUaHJlYWRDb250cm9sbGVyOjp1cGRhdGVOYW1lZEZsb3dzTGF5ZXJMaXN0 c0lmTmVlZGVkKCkKIHsKLSAgICBmb3IgKGF1dG8gaXRlciA9IG1fcmVuZGVyTmFtZWRGbG93VGhy ZWFkTGlzdC0+YmVnaW4oKSwgZW5kID0gbV9yZW5kZXJOYW1lZEZsb3dUaHJlYWRMaXN0LT5lbmQo KTsgaXRlciAhPSBlbmQ7ICsraXRlcikgewotICAgICAgICBSZW5kZXJOYW1lZEZsb3dUaHJlYWQq IGZsb3dSZW5kZXJlciA9ICppdGVyOworICAgIGZvciAoYXV0byYgZmxvd1JlbmRlcmVyIDogKm1f cmVuZGVyTmFtZWRGbG93VGhyZWFkTGlzdCkKICAgICAgICAgZmxvd1JlbmRlcmVyLT5sYXllcigp LT51cGRhdGVMYXllckxpc3RzSWZOZWVkZWQoKTsKLSAgICB9CiB9CiAKIHN0YXRpYyBpbmxpbmUg Ym9vbCBjb21wYXJlWkluZGV4KFJlbmRlckxheWVyKiBmaXJzdCwgUmVuZGVyTGF5ZXIqIHNlY29u ZCkKQEAgLTI4NCw5ICsyNjcsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgY29tcGFyZVpJbmRleChS ZW5kZXJMYXllciogZmlyc3QsIFJlbmRlckxheWVyKiBzZWNvbmQpCiAvLyBUaGVzZSBsYXllcnMg YXJlIHBhaW50ZWQgYW5kIGhpdC10ZXN0ZWQgc3RhcnRpbmcgZnJvbSBSZW5kZXJWaWV3IG5vdCBm cm9tIHJlZ2lvbnMuCiB2b2lkIEZsb3dUaHJlYWRDb250cm9sbGVyOjpjb2xsZWN0Rml4ZWRQb3Np dGlvbmVkTGF5ZXJzKFZlY3RvcjxSZW5kZXJMYXllcio+JiBmaXhlZFBvc0xheWVycykgY29uc3QK IHsKLSAgICBmb3IgKGF1dG8gaXRlciA9IG1fcmVuZGVyTmFtZWRGbG93VGhyZWFkTGlzdC0+YmVn aW4oKSwgZW5kID0gbV9yZW5kZXJOYW1lZEZsb3dUaHJlYWRMaXN0LT5lbmQoKTsgaXRlciAhPSBl bmQ7ICsraXRlcikgewotICAgICAgICBSZW5kZXJOYW1lZEZsb3dUaHJlYWQqIGZsb3dSZW5kZXJl ciA9ICppdGVyOwotCisgICAgZm9yIChhdXRvJiBmbG93UmVuZGVyZXIgOiAqbV9yZW5kZXJOYW1l ZEZsb3dUaHJlYWRMaXN0KSB7CiAgICAgICAgIC8vIElmIHRoZSBuYW1lZCBmbG93IGRvZXMgbm90 IGhhdmUgYW55IHJlZ2lvbnMgYXR0YWNoZWQsIGEgZml4ZWQgZWxlbWVudCBzaG91bGQgbm90IGJl CiAgICAgICAgIC8vIGRpc3BsYXllZCBldmVuIGlmIHRoZSBmaXhlZCBlbGVtZW50IGlzIHBvc2l0 aW9uZWQvc2l6ZWQgYnkgdGhlIHZpZXdwb3J0LgogICAgICAgICBpZiAoIWZsb3dSZW5kZXJlci0+ aGFzUmVnaW9ucygpKQpAQCAtMzIxLDggKzMwMiw4IEBAIGJvb2wgRmxvd1RocmVhZENvbnRyb2xs ZXI6OmlzQXV0b0xvZ2ljYWxIZWlnaHRSZWdpb25zQ291bnRDb25zaXN0ZW50KCkgY29uc3QKICAg ICBpZiAoIWhhc1JlbmRlck5hbWVkRmxvd1RocmVhZHMoKSkKICAgICAgICAgcmV0dXJuICFoYXNG bG93VGhyZWFkc1dpdGhBdXRvTG9naWNhbEhlaWdodFJlZ2lvbnMoKTsKIAotICAgIGZvciAoYXV0 byBpdGVyID0gbV9yZW5kZXJOYW1lZEZsb3dUaHJlYWRMaXN0LT5iZWdpbigpLCBlbmQgPSBtX3Jl bmRlck5hbWVkRmxvd1RocmVhZExpc3QtPmVuZCgpOyBpdGVyICE9IGVuZDsgKytpdGVyKSB7Ci0g ICAgICAgIGlmICghKCppdGVyKS0+aXNBdXRvTG9naWNhbEhlaWdodFJlZ2lvbnNDb3VudENvbnNp c3RlbnQoKSkKKyAgICBmb3IgKGF1dG8mIGZsb3dSZW5kZXJlciA6ICptX3JlbmRlck5hbWVkRmxv d1RocmVhZExpc3QpIHsKKyAgICAgICAgaWYgKCFmbG93UmVuZGVyZXItPmlzQXV0b0xvZ2ljYWxI ZWlnaHRSZWdpb25zQ291bnRDb25zaXN0ZW50KCkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgfQogCg==