54221 2011-02-10 10:32:59 -0800 Fix clang warning "WebCore::HTMLAreaElement::getRect' hides overloaded virtual function [-Woverloaded-virtual]" 2011-02-10 20:23:29 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 thakis thakis andersca commit-queue darin jamesr jeffm oldest_to_newest 349172 0 thakis 2011-02-10 10:32:59 -0800 Fix clang warning "WebCore::HTMLAreaElement::getRect' hides overloaded virtual function [-Woverloaded-virtual]" 349174 1 82000 thakis 2011-02-10 10:35:09 -0800 Created attachment 82000 Patch 349176 2 thakis 2011-02-10 10:36:54 -0800 Full warning: third_party/WebKit/Source/WebCore/html/HTMLAreaElement.h:44:13:error: 'WebCore::HTMLAreaElement::getRect' hides overloaded virtual function [-Woverloaded-virtual] IntRect getRect(RenderObject*) const; ^ third_party/WebKit/Source/WebCore/dom/ContainerNode.h:63:21: note: hidden overloaded virtual function 'WebCore::ContainerNode::getRect' declared here virtual IntRect getRect() const; ^ 349220 3 jamesr 2011-02-10 11:31:33 -0800 I'm not completely sure this is avoiding a (potential) bug - looks like getRect() isn't intended to be an override and callsites are never ambiguous. It is a little confusing, though. 349228 4 thakis 2011-02-10 11:37:13 -0800 Yes, it's not a real bug in this case, just confusing. But fixing this makes it possible to turn on -Woverride-virtual in clang (and this warning is on by default with -Wall), which does find real bugs. Even since it's not a bug in this case, it's a bit confusing to have a non-override with the same name as you say, so changing this seems beneficial in general. 349231 5 82000 darin 2011-02-10 11:38:37 -0800 Comment on attachment 82000 Patch I think a rename is totally fine. But I don’t think that adding a “for renderer” suffix is the best rename. For one thing, having “get” in these names doesn’t match our usual naming scheme. So the Node::getRect function also has a bad name for a WebKit function. I think I’d name them computeRect and computePath. Since the patch isn’t applying with the EWS I think we need a new version. review- because of the EWS issue. 349248 6 82019 thakis 2011-02-10 11:54:23 -0800 Created attachment 82019 Patch 349307 7 82019 commit-queue 2011-02-10 13:04:57 -0800 Comment on attachment 82019 Patch Clearing flags on attachment: 82019 Committed r78261: <http://trac.webkit.org/changeset/78261> 349308 8 commit-queue 2011-02-10 13:05:01 -0800 All reviewed patches have been landed. Closing bug. 82000 2011-02-10 10:35:09 -0800 2011-02-10 11:54:20 -0800 Patch bug-54221-20110210103508.patch text/plain 5633 thakis ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiMDI0OWRmMjE5MzQ5ZDk5MzY0ZjhlZjIwNjg0OWNjNDZhNjdkYmE2Li41 MDI2MjI5N2ZhNGI5NTk0NGVjYWM3NmZmZDNhYjNlM2ViMjUxY2VlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjcgQEAKKzIwMTEtMDItMTAgIE5pY28gV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBj bGFuZyB3YXJuaW5nICJXZWJDb3JlOjpIVE1MQXJlYUVsZW1lbnQ6OmdldFJlY3QnIGhpZGVzIG92 ZXJsb2FkZWQgdmlydHVhbCBmdW5jdGlvbiBbLVdvdmVybG9hZGVkLXZpcnR1YWxdIgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQyMjEKKworICAgICAg ICBUaGUgbWV0aG9kIG5hbWUgY29uZmxpY3RzIHdpdGggQ29udGFpbmVyTm9kZTo6Z2V0UmVjdCgp IHNvIHJlbmFtZSBpdCB0bworICAgICAgICBnZXRSZWN0Rm9yUmVuZGVyZXIoKS4gUmVuYW1lIGdl dFBhdGgoKSB0byBnZXRQYXRoRm9yUmVuZGVyZXIoKSBmb3IKKyAgICAgICAgY29uc2lzdGVuY3kg YXMgd2VsbC4KKworICAgICAgICBObyBpbnRlbmRlZCBmdW5jdGlvbmFsaXR5IGNoYW5nZSwgY292 ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eUltYWdlTWFwTGluay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5 SW1hZ2VNYXBMaW5rOjplbGVtZW50UmVjdCk6CisgICAgICAgICogaHRtbC9IVE1MQXJlYUVsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEFyZWFFbGVtZW50OjpnZXRQYXRoRm9yUmVu ZGVyZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEFyZWFFbGVtZW50OjpnZXRSZWN0Rm9yUmVu ZGVyZXIpOgorICAgICAgICAqIGh0bWwvSFRNTEFyZWFFbGVtZW50Lmg6CisgICAgICAgICogcGFn ZS9TcGF0aWFsTmF2aWdhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjp2aXJ0dWFsUmVjdEZv ckFyZWFFbGVtZW50QW5kRGlyZWN0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW1h Z2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW1hZ2U6OnBhaW50Rm9jdXNSaW5nKToK KwogMjAxMS0wMS0xNyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAg ICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzUyNTk2PiBBZGQgbWlzc2luZyBET01Eb2N1bWVudC9E T01Eb2N1bWVudEZyYWdtZW50IGhlYWRlcnMgdG8gWGNvZGUgcHJvamVjdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5rLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUltYWdlTWFwTGlu ay5jcHAKaW5kZXggNTY3NjIwNjc3MGZiZmI2YmFmODQyODIwNDQ5ZTM3ZWIwYTk3ZGI3OC4uZDNm YTg1YTBlZGE3NGJkYjZkYjc1N2M4YzQzYWU3ODVkNTVlZTE3YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5rLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlJbWFnZU1hcExpbmsu Y3BwCkBAIC0xMzMsNyArMTMzLDcgQEAgSW50UmVjdCBBY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5r OjplbGVtZW50UmVjdCgpIGNvbnN0CiAgICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJu IEludFJlY3QoKTsKICAgICAKLSAgICByZXR1cm4gbV9hcmVhRWxlbWVudC0+Z2V0UmVjdChyZW5k ZXJlcik7CisgICAgcmV0dXJuIG1fYXJlYUVsZW1lbnQtPmdldFJlY3RGb3JSZW5kZXJlcihyZW5k ZXJlcik7CiB9CiAgICAgCiBTdHJpbmcgQWNjZXNzaWJpbGl0eUltYWdlTWFwTGluazo6c3RyaW5n VmFsdWVGb3JNU0FBKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TEFyZWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFyZWFFbGVtZW50LmNw cAppbmRleCBkYzg3ZWY2Y2JmY2Y1MjM4NWIzZGI2ODA4Nzc2MzkwZDNlZGM3NzgzLi40NTUxMzI1 MWRiNTA4YWEwNmIyMjNlZjcxMjZjNjkxYTE1YmMxMTAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxBcmVhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MQXJlYUVsZW1lbnQuY3BwCkBAIC04NSw3ICs4NSw3IEBAIGJvb2wgSFRNTEFyZWFFbGVtZW50 OjptYXBNb3VzZUV2ZW50KGludCB4LCBpbnQgeSwgY29uc3QgSW50U2l6ZSYgc2l6ZSwgSGl0VGVz dFJlCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLVBhdGggSFRNTEFyZWFFbGVtZW50OjpnZXRQYXRo KFJlbmRlck9iamVjdCogb2JqKSBjb25zdAorUGF0aCBIVE1MQXJlYUVsZW1lbnQ6OmdldFBhdGhG b3JSZW5kZXJlcihSZW5kZXJPYmplY3QqIG9iaikgY29uc3QKIHsKICAgICBpZiAoIW9iaikKICAg ICAgICAgcmV0dXJuIFBhdGgoKTsKQEAgLTExMCw5ICsxMTAsOSBAQCBQYXRoIEhUTUxBcmVhRWxl bWVudDo6Z2V0UGF0aChSZW5kZXJPYmplY3QqIG9iaikgY29uc3QKICAgICByZXR1cm4gcDsKIH0K ICAgICAKLUludFJlY3QgSFRNTEFyZWFFbGVtZW50OjpnZXRSZWN0KFJlbmRlck9iamVjdCogb2Jq KSBjb25zdAorSW50UmVjdCBIVE1MQXJlYUVsZW1lbnQ6OmdldFJlY3RGb3JSZW5kZXJlcihSZW5k ZXJPYmplY3QqIG9iaikgY29uc3QKIHsKLSAgICByZXR1cm4gZW5jbG9zaW5nSW50UmVjdChnZXRQ YXRoKG9iaikuYm91bmRpbmdSZWN0KCkpOworICAgIHJldHVybiBlbmNsb3NpbmdJbnRSZWN0KGdl dFBhdGhGb3JSZW5kZXJlcihvYmopLmJvdW5kaW5nUmVjdCgpKTsKIH0KIAogUGF0aCBIVE1MQXJl YUVsZW1lbnQ6OmdldFJlZ2lvbihjb25zdCBJbnRTaXplJiBzaXplKSBjb25zdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXJlYUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEFyZWFFbGVtZW50LmgKaW5kZXggNDJkNDE5OGVkNDdiMzFkOTdlZDBhMjg4ZDUy ODc4MTQ5NTMxZDcyNi4uMTI0ZmRjODdmYWJkODgzMzkwNDdlN2MzZDUzNTI0ODk1NjE5MDQyYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXJlYUVsZW1lbnQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBcmVhRWxlbWVudC5oCkBAIC00MSw4ICs0MSw4IEBAIHB1 YmxpYzoKIAogICAgIGJvb2wgbWFwTW91c2VFdmVudChpbnQgeCwgaW50IHksIGNvbnN0IEludFNp emUmLCBIaXRUZXN0UmVzdWx0Jik7CiAKLSAgICBJbnRSZWN0IGdldFJlY3QoUmVuZGVyT2JqZWN0 KikgY29uc3Q7Ci0gICAgUGF0aCBnZXRQYXRoKFJlbmRlck9iamVjdCopIGNvbnN0OworICAgIElu dFJlY3QgZ2V0UmVjdEZvclJlbmRlcmVyKFJlbmRlck9iamVjdCopIGNvbnN0OworICAgIFBhdGgg Z2V0UGF0aEZvclJlbmRlcmVyKFJlbmRlck9iamVjdCopIGNvbnN0OwogCiAgICAgLy8gVGhlIHBh cmVudCBtYXAncyBpbWFnZS4KICAgICBIVE1MSW1hZ2VFbGVtZW50KiBpbWFnZUVsZW1lbnQoKSBj b25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU3BhdGlhbE5hdmlnYXRpb24u Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TcGF0aWFsTmF2aWdhdGlvbi5jcHAKaW5kZXggN2Q4 ZWRlMzBiMjE1MGU0ODY1ZDgwZTU0YjQ2YWYxNjI5MTI0NGEzYS4uMzQzZWMxNTdlMTEyZjU4NjNj YTUxMWRlZjQ1ODY3YjU5OGViMzViOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9T cGF0aWFsTmF2aWdhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TcGF0aWFsTmF2 aWdhdGlvbi5jcHAKQEAgLTcwMSw3ICs3MDEsNyBAQCBJbnRSZWN0IHZpcnR1YWxSZWN0Rm9yQXJl YUVsZW1lbnRBbmREaXJlY3Rpb24oSFRNTEFyZWFFbGVtZW50KiBhcmVhLCBGb2N1c0RpcmVjdAog ICAgIEFTU0VSVChhcmVhLT5pbWFnZUVsZW1lbnQoKSk7CiAgICAgLy8gQXJlYSBlbGVtZW50cyB0 ZW5kIHRvIG92ZXJsYXAgbW9yZSB0aGFuIG90aGVyIGZvY3VzYWJsZSBlbGVtZW50cy4gV2UgZmxh dHRlbiB0aGUgcmVjdCBvZiB0aGUgYXJlYSBlbGVtZW50cwogICAgIC8vIHRvIG1pbmltaXplIHRo ZSBlZmZlY3Qgb2Ygb3ZlcmxhcHBpbmcgYXJlYXMuCi0gICAgSW50UmVjdCByZWN0ID0gdmlydHVh bFJlY3RGb3JEaXJlY3Rpb24oZGlyZWN0aW9uLCByZWN0VG9BYnNvbHV0ZUNvb3JkaW5hdGVzKGFy ZWEtPmRvY3VtZW50KCktPmZyYW1lKCksIGFyZWEtPmdldFJlY3QoYXJlYS0+aW1hZ2VFbGVtZW50 KCktPnJlbmRlcmVyKCkpKSwgMSk7CisgICAgSW50UmVjdCByZWN0ID0gdmlydHVhbFJlY3RGb3JE aXJlY3Rpb24oZGlyZWN0aW9uLCByZWN0VG9BYnNvbHV0ZUNvb3JkaW5hdGVzKGFyZWEtPmRvY3Vt ZW50KCktPmZyYW1lKCksIGFyZWEtPmdldFJlY3RGb3JSZW5kZXJlcihhcmVhLT5pbWFnZUVsZW1l bnQoKS0+cmVuZGVyZXIoKSkpLCAxKTsKICAgICByZXR1cm4gcmVjdDsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHAKaW5kZXggZWYyMzA4YmRjMDBjM2NiY2EwOWE3 ZGI5MDU0ZWQ3YmY5YjUwYzg5Yi4uZTk5NTBhNzE0YmE4ZDEwYmI3MDc1MTZjNTE4OWRiYzkyMDY1 MzYwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwCkBAIC0zNTgs NyArMzU4LDcgQEAgdm9pZCBSZW5kZXJJbWFnZTo6cGFpbnRGb2N1c1JpbmcoUGFpbnRJbmZvJiBw YWludEluZm8sIGNvbnN0IFJlbmRlclN0eWxlKikKICAgICAgICAgUmVuZGVyU3R5bGUqIHN0eWxl VG9Vc2UgPSBhcmVhRWxlbWVudC0+Y29tcHV0ZWRTdHlsZSgpOwogICAgICAgICBpZiAodGhlbWUo KS0+c3VwcG9ydHNGb2N1c1Jpbmcoc3R5bGVUb1VzZSkpCiAgICAgICAgICAgICByZXR1cm47IC8v IFRoZSB0aGVtZSBkcmF3cyB0aGUgZm9jdXMgcmluZy4KLSAgICAgICAgcGFpbnRJbmZvLmNvbnRl eHQtPmRyYXdGb2N1c1JpbmcoYXJlYUVsZW1lbnQtPmdldFBhdGgodGhpcyksIHN0eWxlVG9Vc2Ut Pm91dGxpbmVXaWR0aCgpLCBzdHlsZVRvVXNlLT5vdXRsaW5lT2Zmc2V0KCksIHN0eWxlVG9Vc2Ut PnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eU91dGxpbmVDb2xvcikpOworICAgICAg ICBwYWludEluZm8uY29udGV4dC0+ZHJhd0ZvY3VzUmluZyhhcmVhRWxlbWVudC0+Z2V0UGF0aEZv clJlbmRlcmVyKHRoaXMpLCBzdHlsZVRvVXNlLT5vdXRsaW5lV2lkdGgoKSwgc3R5bGVUb1VzZS0+ b3V0bGluZU9mZnNldCgpLCBzdHlsZVRvVXNlLT52aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJv cGVydHlPdXRsaW5lQ29sb3IpKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogfQo= 82019 2011-02-10 11:54:23 -0800 2011-02-10 13:04:57 -0800 Patch bug-54221-20110210115422.patch text/plain 5239 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogNzgyNTIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhODlhZTVlOTAxYzU0NzZk NDY2OTg5NzNmNzZmZDcyNjhhYTIxZDY0Li5lNWIzZjE3MWQ5YjE4NDQ0YTFiNDZkYWQzNzFhY2Iz MDdhNDA4NWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDItMTAgIE5pY28g V2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZpeCBjbGFuZyB3YXJuaW5nICJXZWJDb3JlOjpIVE1MQXJl YUVsZW1lbnQ6OmdldFJlY3QnIGhpZGVzIG92ZXJsb2FkZWQgdmlydHVhbCBmdW5jdGlvbiBbLVdv dmVybG9hZGVkLXZpcnR1YWxdIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTQyMjEKKworICAgICAgICBUaGUgbWV0aG9kIG5hbWUgY29uZmxpY3RzIHdp dGggQ29udGFpbmVyTm9kZTo6Z2V0UmVjdCgpIHNvIHJlbmFtZSBpdCB0bworICAgICAgICBjb21w dXRlUmVjdCgpLiBSZW5hbWUgZ2V0UGF0aCgpIHRvIGNvbXB1dGVQYXRoKCkgZm9yIGNvbnNpc3Rl bmN5IGFzCisgICAgICAgIHdlbGwuCisKKyAgICAgICAgTm8gaW50ZW5kZWQgZnVuY3Rpb25hbGl0 eSBjaGFuZ2UsIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBhY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlJbWFnZU1hcExpbmsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 QWNjZXNzaWJpbGl0eUltYWdlTWFwTGluazo6ZWxlbWVudFJlY3QpOgorICAgICAgICAqIGh0bWwv SFRNTEFyZWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxBcmVhRWxlbWVudDo6 Y29tcHV0ZVBhdGgpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEFyZWFFbGVtZW50Ojpjb21wdXRl UmVjdCk6CisgICAgICAgICogaHRtbC9IVE1MQXJlYUVsZW1lbnQuaDoKKyAgICAgICAgKiBwYWdl L1NwYXRpYWxOYXZpZ2F0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnZpcnR1YWxSZWN0Rm9y QXJlYUVsZW1lbnRBbmREaXJlY3Rpb24pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbWFn ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZTo6cGFpbnRGb2N1c1JpbmcpOgor CiAyMDExLTAyLTEwICBEaXJrIFNjaHVsemUgIDxrcml0QHdlYmtpdC5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgTmlrb2xhcyBaaW1tZXJtYW5uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5rLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUltYWdlTWFwTGluay5jcHAKaW5kZXgg NTY3NjIwNjc3MGZiZmI2YmFmODQyODIwNDQ5ZTM3ZWIwYTk3ZGI3OC4uMDg0NGQwMmEzMzk0NWQ0 MjNhNGNiYTg2OGE4NTQyZDU4NjY0YWIwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5rLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlJbWFnZU1hcExpbmsuY3BwCkBAIC0xMzMs NyArMTMzLDcgQEAgSW50UmVjdCBBY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5rOjplbGVtZW50UmVj dCgpIGNvbnN0CiAgICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJuIEludFJlY3QoKTsK ICAgICAKLSAgICByZXR1cm4gbV9hcmVhRWxlbWVudC0+Z2V0UmVjdChyZW5kZXJlcik7CisgICAg cmV0dXJuIG1fYXJlYUVsZW1lbnQtPmNvbXB1dGVSZWN0KHJlbmRlcmVyKTsKIH0KICAgICAKIFN0 cmluZyBBY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5rOjpzdHJpbmdWYWx1ZUZvck1TQUEoKSBjb25z dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXJlYUVsZW1lbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXJlYUVsZW1lbnQuY3BwCmluZGV4IGQzY2UxN2Q3MTMz NWE1NWNlYTExOGRhZjM5MTFlNjkwZjNkMWRlYjAuLjk4MzJkMDZkZTlkNjU3NTFlMWM2OTFhNzU1 ZTY0NDkyNjQ0YTk3ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFyZWFF bGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBcmVhRWxlbWVudC5jcHAK QEAgLTg2LDcgKzg2LDcgQEAgYm9vbCBIVE1MQXJlYUVsZW1lbnQ6Om1hcE1vdXNlRXZlbnQoaW50 IHgsIGludCB5LCBjb25zdCBJbnRTaXplJiBzaXplLCBIaXRUZXN0UmUKICAgICByZXR1cm4gdHJ1 ZTsKIH0KIAotUGF0aCBIVE1MQXJlYUVsZW1lbnQ6OmdldFBhdGgoUmVuZGVyT2JqZWN0KiBvYmop IGNvbnN0CitQYXRoIEhUTUxBcmVhRWxlbWVudDo6Y29tcHV0ZVBhdGgoUmVuZGVyT2JqZWN0KiBv YmopIGNvbnN0CiB7CiAgICAgaWYgKCFvYmopCiAgICAgICAgIHJldHVybiBQYXRoKCk7CkBAIC0x MTEsOSArMTExLDkgQEAgUGF0aCBIVE1MQXJlYUVsZW1lbnQ6OmdldFBhdGgoUmVuZGVyT2JqZWN0 KiBvYmopIGNvbnN0CiAgICAgcmV0dXJuIHA7CiB9CiAgICAgCi1JbnRSZWN0IEhUTUxBcmVhRWxl bWVudDo6Z2V0UmVjdChSZW5kZXJPYmplY3QqIG9iaikgY29uc3QKK0ludFJlY3QgSFRNTEFyZWFF bGVtZW50Ojpjb21wdXRlUmVjdChSZW5kZXJPYmplY3QqIG9iaikgY29uc3QKIHsKLSAgICByZXR1 cm4gZW5jbG9zaW5nSW50UmVjdChnZXRQYXRoKG9iaikuYm91bmRpbmdSZWN0KCkpOworICAgIHJl dHVybiBlbmNsb3NpbmdJbnRSZWN0KGNvbXB1dGVQYXRoKG9iaikuYm91bmRpbmdSZWN0KCkpOwog fQogCiBQYXRoIEhUTUxBcmVhRWxlbWVudDo6Z2V0UmVnaW9uKGNvbnN0IEludFNpemUmIHNpemUp IGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBcmVhRWxlbWVudC5o IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXJlYUVsZW1lbnQuaAppbmRleCBkYjE3MmI1MGU0 NThhZjhhYzRjMzUyNTIwN2UwODlkZTNiZDQyODUxLi4zNGY1YmE5OTU5MmU0ZmE0MzhkYTQwZWQz MDZjNzM0MGI0NmY0OWU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBcmVh RWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFyZWFFbGVtZW50LmgKQEAg LTQxLDggKzQxLDggQEAgcHVibGljOgogCiAgICAgYm9vbCBtYXBNb3VzZUV2ZW50KGludCB4LCBp bnQgeSwgY29uc3QgSW50U2l6ZSYsIEhpdFRlc3RSZXN1bHQmKTsKIAotICAgIEludFJlY3QgZ2V0 UmVjdChSZW5kZXJPYmplY3QqKSBjb25zdDsKLSAgICBQYXRoIGdldFBhdGgoUmVuZGVyT2JqZWN0 KikgY29uc3Q7CisgICAgSW50UmVjdCBjb21wdXRlUmVjdChSZW5kZXJPYmplY3QqKSBjb25zdDsK KyAgICBQYXRoIGNvbXB1dGVQYXRoKFJlbmRlck9iamVjdCopIGNvbnN0OwogCiAgICAgLy8gVGhl IHBhcmVudCBtYXAncyBpbWFnZS4KICAgICBIVE1MSW1hZ2VFbGVtZW50KiBpbWFnZUVsZW1lbnQo KSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU3BhdGlhbE5hdmlnYXRp b24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TcGF0aWFsTmF2aWdhdGlvbi5jcHAKaW5kZXgg ZjY2ZDgyMzZkMWJjZGE2YjczMGQzMTc1ZTVmNzJmOGVlOTNjZGI4Yi4uMzRhMmM5NzY3YmYwMTIz MTM5ZDQ1Y2FlYjg3MjEzODc2ZDYwZDRiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9TcGF0aWFsTmF2aWdhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TcGF0aWFs TmF2aWdhdGlvbi5jcHAKQEAgLTcwMSw3ICs3MDEsNyBAQCBJbnRSZWN0IHZpcnR1YWxSZWN0Rm9y QXJlYUVsZW1lbnRBbmREaXJlY3Rpb24oSFRNTEFyZWFFbGVtZW50KiBhcmVhLCBGb2N1c0RpcmVj dAogICAgIEFTU0VSVChhcmVhLT5pbWFnZUVsZW1lbnQoKSk7CiAgICAgLy8gQXJlYSBlbGVtZW50 cyB0ZW5kIHRvIG92ZXJsYXAgbW9yZSB0aGFuIG90aGVyIGZvY3VzYWJsZSBlbGVtZW50cy4gV2Ug ZmxhdHRlbiB0aGUgcmVjdCBvZiB0aGUgYXJlYSBlbGVtZW50cwogICAgIC8vIHRvIG1pbmltaXpl IHRoZSBlZmZlY3Qgb2Ygb3ZlcmxhcHBpbmcgYXJlYXMuCi0gICAgSW50UmVjdCByZWN0ID0gdmly dHVhbFJlY3RGb3JEaXJlY3Rpb24oZGlyZWN0aW9uLCByZWN0VG9BYnNvbHV0ZUNvb3JkaW5hdGVz KGFyZWEtPmRvY3VtZW50KCktPmZyYW1lKCksIGFyZWEtPmdldFJlY3QoYXJlYS0+aW1hZ2VFbGVt ZW50KCktPnJlbmRlcmVyKCkpKSwgMSk7CisgICAgSW50UmVjdCByZWN0ID0gdmlydHVhbFJlY3RG b3JEaXJlY3Rpb24oZGlyZWN0aW9uLCByZWN0VG9BYnNvbHV0ZUNvb3JkaW5hdGVzKGFyZWEtPmRv Y3VtZW50KCktPmZyYW1lKCksIGFyZWEtPmNvbXB1dGVSZWN0KGFyZWEtPmltYWdlRWxlbWVudCgp LT5yZW5kZXJlcigpKSksIDEpOwogICAgIHJldHVybiByZWN0OwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckltYWdlLmNwcAppbmRleCBjYjU4MjhlNTg0NWE4OGJhYTIyNGQwNDIy YWE1OWRiMjdjMjcyNTMzLi43ZTQyOGMxYjk3M2E1N2FiNTJkODY0YzhhNWRjMmYwODQwZGNjNTc5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHAKQEAgLTM0NSw3ICsz NDUsNyBAQCB2b2lkIFJlbmRlckltYWdlOjpwYWludEFyZWFFbGVtZW50Rm9jdXNSaW5nKFBhaW50 SW5mbyYgcGFpbnRJbmZvKQogICAgIC8vIEV2ZW4gaWYgdGhlIHRoZW1lIGhhbmRsZXMgZm9jdXMg cmluZyBkcmF3aW5nIGZvciBlbnRpcmUgZWxlbWVudHMsIGl0IHdvbid0IGRvIGl0IGZvcgogICAg IC8vIGFuIGFyZWEgd2l0aGluIGFuIGltYWdlLCBzbyB3ZSBkb24ndCBjYWxsIFJlbmRlclRoZW1l OjpzdXBwb3J0c0ZvY3VzUmluZyBoZXJlLgogCi0gICAgUGF0aCBwYXRoID0gYXJlYUVsZW1lbnQt PmdldFBhdGgodGhpcyk7CisgICAgUGF0aCBwYXRoID0gYXJlYUVsZW1lbnQtPmNvbXB1dGVQYXRo KHRoaXMpOwogICAgIGlmIChwYXRoLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCg==