119946 2013-08-17 07:14:30 -0700 Move some code used only by EventHandler from Clipboard to EventHandler 2013-08-20 09:48:48 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 115980 1 darin darin commit-queue esprehn+autocc kangil.han oldest_to_newest 918273 0 darin 2013-08-17 07:14:30 -0700 Move some code used only by EventHandler from Clipboard to EventHandler 918275 1 208995 darin 2013-08-17 07:18:36 -0700 Created attachment 208995 Patch 918288 2 208995 kling 2013-08-17 07:38:47 -0700 Comment on attachment 208995 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208995&action=review r=me > Source/WebCore/page/EventHandler.cpp:2037 > +static inline bool hasFileOfType(Clipboard* clipboard, const String& type) I'd use Clipboard& here. > Source/WebCore/page/EventHandler.cpp:2047 > +static inline bool hasStringOfType(Clipboard* clipboard, const String& type) Ditto. > Source/WebCore/page/EventHandler.cpp:2052 > +static bool hasDropZoneType(Clipboard* clipboard, const String& keyword) Ditto. 918292 3 darin 2013-08-17 07:55:38 -0700 Committed r154229: <http://trac.webkit.org/changeset/154229> 208995 2013-08-17 07:18:36 -0700 2013-08-17 07:52:30 -0700 Patch bug-119946-20130817071835.patch text/plain 8273 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0MjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E4ZDdmZThmNjYyMWNm OTI2ODkyMTcxZjhjOTMzMGUwYWQwZmNkZC4uMzY3Y2ExOWNlNTM0NTU5MzZjOGZiNjAxYmMyZWVi NDAwZDEyYTIyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTA4LTE3ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3Jn L2IvMTE5OTQ2PiBNb3ZlIHNvbWUgY29kZSB1c2VkIG9ubHkgYnkgRXZlbnRIYW5kbGVyIGZyb20g Q2xpcGJvYXJkIHRvIEV2ZW50SGFuZGxlcgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIExhdGVyIGl0IHdvdWxkIGJlIGdvb2QgdG8gbW92ZSB0aGlzIGFs bCB0byBEcmFnQ29udHJvbGxlciwgYnV0IHRoZXJlIGlzIG5vIHJlYXNvbiB0byBoYXZlCisgICAg ICAgIHRoZXNlIGZ1bmN0aW9ucyBhcyBtZW1iZXIgZnVuY3Rpb25zIG9mIHRoZSBET00tZXhwb3Nl ZCBDbGlwYm9hcmQgY2xhc3MuCisKKyAgICAgICAgKiBkb20vQ2xpcGJvYXJkLmNwcDogRGVsZXRl ZCBoYXNGaWxlT2ZUeXBlLCBoYXNTdHJpbmdPZlR5cGUsIGNvbnZlcnREcm9wWm9uZU9wZXJhdGlv blRvRHJhZ09wZXJhdGlvbiwKKyAgICAgICAgY29udmVydERyYWdPcGVyYXRpb25Ub0Ryb3Bab25l T3BlcmF0aW9uLgorICAgICAgICAqIGRvbS9DbGlwYm9hcmQuaDogRGl0dG8uCisKKyAgICAgICAg KiBwYWdlL0V2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0RHJvcFpv bmVPcGVyYXRpb25Ub0RyYWdPcGVyYXRpb24pOiBNb3ZlZCBoZXJlLgorICAgICAgICAoV2ViQ29y ZTo6Y29udmVydERyYWdPcGVyYXRpb25Ub0Ryb3Bab25lT3BlcmF0aW9uKTogTW92ZWQgaGVyZS4g QWxzbyBjaGFuZ2VkIHRvIHVzZSBBU0NJSUxpdGVyYWwuCisgICAgICAgIChXZWJDb3JlOjpoYXNG aWxlT2ZUeXBlKTogTW92ZWQgaGVyZSBhbmQgbWFkZSBhIGZyZWUgZnVuY3Rpb24gaW5zdGVhZCBv ZiBhIG1lbWJlciBmdW5jdGlvbi4gUmVtb3ZlZAorICAgICAgICBjYW5SZWFkVHlwZXMgY2hlY2sg YmVjYXVzZSBDbGlwYm9hcmQ6OmZpbGVzIGFscmVhZHkgdGFrZXMgY2FyZSBvZiB0aGF0LgorICAg ICAgICAoV2ViQ29yZTo6aGFzU3RyaW5nT2ZUeXBlKTogTW92ZWQgaGVyZSBhbmQgbWFkZSBhIGZy ZWUgZnVuY3Rpb24gaW5zdGVhZCBvZiBhIG1lbWJlciBmdW5jdGlvbi4KKyAgICAgICAgQWRkZWQg YSBjaGVjayBmb3IgdGhlIG51bGwgc3RyaW5nIGJlY2F1c2UgSGFzaFNldDo6Y29udGFpbnMgd2ls bCBub3Qgd29yayBvbiBhIG51bGwgc3RyaW5nLgorICAgICAgICAoV2ViQ29yZTo6aGFzRHJvcFpv bmVUeXBlKTogTW92ZWQgaGVyZSBhbmQgbWFkZSBhIGZyZWUgZnVuY3Rpb24gaW5zdGVhZCBvZiBh IG1lbWJlciBmdW5jdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6OmZpbmREcm9wWm9uZSk6IENhbGwg dGhlIGhhc0Ryb3Bab25lVHlwZSBmdW5jdGlvbiBpbnN0ZWFkIG9mIENsaXBib2FyZDo6aGFzRHJv cFpvbmVUeXBlLgorCiAyMDEzLTA4LTE3ICBNb3J0ZW4gU3RlbnNob3JuZSAgPG1zdGVuc2hvQG9w ZXJhLmNvbT4KIAogICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTE5Nzk1PiBQcm9wYWdh dGUgd3JpdGluZy1tb2RlIGZyb20gdGhlIGZpcnN0IHJlZ2lvbiB0byB0aGUgZmxvdyB0aHJlYWQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlwYm9hcmQuY3BwIGIvU291cmNlL1dl YkNvcmUvZG9tL0NsaXBib2FyZC5jcHAKaW5kZXggNzNmNTE5YmM1MGFkYmVlYmI4OWE3MTQzODRk Y2ZmY2U2ZjhkZTgzNy4uMDM2NDhiMTdkZGNhNjUyM2JkZmUzOWRhZDA2YzVkY2VhNmM0ODRjYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0NsaXBib2FyZC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL0NsaXBib2FyZC5jcHAKQEAgLTE4MywzMCArMTgzLDYgQEAgdm9pZCBDbGlw Ym9hcmQ6OnNldERlc3RpbmF0aW9uT3BlcmF0aW9uKERyYWdPcGVyYXRpb24gb3ApCiAgICAgbV9k cm9wRWZmZWN0ID0gSUVPcEZyb21EcmFnT3Aob3ApOwogfQogCi1ib29sIENsaXBib2FyZDo6aGFz RmlsZU9mVHlwZShjb25zdCBTdHJpbmcmIHR5cGUpIGNvbnN0Ci17Ci0gICAgaWYgKCFjYW5SZWFk VHlwZXMoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIAotICAgIFJlZlB0cjxGaWxlTGlz dD4gZmlsZUxpc3QgPSBmaWxlcygpOwotICAgIGlmIChmaWxlTGlzdC0+aXNFbXB0eSgpKQotICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgCi0gICAgZm9yICh1bnNpZ25lZCBpbnQgZiA9IDA7IGYg PCBmaWxlTGlzdC0+bGVuZ3RoKCk7IGYrKykgewotICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nh c2UoZmlsZUxpc3QtPml0ZW0oZiktPnR5cGUoKSwgdHlwZSkpCi0gICAgICAgICAgICByZXR1cm4g dHJ1ZTsKLSAgICB9Ci0gICAgcmV0dXJuIGZhbHNlOwotfQotCi1ib29sIENsaXBib2FyZDo6aGFz U3RyaW5nT2ZUeXBlKGNvbnN0IFN0cmluZyYgdHlwZSkgY29uc3QKLXsKLSAgICBpZiAoIWNhblJl YWRUeXBlcygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgCi0gICAgcmV0dXJuIHR5cGVz KCkuY29udGFpbnModHlwZSk7IAotfQotICAgIAogdm9pZCBDbGlwYm9hcmQ6OnNldERyb3BFZmZl Y3QoY29uc3QgU3RyaW5nICZlZmZlY3QpCiB7CiAgICAgaWYgKCFpc0ZvckRyYWdBbmREcm9wKCkp CkBAIC0yNDIsNDIgKzIxOCw2IEBAIHZvaWQgQ2xpcGJvYXJkOjpzZXRFZmZlY3RBbGxvd2VkKGNv bnN0IFN0cmluZyAmZWZmZWN0KQogICAgICAgICBtX2VmZmVjdEFsbG93ZWQgPSBlZmZlY3Q7CiB9 CiAgICAgCi1EcmFnT3BlcmF0aW9uIGNvbnZlcnREcm9wWm9uZU9wZXJhdGlvblRvRHJhZ09wZXJh dGlvbihjb25zdCBTdHJpbmcmIGRyYWdPcGVyYXRpb24pCi17Ci0gICAgaWYgKGRyYWdPcGVyYXRp b24gPT0gImNvcHkiKQotICAgICAgICByZXR1cm4gRHJhZ09wZXJhdGlvbkNvcHk7Ci0gICAgaWYg KGRyYWdPcGVyYXRpb24gPT0gIm1vdmUiKQotICAgICAgICByZXR1cm4gRHJhZ09wZXJhdGlvbk1v dmU7Ci0gICAgaWYgKGRyYWdPcGVyYXRpb24gPT0gImxpbmsiKQotICAgICAgICByZXR1cm4gRHJh Z09wZXJhdGlvbkxpbms7Ci0gICAgcmV0dXJuIERyYWdPcGVyYXRpb25Ob25lOwotfQotCi1TdHJp bmcgY29udmVydERyYWdPcGVyYXRpb25Ub0Ryb3Bab25lT3BlcmF0aW9uKERyYWdPcGVyYXRpb24g b3BlcmF0aW9uKQotewotICAgIHN3aXRjaCAob3BlcmF0aW9uKSB7Ci0gICAgY2FzZSBEcmFnT3Bl cmF0aW9uQ29weToKLSAgICAgICAgcmV0dXJuIFN0cmluZygiY29weSIpOwotICAgIGNhc2UgRHJh Z09wZXJhdGlvbk1vdmU6Ci0gICAgICAgIHJldHVybiBTdHJpbmcoIm1vdmUiKTsKLSAgICBjYXNl IERyYWdPcGVyYXRpb25MaW5rOgotICAgICAgICByZXR1cm4gU3RyaW5nKCJsaW5rIik7Ci0gICAg ZGVmYXVsdDoKLSAgICAgICAgcmV0dXJuIFN0cmluZygiY29weSIpOwotICAgIH0KLX0KLQotYm9v bCBDbGlwYm9hcmQ6Omhhc0Ryb3Bab25lVHlwZShjb25zdCBTdHJpbmcmIGtleXdvcmQpCi17Ci0g ICAgaWYgKGtleXdvcmQuc3RhcnRzV2l0aCgiZmlsZToiKSkKLSAgICAgICAgcmV0dXJuIGhhc0Zp bGVPZlR5cGUoa2V5d29yZC5zdWJzdHJpbmcoNSkpOwotCi0gICAgaWYgKGtleXdvcmQuc3RhcnRz V2l0aCgic3RyaW5nOiIpKQotICAgICAgICByZXR1cm4gaGFzU3RyaW5nT2ZUeXBlKGtleXdvcmQu c3Vic3RyaW5nKDcpKTsKLQotICAgIHJldHVybiBmYWxzZTsKLX0KLQogI2lmIFVTRShMRUdBQ1lf U1RZTEVfQUJTVFJBQ1RfQ0xJUEJPQVJEX0NMQVNTKQogCiB2b2lkIENsaXBib2FyZDo6c2V0RHJh Z0ltYWdlKEVsZW1lbnQqIGVsZW1lbnQsIGludCB4LCBpbnQgeSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9DbGlwYm9hcmQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlwYm9hcmQu aAppbmRleCAzY2I2NzZhZTg3MGNmYmM0ZWRjYjRkMzdhZDk0MmZjMmUzMGQ5MjBhLi42NTQ3OTZl MWVmZDJhMGYyNzc0ODI1NDBmOGEyNWFlMWZhYjY5NTk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vQ2xpcGJvYXJkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0NsaXBib2FyZC5o CkBAIC0xMjIsOCArMTIyLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHNl dFNvdXJjZU9wZXJhdGlvbihEcmFnT3BlcmF0aW9uKTsKICAgICAgICAgdm9pZCBzZXREZXN0aW5h dGlvbk9wZXJhdGlvbihEcmFnT3BlcmF0aW9uKTsKICAgICAgICAgCi0gICAgICAgIGJvb2wgaGFz RHJvcFpvbmVUeXBlKGNvbnN0IFN0cmluZyYpOwotICAgICAgICAKICAgICAgICAgdm9pZCBzZXRE cmFnSGFzU3RhcnRlZCgpIHsgbV9kcmFnU3RhcnRlZCA9IHRydWU7IH0KIAogI2lmIEVOQUJMRShE QVRBX1RSQU5TRkVSX0lURU1TKQpAQCAtMTUyLDkgKzE1MCw2IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgYm9vbCBkcmFnU3RhcnRlZCgpIGNvbnN0IHsgcmV0dXJuIG1fZHJhZ1N0YXJ0 ZWQ7IH0KICAgICAgICAgCiAgICAgcHJpdmF0ZToKLSAgICAgICAgYm9vbCBoYXNGaWxlT2ZUeXBl KGNvbnN0IFN0cmluZyYpIGNvbnN0OwotICAgICAgICBib29sIGhhc1N0cmluZ09mVHlwZShjb25z dCBTdHJpbmcmKSBjb25zdDsKLQogICAgICAgICAvLyBJbnN0ZWFkIG9mIHVzaW5nIHRoaXMgbWVt YmVyIGRpcmVjdGx5LCBwcmVmZXIgdG8gdXNlIHRoZSBjYW4qKCkgbWV0aG9kcyBhYm92ZS4KICAg ICAgICAgQ2xpcGJvYXJkQWNjZXNzUG9saWN5IG1fcG9saWN5OwogICAgICAgICBTdHJpbmcgbV9k cm9wRWZmZWN0OwpAQCAtMTc3LDkgKzE3Miw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICNlbmRp ZgogICAgIH07CiAKLSAgICBEcmFnT3BlcmF0aW9uIGNvbnZlcnREcm9wWm9uZU9wZXJhdGlvblRv RHJhZ09wZXJhdGlvbihjb25zdCBTdHJpbmcmIGRyYWdPcGVyYXRpb24pOwotICAgIFN0cmluZyBj b252ZXJ0RHJhZ09wZXJhdGlvblRvRHJvcFpvbmVPcGVyYXRpb24oRHJhZ09wZXJhdGlvbik7Ci0K ICN1bmRlZiBMRUdBQ1lfVklSVFVBTAogI3VuZGVmIExFR0FDWV9QVVJFCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCA5NDE0MzI5NjlmNTc5ODUyMDAyZDk5YjQyNDk4OWJh MzAzZWYwNWI2Li4wMWI1YThkNmJjNGQyM2UxMTgzNzVmMThlMzk5YjZkMTU1YmVmNTQyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBAIC00NCw2ICs0NCw3IEBACiAjaW5jbHVk ZSAiRXZlbnROYW1lcy5oIgogI2luY2x1ZGUgIkV2ZW50UGF0aFdhbGtlci5oIgogI2luY2x1ZGUg IkV4Y2VwdGlvbkNvZGVQbGFjZWhvbGRlci5oIgorI2luY2x1ZGUgIkZpbGVMaXN0LmgiCiAjaW5j bHVkZSAiRmxvYXRQb2ludC5oIgogI2luY2x1ZGUgIkZsb2F0UmVjdC5oIgogI2luY2x1ZGUgIkZv Y3VzQ29udHJvbGxlci5oIgpAQCAtMTk3MSw4ICsxOTcyLDggQEAgYm9vbCBFdmVudEhhbmRsZXI6 OmhhbmRsZVBhc3RlR2xvYmFsU2VsZWN0aW9uKGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgbW91 c2VFdmUKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLQogI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQp CisKIGJvb2wgRXZlbnRIYW5kbGVyOjpkaXNwYXRjaERyYWdFdmVudChjb25zdCBBdG9taWNTdHJp bmcmIGV2ZW50VHlwZSwgTm9kZSogZHJhZ1RhcmdldCwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50 JiBldmVudCwgQ2xpcGJvYXJkKiBjbGlwYm9hcmQpCiB7CiAgICAgRnJhbWVWaWV3KiB2aWV3ID0g bV9mcmFtZS0+dmlldygpOwpAQCAtMjAwOCw2ICsyMDA5LDU3IEBAIHN0YXRpYyBib29sIHRhcmdl dElzRnJhbWUoTm9kZSogdGFyZ2V0LCBGcmFtZSomIGZyYW1lKQogICAgIHJldHVybiB0cnVlOwog fQogCitzdGF0aWMgRHJhZ09wZXJhdGlvbiBjb252ZXJ0RHJvcFpvbmVPcGVyYXRpb25Ub0RyYWdP cGVyYXRpb24oY29uc3QgU3RyaW5nJiBkcmFnT3BlcmF0aW9uKQoreworICAgIGlmIChkcmFnT3Bl cmF0aW9uID09ICJjb3B5IikKKyAgICAgICAgcmV0dXJuIERyYWdPcGVyYXRpb25Db3B5OworICAg IGlmIChkcmFnT3BlcmF0aW9uID09ICJtb3ZlIikKKyAgICAgICAgcmV0dXJuIERyYWdPcGVyYXRp b25Nb3ZlOworICAgIGlmIChkcmFnT3BlcmF0aW9uID09ICJsaW5rIikKKyAgICAgICAgcmV0dXJu IERyYWdPcGVyYXRpb25MaW5rOworICAgIHJldHVybiBEcmFnT3BlcmF0aW9uTm9uZTsKK30KKwor c3RhdGljIFN0cmluZyBjb252ZXJ0RHJhZ09wZXJhdGlvblRvRHJvcFpvbmVPcGVyYXRpb24oRHJh Z09wZXJhdGlvbiBvcGVyYXRpb24pCit7CisgICAgc3dpdGNoIChvcGVyYXRpb24pIHsKKyAgICBj YXNlIERyYWdPcGVyYXRpb25Db3B5OgorICAgICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJjb3B5 Iik7CisgICAgY2FzZSBEcmFnT3BlcmF0aW9uTW92ZToKKyAgICAgICAgcmV0dXJuIEFTQ0lJTGl0 ZXJhbCgibW92ZSIpOworICAgIGNhc2UgRHJhZ09wZXJhdGlvbkxpbms6CisgICAgICAgIHJldHVy biBBU0NJSUxpdGVyYWwoImxpbmsiKTsKKyAgICBkZWZhdWx0OgorICAgICAgICByZXR1cm4gQVND SUlMaXRlcmFsKCJjb3B5Iik7CisgICAgfQorfQorCitzdGF0aWMgaW5saW5lIGJvb2wgaGFzRmls ZU9mVHlwZShDbGlwYm9hcmQqIGNsaXBib2FyZCwgY29uc3QgU3RyaW5nJiB0eXBlKQoreworICAg IFJlZlB0cjxGaWxlTGlzdD4gZmlsZUxpc3QgPSBjbGlwYm9hcmQtPmZpbGVzKCk7CisgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IGZpbGVMaXN0LT5sZW5ndGgoKTsgaSsrKSB7CisgICAgICAg IGlmIChlcXVhbElnbm9yaW5nQ2FzZShmaWxlTGlzdC0+aXRlbShpKS0+dHlwZSgpLCB0eXBlKSkK KyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICByZXR1cm4gZmFsc2U7Cit9CisK K3N0YXRpYyBpbmxpbmUgYm9vbCBoYXNTdHJpbmdPZlR5cGUoQ2xpcGJvYXJkKiBjbGlwYm9hcmQs IGNvbnN0IFN0cmluZyYgdHlwZSkKK3sKKyAgICByZXR1cm4gIXR5cGUuaXNOdWxsKCkgJiYgY2xp cGJvYXJkLT50eXBlcygpLmNvbnRhaW5zKHR5cGUpOworfQorCitzdGF0aWMgYm9vbCBoYXNEcm9w Wm9uZVR5cGUoQ2xpcGJvYXJkKiBjbGlwYm9hcmQsIGNvbnN0IFN0cmluZyYga2V5d29yZCkKK3sK KyAgICBpZiAoa2V5d29yZC5zdGFydHNXaXRoKCJmaWxlOiIpKQorICAgICAgICByZXR1cm4gaGFz RmlsZU9mVHlwZShjbGlwYm9hcmQsIGtleXdvcmQuc3Vic3RyaW5nKDUpKTsKKworICAgIGlmIChr ZXl3b3JkLnN0YXJ0c1dpdGgoInN0cmluZzoiKSkKKyAgICAgICAgcmV0dXJuIGhhc1N0cmluZ09m VHlwZShjbGlwYm9hcmQsIGtleXdvcmQuc3Vic3RyaW5nKDcpKTsKKworICAgIHJldHVybiBmYWxz ZTsKK30KKwogc3RhdGljIGJvb2wgZmluZERyb3Bab25lKE5vZGUqIHRhcmdldCwgQ2xpcGJvYXJk KiBjbGlwYm9hcmQpCiB7CiAgICAgRWxlbWVudCogZWxlbWVudCA9IHRhcmdldC0+aXNFbGVtZW50 Tm9kZSgpID8gdG9FbGVtZW50KHRhcmdldCkgOiB0YXJnZXQtPnBhcmVudEVsZW1lbnQoKTsKQEAg LTIwMzEsNyArMjA4Myw3IEBAIHN0YXRpYyBib29sIGZpbmREcm9wWm9uZShOb2RlKiB0YXJnZXQs IENsaXBib2FyZCogY2xpcGJvYXJkKQogICAgICAgICAgICAgICAgIGlmIChkcmFnT3BlcmF0aW9u ID09IERyYWdPcGVyYXRpb25Ob25lKQogICAgICAgICAgICAgICAgICAgICBkcmFnT3BlcmF0aW9u ID0gb3A7CiAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICBtYXRjaGVkID0gbWF0 Y2hlZCB8fCBjbGlwYm9hcmQtPmhhc0Ryb3Bab25lVHlwZShrZXl3b3Jkc1tpXS5zdHJpbmcoKSk7 CisgICAgICAgICAgICAgICAgbWF0Y2hlZCA9IG1hdGNoZWQgfHwgaGFzRHJvcFpvbmVUeXBlKGNs aXBib2FyZCwga2V5d29yZHNbaV0uc3RyaW5nKCkpOwogCiAgICAgICAgICAgICBpZiAobWF0Y2hl ZCAmJiBkcmFnT3BlcmF0aW9uICE9IERyYWdPcGVyYXRpb25Ob25lKQogICAgICAgICAgICAgICAg IGJyZWFrOwo=