132672 2014-05-08 01:13:18 -0700 [CSS Regions] 1-2% performance regression in html5-full-render after r168286 2014-05-09 09:16:32 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED AdobeTracked P2 Normal --- 128243 1 abucur abucur commit-queue esprehn+autocc glenn kondapallykalyan rniwa WebkitBugTracker oldest_to_newest 1007556 0 abucur 2014-05-08 01:13:18 -0700 After new-multi was enabled the RenderFlowThread code path started affecting some of the performance tests (some have multi-column elements). Investigate this regression and find a fix for it. 1007557 1 abucur 2014-05-08 01:14:02 -0700 The changeset to blame: http://trac.webkit.org/changeset/168286 1007927 2 231135 abucur 2014-05-09 02:00:10 -0700 Created attachment 231135 Patch 1007929 3 231136 abucur 2014-05-09 02:05:55 -0700 Created attachment 231136 Patch that applies 1007941 4 231136 mihnea 2014-05-09 04:03:08 -0700 Comment on attachment 231136 Patch that applies r=me. Instead of testing the single region case directly, it may be a good idea to have a helper function. 1007992 5 abucur 2014-05-09 08:45:14 -0700 I don't suspect I'll use this condition in more places. I'm kinda skeptical having a function hasOneRegion actually brings value. If this is an optimization that can be applied in other places as well, I'll create that helper function. 1007997 6 231136 commit-queue 2014-05-09 09:16:28 -0700 Comment on attachment 231136 Patch that applies Clearing flags on attachment: 231136 Committed r168534: <http://trac.webkit.org/changeset/168534> 1007998 7 commit-queue 2014-05-09 09:16:32 -0700 All reviewed patches have been landed. Closing bug. 231135 2014-05-09 02:00:10 -0700 2014-05-09 02:05:46 -0700 Patch bug-132672-20140509115941.patch text/plain 4651 abucur U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4NDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2E0Y2Y1YWEzZTY3MmE5 OTc5ZjBmZWJjNTk2M2VkMmNjMjM3NzM5NS4uOGNmNjQxYWZlYTQ2ZDhjMzMzYTQ0ODI5OGUzODY2 NzllNzMwODJkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTA1LTA5ICBBbmRy ZWkgQnVjdXIgIDxhYnVjdXJAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1MgUmVnaW9uc10gMS0y JSBwZXJmb3JtYW5jZSByZWdyZXNzaW9uIGluIGh0bWw1LWZ1bGwtcmVuZGVyIGFmdGVyIHIxNjgy ODYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjY3 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBw YXRjaCBvcHRpbWl6ZXMgdGhlIHNlYXJjaCBvZiByZWdpb25zIHdoZW4gdGhlcmUncyBhIHNpbmds ZSByZWdpb24gaW4gdGhlIGNoYWluLgorICAgICAgICBUaGVyZSdzIG5vIG5lZWQgdG8gZXhlY3V0 ZSBhZHZhbmNlZCBzZWFyY2ggbG9naWMsIHdlIGNhbiBkaXJlY3RseSByZXR1cm4gdGhhdCByZWdp b24uCisKKyAgICAgICAgVGVzdHM6IE5vIGZ1bmN0aW9uIGNoYW5nZSwgbm8gdGVzdHMuCisKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2Fu Q29tcHV0ZVJlZ2lvblJhbmdlRm9yQm94KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxv d1RocmVhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbG93VGhyZWFkOjpyZWdpb25B dEJsb2NrT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6Omhhc0Nh Y2hlZFJlZ2lvblJhbmdlRm9yQm94KTogUmVuYW1lZCBmcm9tIGhhc1JlZ2lvblJhbmdlRm9yQm94 IHRvCisgICAgICAgIGJldHRlciBzdWdnZXN0IHdoYXQgdGhlIGZ1bmN0aW9uIGRvZXMuCisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJGbG93VGhyZWFkOjpnZXRSZWdpb25SYW5nZUZvckJveCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbG93VGhyZWFkOjpoYXNSZWdpb25SYW5nZUZvckJveCk6 IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuaDoKKwogMjAx NC0wNS0wNyAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAg ICAgICBSZXBsYWNlIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTCBieSBzdGF0aWMgTmV2 ZXJEZXN0cm95ZWQ8VD4gaW4gc3ZnLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5jcHAKaW5kZXggZTU3M2RlMmU4ODdhYzI2OTk4OTQ3MzY3ZmM4YzExOGUzYTBjYzM5OS4uOTFj MzA4YmU2M2NiZmM5MmM2MWI5ODE2ODgzMTc5OWZjMjMxMzlhNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0zODk3LDcgKzM4OTcsNyBAQCBzdGF0aWMgYm9v bCBjYW5Db21wdXRlUmVnaW9uUmFuZ2VGb3JCb3goY29uc3QgUmVuZGVyQmxvY2sqIHBhcmVudEJs b2NrLCBjb25zdCBSZQogICAgIGlmICghY2hpbGRCb3guY2FuSGF2ZU91dHNpZGVSZWdpb25SYW5n ZSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1cm4gZmxvd1RocmVhZENvbnRh aW5pbmdCbG9jay0+aGFzUmVnaW9uUmFuZ2VGb3JCb3gocGFyZW50QmxvY2spOworICAgIHJldHVy biBmbG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrLT5oYXNDYWNoZWRSZWdpb25SYW5nZUZvckJveChw YXJlbnRCbG9jayk7CiB9CiAKIGJvb2wgUmVuZGVyQmxvY2s6OmNoaWxkQm94SXNVbnNwbGl0dGFi bGVGb3JGcmFnbWVudGF0aW9uKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAKaW5kZXggY2JjZWRmZjY5 ODg0MjFlNDFmZTA3ZDM2NmQ4MjY0NmZlNDI0ZDU0NS4uNjQ2ZGQzYWJlOGYxYTgxNTgxYzUxN2E5 ZmU1NmUxY2ZhZjY5NDU2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsb3dUaHJlYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bG93VGhyZWFkLmNwcApAQCAtNDAxLDYgKzQwMSw5IEBAIFJlbmRlclJlZ2lvbiogUmVuZGVyRmxv d1RocmVhZDo6cmVnaW9uQXRCbG9ja09mZnNldChjb25zdCBSZW5kZXJCb3gqIGNsYW1wQm94LCBM CiAgICAgaWYgKG1fcmVnaW9uTGlzdC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiAwOwogCisg ICAgaWYgKG1fcmVnaW9uTGlzdC5zaXplKCkgPT0gMSAmJiBleHRlbmRMYXN0UmVnaW9uKQorICAg ICAgICByZXR1cm4gbV9yZWdpb25MaXN0LmZpcnN0KCk7CisKICAgICBpZiAob2Zmc2V0IDw9IDAp CiAgICAgICAgIHJldHVybiBjbGFtcEJveCA/IGNsYW1wQm94LT5jbGFtcFRvU3RhcnRBbmRFbmRS ZWdpb25zKG1fcmVnaW9uTGlzdC5maXJzdCgpKSA6IG1fcmVnaW9uTGlzdC5maXJzdCgpOwogCkBA IC03NDcsNyArNzUwLDcgQEAgdm9pZCBSZW5kZXJGbG93VGhyZWFkOjpzZXRSZWdpb25SYW5nZUZv ckJveChjb25zdCBSZW5kZXJCb3gqIGJveCwgUmVuZGVyUmVnaW9uKgogICAgIHJhbmdlLnNldFJh bmdlKHN0YXJ0UmVnaW9uLCBlbmRSZWdpb24pOwogfQogCi1ib29sIFJlbmRlckZsb3dUaHJlYWQ6 Omhhc1JlZ2lvblJhbmdlRm9yQm94KGNvbnN0IFJlbmRlckJveCogYm94KSBjb25zdAorYm9vbCBS ZW5kZXJGbG93VGhyZWFkOjpoYXNDYWNoZWRSZWdpb25SYW5nZUZvckJveChjb25zdCBSZW5kZXJC b3gqIGJveCkgY29uc3QKIHsKICAgICBBU1NFUlQoYm94KTsKIApAQCAtNzk0LDYgKzc5NywxMSBA QCBib29sIFJlbmRlckZsb3dUaHJlYWQ6OmdldFJlZ2lvblJhbmdlRm9yQm94KGNvbnN0IFJlbmRl ckJveCogYm94LCBSZW5kZXJSZWdpb24qJgogICAgIGlmICghaGFzVmFsaWRSZWdpb25JbmZvKCkp IC8vIFdlIGNsZWFyIHRoZSByYW5nZXMgd2hlbiB3ZSBpbnZhbGlkYXRlIHRoZSByZWdpb25zLgog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAobV9yZWdpb25MaXN0LnNpemUoKSA9PSAx KSB7CisgICAgICAgIHN0YXJ0UmVnaW9uID0gZW5kUmVnaW9uID0gbV9yZWdpb25MaXN0LmZpcnN0 KCk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKwogICAgIGlmIChnZXRSZWdpb25SYW5n ZUZvckJveEZyb21DYWNoZWRJbmZvKGJveCwgc3RhcnRSZWdpb24sIGVuZFJlZ2lvbikpCiAgICAg ICAgIHJldHVybiB0cnVlOwogCkBAIC04MTAsNyArODE4LDcgQEAgYm9vbCBSZW5kZXJGbG93VGhy ZWFkOjpnZXRSZWdpb25SYW5nZUZvckJveChjb25zdCBSZW5kZXJCb3gqIGJveCwgUmVuZGVyUmVn aW9uKiYKICAgICAgICAgY2IgPSBjYi0+cGFyZW50KCktPmVuY2xvc2luZ0JveCgpOwogICAgICAg ICBBU1NFUlQoY2IpOwogCi0gICAgICAgIGlmIChoYXNSZWdpb25SYW5nZUZvckJveChjYikpCisg ICAgICAgIGlmIChoYXNDYWNoZWRSZWdpb25SYW5nZUZvckJveChjYikpCiAgICAgICAgICAgICBj YlRvVXNlID0gY2I7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRmxvd1RocmVhZC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs b3dUaHJlYWQuaAppbmRleCBmODkyNzY5NDFiMjU2MDllYWJiMGFjNWFhOTJlNDliMDUxODQ0ZGQ5 Li5kYTNhYjBhOTI0MDBiMzUzN2JjYWY1MTY3OTBhOGMxMjMyODk0M2MyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmgKQEAgLTE0MSw3ICsxNDEsNyBAQCBw dWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0UmVnaW9uUmFuZ2VGb3JCb3goY29uc3QgUmVu ZGVyQm94KiwgUmVuZGVyUmVnaW9uKiwgUmVuZGVyUmVnaW9uKik7CiAgICAgYm9vbCBnZXRSZWdp b25SYW5nZUZvckJveChjb25zdCBSZW5kZXJCb3gqLCBSZW5kZXJSZWdpb24qJiBzdGFydFJlZ2lv biwgUmVuZGVyUmVnaW9uKiYgZW5kUmVnaW9uKSBjb25zdDsKLSAgICBib29sIGhhc1JlZ2lvblJh bmdlRm9yQm94KGNvbnN0IFJlbmRlckJveCopIGNvbnN0OworICAgIGJvb2wgaGFzQ2FjaGVkUmVn aW9uUmFuZ2VGb3JCb3goY29uc3QgUmVuZGVyQm94KikgY29uc3Q7CiAKICAgICAvLyBDaGVjayBp ZiB0aGUgb2JqZWN0IGlzIGluIHJlZ2lvbiBhbmQgdGhlIHJlZ2lvbiBpcyBwYXJ0IG9mIHRoaXMg ZmxvdyB0aHJlYWQuCiAgICAgYm9vbCBvYmplY3RJbkZsb3dSZWdpb24oY29uc3QgUmVuZGVyT2Jq ZWN0KiwgY29uc3QgUmVuZGVyUmVnaW9uKikgY29uc3Q7Cg== 231136 2014-05-09 02:05:55 -0700 2014-05-09 09:16:28 -0700 Patch that applies bug-132672-20140509120525.patch text/plain 4653 abucur U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4NTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWEzNDlkOTEyYjNjOWI3 ZDhkOTkxZWY1ZWE1MzczZGYwODZiZDBhNy4uNDBhNmY0ZjBkZWQxYWUxN2RkMzQ4NTQxZDA0ODVj OWJkZDE4MmM2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTA1LTA5ICBBbmRy ZWkgQnVjdXIgIDxhYnVjdXJAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1MgUmVnaW9uc10gMS0y JSBwZXJmb3JtYW5jZSByZWdyZXNzaW9uIGluIGh0bWw1LWZ1bGwtcmVuZGVyIGFmdGVyIHIxNjgy ODYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjY3 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBw YXRjaCBvcHRpbWl6ZXMgdGhlIHNlYXJjaCBvZiByZWdpb25zIHdoZW4gdGhlcmUncyBhIHNpbmds ZSByZWdpb24gaW4gdGhlIGNoYWluLgorICAgICAgICBUaGVyZSdzIG5vIG5lZWQgdG8gZXhlY3V0 ZSBhZHZhbmNlZCBzZWFyY2ggbG9naWMsIHdlIGNhbiBkaXJlY3RseSByZXR1cm4gdGhhdCByZWdp b24uCisKKyAgICAgICAgVGVzdHM6IE5vIGZ1bmN0aW9uIGNoYW5nZSwgbm8gdGVzdHMuCisKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2Fu Q29tcHV0ZVJlZ2lvblJhbmdlRm9yQm94KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxv d1RocmVhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbG93VGhyZWFkOjpyZWdpb25B dEJsb2NrT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6Omhhc0Nh Y2hlZFJlZ2lvblJhbmdlRm9yQm94KTogUmVuYW1lZCBmcm9tIGhhc1JlZ2lvblJhbmdlRm9yQm94 IHRvCisgICAgICAgIGJldHRlciBzdWdnZXN0IHdoYXQgdGhlIGZ1bmN0aW9uIGRvZXMuCisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJGbG93VGhyZWFkOjpnZXRSZWdpb25SYW5nZUZvckJveCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbG93VGhyZWFkOjpoYXNSZWdpb25SYW5nZUZvckJveCk6 IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuaDoKKwogMjAx NC0wNS0wOCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBN dWx0aXBsZSAoc3RhY2tlZCkgY3VlcyB3aGVuIHNodXR0bGluZyB0aHJvdWdoIHZpZGVvIHdoaWxl IHBsYXlpbmcgY2xvc2VkIGNhcHRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmNwcAppbmRleCA3NTk5ZDA4ODI0OTUyNzk5Y2I2NGJiMmJhNWQ2ZDhmMzhhZjgxY2FhLi5j NTA3ZDY2YmI4ZjJkODZmNWUwNWQ5ZmMwYmU3YTJmMzU3MzY3ZTZmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTM4OTcsNyArMzg5Nyw3IEBAIHN0YXRpYyBi b29sIGNhbkNvbXB1dGVSZWdpb25SYW5nZUZvckJveChjb25zdCBSZW5kZXJCbG9jayogcGFyZW50 QmxvY2ssIGNvbnN0IFJlCiAgICAgaWYgKCFjaGlsZEJveC5jYW5IYXZlT3V0c2lkZVJlZ2lvblJh bmdlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJldHVybiBmbG93VGhyZWFkQ29u dGFpbmluZ0Jsb2NrLT5oYXNSZWdpb25SYW5nZUZvckJveChwYXJlbnRCbG9jayk7CisgICAgcmV0 dXJuIGZsb3dUaHJlYWRDb250YWluaW5nQmxvY2stPmhhc0NhY2hlZFJlZ2lvblJhbmdlRm9yQm94 KHBhcmVudEJsb2NrKTsKIH0KIAogYm9vbCBSZW5kZXJCbG9jazo6Y2hpbGRCb3hJc1Vuc3BsaXR0 YWJsZUZvckZyYWdtZW50YXRpb24oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcAppbmRleCBjYmNlZGZm Njk4ODQyMWU0MWZlMDdkMzY2ZDgyNjQ2ZmU0MjRkNTQ1Li42NDZkZDNhYmU4ZjFhODE1ODFjNTE3 YTlmZTU2ZTFjZmFmNjk0NTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyRmxvd1RocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckZsb3dUaHJlYWQuY3BwCkBAIC00MDEsNiArNDAxLDkgQEAgUmVuZGVyUmVnaW9uKiBSZW5kZXJG bG93VGhyZWFkOjpyZWdpb25BdEJsb2NrT2Zmc2V0KGNvbnN0IFJlbmRlckJveCogY2xhbXBCb3gs IEwKICAgICBpZiAobV9yZWdpb25MaXN0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIDA7CiAK KyAgICBpZiAobV9yZWdpb25MaXN0LnNpemUoKSA9PSAxICYmIGV4dGVuZExhc3RSZWdpb24pCisg ICAgICAgIHJldHVybiBtX3JlZ2lvbkxpc3QuZmlyc3QoKTsKKwogICAgIGlmIChvZmZzZXQgPD0g MCkKICAgICAgICAgcmV0dXJuIGNsYW1wQm94ID8gY2xhbXBCb3gtPmNsYW1wVG9TdGFydEFuZEVu ZFJlZ2lvbnMobV9yZWdpb25MaXN0LmZpcnN0KCkpIDogbV9yZWdpb25MaXN0LmZpcnN0KCk7CiAK QEAgLTc0Nyw3ICs3NTAsNyBAQCB2b2lkIFJlbmRlckZsb3dUaHJlYWQ6OnNldFJlZ2lvblJhbmdl Rm9yQm94KGNvbnN0IFJlbmRlckJveCogYm94LCBSZW5kZXJSZWdpb24qCiAgICAgcmFuZ2Uuc2V0 UmFuZ2Uoc3RhcnRSZWdpb24sIGVuZFJlZ2lvbik7CiB9CiAKLWJvb2wgUmVuZGVyRmxvd1RocmVh ZDo6aGFzUmVnaW9uUmFuZ2VGb3JCb3goY29uc3QgUmVuZGVyQm94KiBib3gpIGNvbnN0Citib29s IFJlbmRlckZsb3dUaHJlYWQ6Omhhc0NhY2hlZFJlZ2lvblJhbmdlRm9yQm94KGNvbnN0IFJlbmRl ckJveCogYm94KSBjb25zdAogewogICAgIEFTU0VSVChib3gpOwogCkBAIC03OTQsNiArNzk3LDEx IEBAIGJvb2wgUmVuZGVyRmxvd1RocmVhZDo6Z2V0UmVnaW9uUmFuZ2VGb3JCb3goY29uc3QgUmVu ZGVyQm94KiBib3gsIFJlbmRlclJlZ2lvbiomCiAgICAgaWYgKCFoYXNWYWxpZFJlZ2lvbkluZm8o KSkgLy8gV2UgY2xlYXIgdGhlIHJhbmdlcyB3aGVuIHdlIGludmFsaWRhdGUgdGhlIHJlZ2lvbnMu CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIGlmIChtX3JlZ2lvbkxpc3Quc2l6ZSgpID09 IDEpIHsKKyAgICAgICAgc3RhcnRSZWdpb24gPSBlbmRSZWdpb24gPSBtX3JlZ2lvbkxpc3QuZmly c3QoKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCiAgICAgaWYgKGdldFJlZ2lvblJh bmdlRm9yQm94RnJvbUNhY2hlZEluZm8oYm94LCBzdGFydFJlZ2lvbiwgZW5kUmVnaW9uKSkKICAg ICAgICAgcmV0dXJuIHRydWU7CiAKQEAgLTgxMCw3ICs4MTgsNyBAQCBib29sIFJlbmRlckZsb3dU aHJlYWQ6OmdldFJlZ2lvblJhbmdlRm9yQm94KGNvbnN0IFJlbmRlckJveCogYm94LCBSZW5kZXJS ZWdpb24qJgogICAgICAgICBjYiA9IGNiLT5wYXJlbnQoKS0+ZW5jbG9zaW5nQm94KCk7CiAgICAg ICAgIEFTU0VSVChjYik7CiAKLSAgICAgICAgaWYgKGhhc1JlZ2lvblJhbmdlRm9yQm94KGNiKSkK KyAgICAgICAgaWYgKGhhc0NhY2hlZFJlZ2lvblJhbmdlRm9yQm94KGNiKSkKICAgICAgICAgICAg IGNiVG9Vc2UgPSBjYjsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGbG93VGhyZWFkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Rmxvd1RocmVhZC5oCmluZGV4IGY4OTI3Njk0MWIyNTYwOWVhYmIwYWM1YWE5MmU0OWIwNTE4NDRk ZDkuLmRhM2FiMGE5MjQwMGIzNTM3YmNhZjUxNjc5MGE4YzEyMzI4OTQzYzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuaApAQCAtMTQxLDcgKzE0MSw3IEBA IHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRSZWdpb25SYW5nZUZvckJveChjb25zdCBS ZW5kZXJCb3gqLCBSZW5kZXJSZWdpb24qLCBSZW5kZXJSZWdpb24qKTsKICAgICBib29sIGdldFJl Z2lvblJhbmdlRm9yQm94KGNvbnN0IFJlbmRlckJveCosIFJlbmRlclJlZ2lvbiomIHN0YXJ0UmVn aW9uLCBSZW5kZXJSZWdpb24qJiBlbmRSZWdpb24pIGNvbnN0OwotICAgIGJvb2wgaGFzUmVnaW9u UmFuZ2VGb3JCb3goY29uc3QgUmVuZGVyQm94KikgY29uc3Q7CisgICAgYm9vbCBoYXNDYWNoZWRS ZWdpb25SYW5nZUZvckJveChjb25zdCBSZW5kZXJCb3gqKSBjb25zdDsKIAogICAgIC8vIENoZWNr IGlmIHRoZSBvYmplY3QgaXMgaW4gcmVnaW9uIGFuZCB0aGUgcmVnaW9uIGlzIHBhcnQgb2YgdGhp cyBmbG93IHRocmVhZC4KICAgICBib29sIG9iamVjdEluRmxvd1JlZ2lvbihjb25zdCBSZW5kZXJP YmplY3QqLCBjb25zdCBSZW5kZXJSZWdpb24qKSBjb25zdDsK