128914 2014-02-17 09:19:34 -0800 [CSS Regions] Move specific named flow methods from RenderRegion to RenderNamedFlowFragment 2014-02-17 23:49:23 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED AdobeTracked P2 Normal --- 57312 1 stavila stavila commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser WebkitBugTracker oldest_to_newest 981498 0 stavila 2014-02-17 09:19:34 -0800 Move the regionContainer and regionContainerLayer methods from RenderRegion to RenderNamedFlowFragment 981640 1 224423 stavila 2014-02-17 14:19:45 -0800 Created attachment 224423 Patch 981642 2 224423 koivisto 2014-02-17 14:23:05 -0800 Comment on attachment 224423 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224423&action=review r=me > Source/WebCore/rendering/RenderNamedFlowFragment.cpp:195 > +RenderBlockFlow* RenderNamedFlowFragment::fragmentContainer() const > +{ > + ASSERT(parent() && parent()->isRenderNamedFlowFragmentContainer()); > + return toRenderBlockFlow(parent()); > +} Looks like this is never null. Could you return a reference? Please assert the conditions separately (makes seeing what failed easier). > Source/WebCore/rendering/RenderNamedFlowFragment.cpp:200 > +RenderLayer* RenderNamedFlowFragment::fragmentContainerLayer() const > +{ > + return fragmentContainer()->layer(); > +} Can this be null? 981646 3 224425 stavila 2014-02-17 14:41:16 -0800 Created attachment 224425 Patch integrating feedback 981685 4 224441 stavila 2014-02-17 15:44:12 -0800 Created attachment 224441 Rebase 981810 5 224441 commit-queue 2014-02-17 23:48:38 -0800 Comment on attachment 224441 Rebase Clearing flags on attachment: 224441 Committed r164275: <http://trac.webkit.org/changeset/164275> 224423 2014-02-17 14:19:45 -0800 2014-02-17 14:23:05 -0800 Patch 128914.patch text/plain 6962 stavila ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ODdlMTU3Li40YjdmOTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTQtMDItMTcgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgorCisgICAg ICAgIFtDU1MgUmVnaW9uc10gTW92ZSBzcGVjaWZpYyBuYW1lZCBmbG93IG1ldGhvZHMgZnJvbSBS ZW5kZXJSZWdpb24gdG8gUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODkxNAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmVkIG5hbWVkIGZsb3cgc3BlY2lmaWMg bWV0aG9kcyByZWdpb25Db250YWluZXIoKSBhbmQgcmVnaW9uQ29udGFpbmVyTGF5ZXIoKSBmcm9t IAorICAgICAgICBSZW5kZXJSZWdpb24gdG8gUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQgYW5kIHJl bmFtZWQgdGhlbSB0byBmcmFnbWVudENvbnRhaW5lciBhbmQKKyAgICAgICAgZnJhZ21lbnRDb250 YWluZXJMYXllci4KKworICAgICAgICBObyBuZXcgdGVzdHMgcmVxdWlyZWQuCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXI6Om1hcExheWVyQ2xpcFJlY3RzVG9GcmFnbWVudGF0aW9uTGF5ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ck5hbWVkRmxvd0ZyYWdtZW50OjpmcmFnbWVudENvbnRhaW5lcik6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJOYW1lZEZsb3dGcmFnbWVudDo6ZnJhZ21lbnRDb250YWluZXJMYXllcik6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50Lmg6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlclJlZ2lvbi5jcHA6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJlZ2lv bi5oOgorCiAyMDE0LTAyLTE3ICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtDU1MgR3JpZCBMYXlvdXRdIEZpeCBtaXNzaW5nIGxheW91dCBpbiBm bGV4aWJsZSBhbmQgY29udGVudCBzaXplZCBjb2x1bW5zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcAppbmRleCAzNmYzYWJkLi43OTk3ODIyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTUyNTIsMTUgKzUyNTIsMTcgQEAgdm9pZCBS ZW5kZXJMYXllcjo6dXBkYXRlQ2xpcFJlY3RzKGNvbnN0IENsaXBSZWN0c0NvbnRleHQmIGNsaXBS ZWN0c0NvbnRleHQpCiAKIHZvaWQgUmVuZGVyTGF5ZXI6Om1hcExheWVyQ2xpcFJlY3RzVG9GcmFn bWVudGF0aW9uTGF5ZXIoUmVuZGVyUmVnaW9uKiByZWdpb24sIENsaXBSZWN0cyYgY2xpcFJlY3Rz KSBjb25zdAogewotICAgIEFTU0VSVChyZWdpb24gJiYgcmVnaW9uLT5wYXJlbnQoKSAmJiByZWdp b24tPnBhcmVudCgpLT5pc1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50Q29udGFpbmVyKCkpOworICAg IEFTU0VSVChyZWdpb24gJiYgcmVnaW9uLT5pc1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50KCkgJiYg cmVnaW9uLT5wYXJlbnQoKSAmJiByZWdpb24tPnBhcmVudCgpLT5pc1JlbmRlck5hbWVkRmxvd0Zy YWdtZW50Q29udGFpbmVyKCkpOworICAgIAorICAgIFJlbmRlck5hbWVkRmxvd0ZyYWdtZW50KiBm bG93RnJhZ21lbnQgPSB0b1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50KHJlZ2lvbik7CiAKLSAgICBD bGlwUmVjdHNDb250ZXh0IHRhcmdldENsaXBSZWN0c0NvbnRleHQocmVnaW9uLT5yZWdpb25Db250 YWluZXJMYXllcigpLCAwLCBUZW1wb3JhcnlDbGlwUmVjdHMpOwotICAgIHJlZ2lvbi0+cmVnaW9u Q29udGFpbmVyTGF5ZXIoKS0+Y2FsY3VsYXRlQ2xpcFJlY3RzKHRhcmdldENsaXBSZWN0c0NvbnRl eHQsIGNsaXBSZWN0cyk7CisgICAgQ2xpcFJlY3RzQ29udGV4dCB0YXJnZXRDbGlwUmVjdHNDb250 ZXh0KGZsb3dGcmFnbWVudC0+ZnJhZ21lbnRDb250YWluZXJMYXllcigpLCAwLCBUZW1wb3JhcnlD bGlwUmVjdHMpOworICAgIGZsb3dGcmFnbWVudC0+ZnJhZ21lbnRDb250YWluZXJMYXllcigpLT5j YWxjdWxhdGVDbGlwUmVjdHModGFyZ2V0Q2xpcFJlY3RzQ29udGV4dCwgY2xpcFJlY3RzKTsKIAog ICAgIExheW91dFJlY3QgZmxvd1RocmVhZFBvcnRpb25SZWN0ID0gcmVnaW9uLT5mbG93VGhyZWFk UG9ydGlvblJlY3QoKTsKIAogICAgIExheW91dFBvaW50IHBvcnRpb25Mb2NhdGlvbiA9IGZsb3dU aHJlYWRQb3J0aW9uUmVjdC5sb2NhdGlvbigpOwotICAgIExheW91dFJlY3QgcmVnaW9uQ29udGVu dEJveCA9IHJlZ2lvbi0+cmVnaW9uQ29udGFpbmVyKCktPmNvbnRlbnRCb3hSZWN0KCk7CisgICAg TGF5b3V0UmVjdCByZWdpb25Db250ZW50Qm94ID0gZmxvd0ZyYWdtZW50LT5mcmFnbWVudENvbnRh aW5lcigpLT5jb250ZW50Qm94UmVjdCgpOwogICAgIExheW91dFNpemUgbW92ZU9mZnNldCA9IHBv cnRpb25Mb2NhdGlvbiAtIHJlZ2lvbkNvbnRlbnRCb3gubG9jYXRpb24oKTsKIAogICAgIENsaXBS ZWN0IG5ld092ZXJmbG93Q2xpcFJlY3QgPSBjbGlwUmVjdHMub3ZlcmZsb3dDbGlwUmVjdCgpOwpA QCAtNTQ1Niw4ICs1NDU4LDEwIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZVJlY3RzKGNv bnN0IENsaXBSZWN0c0NvbnRleHQmIGNsaXBSZWN0c0NvbnRleHQsIGNvbnN0CiAgICAgICAgIG91 dGxpbmVSZWN0ID0gYmFja2dyb3VuZFJlY3Q7CiAgICAgICAgIAogICAgICAgICAvLyBJZiB0aGUg cmVnaW9uIGRvZXMgbm90IGNsaXAgaXRzIG92ZXJmbG93LCBpbmZsYXRlIHRoZSBvdXRsaW5lIHJl Y3QuCi0gICAgICAgIGlmICghKGNsaXBSZWN0c0NvbnRleHQucmVnaW9uLT5wYXJlbnQoKS0+aGFz T3ZlcmZsb3dDbGlwKCkgJiYgKGNsaXBSZWN0c0NvbnRleHQucmVnaW9uLT5yZWdpb25Db250YWlu ZXJMYXllcigpICE9IGNsaXBSZWN0c0NvbnRleHQucm9vdExheWVyIHx8IGNsaXBSZWN0c0NvbnRl eHQucmVzcGVjdE92ZXJmbG93Q2xpcCA9PSBSZXNwZWN0T3ZlcmZsb3dDbGlwKSkpCi0gICAgICAg ICAgICBvdXRsaW5lUmVjdC5pbmZsYXRlKHJlbmRlcmVyKCkubWF4aW1hbE91dGxpbmVTaXplKFBh aW50UGhhc2VPdXRsaW5lKSk7CisgICAgICAgIGlmIChjbGlwUmVjdHNDb250ZXh0LnJlZ2lvbi0+ aXNSZW5kZXJOYW1lZEZsb3dGcmFnbWVudCgpKSB7CisgICAgICAgICAgICBpZiAoIShjbGlwUmVj dHNDb250ZXh0LnJlZ2lvbi0+cGFyZW50KCktPmhhc092ZXJmbG93Q2xpcCgpICYmICh0b1JlbmRl ck5hbWVkRmxvd0ZyYWdtZW50KGNsaXBSZWN0c0NvbnRleHQucmVnaW9uKS0+ZnJhZ21lbnRDb250 YWluZXJMYXllcigpICE9IGNsaXBSZWN0c0NvbnRleHQucm9vdExheWVyIHx8IGNsaXBSZWN0c0Nv bnRleHQucmVzcGVjdE92ZXJmbG93Q2xpcCA9PSBSZXNwZWN0T3ZlcmZsb3dDbGlwKSkpCisgICAg ICAgICAgICAgICAgb3V0bGluZVJlY3QuaW5mbGF0ZShyZW5kZXJlcigpLm1heGltYWxPdXRsaW5l U2l6ZShQYWludFBoYXNlT3V0bGluZSkpOworICAgICAgICB9CiAgICAgfQogCiAgICAgLy8gVXBk YXRlIHRoZSBjbGlwIHJlY3RzIHRoYXQgd2lsbCBiZSBwYXNzZWQgdG8gY2hpbGQgbGF5ZXJzLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dGcmFnbWVu dC5jcHAKaW5kZXggYjg1NTlhZi4uNjI0MGYwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQuY3BwCkBAIC0xODgsNiArMTg4LDE3 IEBAIExheW91dFVuaXQgUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQ6Om1heFBhZ2VMb2dpY2FsSGVp Z2h0KCkgY29uc3QKICAgICByZXR1cm4gc3R5bGVUb1VzZS5sb2dpY2FsTWF4SGVpZ2h0KCkuaXNV bmRlZmluZWQoKSA/IFJlbmRlckZsb3dUaHJlYWQ6Om1heExvZ2ljYWxIZWlnaHQoKSA6IHRvUmVu ZGVyQmxvY2socGFyZW50KCkpLT5jb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0VXNpbmcoc3R5 bGVUb1VzZS5sb2dpY2FsTWF4SGVpZ2h0KCkpOwogfQogCitSZW5kZXJCbG9ja0Zsb3cqIFJlbmRl ck5hbWVkRmxvd0ZyYWdtZW50OjpmcmFnbWVudENvbnRhaW5lcigpIGNvbnN0Cit7CisgICAgQVNT RVJUKHBhcmVudCgpICYmIHBhcmVudCgpLT5pc1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50Q29udGFp bmVyKCkpOworICAgIHJldHVybiB0b1JlbmRlckJsb2NrRmxvdyhwYXJlbnQoKSk7Cit9CisKK1Jl bmRlckxheWVyKiBSZW5kZXJOYW1lZEZsb3dGcmFnbWVudDo6ZnJhZ21lbnRDb250YWluZXJMYXll cigpIGNvbnN0Cit7CisgICAgcmV0dXJuIGZyYWdtZW50Q29udGFpbmVyKCktPmxheWVyKCk7Cit9 CisKIHZvaWQgUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQ6OmxheW91dEJsb2NrKGJvb2wgcmVsYXlv dXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKIHsKICAgICBTdGFja1N0YXRzOjpMYXlvdXRDaGVja1Bv aW50IGxheW91dENoZWNrUG9pbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJOYW1lZEZsb3dGcmFnbWVudC5oCmluZGV4IDk4YzU0OTcuLjQwN2M5ODkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dGcmFnbWVudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dGcmFnbWVudC5oCkBA IC02MCw2ICs2MCw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIExheW91dFVuaXQgcGFnZUxvZ2lj YWxIZWlnaHQoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IG1heFBhZ2VMb2dpY2FsSGVpZ2h0KCkg Y29uc3Q7CiAKKyAgICBSZW5kZXJCbG9ja0Zsb3cqIGZyYWdtZW50Q29udGFpbmVyKCkgY29uc3Q7 CisgICAgUmVuZGVyTGF5ZXIqIGZyYWdtZW50Q29udGFpbmVyTGF5ZXIoKSBjb25zdDsKKwogICAg IGJvb2wgaXNQc2V1ZG9FbGVtZW50UmVnaW9uKCkgY29uc3QgeyByZXR1cm4gcGFyZW50KCkgJiYg cGFyZW50KCktPmlzUHNldWRvRWxlbWVudCgpOyB9CiAKICAgICAvLyBXaGVuIHRoZSBjb250ZW50 IGluc2lkZSB0aGUgcmVnaW9uIHJlcXVpcmVzIHRoZSByZWdpb24gdG8gaGF2ZSBhIGxheWVyLCB0 aGUgbGF5ZXIgd2lsbCBiZSBjcmVhdGVkIG9uIHRoZSByZWdpb24ncwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlZ2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyUmVnaW9uLmNwcAppbmRleCAzMGMwNmU2Li5jN2I3YTgzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVnaW9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVnaW9uLmNwcApAQCAtMTUwLDE3ICsxNTAsNiBA QCBMYXlvdXRQb2ludCBSZW5kZXJSZWdpb246OmZsb3dUaHJlYWRQb3J0aW9uTG9jYXRpb24oKSBj b25zdAogICAgIHJldHVybiBwb3J0aW9uTG9jYXRpb247CiB9CiAKLVJlbmRlckJsb2NrRmxvdyog UmVuZGVyUmVnaW9uOjpyZWdpb25Db250YWluZXIoKSBjb25zdAotewotICAgIEFTU0VSVChwYXJl bnQoKSAmJiBwYXJlbnQoKS0+aXNSZW5kZXJOYW1lZEZsb3dGcmFnbWVudENvbnRhaW5lcigpKTsK LSAgICByZXR1cm4gdG9SZW5kZXJCbG9ja0Zsb3cocGFyZW50KCkpOwotfQotCi1SZW5kZXJMYXll ciogUmVuZGVyUmVnaW9uOjpyZWdpb25Db250YWluZXJMYXllcigpIGNvbnN0Ci17Ci0gICAgcmV0 dXJuIHJlZ2lvbkNvbnRhaW5lcigpLT5sYXllcigpOwotfQotCiBMYXlvdXRSZWN0IFJlbmRlclJl Z2lvbjo6b3ZlcmZsb3dSZWN0Rm9yRmxvd1RocmVhZFBvcnRpb24oY29uc3QgTGF5b3V0UmVjdCYg Zmxvd1RocmVhZFBvcnRpb25SZWN0LCBib29sIGlzRmlyc3RQb3J0aW9uLCBib29sIGlzTGFzdFBv cnRpb24sIE92ZXJmbG93VHlwZSBvdmVyZmxvd1R5cGUpCiB7CiAgICAgQVNTRVJUKGlzVmFsaWQo KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVnaW9uLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVnaW9uLmgKaW5kZXggODA5NDdhNC4u ZDdhMzllMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlZ2lv bi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZWdpb24uaApAQCAtNTYs OSArNTYsNiBAQCBwdWJsaWM6CiAgICAgTGF5b3V0UmVjdCBmbG93VGhyZWFkUG9ydGlvbk92ZXJm bG93UmVjdCgpOwogCiAgICAgTGF5b3V0UG9pbnQgZmxvd1RocmVhZFBvcnRpb25Mb2NhdGlvbigp IGNvbnN0OwotICAgIAotICAgIFJlbmRlckJsb2NrRmxvdyogcmVnaW9uQ29udGFpbmVyKCkgY29u c3Q7Ci0gICAgUmVuZGVyTGF5ZXIqIHJlZ2lvbkNvbnRhaW5lckxheWVyKCkgY29uc3Q7CiAKICAg ICB2aXJ0dWFsIHZvaWQgYXR0YWNoUmVnaW9uKCk7CiAgICAgdmlydHVhbCB2b2lkIGRldGFjaFJl Z2lvbigpOwo= 224425 2014-02-17 14:41:16 -0800 2014-02-17 15:44:12 -0800 Patch integrating feedback 128914.patch text/plain 7016 stavila ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ODdlMTU3Li44YzU3NTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTQtMDItMTcgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgorCisgICAg ICAgIFtDU1MgUmVnaW9uc10gTW92ZSBzcGVjaWZpYyBuYW1lZCBmbG93IG1ldGhvZHMgZnJvbSBS ZW5kZXJSZWdpb24gdG8gUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODkxNAorCisgICAgICAgIFJldmlld2Vk IGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIE1vdmVkIG5hbWVkIGZsb3cgc3BlY2lmaWMg bWV0aG9kcyByZWdpb25Db250YWluZXIoKSBhbmQgcmVnaW9uQ29udGFpbmVyTGF5ZXIoKSBmcm9t IAorICAgICAgICBSZW5kZXJSZWdpb24gdG8gUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQgYW5kIHJl bmFtZWQgdGhlbSB0byBmcmFnbWVudENvbnRhaW5lciBhbmQKKyAgICAgICAgZnJhZ21lbnRDb250 YWluZXJMYXllci4KKworICAgICAgICBObyBuZXcgdGVzdHMgcmVxdWlyZWQuCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXI6Om1hcExheWVyQ2xpcFJlY3RzVG9GcmFnbWVudGF0aW9uTGF5ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ck5hbWVkRmxvd0ZyYWdtZW50OjpmcmFnbWVudENvbnRhaW5lcik6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJOYW1lZEZsb3dGcmFnbWVudDo6ZnJhZ21lbnRDb250YWluZXJMYXllcik6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50Lmg6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlclJlZ2lvbi5jcHA6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJlZ2lv bi5oOgorCiAyMDE0LTAyLTE3ICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtDU1MgR3JpZCBMYXlvdXRdIEZpeCBtaXNzaW5nIGxheW91dCBpbiBm bGV4aWJsZSBhbmQgY29udGVudCBzaXplZCBjb2x1bW5zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcAppbmRleCAzNmYzYWJkLi4zYWY5OGQzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTUyNTIsMTUgKzUyNTIsMTcgQEAgdm9pZCBS ZW5kZXJMYXllcjo6dXBkYXRlQ2xpcFJlY3RzKGNvbnN0IENsaXBSZWN0c0NvbnRleHQmIGNsaXBS ZWN0c0NvbnRleHQpCiAKIHZvaWQgUmVuZGVyTGF5ZXI6Om1hcExheWVyQ2xpcFJlY3RzVG9GcmFn bWVudGF0aW9uTGF5ZXIoUmVuZGVyUmVnaW9uKiByZWdpb24sIENsaXBSZWN0cyYgY2xpcFJlY3Rz KSBjb25zdAogewotICAgIEFTU0VSVChyZWdpb24gJiYgcmVnaW9uLT5wYXJlbnQoKSAmJiByZWdp b24tPnBhcmVudCgpLT5pc1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50Q29udGFpbmVyKCkpOworICAg IEFTU0VSVChyZWdpb24gJiYgcmVnaW9uLT5pc1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50KCkgJiYg cmVnaW9uLT5wYXJlbnQoKSAmJiByZWdpb24tPnBhcmVudCgpLT5pc1JlbmRlck5hbWVkRmxvd0Zy YWdtZW50Q29udGFpbmVyKCkpOworICAgIAorICAgIFJlbmRlck5hbWVkRmxvd0ZyYWdtZW50KiBm bG93RnJhZ21lbnQgPSB0b1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50KHJlZ2lvbik7CiAKLSAgICBD bGlwUmVjdHNDb250ZXh0IHRhcmdldENsaXBSZWN0c0NvbnRleHQocmVnaW9uLT5yZWdpb25Db250 YWluZXJMYXllcigpLCAwLCBUZW1wb3JhcnlDbGlwUmVjdHMpOwotICAgIHJlZ2lvbi0+cmVnaW9u Q29udGFpbmVyTGF5ZXIoKS0+Y2FsY3VsYXRlQ2xpcFJlY3RzKHRhcmdldENsaXBSZWN0c0NvbnRl eHQsIGNsaXBSZWN0cyk7CisgICAgQ2xpcFJlY3RzQ29udGV4dCB0YXJnZXRDbGlwUmVjdHNDb250 ZXh0KCZmbG93RnJhZ21lbnQtPmZyYWdtZW50Q29udGFpbmVyTGF5ZXIoKSwgMCwgVGVtcG9yYXJ5 Q2xpcFJlY3RzKTsKKyAgICBmbG93RnJhZ21lbnQtPmZyYWdtZW50Q29udGFpbmVyTGF5ZXIoKS5j YWxjdWxhdGVDbGlwUmVjdHModGFyZ2V0Q2xpcFJlY3RzQ29udGV4dCwgY2xpcFJlY3RzKTsKIAog ICAgIExheW91dFJlY3QgZmxvd1RocmVhZFBvcnRpb25SZWN0ID0gcmVnaW9uLT5mbG93VGhyZWFk UG9ydGlvblJlY3QoKTsKIAogICAgIExheW91dFBvaW50IHBvcnRpb25Mb2NhdGlvbiA9IGZsb3dU aHJlYWRQb3J0aW9uUmVjdC5sb2NhdGlvbigpOwotICAgIExheW91dFJlY3QgcmVnaW9uQ29udGVu dEJveCA9IHJlZ2lvbi0+cmVnaW9uQ29udGFpbmVyKCktPmNvbnRlbnRCb3hSZWN0KCk7CisgICAg TGF5b3V0UmVjdCByZWdpb25Db250ZW50Qm94ID0gZmxvd0ZyYWdtZW50LT5mcmFnbWVudENvbnRh aW5lcigpLmNvbnRlbnRCb3hSZWN0KCk7CiAgICAgTGF5b3V0U2l6ZSBtb3ZlT2Zmc2V0ID0gcG9y dGlvbkxvY2F0aW9uIC0gcmVnaW9uQ29udGVudEJveC5sb2NhdGlvbigpOwogCiAgICAgQ2xpcFJl Y3QgbmV3T3ZlcmZsb3dDbGlwUmVjdCA9IGNsaXBSZWN0cy5vdmVyZmxvd0NsaXBSZWN0KCk7CkBA IC01NDU2LDggKzU0NTgsMTAgQEAgdm9pZCBSZW5kZXJMYXllcjo6Y2FsY3VsYXRlUmVjdHMoY29u c3QgQ2xpcFJlY3RzQ29udGV4dCYgY2xpcFJlY3RzQ29udGV4dCwgY29uc3QKICAgICAgICAgb3V0 bGluZVJlY3QgPSBiYWNrZ3JvdW5kUmVjdDsKICAgICAgICAgCiAgICAgICAgIC8vIElmIHRoZSBy ZWdpb24gZG9lcyBub3QgY2xpcCBpdHMgb3ZlcmZsb3csIGluZmxhdGUgdGhlIG91dGxpbmUgcmVj dC4KLSAgICAgICAgaWYgKCEoY2xpcFJlY3RzQ29udGV4dC5yZWdpb24tPnBhcmVudCgpLT5oYXNP dmVyZmxvd0NsaXAoKSAmJiAoY2xpcFJlY3RzQ29udGV4dC5yZWdpb24tPnJlZ2lvbkNvbnRhaW5l ckxheWVyKCkgIT0gY2xpcFJlY3RzQ29udGV4dC5yb290TGF5ZXIgfHwgY2xpcFJlY3RzQ29udGV4 dC5yZXNwZWN0T3ZlcmZsb3dDbGlwID09IFJlc3BlY3RPdmVyZmxvd0NsaXApKSkKLSAgICAgICAg ICAgIG91dGxpbmVSZWN0LmluZmxhdGUocmVuZGVyZXIoKS5tYXhpbWFsT3V0bGluZVNpemUoUGFp bnRQaGFzZU91dGxpbmUpKTsKKyAgICAgICAgaWYgKGNsaXBSZWN0c0NvbnRleHQucmVnaW9uLT5p c1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50KCkpIHsKKyAgICAgICAgICAgIGlmICghKGNsaXBSZWN0 c0NvbnRleHQucmVnaW9uLT5wYXJlbnQoKS0+aGFzT3ZlcmZsb3dDbGlwKCkgJiYgKCZ0b1JlbmRl ck5hbWVkRmxvd0ZyYWdtZW50KGNsaXBSZWN0c0NvbnRleHQucmVnaW9uKS0+ZnJhZ21lbnRDb250 YWluZXJMYXllcigpICE9IGNsaXBSZWN0c0NvbnRleHQucm9vdExheWVyIHx8IGNsaXBSZWN0c0Nv bnRleHQucmVzcGVjdE92ZXJmbG93Q2xpcCA9PSBSZXNwZWN0T3ZlcmZsb3dDbGlwKSkpCisgICAg ICAgICAgICAgICAgb3V0bGluZVJlY3QuaW5mbGF0ZShyZW5kZXJlcigpLm1heGltYWxPdXRsaW5l U2l6ZShQYWludFBoYXNlT3V0bGluZSkpOworICAgICAgICB9CiAgICAgfQogCiAgICAgLy8gVXBk YXRlIHRoZSBjbGlwIHJlY3RzIHRoYXQgd2lsbCBiZSBwYXNzZWQgdG8gY2hpbGQgbGF5ZXJzLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dGcmFnbWVu dC5jcHAKaW5kZXggYjg1NTlhZi4uNTJjOTVjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQuY3BwCkBAIC0xODgsNiArMTg4LDE5 IEBAIExheW91dFVuaXQgUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQ6Om1heFBhZ2VMb2dpY2FsSGVp Z2h0KCkgY29uc3QKICAgICByZXR1cm4gc3R5bGVUb1VzZS5sb2dpY2FsTWF4SGVpZ2h0KCkuaXNV bmRlZmluZWQoKSA/IFJlbmRlckZsb3dUaHJlYWQ6Om1heExvZ2ljYWxIZWlnaHQoKSA6IHRvUmVu ZGVyQmxvY2socGFyZW50KCkpLT5jb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0VXNpbmcoc3R5 bGVUb1VzZS5sb2dpY2FsTWF4SGVpZ2h0KCkpOwogfQogCitSZW5kZXJCbG9ja0Zsb3cmIFJlbmRl ck5hbWVkRmxvd0ZyYWdtZW50OjpmcmFnbWVudENvbnRhaW5lcigpIGNvbnN0Cit7CisgICAgQVNT RVJUKHBhcmVudCgpKTsKKyAgICBBU1NFUlQocGFyZW50KCktPmlzUmVuZGVyTmFtZWRGbG93RnJh Z21lbnRDb250YWluZXIoKSk7CisgICAgcmV0dXJuICp0b1JlbmRlckJsb2NrRmxvdyhwYXJlbnQo KSk7Cit9CisKK1JlbmRlckxheWVyJiBSZW5kZXJOYW1lZEZsb3dGcmFnbWVudDo6ZnJhZ21lbnRD b250YWluZXJMYXllcigpIGNvbnN0Cit7CisgICAgQVNTRVJUKGZyYWdtZW50Q29udGFpbmVyKCku bGF5ZXIoKSk7CisgICAgcmV0dXJuICpmcmFnbWVudENvbnRhaW5lcigpLmxheWVyKCk7Cit9CisK IHZvaWQgUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQ6OmxheW91dEJsb2NrKGJvb2wgcmVsYXlvdXRD aGlsZHJlbiwgTGF5b3V0VW5pdCkKIHsKICAgICBTdGFja1N0YXRzOjpMYXlvdXRDaGVja1BvaW50 IGxheW91dENoZWNrUG9pbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTmFtZWRGbG93RnJhZ21lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJOYW1lZEZsb3dGcmFnbWVudC5oCmluZGV4IDk4YzU0OTcuLmM0MzMwM2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dGcmFnbWVudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dGcmFnbWVudC5oCkBAIC02 MCw2ICs2MCw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIExheW91dFVuaXQgcGFnZUxvZ2ljYWxI ZWlnaHQoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IG1heFBhZ2VMb2dpY2FsSGVpZ2h0KCkgY29u c3Q7CiAKKyAgICBSZW5kZXJCbG9ja0Zsb3cmIGZyYWdtZW50Q29udGFpbmVyKCkgY29uc3Q7Cisg ICAgUmVuZGVyTGF5ZXImIGZyYWdtZW50Q29udGFpbmVyTGF5ZXIoKSBjb25zdDsKKwogICAgIGJv b2wgaXNQc2V1ZG9FbGVtZW50UmVnaW9uKCkgY29uc3QgeyByZXR1cm4gcGFyZW50KCkgJiYgcGFy ZW50KCktPmlzUHNldWRvRWxlbWVudCgpOyB9CiAKICAgICAvLyBXaGVuIHRoZSBjb250ZW50IGlu c2lkZSB0aGUgcmVnaW9uIHJlcXVpcmVzIHRoZSByZWdpb24gdG8gaGF2ZSBhIGxheWVyLCB0aGUg bGF5ZXIgd2lsbCBiZSBjcmVhdGVkIG9uIHRoZSByZWdpb24ncwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlZ2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyUmVnaW9uLmNwcAppbmRleCAzMGMwNmU2Li5jN2I3YTgzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVnaW9uLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVnaW9uLmNwcApAQCAtMTUwLDE3ICsxNTAsNiBAQCBM YXlvdXRQb2ludCBSZW5kZXJSZWdpb246OmZsb3dUaHJlYWRQb3J0aW9uTG9jYXRpb24oKSBjb25z dAogICAgIHJldHVybiBwb3J0aW9uTG9jYXRpb247CiB9CiAKLVJlbmRlckJsb2NrRmxvdyogUmVu ZGVyUmVnaW9uOjpyZWdpb25Db250YWluZXIoKSBjb25zdAotewotICAgIEFTU0VSVChwYXJlbnQo KSAmJiBwYXJlbnQoKS0+aXNSZW5kZXJOYW1lZEZsb3dGcmFnbWVudENvbnRhaW5lcigpKTsKLSAg ICByZXR1cm4gdG9SZW5kZXJCbG9ja0Zsb3cocGFyZW50KCkpOwotfQotCi1SZW5kZXJMYXllciog UmVuZGVyUmVnaW9uOjpyZWdpb25Db250YWluZXJMYXllcigpIGNvbnN0Ci17Ci0gICAgcmV0dXJu IHJlZ2lvbkNvbnRhaW5lcigpLT5sYXllcigpOwotfQotCiBMYXlvdXRSZWN0IFJlbmRlclJlZ2lv bjo6b3ZlcmZsb3dSZWN0Rm9yRmxvd1RocmVhZFBvcnRpb24oY29uc3QgTGF5b3V0UmVjdCYgZmxv d1RocmVhZFBvcnRpb25SZWN0LCBib29sIGlzRmlyc3RQb3J0aW9uLCBib29sIGlzTGFzdFBvcnRp b24sIE92ZXJmbG93VHlwZSBvdmVyZmxvd1R5cGUpCiB7CiAgICAgQVNTRVJUKGlzVmFsaWQoKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVnaW9uLmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVnaW9uLmgKaW5kZXggODA5NDdhNC4uZDdh MzllMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlZ2lvbi5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZWdpb24uaApAQCAtNTYsOSAr NTYsNiBAQCBwdWJsaWM6CiAgICAgTGF5b3V0UmVjdCBmbG93VGhyZWFkUG9ydGlvbk92ZXJmbG93 UmVjdCgpOwogCiAgICAgTGF5b3V0UG9pbnQgZmxvd1RocmVhZFBvcnRpb25Mb2NhdGlvbigpIGNv bnN0OwotICAgIAotICAgIFJlbmRlckJsb2NrRmxvdyogcmVnaW9uQ29udGFpbmVyKCkgY29uc3Q7 Ci0gICAgUmVuZGVyTGF5ZXIqIHJlZ2lvbkNvbnRhaW5lckxheWVyKCkgY29uc3Q7CiAKICAgICB2 aXJ0dWFsIHZvaWQgYXR0YWNoUmVnaW9uKCk7CiAgICAgdmlydHVhbCB2b2lkIGRldGFjaFJlZ2lv bigpOwo= 224441 2014-02-17 15:44:12 -0800 2014-02-17 23:48:38 -0800 Rebase 128914.patch text/plain 9103 stavila ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkNDYxNjUxLi5hYTM1ZGRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTQtMDItMTcgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgorCisgICAg ICAgIFtDU1MgUmVnaW9uc10gTW92ZSBzcGVjaWZpYyBuYW1lZCBmbG93IG1ldGhvZHMgZnJvbSBS ZW5kZXJSZWdpb24gdG8gUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODkxNAorCisgICAgICAgIFJldmlld2Vk IGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIE1vdmVkIG5hbWVkIGZsb3cgc3BlY2lmaWMg bWV0aG9kcyByZWdpb25Db250YWluZXIoKSBhbmQgcmVnaW9uQ29udGFpbmVyTGF5ZXIoKSBmcm9t IAorICAgICAgICBSZW5kZXJSZWdpb24gdG8gUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQgYW5kIHJl bmFtZWQgdGhlbSB0byBmcmFnbWVudENvbnRhaW5lciBhbmQKKyAgICAgICAgZnJhZ21lbnRDb250 YWluZXJMYXllci4KKworICAgICAgICBObyBuZXcgdGVzdHMgcmVxdWlyZWQuCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXI6Om1hcExheWVyQ2xpcFJlY3RzVG9GcmFnbWVudGF0aW9uTGF5ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ck5hbWVkRmxvd0ZyYWdtZW50OjpmcmFnbWVudENvbnRhaW5lcik6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJOYW1lZEZsb3dGcmFnbWVudDo6ZnJhZ21lbnRDb250YWluZXJMYXllcik6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50Lmg6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlclJlZ2lvbi5jcHA6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJlZ2lv bi5oOgorCiAyMDE0LTAyLTE3ICBTZXJnaW8gQ29ycmVpYSAgPHNlcmdpby5jb3JyZWlhQG9wZW5i b3NzYS5vcmc+CiAKICAgICAgICAgUmVwbGFjZSB1c2VzIG9mIFBhc3NPd25QdHIvT3duUHRyIHdp dGggc3RkOjp1bmlxdWVfcHRyIGluIFdlYkNvcmUvaW5zcGVjdG9yCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCAzNmYzYWJkLi4zYWY5OGQzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTUyNTIsMTUgKzUyNTIsMTcgQEAg dm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlQ2xpcFJlY3RzKGNvbnN0IENsaXBSZWN0c0NvbnRleHQm IGNsaXBSZWN0c0NvbnRleHQpCiAKIHZvaWQgUmVuZGVyTGF5ZXI6Om1hcExheWVyQ2xpcFJlY3Rz VG9GcmFnbWVudGF0aW9uTGF5ZXIoUmVuZGVyUmVnaW9uKiByZWdpb24sIENsaXBSZWN0cyYgY2xp cFJlY3RzKSBjb25zdAogewotICAgIEFTU0VSVChyZWdpb24gJiYgcmVnaW9uLT5wYXJlbnQoKSAm JiByZWdpb24tPnBhcmVudCgpLT5pc1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50Q29udGFpbmVyKCkp OworICAgIEFTU0VSVChyZWdpb24gJiYgcmVnaW9uLT5pc1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50 KCkgJiYgcmVnaW9uLT5wYXJlbnQoKSAmJiByZWdpb24tPnBhcmVudCgpLT5pc1JlbmRlck5hbWVk Rmxvd0ZyYWdtZW50Q29udGFpbmVyKCkpOworICAgIAorICAgIFJlbmRlck5hbWVkRmxvd0ZyYWdt ZW50KiBmbG93RnJhZ21lbnQgPSB0b1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50KHJlZ2lvbik7CiAK LSAgICBDbGlwUmVjdHNDb250ZXh0IHRhcmdldENsaXBSZWN0c0NvbnRleHQocmVnaW9uLT5yZWdp b25Db250YWluZXJMYXllcigpLCAwLCBUZW1wb3JhcnlDbGlwUmVjdHMpOwotICAgIHJlZ2lvbi0+ cmVnaW9uQ29udGFpbmVyTGF5ZXIoKS0+Y2FsY3VsYXRlQ2xpcFJlY3RzKHRhcmdldENsaXBSZWN0 c0NvbnRleHQsIGNsaXBSZWN0cyk7CisgICAgQ2xpcFJlY3RzQ29udGV4dCB0YXJnZXRDbGlwUmVj dHNDb250ZXh0KCZmbG93RnJhZ21lbnQtPmZyYWdtZW50Q29udGFpbmVyTGF5ZXIoKSwgMCwgVGVt cG9yYXJ5Q2xpcFJlY3RzKTsKKyAgICBmbG93RnJhZ21lbnQtPmZyYWdtZW50Q29udGFpbmVyTGF5 ZXIoKS5jYWxjdWxhdGVDbGlwUmVjdHModGFyZ2V0Q2xpcFJlY3RzQ29udGV4dCwgY2xpcFJlY3Rz KTsKIAogICAgIExheW91dFJlY3QgZmxvd1RocmVhZFBvcnRpb25SZWN0ID0gcmVnaW9uLT5mbG93 VGhyZWFkUG9ydGlvblJlY3QoKTsKIAogICAgIExheW91dFBvaW50IHBvcnRpb25Mb2NhdGlvbiA9 IGZsb3dUaHJlYWRQb3J0aW9uUmVjdC5sb2NhdGlvbigpOwotICAgIExheW91dFJlY3QgcmVnaW9u Q29udGVudEJveCA9IHJlZ2lvbi0+cmVnaW9uQ29udGFpbmVyKCktPmNvbnRlbnRCb3hSZWN0KCk7 CisgICAgTGF5b3V0UmVjdCByZWdpb25Db250ZW50Qm94ID0gZmxvd0ZyYWdtZW50LT5mcmFnbWVu dENvbnRhaW5lcigpLmNvbnRlbnRCb3hSZWN0KCk7CiAgICAgTGF5b3V0U2l6ZSBtb3ZlT2Zmc2V0 ID0gcG9ydGlvbkxvY2F0aW9uIC0gcmVnaW9uQ29udGVudEJveC5sb2NhdGlvbigpOwogCiAgICAg Q2xpcFJlY3QgbmV3T3ZlcmZsb3dDbGlwUmVjdCA9IGNsaXBSZWN0cy5vdmVyZmxvd0NsaXBSZWN0 KCk7CkBAIC01NDU2LDggKzU0NTgsMTAgQEAgdm9pZCBSZW5kZXJMYXllcjo6Y2FsY3VsYXRlUmVj dHMoY29uc3QgQ2xpcFJlY3RzQ29udGV4dCYgY2xpcFJlY3RzQ29udGV4dCwgY29uc3QKICAgICAg ICAgb3V0bGluZVJlY3QgPSBiYWNrZ3JvdW5kUmVjdDsKICAgICAgICAgCiAgICAgICAgIC8vIElm IHRoZSByZWdpb24gZG9lcyBub3QgY2xpcCBpdHMgb3ZlcmZsb3csIGluZmxhdGUgdGhlIG91dGxp bmUgcmVjdC4KLSAgICAgICAgaWYgKCEoY2xpcFJlY3RzQ29udGV4dC5yZWdpb24tPnBhcmVudCgp LT5oYXNPdmVyZmxvd0NsaXAoKSAmJiAoY2xpcFJlY3RzQ29udGV4dC5yZWdpb24tPnJlZ2lvbkNv bnRhaW5lckxheWVyKCkgIT0gY2xpcFJlY3RzQ29udGV4dC5yb290TGF5ZXIgfHwgY2xpcFJlY3Rz Q29udGV4dC5yZXNwZWN0T3ZlcmZsb3dDbGlwID09IFJlc3BlY3RPdmVyZmxvd0NsaXApKSkKLSAg ICAgICAgICAgIG91dGxpbmVSZWN0LmluZmxhdGUocmVuZGVyZXIoKS5tYXhpbWFsT3V0bGluZVNp emUoUGFpbnRQaGFzZU91dGxpbmUpKTsKKyAgICAgICAgaWYgKGNsaXBSZWN0c0NvbnRleHQucmVn aW9uLT5pc1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50KCkpIHsKKyAgICAgICAgICAgIGlmICghKGNs aXBSZWN0c0NvbnRleHQucmVnaW9uLT5wYXJlbnQoKS0+aGFzT3ZlcmZsb3dDbGlwKCkgJiYgKCZ0 b1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50KGNsaXBSZWN0c0NvbnRleHQucmVnaW9uKS0+ZnJhZ21l bnRDb250YWluZXJMYXllcigpICE9IGNsaXBSZWN0c0NvbnRleHQucm9vdExheWVyIHx8IGNsaXBS ZWN0c0NvbnRleHQucmVzcGVjdE92ZXJmbG93Q2xpcCA9PSBSZXNwZWN0T3ZlcmZsb3dDbGlwKSkp CisgICAgICAgICAgICAgICAgb3V0bGluZVJlY3QuaW5mbGF0ZShyZW5kZXJlcigpLm1heGltYWxP dXRsaW5lU2l6ZShQYWludFBoYXNlT3V0bGluZSkpOworICAgICAgICB9CiAgICAgfQogCiAgICAg Ly8gVXBkYXRlIHRoZSBjbGlwIHJlY3RzIHRoYXQgd2lsbCBiZSBwYXNzZWQgdG8gY2hpbGQgbGF5 ZXJzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxv d0ZyYWdtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dG cmFnbWVudC5jcHAKaW5kZXggYjg2NzliYi4uMmMwYTc0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQuY3BwCkBAIC0xOTcsMzYg KzE5Nyw1MCBAQCBMYXlvdXRSZWN0IFJlbmRlck5hbWVkRmxvd0ZyYWdtZW50OjpmbG93VGhyZWFk UG9ydGlvblJlY3RGb3JDbGlwcGluZyhib29sIGlzRmlycwogICAgIC8vIFJlZ2lvbnMgd2l0aCBv dmVyZmxvdzpoaWRkZW4gd2lsbCBhcHBseSBjbGlwIGF0IHRoZSBib3JkZXIgYm94LCBub3QgdGhl IGNvbnRlbnQgYm94LgogICAgIAogICAgIExheW91dFJlY3QgY2xpcHBpbmdSZWN0ID0gZmxvd1Ro cmVhZFBvcnRpb25SZWN0KCk7Ci0gICAgaWYgKHJlZ2lvbkNvbnRhaW5lcigpLT5zdHlsZSgpLmhh c1BhZGRpbmcoKSkgeworICAgIFJlbmRlckJsb2NrRmxvdyYgY29udGFpbmVyID0gZnJhZ21lbnRD b250YWluZXIoKTsKKyAgICBpZiAoY29udGFpbmVyLnN0eWxlKCkuaGFzUGFkZGluZygpKSB7CiAg ICAgICAgIGlmIChpc0ZpcnN0UmVnaW9uSW5SYW5nZSkgewogICAgICAgICAgICAgaWYgKGZsb3dU aHJlYWQoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgewotICAgICAgICAgICAgICAgIGNs aXBwaW5nUmVjdC5tb3ZlKDAsIC1yZWdpb25Db250YWluZXIoKS0+cGFkZGluZ0JlZm9yZSgpKTsK LSAgICAgICAgICAgICAgICBjbGlwcGluZ1JlY3QuZXhwYW5kKDAsIHJlZ2lvbkNvbnRhaW5lcigp LT5wYWRkaW5nQmVmb3JlKCkpOworICAgICAgICAgICAgICAgIGNsaXBwaW5nUmVjdC5tb3ZlKDAs IC1jb250YWluZXIucGFkZGluZ0JlZm9yZSgpKTsKKyAgICAgICAgICAgICAgICBjbGlwcGluZ1Jl Y3QuZXhwYW5kKDAsIGNvbnRhaW5lci5wYWRkaW5nQmVmb3JlKCkpOwogICAgICAgICAgICAgfSBl bHNlIHsKLSAgICAgICAgICAgICAgICBjbGlwcGluZ1JlY3QubW92ZSgtcmVnaW9uQ29udGFpbmVy KCktPnBhZGRpbmdCZWZvcmUoKSwgMCk7Ci0gICAgICAgICAgICAgICAgY2xpcHBpbmdSZWN0LmV4 cGFuZChyZWdpb25Db250YWluZXIoKS0+cGFkZGluZ0JlZm9yZSgpLCAwKTsKKyAgICAgICAgICAg ICAgICBjbGlwcGluZ1JlY3QubW92ZSgtY29udGFpbmVyLnBhZGRpbmdCZWZvcmUoKSwgMCk7Cisg ICAgICAgICAgICAgICAgY2xpcHBpbmdSZWN0LmV4cGFuZChjb250YWluZXIucGFkZGluZ0JlZm9y ZSgpLCAwKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICAKICAgICAgICAgaWYg KGlzTGFzdFJlZ2lvbkluUmFuZ2UpIHsKICAgICAgICAgICAgIGlmIChmbG93VGhyZWFkKCktPmlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCi0gICAgICAgICAgICAgICAgY2xpcHBpbmdSZWN0LmV4 cGFuZCgwLCByZWdpb25Db250YWluZXIoKS0+cGFkZGluZ0FmdGVyKCkpOworICAgICAgICAgICAg ICAgIGNsaXBwaW5nUmVjdC5leHBhbmQoMCwgY29udGFpbmVyLnBhZGRpbmdBZnRlcigpKTsKICAg ICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBjbGlwcGluZ1JlY3QuZXhwYW5kKHJlZ2lv bkNvbnRhaW5lcigpLT5wYWRkaW5nQWZ0ZXIoKSwgMCk7CisgICAgICAgICAgICAgICAgY2xpcHBp bmdSZWN0LmV4cGFuZChjb250YWluZXIucGFkZGluZ0FmdGVyKCksIDApOwogICAgICAgICB9CiAg ICAgICAgIAogICAgICAgICBpZiAoZmxvd1RocmVhZCgpLT5pc0hvcml6b250YWxXcml0aW5nTW9k ZSgpKSB7Ci0gICAgICAgICAgICBjbGlwcGluZ1JlY3QubW92ZSgtcmVnaW9uQ29udGFpbmVyKCkt PnBhZGRpbmdTdGFydCgpLCAwKTsKLSAgICAgICAgICAgIGNsaXBwaW5nUmVjdC5leHBhbmQocmVn aW9uQ29udGFpbmVyKCktPnBhZGRpbmdTdGFydCgpICsgcmVnaW9uQ29udGFpbmVyKCktPnBhZGRp bmdFbmQoKSwgMCk7CisgICAgICAgICAgICBjbGlwcGluZ1JlY3QubW92ZSgtY29udGFpbmVyLnBh ZGRpbmdTdGFydCgpLCAwKTsKKyAgICAgICAgICAgIGNsaXBwaW5nUmVjdC5leHBhbmQoY29udGFp bmVyLnBhZGRpbmdTdGFydCgpICsgY29udGFpbmVyLnBhZGRpbmdFbmQoKSwgMCk7CiAgICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICBjbGlwcGluZ1JlY3QubW92ZSgwLCAtcmVnaW9uQ29udGFp bmVyKCktPnBhZGRpbmdTdGFydCgpKTsKLSAgICAgICAgICAgIGNsaXBwaW5nUmVjdC5leHBhbmQo MCwgcmVnaW9uQ29udGFpbmVyKCktPnBhZGRpbmdTdGFydCgpICsgcmVnaW9uQ29udGFpbmVyKCkt PnBhZGRpbmdFbmQoKSk7CisgICAgICAgICAgICBjbGlwcGluZ1JlY3QubW92ZSgwLCAtY29udGFp bmVyLnBhZGRpbmdTdGFydCgpKTsKKyAgICAgICAgICAgIGNsaXBwaW5nUmVjdC5leHBhbmQoMCwg Y29udGFpbmVyLnBhZGRpbmdTdGFydCgpICsgY29udGFpbmVyLnBhZGRpbmdFbmQoKSk7CiAgICAg ICAgIH0KICAgICB9CiAgICAgCiAgICAgcmV0dXJuIGNsaXBwaW5nUmVjdDsKIH0KIAorUmVuZGVy QmxvY2tGbG93JiBSZW5kZXJOYW1lZEZsb3dGcmFnbWVudDo6ZnJhZ21lbnRDb250YWluZXIoKSBj b25zdAoreworICAgIEFTU0VSVChwYXJlbnQoKSk7CisgICAgQVNTRVJUKHBhcmVudCgpLT5pc1Jl bmRlck5hbWVkRmxvd0ZyYWdtZW50Q29udGFpbmVyKCkpOworICAgIHJldHVybiAqdG9SZW5kZXJC bG9ja0Zsb3cocGFyZW50KCkpOworfQorCitSZW5kZXJMYXllciYgUmVuZGVyTmFtZWRGbG93RnJh Z21lbnQ6OmZyYWdtZW50Q29udGFpbmVyTGF5ZXIoKSBjb25zdAoreworICAgIEFTU0VSVChmcmFn bWVudENvbnRhaW5lcigpLmxheWVyKCkpOworICAgIHJldHVybiAqZnJhZ21lbnRDb250YWluZXIo KS5sYXllcigpOworfQorCiB2b2lkIFJlbmRlck5hbWVkRmxvd0ZyYWdtZW50OjpsYXlvdXRCbG9j ayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiB7CiAgICAgU3RhY2tTdGF0czo6 TGF5b3V0Q2hlY2tQb2ludCBsYXlvdXRDaGVja1BvaW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmggYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQuaAppbmRleCA4MGI3Y2MwLi44MzVm YjRjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxv d0ZyYWdtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxv d0ZyYWdtZW50LmgKQEAgLTYyLDYgKzYyLDkgQEAgcHVibGljOgogICAgIAogICAgIExheW91dFJl Y3QgZmxvd1RocmVhZFBvcnRpb25SZWN0Rm9yQ2xpcHBpbmcoYm9vbCBpc0ZpcnN0UmVnaW9uSW5S YW5nZSwgYm9vbCBpc0xhc3RSZWdpb25JblJhbmdlKSBjb25zdDsKIAorICAgIFJlbmRlckJsb2Nr RmxvdyYgZnJhZ21lbnRDb250YWluZXIoKSBjb25zdDsKKyAgICBSZW5kZXJMYXllciYgZnJhZ21l bnRDb250YWluZXJMYXllcigpIGNvbnN0OworCiAgICAgYm9vbCBpc1BzZXVkb0VsZW1lbnRSZWdp b24oKSBjb25zdCB7IHJldHVybiBwYXJlbnQoKSAmJiBwYXJlbnQoKS0+aXNQc2V1ZG9FbGVtZW50 KCk7IH0KIAogICAgIC8vIFdoZW4gdGhlIGNvbnRlbnQgaW5zaWRlIHRoZSByZWdpb24gcmVxdWly ZXMgdGhlIHJlZ2lvbiB0byBoYXZlIGEgbGF5ZXIsIHRoZSBsYXllciB3aWxsIGJlIGNyZWF0ZWQg b24gdGhlIHJlZ2lvbidzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyUmVnaW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZWdpb24uY3Bw CmluZGV4IDE0NmRhZTkuLjZiNzU5ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJSZWdpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJSZWdpb24uY3BwCkBAIC0xNTAsMTcgKzE1MCw2IEBAIExheW91dFBvaW50IFJlbmRlclJlZ2lv bjo6Zmxvd1RocmVhZFBvcnRpb25Mb2NhdGlvbigpIGNvbnN0CiAgICAgcmV0dXJuIHBvcnRpb25M b2NhdGlvbjsKIH0KIAotUmVuZGVyQmxvY2tGbG93KiBSZW5kZXJSZWdpb246OnJlZ2lvbkNvbnRh aW5lcigpIGNvbnN0Ci17Ci0gICAgQVNTRVJUKHBhcmVudCgpICYmIHBhcmVudCgpLT5pc1JlbmRl ck5hbWVkRmxvd0ZyYWdtZW50Q29udGFpbmVyKCkpOwotICAgIHJldHVybiB0b1JlbmRlckJsb2Nr RmxvdyhwYXJlbnQoKSk7Ci19Ci0KLVJlbmRlckxheWVyKiBSZW5kZXJSZWdpb246OnJlZ2lvbkNv bnRhaW5lckxheWVyKCkgY29uc3QKLXsKLSAgICByZXR1cm4gcmVnaW9uQ29udGFpbmVyKCktPmxh eWVyKCk7Ci19Ci0KIExheW91dFJlY3QgUmVuZGVyUmVnaW9uOjpvdmVyZmxvd1JlY3RGb3JGbG93 VGhyZWFkUG9ydGlvbihjb25zdCBMYXlvdXRSZWN0JiBmbG93VGhyZWFkUG9ydGlvblJlY3QsIGJv b2wgaXNGaXJzdFBvcnRpb24sIGJvb2wgaXNMYXN0UG9ydGlvbiwgT3ZlcmZsb3dUeXBlIG92ZXJm bG93VHlwZSkKIHsKICAgICBBU1NFUlQoaXNWYWxpZCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZWdpb24uaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJSZWdpb24uaAppbmRleCA4MDk0N2E0Li5kN2EzOWUwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVnaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclJlZ2lvbi5oCkBAIC01Niw5ICs1Niw2IEBAIHB1YmxpYzoKICAgICBM YXlvdXRSZWN0IGZsb3dUaHJlYWRQb3J0aW9uT3ZlcmZsb3dSZWN0KCk7CiAKICAgICBMYXlvdXRQ b2ludCBmbG93VGhyZWFkUG9ydGlvbkxvY2F0aW9uKCkgY29uc3Q7Ci0gICAgCi0gICAgUmVuZGVy QmxvY2tGbG93KiByZWdpb25Db250YWluZXIoKSBjb25zdDsKLSAgICBSZW5kZXJMYXllciogcmVn aW9uQ29udGFpbmVyTGF5ZXIoKSBjb25zdDsKIAogICAgIHZpcnR1YWwgdm9pZCBhdHRhY2hSZWdp b24oKTsKICAgICB2aXJ0dWFsIHZvaWQgZGV0YWNoUmVnaW9uKCk7Cg==