142758 2015-03-16 18:06:54 -0700 Move some code from LogicalSelectionOffsetCaches into RenderElement 2015-03-17 12:00:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan rniwa simon.fraser oldest_to_newest 1077667 0 simon.fraser 2015-03-16 18:06:54 -0700 Move some code from LogicalSelectionOffsetCaches into RenderElement 1077668 1 248772 simon.fraser 2015-03-16 18:08:37 -0700 Created attachment 248772 Patch 1077676 2 248772 mmaxfield 2015-03-16 18:25:27 -0700 Comment on attachment 248772 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248772&action=review > Source/WebCore/rendering/RenderElement.cpp:40 > +#include "RenderBlock.h" Does LogicalSelectionOffsetCaches.h still need this include? I don't see it deleted 1077922 3 simon.fraser 2015-03-17 12:00:16 -0700 https://trac.webkit.org/r181654 248772 2015-03-16 18:08:37 -0700 2015-03-16 18:25:27 -0700 Patch bug-142758-20150316180807.patch text/plain 13364 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxNTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjZiOTQ4OTlmNTc0MTVh OWRmNjU1NzFhOGRlOTc0NGI0OTU5YWE1NC4uNGFiNDlkN2Q4YWE2OWQ4MzI0YjdjZjQ3MGQ2NzQ5 ODc3ZDAyNjNiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE1LTAzLTE2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgc29tZSBj b2RlIGZyb20gTG9naWNhbFNlbGVjdGlvbk9mZnNldENhY2hlcyBpbnRvIFJlbmRlckVsZW1lbnQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Mjc1OAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExvZ2ljYWxT ZWxlY3Rpb25PZmZzZXRDYWNoZXMgaGFkIHNvbWUgdXNlZnVsIGNvZGUgcmVnYXJkaW5nIGNvbnRh aW5pbmcgYmxvY2tzIGV0YworICAgICAgICB0aGF0IHNob3VsZCBiZSB1c2VkIGluIG1vcmUgcGxh Y2VzLCBzbyBtb3ZlIGl0IGludG8gUmVuZGVyRWxlbWVudC4KKyAgICAgICAgCisgICAgICAgIE5v IGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHJlbmRlcmluZy9Mb2dpY2FsU2VsZWN0aW9u T2Zmc2V0Q2FjaGVzLmg6CisgICAgICAgIChXZWJDb3JlOjpMb2dpY2FsU2VsZWN0aW9uT2Zmc2V0 Q2FjaGVzOjpMb2dpY2FsU2VsZWN0aW9uT2Zmc2V0Q2FjaGVzKToKKyAgICAgICAgKFdlYkNvcmU6 OmlzQ29udGFpbmluZ0Jsb2NrQ2FuZGlkYXRlRm9yQWJzb2x1dGVseVBvc2l0aW9uZWRPYmplY3Qp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6aXNOb25SZW5kZXJCbG9ja0lubGluZSk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpjb250YWluaW5nQmxvY2tGb3JGaXhlZFBvc2l0aW9u KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmNvbnRhaW5pbmdCbG9ja0ZvckFic29sdXRl UG9zaXRpb24pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Y29udGFpbmluZ0Jsb2NrRm9y T2JqZWN0SW5GbG93KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwOiBObyBuZWVkIHRvIGluaXRpYWxpemUgc3RhdGljIGRhdGEuCisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9jazo6cG9zaXRpb25lZE9iamVjdHMpOiBudWxscHRyCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVu dDo6Y29udGFpbmluZ0Jsb2NrRm9yRml4ZWRQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJFbGVtZW50Ojpjb250YWluaW5nQmxvY2tGb3JBYnNvbHV0ZVBvc2l0aW9uKToKKyAgICAg ICAgKFdlYkNvcmU6OmlzTm9uUmVuZGVyQmxvY2tJbmxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyRWxlbWVudDo6Y29udGFpbmluZ0Jsb2NrRm9yT2JqZWN0SW5GbG93KToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxl bWVudDo6Y2FuQ29udGFpbkFic29sdXRlbHlQb3NpdGlvbmVkT2JqZWN0cyk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzQ29udGFpbmVy Rm9yUG9zaXRpb25lZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmNvbnRhaW5pbmdCbG9jayk6CisKIDIwMTUt MDMtMTUgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAg QWRkIHRoZSBzYW1lIGlzPFJlbmRlckJveD4gdGVzdCB0byBLZXlmcmFtZUFuaW1hdGlvbjo6Y29t cHV0ZUV4dGVudE9mVHJhbnNmb3JtQW5pbWF0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9Mb2dpY2FsU2VsZWN0aW9uT2Zmc2V0Q2FjaGVzLmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvTG9naWNhbFNlbGVjdGlvbk9mZnNldENhY2hlcy5oCmluZGV4IGM1YTMz NjhhMTRlMWM3OGJhNzVmMjFiMzAyOGY3ODIxMTM3NmE5YWQuLmE0ODBjNjc4ZmYwNTc1NjBlOTNh YjQyZWMwYWMzYjJkZTdkZTMwOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9Mb2dpY2FsU2VsZWN0aW9uT2Zmc2V0Q2FjaGVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0xvZ2ljYWxTZWxlY3Rpb25PZmZzZXRDYWNoZXMuaApAQCAtMjUsNTggKzI1LDYgQEAK IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0vLyBGSVhNRTogc2hhcmUgY29kZSB3aXRoIFJlbmRl ck9iamVjdDo6Y29udGFpbmVyKCkuCi1zdGF0aWMgaW5saW5lIGJvb2wgaXNDb250YWluaW5nQmxv Y2tDYW5kaWRhdGVGb3JBYnNvbHV0ZWx5UG9zaXRpb25lZE9iamVjdChSZW5kZXJFbGVtZW50JiBv YmplY3QpCi17Ci0gICAgLy8gRklYTUU6IGhhc1RyYW5zZm9ybVJlbGF0ZWRQcm9wZXJ0eSgpIGlu Y2x1ZGVzIHByZXNlcnZlczNEKCkgY2hlY2ssIGJ1dCB0aGlzIG1heSBuZWVkIHRvIGNoYW5nZTog aHR0cHM6Ly93d3cudzMub3JnL0J1Z3MvUHVibGljL3Nob3dfYnVnLmNnaT9pZD0yNzU2NgotICAg IHJldHVybiBvYmplY3Quc3R5bGUoKS5wb3NpdGlvbigpICE9IFN0YXRpY1Bvc2l0aW9uCi0gICAg ICAgIHx8IChvYmplY3QuaXNSZW5kZXJCbG9jaygpICYmIG9iamVjdC5oYXNUcmFuc2Zvcm1SZWxh dGVkUHJvcGVydHkoKSkKLSAgICAgICAgfHwgb2JqZWN0LmlzU1ZHRm9yZWlnbk9iamVjdCgpCi0g ICAgICAgIHx8IG9iamVjdC5pc1JlbmRlclZpZXcoKTsKLX0KLQotc3RhdGljIGlubGluZSBib29s IGlzTm9uUmVuZGVyQmxvY2tJbmxpbmUoUmVuZGVyRWxlbWVudCYgb2JqZWN0KQotewotICAgIHJl dHVybiAob2JqZWN0LmlzSW5saW5lKCkgJiYgIW9iamVjdC5pc1JlcGxhY2VkKCkpIHx8ICFvYmpl Y3QuaXNSZW5kZXJCbG9jaygpOwotfQotCi0vLyBGSVhNRTogc2hhcmUgY29kZSB3aXRoIFJlbmRl ck9iamVjdDo6Y29udGFpbmVyKCkuCi1zdGF0aWMgaW5saW5lIFJlbmRlckJsb2NrKiBjb250YWlu aW5nQmxvY2tGb3JGaXhlZFBvc2l0aW9uKFJlbmRlckVsZW1lbnQqIHBhcmVudCkKLXsKLSAgICBS ZW5kZXJFbGVtZW50KiBvYmplY3QgPSBwYXJlbnQ7Ci0gICAgd2hpbGUgKG9iamVjdCAmJiAhb2Jq ZWN0LT5jYW5Db250YWluRml4ZWRQb3NpdGlvbk9iamVjdHMoKSkKLSAgICAgICAgb2JqZWN0ID0g b2JqZWN0LT5wYXJlbnQoKTsKLSAgICBBU1NFUlQoIW9iamVjdCB8fCAhb2JqZWN0LT5pc0Fub255 bW91c0Jsb2NrKCkpOwotICAgIHJldHVybiBkb3duY2FzdDxSZW5kZXJCbG9jaz4ob2JqZWN0KTsK LX0KLQotc3RhdGljIGlubGluZSBSZW5kZXJCbG9jayogY29udGFpbmluZ0Jsb2NrRm9yQWJzb2x1 dGVQb3NpdGlvbihSZW5kZXJFbGVtZW50KiBwYXJlbnQpCi17Ci0gICAgUmVuZGVyRWxlbWVudCog b2JqZWN0ID0gcGFyZW50OwotICAgIHdoaWxlIChvYmplY3QgJiYgIWlzQ29udGFpbmluZ0Jsb2Nr Q2FuZGlkYXRlRm9yQWJzb2x1dGVseVBvc2l0aW9uZWRPYmplY3QoKm9iamVjdCkpCi0gICAgICAg IG9iamVjdCA9IG9iamVjdC0+cGFyZW50KCk7Ci0KLSAgICAvLyBGb3IgYSByZWxhdGl2ZWx5IHBv c2l0aW9uZWQgaW5saW5lLCByZXR1cm4gaXRzIG5lYXJlc3Qgbm9uLWFub255bW91cyBjb250YWlu aW5nIGJsb2NrLAotICAgIC8vIG5vdCB0aGUgaW5saW5lIGl0c2VsZiwgdG8gYXZvaWQgaGF2aW5n IGEgcG9zaXRpb25lZCBvYmplY3RzIGxpc3QgaW4gYWxsIFJlbmRlcklubGluZXMKLSAgICAvLyBh bmQgdXNlIFJlbmRlckJsb2NrKiBhcyBSZW5kZXJFbGVtZW50Ojpjb250YWluaW5nQmxvY2sncyBy ZXR1cm4gdHlwZS4KLSAgICAvLyBVc2UgUmVuZGVyQmxvY2s6OmNvbnRhaW5lcigpIHRvIG9idGFp biB0aGUgaW5saW5lLgotICAgIGlmIChvYmplY3QgJiYgIWlzPFJlbmRlckJsb2NrPigqb2JqZWN0 KSkKLSAgICAgICAgb2JqZWN0ID0gb2JqZWN0LT5jb250YWluaW5nQmxvY2soKTsKLQotICAgIHdo aWxlIChvYmplY3QgJiYgb2JqZWN0LT5pc0Fub255bW91c0Jsb2NrKCkpCi0gICAgICAgIG9iamVj dCA9IG9iamVjdC0+Y29udGFpbmluZ0Jsb2NrKCk7Ci0KLSAgICByZXR1cm4gZG93bmNhc3Q8UmVu ZGVyQmxvY2s+KG9iamVjdCk7Ci19Ci0KLXN0YXRpYyBpbmxpbmUgUmVuZGVyQmxvY2sqIGNvbnRh aW5pbmdCbG9ja0Zvck9iamVjdEluRmxvdyhSZW5kZXJFbGVtZW50KiBwYXJlbnQpCi17Ci0gICAg UmVuZGVyRWxlbWVudCogb2JqZWN0ID0gcGFyZW50OwotICAgIHdoaWxlIChvYmplY3QgJiYgaXNO b25SZW5kZXJCbG9ja0lubGluZSgqb2JqZWN0KSkKLSAgICAgICAgb2JqZWN0ID0gb2JqZWN0LT5w YXJlbnQoKTsKLSAgICByZXR1cm4gZG93bmNhc3Q8UmVuZGVyQmxvY2s+KG9iamVjdCk7Ci19Ci0K IGNsYXNzIExvZ2ljYWxTZWxlY3Rpb25PZmZzZXRDYWNoZXMgewogcHVibGljOgogICAgIGNsYXNz IENvbnRhaW5pbmdCbG9ja0luZm8gewpAQCAtMTQ0LDkgKzkyLDkgQEAgcHVibGljOgogICAgICAg ICBhdXRvIHBhcmVudCA9IHJvb3RCbG9jay5wYXJlbnQoKTsKIAogICAgICAgICAvLyBMb2dpY2Fs U2VsZWN0aW9uT2Zmc2V0Q2FjaGVzIHNob3VsZCBub3QgYmUgdXNlZCBvbiBhbiBvcnBoYW5lZCB0 cmVlLgotICAgICAgICBtX2NvbnRhaW5pbmdCbG9ja0ZvckZpeGVkUG9zaXRpb24uc2V0QmxvY2so Y29udGFpbmluZ0Jsb2NrRm9yRml4ZWRQb3NpdGlvbihwYXJlbnQpLCAwKTsKLSAgICAgICAgbV9j b250YWluaW5nQmxvY2tGb3JBYnNvbHV0ZVBvc2l0aW9uLnNldEJsb2NrKGNvbnRhaW5pbmdCbG9j a0ZvckFic29sdXRlUG9zaXRpb24ocGFyZW50KSwgMCk7Ci0gICAgICAgIG1fY29udGFpbmluZ0Js b2NrRm9ySW5mbG93UG9zaXRpb24uc2V0QmxvY2soY29udGFpbmluZ0Jsb2NrRm9yT2JqZWN0SW5G bG93KHBhcmVudCksIDApOworICAgICAgICBtX2NvbnRhaW5pbmdCbG9ja0ZvckZpeGVkUG9zaXRp b24uc2V0QmxvY2socGFyZW50LT5jb250YWluaW5nQmxvY2tGb3JGaXhlZFBvc2l0aW9uKCksIG51 bGxwdHIpOworICAgICAgICBtX2NvbnRhaW5pbmdCbG9ja0ZvckFic29sdXRlUG9zaXRpb24uc2V0 QmxvY2socGFyZW50LT5jb250YWluaW5nQmxvY2tGb3JBYnNvbHV0ZVBvc2l0aW9uKCksIG51bGxw dHIpOworICAgICAgICBtX2NvbnRhaW5pbmdCbG9ja0ZvckluZmxvd1Bvc2l0aW9uLnNldEJsb2Nr KHBhcmVudC0+Y29udGFpbmluZ0Jsb2NrRm9yT2JqZWN0SW5GbG93KCksIG51bGxwdHIpOwogICAg IH0KIAogICAgIExvZ2ljYWxTZWxlY3Rpb25PZmZzZXRDYWNoZXMoUmVuZGVyQmxvY2smIGJsb2Nr LCBjb25zdCBMb2dpY2FsU2VsZWN0aW9uT2Zmc2V0Q2FjaGVzJiBjYWNoZSkKQEAgLTE1Niw3ICsx MDQsNyBAQCBwdWJsaWM6CiAgICAgICAgIGlmIChibG9jay5jYW5Db250YWluRml4ZWRQb3NpdGlv bk9iamVjdHMoKSkKICAgICAgICAgICAgIG1fY29udGFpbmluZ0Jsb2NrRm9yRml4ZWRQb3NpdGlv bi5zZXRCbG9jaygmYmxvY2ssICZjYWNoZSk7CiAKLSAgICAgICAgaWYgKGlzQ29udGFpbmluZ0Js b2NrQ2FuZGlkYXRlRm9yQWJzb2x1dGVseVBvc2l0aW9uZWRPYmplY3QoYmxvY2spICYmICFibG9j ay5pc1JlbmRlcklubGluZSgpICYmICFibG9jay5pc0Fub255bW91c0Jsb2NrKCkpCisgICAgICAg IGlmIChibG9jay5jYW5Db250YWluQWJzb2x1dGVseVBvc2l0aW9uZWRPYmplY3RzKCkgJiYgIWJs b2NrLmlzUmVuZGVySW5saW5lKCkgJiYgIWJsb2NrLmlzQW5vbnltb3VzQmxvY2soKSkKICAgICAg ICAgICAgIG1fY29udGFpbmluZ0Jsb2NrRm9yRml4ZWRQb3NpdGlvbi5zZXRCbG9jaygmYmxvY2ss ICZjYWNoZSk7CiAKICAgICAgICAgbV9jb250YWluaW5nQmxvY2tGb3JJbmZsb3dQb3NpdGlvbi5z ZXRCbG9jaygmYmxvY2ssICZjYWNoZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmNwcAppbmRleCBlMGE3YTA4OTM5MWNkOTBiZmU4MjIyNDcxY2FkYmRlNmNjZWNhMTQwLi4y NDQ0MDMzMmI3NGVjNzZmMzhlMTBjMDYzNTY2YjE1ODI1ODNiZTlkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTkwLDExICs5MCwxMSBAQCBzdHJ1Y3QgU2Ft ZVNpemVBc1JlbmRlckJsb2NrIDogcHVibGljIFJlbmRlckJveCB7CiAKIENPTVBJTEVfQVNTRVJU KHNpemVvZihSZW5kZXJCbG9jaykgPT0gc2l6ZW9mKFNhbWVTaXplQXNSZW5kZXJCbG9jayksIFJl bmRlckJsb2NrX3Nob3VsZF9zdGF5X3NtYWxsKTsKIAotc3RhdGljIFRyYWNrZWREZXNjZW5kYW50 c01hcCogZ1Bvc2l0aW9uZWREZXNjZW5kYW50c01hcCA9IDA7Ci1zdGF0aWMgVHJhY2tlZERlc2Nl bmRhbnRzTWFwKiBnUGVyY2VudEhlaWdodERlc2NlbmRhbnRzTWFwID0gMDsKK3N0YXRpYyBUcmFj a2VkRGVzY2VuZGFudHNNYXAqIGdQb3NpdGlvbmVkRGVzY2VuZGFudHNNYXA7CitzdGF0aWMgVHJh Y2tlZERlc2NlbmRhbnRzTWFwKiBnUGVyY2VudEhlaWdodERlc2NlbmRhbnRzTWFwOwogCi1zdGF0 aWMgVHJhY2tlZENvbnRhaW5lck1hcCogZ1Bvc2l0aW9uZWRDb250YWluZXJNYXAgPSAwOwotc3Rh dGljIFRyYWNrZWRDb250YWluZXJNYXAqIGdQZXJjZW50SGVpZ2h0Q29udGFpbmVyTWFwID0gMDsK K3N0YXRpYyBUcmFja2VkQ29udGFpbmVyTWFwKiBnUG9zaXRpb25lZENvbnRhaW5lck1hcDsKK3N0 YXRpYyBUcmFja2VkQ29udGFpbmVyTWFwKiBnUGVyY2VudEhlaWdodENvbnRhaW5lck1hcDsKIAog dHlwZWRlZiBIYXNoTWFwPFJlbmRlckJsb2NrKiwgc3RkOjp1bmlxdWVfcHRyPExpc3RIYXNoU2V0 PFJlbmRlcklubGluZSo+Pj4gQ29udGludWF0aW9uT3V0bGluZVRhYmxlTWFwOwogCkBAIC0yMTQ0 LDcgKzIxNDQsNyBAQCBUcmFja2VkUmVuZGVyZXJMaXN0SGFzaFNldCogUmVuZGVyQmxvY2s6OnBv c2l0aW9uZWRPYmplY3RzKCkgY29uc3QKIHsKICAgICBpZiAoZ1Bvc2l0aW9uZWREZXNjZW5kYW50 c01hcCkKICAgICAgICAgcmV0dXJuIGdQb3NpdGlvbmVkRGVzY2VuZGFudHNNYXAtPmdldCh0aGlz KTsKLSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAogdm9pZCBSZW5kZXJC bG9jazo6aW5zZXJ0UG9zaXRpb25lZE9iamVjdChSZW5kZXJCb3gmIG8pCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXggMmFkZWZhYzY1ZGU0ZTQ5Yjc1NjAx ZTdhN2M3ODIwMzdjYThhN2ZiMS4uOGVkZDQ4YmE0ZTdjNmU5YzVjMTJmN2M0YWQ0MjIxODk1ZGQz NzFlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcApAQCAt MzcsNiArMzcsNyBAQAogI2luY2x1ZGUgIkhUTUxIdG1sRWxlbWVudC5oIgogI2luY2x1ZGUgIkhU TUxOYW1lcy5oIgogI2luY2x1ZGUgIkZsb3dUaHJlYWRDb250cm9sbGVyLmgiCisjaW5jbHVkZSAi UmVuZGVyQmxvY2suaCIKICNpbmNsdWRlICJSZW5kZXJDb3VudGVyLmgiCiAjaW5jbHVkZSAiUmVu ZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmgiCiAjaW5jbHVkZSAiUmVuZGVyRmxleGlibGVCb3gu aCIKQEAgLTE0OTYsNiArMTQ5Nyw0OCBAQCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBSZW5kZXJF bGVtZW50OjpnZXRVbmNhY2hlZFBzZXVkb1N0eWxlKGNvbnN0IFBzZXVkb1N0eWxlUgogICAgIHJl dHVybiBkb2N1bWVudCgpLmVuc3VyZVN0eWxlUmVzb2x2ZXIoKS5wc2V1ZG9TdHlsZUZvckVsZW1l bnQoZWxlbWVudCgpLCBwc2V1ZG9TdHlsZVJlcXVlc3QsIHBhcmVudFN0eWxlKTsKIH0KIAorUmVu ZGVyQmxvY2sqIFJlbmRlckVsZW1lbnQ6OmNvbnRhaW5pbmdCbG9ja0ZvckZpeGVkUG9zaXRpb24o KSBjb25zdAoreworICAgIGNvbnN0IFJlbmRlckVsZW1lbnQqIG9iamVjdCA9IHRoaXM7CisgICAg d2hpbGUgKG9iamVjdCAmJiAhb2JqZWN0LT5jYW5Db250YWluRml4ZWRQb3NpdGlvbk9iamVjdHMo KSkKKyAgICAgICAgb2JqZWN0ID0gb2JqZWN0LT5wYXJlbnQoKTsKKworICAgIEFTU0VSVCghb2Jq ZWN0IHx8ICFvYmplY3QtPmlzQW5vbnltb3VzQmxvY2soKSk7CisgICAgcmV0dXJuIGNvbnN0X2Nh c3Q8UmVuZGVyQmxvY2sqPihkb3duY2FzdDxSZW5kZXJCbG9jaz4ob2JqZWN0KSk7Cit9CisKK1Jl bmRlckJsb2NrKiBSZW5kZXJFbGVtZW50Ojpjb250YWluaW5nQmxvY2tGb3JBYnNvbHV0ZVBvc2l0 aW9uKCkgY29uc3QKK3sKKyAgICBjb25zdCBSZW5kZXJFbGVtZW50KiBvYmplY3QgPSB0aGlzOwor ICAgIHdoaWxlIChvYmplY3QgJiYgIW9iamVjdC0+Y2FuQ29udGFpbkFic29sdXRlbHlQb3NpdGlv bmVkT2JqZWN0cygpKQorICAgICAgICBvYmplY3QgPSBvYmplY3QtPnBhcmVudCgpOworCisgICAg Ly8gRm9yIGEgcmVsYXRpdmVseSBwb3NpdGlvbmVkIGlubGluZSwgcmV0dXJuIGl0cyBuZWFyZXN0 IG5vbi1hbm9ueW1vdXMgY29udGFpbmluZyBibG9jaywKKyAgICAvLyBub3QgdGhlIGlubGluZSBp dHNlbGYsIHRvIGF2b2lkIGhhdmluZyBhIHBvc2l0aW9uZWQgb2JqZWN0cyBsaXN0IGluIGFsbCBS ZW5kZXJJbmxpbmVzCisgICAgLy8gYW5kIHVzZSBSZW5kZXJCbG9jayogYXMgUmVuZGVyRWxlbWVu dDo6Y29udGFpbmluZ0Jsb2NrJ3MgcmV0dXJuIHR5cGUuCisgICAgLy8gVXNlIFJlbmRlckJsb2Nr Ojpjb250YWluZXIoKSB0byBvYnRhaW4gdGhlIGlubGluZS4KKyAgICBpZiAob2JqZWN0ICYmICFp czxSZW5kZXJCbG9jaz4oKm9iamVjdCkpCisgICAgICAgIG9iamVjdCA9IG9iamVjdC0+Y29udGFp bmluZ0Jsb2NrKCk7CisKKyAgICB3aGlsZSAob2JqZWN0ICYmIG9iamVjdC0+aXNBbm9ueW1vdXNC bG9jaygpKQorICAgICAgICBvYmplY3QgPSBvYmplY3QtPmNvbnRhaW5pbmdCbG9jaygpOworCisg ICAgcmV0dXJuIGNvbnN0X2Nhc3Q8UmVuZGVyQmxvY2sqPihkb3duY2FzdDxSZW5kZXJCbG9jaz4o b2JqZWN0KSk7Cit9CisKK3N0YXRpYyBpbmxpbmUgYm9vbCBpc05vblJlbmRlckJsb2NrSW5saW5l KGNvbnN0IFJlbmRlckVsZW1lbnQmIG9iamVjdCkKK3sKKyAgICByZXR1cm4gKG9iamVjdC5pc0lu bGluZSgpICYmICFvYmplY3QuaXNSZXBsYWNlZCgpKSB8fCAhb2JqZWN0LmlzUmVuZGVyQmxvY2so KTsKK30KKworUmVuZGVyQmxvY2sqIFJlbmRlckVsZW1lbnQ6OmNvbnRhaW5pbmdCbG9ja0Zvck9i amVjdEluRmxvdygpIGNvbnN0Cit7CisgICAgY29uc3QgUmVuZGVyRWxlbWVudCogb2JqZWN0ID0g dGhpczsKKyAgICB3aGlsZSAob2JqZWN0ICYmIGlzTm9uUmVuZGVyQmxvY2tJbmxpbmUoKm9iamVj dCkpCisgICAgICAgIG9iamVjdCA9IG9iamVjdC0+cGFyZW50KCk7CisgICAgcmV0dXJuIGNvbnN0 X2Nhc3Q8UmVuZGVyQmxvY2sqPihkb3duY2FzdDxSZW5kZXJCbG9jaz4ob2JqZWN0KSk7Cit9CisK IENvbG9yIFJlbmRlckVsZW1lbnQ6OnNlbGVjdGlvbkNvbG9yKGludCBjb2xvclByb3BlcnR5KSBj b25zdAogewogICAgIC8vIElmIHRoZSBlbGVtZW50IGlzIHVuc2VsZWN0YWJsZSwgb3Igd2UgYXJl IG9ubHkgcGFpbnRpbmcgdGhlIHNlbGVjdGlvbiwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRWxlbWVudC5oCmluZGV4IDVjYjEyNDBlYmY4ZDkzNGRiZTE2MGQwYjZkNDBjZWVkMGZlOWRk NDUuLjMwNmRkNjM1MDgyZTg0YWJkNWFkYTViMzAyODc3ZTJlMWIzODU5NzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaApAQCAtMjksNiArMjksNyBAQAogbmFtZXNw YWNlIFdlYkNvcmUgewogCiBjbGFzcyBDb250cm9sU3RhdGVzOworY2xhc3MgUmVuZGVyQmxvY2s7 CiAKIGNsYXNzIFJlbmRlckVsZW1lbnQgOiBwdWJsaWMgUmVuZGVyT2JqZWN0IHsKIHB1YmxpYzoK QEAgLTYzLDYgKzY0LDExIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgaXNFbXB0eSgpIGNv bnN0IG92ZXJyaWRlIHsgcmV0dXJuICFmaXJzdENoaWxkKCk7IH0KIAogICAgIGJvb2wgY2FuQ29u dGFpbkZpeGVkUG9zaXRpb25PYmplY3RzKCkgY29uc3Q7CisgICAgYm9vbCBjYW5Db250YWluQWJz b2x1dGVseVBvc2l0aW9uZWRPYmplY3RzKCkgY29uc3Q7CisKKyAgICBSZW5kZXJCbG9jayogY29u dGFpbmluZ0Jsb2NrRm9yRml4ZWRQb3NpdGlvbigpIGNvbnN0OworICAgIFJlbmRlckJsb2NrKiBj b250YWluaW5nQmxvY2tGb3JBYnNvbHV0ZVBvc2l0aW9uKCkgY29uc3Q7CisgICAgUmVuZGVyQmxv Y2sqIGNvbnRhaW5pbmdCbG9ja0Zvck9iamVjdEluRmxvdygpIGNvbnN0OwogCiAgICAgQ29sb3Ig c2VsZWN0aW9uQ29sb3IoaW50IGNvbG9yUHJvcGVydHkpIGNvbnN0OwogICAgIFBhc3NSZWZQdHI8 UmVuZGVyU3R5bGU+IHNlbGVjdGlvblBzZXVkb1N0eWxlKCkgY29uc3Q7CkBAIC0zOTMsNiArMzk5 LDE0IEBAIGlubGluZSBib29sIFJlbmRlckVsZW1lbnQ6OmNhbkNvbnRhaW5GaXhlZFBvc2l0aW9u T2JqZWN0cygpIGNvbnN0CiAgICAgICAgIHx8IGlzT3V0T2ZGbG93UmVuZGVyRmxvd1RocmVhZCgp OwogfQogCitpbmxpbmUgYm9vbCBSZW5kZXJFbGVtZW50OjpjYW5Db250YWluQWJzb2x1dGVseVBv c2l0aW9uZWRPYmplY3RzKCkgY29uc3QKK3sKKyAgICByZXR1cm4gc3R5bGUoKS5wb3NpdGlvbigp ICE9IFN0YXRpY1Bvc2l0aW9uCisgICAgICAgIHx8IChpc1JlbmRlckJsb2NrKCkgJiYgaGFzVHJh bnNmb3JtUmVsYXRlZFByb3BlcnR5KCkpCisgICAgICAgIHx8IGlzU1ZHRm9yZWlnbk9iamVjdCgp CisgICAgICAgIHx8IGlzUmVuZGVyVmlldygpOworfQorCiBpbmxpbmUgYm9vbCBSZW5kZXJPYmpl Y3Q6OmlzUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGlzPFJl bmRlckVsZW1lbnQ+KCp0aGlzKSAmJiBkb3duY2FzdDxSZW5kZXJFbGVtZW50PigqdGhpcykuaXNS ZW5kZXJMYXllck1vZGVsT2JqZWN0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcAppbmRleCBlNjgxZjUxNTEyNzY0OTgwNjJjMDBkOWM5MmVkNWI3NWMyNzVkYzY0Li40 NTU3YTA5NGE3ODc3YWVjNjI5M2Y2NTJkMDEzZDE0MTQwNTdkOTY0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTc3LDcgKzc3LDYgQEAKICNpbmNsdWRlICJI aXRUZXN0UmVxdWVzdC5oIgogI2luY2x1ZGUgIkhpdFRlc3RSZXN1bHQuaCIKICNpbmNsdWRlICJJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaCIKLSNpbmNsdWRlICJMb2dpY2FsU2VsZWN0aW9uT2Zm c2V0Q2FjaGVzLmgiCiAjaW5jbHVkZSAiT3ZlcmZsb3dFdmVudC5oIgogI2luY2x1ZGUgIk92ZXJs YXBUZXN0UmVxdWVzdENsaWVudC5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKQEAgLTE0MzQsNyArMTQz Myw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc0NvbnRhaW5lckZvclBvc2l0aW9uZWQoUmVuZGVy TGF5ZXImIGxheWVyLCBFUG9zaXRpb24gcG9zaXRpCiAgICAgICAgIHJldHVybiBsYXllci5yZW5k ZXJlcigpLmNhbkNvbnRhaW5GaXhlZFBvc2l0aW9uT2JqZWN0cygpOwogCiAgICAgY2FzZSBBYnNv bHV0ZVBvc2l0aW9uOgotICAgICAgICByZXR1cm4gaXNDb250YWluaW5nQmxvY2tDYW5kaWRhdGVG b3JBYnNvbHV0ZWx5UG9zaXRpb25lZE9iamVjdChsYXllci5yZW5kZXJlcigpKTsKKyAgICAgICAg cmV0dXJuIGxheWVyLnJlbmRlcmVyKCkuY2FuQ29udGFpbkFic29sdXRlbHlQb3NpdGlvbmVkT2Jq ZWN0cygpOwogICAgIAogICAgIGRlZmF1bHQ6CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCAzZmRhNGEw Zjk2MDUxOTllZjFkNmExN2M0NmEzMzg0NzJmYjY5MTI4Li45ODYxN2Q1NjdjNTA2OWNhYmU0MDdk ODA0MTQ0ZTRjYzI2MmNlMmY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmNwcApAQCAtNjkzLDExICs2OTMsMTEgQEAgUmVuZGVyQmxvY2sqIFJlbmRlck9iamVjdDo6 Y29udGFpbmluZ0Jsb2NrKCkgY29uc3QKIAogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSA9 IHRoaXMtPnN0eWxlKCk7CiAgICAgaWYgKCFpczxSZW5kZXJUZXh0PigqdGhpcykgJiYgc3R5bGUu cG9zaXRpb24oKSA9PSBGaXhlZFBvc2l0aW9uKQotICAgICAgICBwYXJlbnQgPSBjb250YWluaW5n QmxvY2tGb3JGaXhlZFBvc2l0aW9uKHBhcmVudCk7CisgICAgICAgIHBhcmVudCA9IHBhcmVudC0+ Y29udGFpbmluZ0Jsb2NrRm9yRml4ZWRQb3NpdGlvbigpOwogICAgIGVsc2UgaWYgKCFpczxSZW5k ZXJUZXh0PigqdGhpcykgJiYgc3R5bGUucG9zaXRpb24oKSA9PSBBYnNvbHV0ZVBvc2l0aW9uKQot ICAgICAgICBwYXJlbnQgPSBjb250YWluaW5nQmxvY2tGb3JBYnNvbHV0ZVBvc2l0aW9uKHBhcmVu dCk7CisgICAgICAgIHBhcmVudCA9IHBhcmVudC0+Y29udGFpbmluZ0Jsb2NrRm9yQWJzb2x1dGVQ b3NpdGlvbigpOwogICAgIGVsc2UKLSAgICAgICAgcGFyZW50ID0gY29udGFpbmluZ0Jsb2NrRm9y T2JqZWN0SW5GbG93KHBhcmVudCk7CisgICAgICAgIHBhcmVudCA9IHBhcmVudC0+Y29udGFpbmlu Z0Jsb2NrRm9yT2JqZWN0SW5GbG93KCk7CiAKICAgICBpZiAoIWlzPFJlbmRlckJsb2NrPihwYXJl bnQpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsgLy8gVGhpcyBjYW4gc3RpbGwgaGFwcGVuIGlu IGNhc2Ugb2YgYW4gb3JwaGFuZWQgdHJlZQo=