121172 2013-09-11 11:25:15 -0700 Stop using deleteAllValues in SVG code 2013-09-11 15:43:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue darin dino d-r esprehn+autocc fmalita glenn kondapallykalyan pdr schenney oldest_to_newest 927883 0 andersca 2013-09-11 11:25:15 -0700 Stop using deleteAllValues in SVG code 927885 1 211333 andersca 2013-09-11 11:27:25 -0700 Created attachment 211333 Patch 927896 2 andersca 2013-09-11 11:38:26 -0700 Committed r155547: <http://trac.webkit.org/changeset/155547> 927918 3 andersca 2013-09-11 12:16:22 -0700 Committed r155552: <http://trac.webkit.org/changeset/155552> 927998 4 211333 darin 2013-09-11 15:06:41 -0700 Comment on attachment 211333 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211333&action=review > Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp:150 > + m_clipper.set(object, createOwned<ClipperData>().release()); Why release() instead of std::move? > Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp:219 > + m_filter.set(object, filterData.release()); Same question. > Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp:233 > + m_filter.set(object, filterData.release()); Same question.Same question. > Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp:249 > + m_filter.set(object, filterData.release()); Same question.Same question. > Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp:77 > + m_masker.set(object, createOwned<MaskerData>().release()); Same question. 928020 5 andersca 2013-09-11 15:43:40 -0700 (In reply to comment #4) > (From update of attachment 211333 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=211333&action=review > > > Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp:150 > > + m_clipper.set(object, createOwned<ClipperData>().release()); > > Why release() instead of std::move? > Because you can’t currently pass a move-only type as a value to HashMap. We work around this with PassOwnPtr by using the pass traits. I hope that once we make our other collections work with move-only types we’ll be able to get rid of the pass traits. 211333 2013-09-11 11:27:25 -0700 2013-09-11 15:06:41 -0700 Patch bug-121172-20130911112725.patch text/plain 11473 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1NTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI2OWMyZDg3ZDMxNDgy NTc3MWMyOGI1MjBmNTgyN2QzM2E2YzUyNi4uNjI2OTZjOTVjMjg1ZTdhMDY1MTBkMWRiNTY1ZTQ4 NjEzM2I3MzJhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEzLTA5LTExICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCB1c2luZyBk ZWxldGVBbGxWYWx1ZXMgaW4gU1ZHIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyMTE3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFVzZSBPd25QdHIgZm9yIHZhbHVlcyBpbnN0ZWFkLgorCisgICAg ICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyOjp+UmVuZGVyU1ZHUmVzb3VyY2VD bGlwcGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jlc291cmNlQ2xpcHBlcjo6cmVt b3ZlQWxsQ2xpZW50c0Zyb21DYWNoZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdSZXNv dXJjZUNsaXBwZXI6OnJlbW92ZUNsaWVudEZyb21DYWNoZSk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXI6OmFwcGx5Q2xpcHBpbmdUb0NvbnRleHQpOgorICAgICAg ICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyLmg6CisgICAgICAgICog cmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUZpbHRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJTVkdSZXNvdXJjZUZpbHRlcjo6flJlbmRlclNWR1Jlc291cmNlRmlsdGVyKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jlc291cmNlRmlsdGVyOjpyZW1vdmVBbGxDbGll bnRzRnJvbUNhY2hlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jlc291cmNlRmlsdGVy OjpyZW1vdmVDbGllbnRGcm9tQ2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHUmVz b3VyY2VGaWx0ZXI6OmFwcGx5UmVzb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZH UmVzb3VyY2VGaWx0ZXI6OnBvc3RBcHBseVJlc291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclNWR1Jlc291cmNlRmlsdGVyOjpwcmltaXRpdmVBdHRyaWJ1dGVDaGFuZ2VkKToKKyAgICAg ICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmg6CisgICAgICAgICog cmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hc2tlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJTVkdSZXNvdXJjZU1hc2tlcjo6flJlbmRlclNWR1Jlc291cmNlTWFza2VyKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jlc291cmNlTWFza2VyOjpyZW1vdmVBbGxDbGll bnRzRnJvbUNhY2hlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jlc291cmNlTWFza2Vy OjpyZW1vdmVDbGllbnRGcm9tQ2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHUmVz b3VyY2VNYXNrZXI6OmFwcGx5UmVzb3VyY2UpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVu ZGVyU1ZHUmVzb3VyY2VNYXNrZXIuaDoKKwogMjAxMy0wOS0xMSAgQW5kcmVhcyBLbGluZyAgPGFr bGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHVubmVjZXNzYXJ5IERvY3VtZW50Ojpm cmFtZSgpIG51bGwgY2hlY2tzIGluIHJlbmRlcmVySXNOZWVkZWQoKS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyLmNw cAppbmRleCAxNDcxMDAzM2NjMzgzODA0ZmMwOWU1M2QwY2YxZmNhOGMyN2FjMzY4Li41N2U5NGJk ZGY5NTRkYTk1NjU4NGYxNmM5YThjNjhjNjdlZTIzOTZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ2xpcHBlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXIuY3BwCkBA IC02MCwyMCArNjAsMTIgQEAgUmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyOjpSZW5kZXJTVkdSZXNv dXJjZUNsaXBwZXIoU1ZHQ2xpcFBhdGhFbGVtZW50KiBub2RlKQogCiBSZW5kZXJTVkdSZXNvdXJj ZUNsaXBwZXI6On5SZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXIoKQogewotICAgIGlmIChtX2NsaXBw ZXIuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBkZWxldGVBbGxWYWx1ZXMobV9j bGlwcGVyKTsKLSAgICBtX2NsaXBwZXIuY2xlYXIoKTsKIH0KIAogdm9pZCBSZW5kZXJTVkdSZXNv dXJjZUNsaXBwZXI6OnJlbW92ZUFsbENsaWVudHNGcm9tQ2FjaGUoYm9vbCBtYXJrRm9ySW52YWxp ZGF0aW9uKQogewogICAgIG1fY2xpcEJvdW5kYXJpZXMgPSBGbG9hdFJlY3QoKTsKLSAgICBpZiAo IW1fY2xpcHBlci5pc0VtcHR5KCkpIHsKLSAgICAgICAgZGVsZXRlQWxsVmFsdWVzKG1fY2xpcHBl cik7Ci0gICAgICAgIG1fY2xpcHBlci5jbGVhcigpOwotICAgIH0KKyAgICBtX2NsaXBwZXIuY2xl YXIoKTsKIAogICAgIG1hcmtBbGxDbGllbnRzRm9ySW52YWxpZGF0aW9uKG1hcmtGb3JJbnZhbGlk YXRpb24gPyBMYXlvdXRBbmRCb3VuZGFyaWVzSW52YWxpZGF0aW9uIDogUGFyZW50T25seUludmFs aWRhdGlvbik7CiB9CkBAIC04MSw4ICs3Myw3IEBAIHZvaWQgUmVuZGVyU1ZHUmVzb3VyY2VDbGlw cGVyOjpyZW1vdmVBbGxDbGllbnRzRnJvbUNhY2hlKGJvb2wgbWFya0ZvckludmFsaWRhdGlvCiB2 b2lkIFJlbmRlclNWR1Jlc291cmNlQ2xpcHBlcjo6cmVtb3ZlQ2xpZW50RnJvbUNhY2hlKFJlbmRl ck9iamVjdCogY2xpZW50LCBib29sIG1hcmtGb3JJbnZhbGlkYXRpb24pCiB7CiAgICAgQVNTRVJU KGNsaWVudCk7Ci0gICAgaWYgKG1fY2xpcHBlci5jb250YWlucyhjbGllbnQpKQotICAgICAgICBk ZWxldGUgbV9jbGlwcGVyLnRha2UoY2xpZW50KTsKKyAgICBtX2NsaXBwZXIucmVtb3ZlKGNsaWVu dCk7CiAKICAgICBtYXJrQ2xpZW50Rm9ySW52YWxpZGF0aW9uKGNsaWVudCwgbWFya0ZvckludmFs aWRhdGlvbiA/IEJvdW5kYXJpZXNJbnZhbGlkYXRpb24gOiBQYXJlbnRPbmx5SW52YWxpZGF0aW9u KTsKIH0KQEAgLTE1Niw3ICsxNDcsNyBAQCBib29sIFJlbmRlclNWR1Jlc291cmNlQ2xpcHBlcjo6 YXBwbHlDbGlwcGluZ1RvQ29udGV4dChSZW5kZXJPYmplY3QqIG9iamVjdCwgY29ucwogewogICAg IGJvb2wgbWlzc2luZ0NsaXBwZXJEYXRhID0gIW1fY2xpcHBlci5jb250YWlucyhvYmplY3QpOwog ICAgIGlmIChtaXNzaW5nQ2xpcHBlckRhdGEpCi0gICAgICAgIG1fY2xpcHBlci5zZXQob2JqZWN0 LCBuZXcgQ2xpcHBlckRhdGEpOworICAgICAgICBtX2NsaXBwZXIuc2V0KG9iamVjdCwgY3JlYXRl T3duZWQ8Q2xpcHBlckRhdGE+KCkucmVsZWFzZSgpKTsKIAogICAgIGJvb2wgc2hvdWxkQ3JlYXRl Q2xpcERhdGEgPSBmYWxzZTsKICAgICBBZmZpbmVUcmFuc2Zvcm0gYW5pbWF0ZWRMb2NhbFRyYW5z Zm9ybSA9IHRvU1ZHQ2xpcFBhdGhFbGVtZW50KGVsZW1lbnQoKSktPmFuaW1hdGVkTG9jYWxUcmFu c2Zvcm0oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVy U1ZHUmVzb3VyY2VDbGlwcGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRl clNWR1Jlc291cmNlQ2xpcHBlci5oCmluZGV4IDIyNzdiYTQ0YTNiMWQ5NTk2Yzc3YWRiNjZkN2Yw MzRlMDYyYzAwMDguLmFhYjNjMjk0MWU5ZjI5MmI0MWUxN2Y2MWYzNTRhYjA2ZmRkZDAxODMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VD bGlwcGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNv dXJjZUNsaXBwZXIuaApAQCAtNzEsNyArNzEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgY2FsY3Vs YXRlQ2xpcENvbnRlbnRSZXBhaW50UmVjdCgpOwogCiAgICAgRmxvYXRSZWN0IG1fY2xpcEJvdW5k YXJpZXM7Ci0gICAgSGFzaE1hcDxSZW5kZXJPYmplY3QqLCBDbGlwcGVyRGF0YSo+IG1fY2xpcHBl cjsKKyAgICBIYXNoTWFwPFJlbmRlck9iamVjdCosIE93blB0cjxDbGlwcGVyRGF0YT4+IG1fY2xp cHBlcjsKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv UmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2 Zy9SZW5kZXJTVkdSZXNvdXJjZUZpbHRlci5jcHAKaW5kZXggMDhkNzMyY2JhNTg3NmRhYWI0NDUy YzE3ZDNkYWE2ZDQ1MmY3NGVmMy4uYjViMDM3NjliMTMzNDJmNzk1MjQ0MjZiOWMyMjZkYjJhNjU0 YzY3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdS ZXNvdXJjZUZpbHRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5k ZXJTVkdSZXNvdXJjZUZpbHRlci5jcHAKQEAgLTY1LDE5ICs2NSwxMSBAQCBSZW5kZXJTVkdSZXNv dXJjZUZpbHRlcjo6UmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXIoU1ZHRmlsdGVyRWxlbWVudCogbm9k ZSkKIAogUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXI6On5SZW5kZXJTVkdSZXNvdXJjZUZpbHRlcigp CiB7Ci0gICAgaWYgKG1fZmlsdGVyLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAg ZGVsZXRlQWxsVmFsdWVzKG1fZmlsdGVyKTsKLSAgICBtX2ZpbHRlci5jbGVhcigpOwogfQogCiB2 b2lkIFJlbmRlclNWR1Jlc291cmNlRmlsdGVyOjpyZW1vdmVBbGxDbGllbnRzRnJvbUNhY2hlKGJv b2wgbWFya0ZvckludmFsaWRhdGlvbikKIHsKLSAgICBpZiAoIW1fZmlsdGVyLmlzRW1wdHkoKSkg ewotICAgICAgICBkZWxldGVBbGxWYWx1ZXMobV9maWx0ZXIpOwotICAgICAgICBtX2ZpbHRlci5j bGVhcigpOwotICAgIH0KKyAgICBtX2ZpbHRlci5jbGVhcigpOwogCiAgICAgbWFya0FsbENsaWVu dHNGb3JJbnZhbGlkYXRpb24obWFya0ZvckludmFsaWRhdGlvbiA/IExheW91dEFuZEJvdW5kYXJp ZXNJbnZhbGlkYXRpb24gOiBQYXJlbnRPbmx5SW52YWxpZGF0aW9uKTsKIH0KQEAgLTkwLDcgKzgy LDcgQEAgdm9pZCBSZW5kZXJTVkdSZXNvdXJjZUZpbHRlcjo6cmVtb3ZlQ2xpZW50RnJvbUNhY2hl KFJlbmRlck9iamVjdCogY2xpZW50LCBib29sIG0KICAgICAgICAgaWYgKGZpbHRlckRhdGEtPnNh dmVkQ29udGV4dCkKICAgICAgICAgICAgIGZpbHRlckRhdGEtPnN0YXRlID0gRmlsdGVyRGF0YTo6 TWFya2VkRm9yUmVtb3ZhbDsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgZGVsZXRlIG1fZmls dGVyLnRha2UoY2xpZW50KTsKKyAgICAgICAgICAgIG1fZmlsdGVyLnJlbW92ZShjbGllbnQpOwog ICAgIH0KIAogICAgIG1hcmtDbGllbnRGb3JJbnZhbGlkYXRpb24oY2xpZW50LCBtYXJrRm9ySW52 YWxpZGF0aW9uID8gQm91bmRhcmllc0ludmFsaWRhdGlvbiA6IFBhcmVudE9ubHlJbnZhbGlkYXRp b24pOwpAQCAtMTU1LDcgKzE0Nyw3IEBAIGJvb2wgUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXI6OmFw cGx5UmVzb3VyY2UoUmVuZGVyT2JqZWN0KiBvYmplY3QsIFJlbmRlclN0eWxlKiwKICAgICAgICAg cmV0dXJuIGZhbHNlOyAvLyBBbHJlYWR5IGJ1aWx0LCBvciB3ZSdyZSBpbiBhIGN5Y2xlLCBvciB3 ZSdyZSBtYXJrZWQgZm9yIHJlbW92YWwuIFJlZ2FyZGxlc3MsIGp1c3QgZG8gbm90aGluZyBtb3Jl IG5vdy4KICAgICB9CiAKLSAgICBPd25QdHI8RmlsdGVyRGF0YT4gZmlsdGVyRGF0YShhZG9wdFB0 cihuZXcgRmlsdGVyRGF0YSkpOworICAgIGF1dG8gZmlsdGVyRGF0YSA9IGNyZWF0ZU93bmVkPEZp bHRlckRhdGE+KCk7CiAgICAgRmxvYXRSZWN0IHRhcmdldEJvdW5kaW5nQm94ID0gb2JqZWN0LT5v YmplY3RCb3VuZGluZ0JveCgpOwogCiAgICAgU1ZHRmlsdGVyRWxlbWVudCogZmlsdGVyRWxlbWVu dCA9IHRvU1ZHRmlsdGVyRWxlbWVudChlbGVtZW50KCkpOwpAQCAtMjI0LDcgKzIxNiw3IEBAIGJv b2wgUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXI6OmFwcGx5UmVzb3VyY2UoUmVuZGVyT2JqZWN0KiBv YmplY3QsIFJlbmRlclN0eWxlKiwKICAgICBpZiAoZmlsdGVyRGF0YS0+ZHJhd2luZ1JlZ2lvbi5p c0VtcHR5KCkpIHsKICAgICAgICAgQVNTRVJUKCFtX2ZpbHRlci5jb250YWlucyhvYmplY3QpKTsK ICAgICAgICAgZmlsdGVyRGF0YS0+c2F2ZWRDb250ZXh0ID0gY29udGV4dDsKLSAgICAgICAgbV9m aWx0ZXIuc2V0KG9iamVjdCwgZmlsdGVyRGF0YS5sZWFrUHRyKCkpOworICAgICAgICBtX2ZpbHRl ci5zZXQob2JqZWN0LCBmaWx0ZXJEYXRhLnJlbGVhc2UoKSk7CiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICB9CiAKQEAgLTIzOCw3ICsyMzAsNyBAQCBib29sIFJlbmRlclNWR1Jlc291cmNlRmls dGVyOjphcHBseVJlc291cmNlKFJlbmRlck9iamVjdCogb2JqZWN0LCBSZW5kZXJTdHlsZSosCiAg ICAgaWYgKCFTVkdSZW5kZXJpbmdDb250ZXh0OjpjcmVhdGVJbWFnZUJ1ZmZlcihmaWx0ZXJEYXRh LT5kcmF3aW5nUmVnaW9uLCBlZmZlY3RpdmVUcmFuc2Zvcm0sIHNvdXJjZUdyYXBoaWMsIENvbG9y U3BhY2VMaW5lYXJSR0IsIHJlbmRlcmluZ01vZGUpKSB7CiAgICAgICAgIEFTU0VSVCghbV9maWx0 ZXIuY29udGFpbnMob2JqZWN0KSk7CiAgICAgICAgIGZpbHRlckRhdGEtPnNhdmVkQ29udGV4dCA9 IGNvbnRleHQ7Ci0gICAgICAgIG1fZmlsdGVyLnNldChvYmplY3QsIGZpbHRlckRhdGEubGVha1B0 cigpKTsKKyAgICAgICAgbV9maWx0ZXIuc2V0KG9iamVjdCwgZmlsdGVyRGF0YS5yZWxlYXNlKCkp OwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogICAgIApAQCAtMjU0LDcgKzI0Niw3IEBA IGJvb2wgUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXI6OmFwcGx5UmVzb3VyY2UoUmVuZGVyT2JqZWN0 KiBvYmplY3QsIFJlbmRlclN0eWxlKiwKICAgICBjb250ZXh0ID0gc291cmNlR3JhcGhpY0NvbnRl eHQ7CiAKICAgICBBU1NFUlQoIW1fZmlsdGVyLmNvbnRhaW5zKG9iamVjdCkpOwotICAgIG1fZmls dGVyLnNldChvYmplY3QsIGZpbHRlckRhdGEubGVha1B0cigpKTsKKyAgICBtX2ZpbHRlci5zZXQo b2JqZWN0LCBmaWx0ZXJEYXRhLnJlbGVhc2UoKSk7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KQEAg LTI3MSw3ICsyNjMsNyBAQCB2b2lkIFJlbmRlclNWR1Jlc291cmNlRmlsdGVyOjpwb3N0QXBwbHlS ZXNvdXJjZShSZW5kZXJPYmplY3QqIG9iamVjdCwgR3JhcGhpY3NDbwogCiAgICAgc3dpdGNoIChm aWx0ZXJEYXRhLT5zdGF0ZSkgewogICAgIGNhc2UgRmlsdGVyRGF0YTo6TWFya2VkRm9yUmVtb3Zh bDoKLSAgICAgICAgZGVsZXRlIG1fZmlsdGVyLnRha2Uob2JqZWN0KTsKKyAgICAgICAgbV9maWx0 ZXIucmVtb3ZlKG9iamVjdCk7CiAgICAgICAgIHJldHVybjsKIAogICAgIGNhc2UgRmlsdGVyRGF0 YTo6Q3ljbGVEZXRlY3RlZDoKQEAgLTMzOCwxMiArMzMwLDEwIEBAIEZsb2F0UmVjdCBSZW5kZXJT VkdSZXNvdXJjZUZpbHRlcjo6cmVzb3VyY2VCb3VuZGluZ0JveChSZW5kZXJPYmplY3QqIG9iamVj dCkKIAogdm9pZCBSZW5kZXJTVkdSZXNvdXJjZUZpbHRlcjo6cHJpbWl0aXZlQXR0cmlidXRlQ2hh bmdlZChSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUXVhbGlmaWVkTmFtZSYgYXR0cmlidXRl KQogewotICAgIEhhc2hNYXA8UmVuZGVyT2JqZWN0KiwgRmlsdGVyRGF0YSo+OjppdGVyYXRvciBp dCA9IG1fZmlsdGVyLmJlZ2luKCk7Ci0gICAgSGFzaE1hcDxSZW5kZXJPYmplY3QqLCBGaWx0ZXJE YXRhKj46Oml0ZXJhdG9yIGVuZCA9IG1fZmlsdGVyLmVuZCgpOwogICAgIFNWR0ZpbHRlclByaW1p dGl2ZVN0YW5kYXJkQXR0cmlidXRlcyogcHJpbWl0dmUgPSBzdGF0aWNfY2FzdDxTVkdGaWx0ZXJQ cmltaXRpdmVTdGFuZGFyZEF0dHJpYnV0ZXMqPihvYmplY3QtPm5vZGUoKSk7CiAKLSAgICBmb3Ig KDsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIEZpbHRlckRhdGEqIGZpbHRlckRhdGEgPSBp dC0+dmFsdWU7CisgICAgZm9yIChhdXRvIGl0ID0gbV9maWx0ZXIuYmVnaW4oKSwgZW5kID0gbV9m aWx0ZXIuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgICAgICBjb25zdCBhdXRvICZmaWx0 ZXJEYXRhID0gaXQtPnZhbHVlOwogICAgICAgICBpZiAoZmlsdGVyRGF0YS0+c3RhdGUgIT0gRmls dGVyRGF0YTo6QnVpbHQpCiAgICAgICAgICAgICBjb250aW51ZTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUZpbHRlci5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUZpbHRlci5oCmluZGV4 IDk3YjkzMDQzYzA4NzZmZWU1NDExM2RhM2UyY2E2OWMzYjM2NzQ0YTAuLjA5ZmJlMmFjODMwMWE4 ZWU2NzNlZDMxYTI1MmQ0NmYyMGIwMjNmZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmgKQEAgLTkzLDcgKzkzLDcg QEAgcHVibGljOgogcHJpdmF0ZToKICAgICBib29sIGZpdHNJbk1heGltdW1JbWFnZVNpemUoY29u c3QgRmxvYXRTaXplJiwgRmxvYXRTaXplJik7CiAKLSAgICBIYXNoTWFwPFJlbmRlck9iamVjdCos IEZpbHRlckRhdGEqPiBtX2ZpbHRlcjsKKyAgICBIYXNoTWFwPFJlbmRlck9iamVjdCosIE93blB0 cjxGaWx0ZXJEYXRhPj4gbV9maWx0ZXI7CiB9OwogCiBpbmxpbmUgUmVuZGVyU1ZHUmVzb3VyY2VG aWx0ZXIqIHRvUmVuZGVyU1ZHRmlsdGVyKFJlbmRlck9iamVjdCogb2JqZWN0KQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hc2tlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFza2Vy LmNwcAppbmRleCBkYzEwMjgzN2I2ZWVlYjI5ZmNiYzM0ZWZlZjBlZWNlYmMzZjg0ZTJmLi4yMGZm YmQwZDMwOTJkYzIyZjU5ZWExOGNiMjMwNjM4ZTIxZDU5YTNkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFza2VyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFza2VyLmNwcApA QCAtNDgsMjAgKzQ4LDEyIEBAIFJlbmRlclNWR1Jlc291cmNlTWFza2VyOjpSZW5kZXJTVkdSZXNv dXJjZU1hc2tlcihTVkdNYXNrRWxlbWVudCogbm9kZSkKIAogUmVuZGVyU1ZHUmVzb3VyY2VNYXNr ZXI6On5SZW5kZXJTVkdSZXNvdXJjZU1hc2tlcigpCiB7Ci0gICAgaWYgKG1fbWFza2VyLmlzRW1w dHkoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgZGVsZXRlQWxsVmFsdWVzKG1fbWFza2VyKTsK LSAgICBtX21hc2tlci5jbGVhcigpOwogfQogCiB2b2lkIFJlbmRlclNWR1Jlc291cmNlTWFza2Vy OjpyZW1vdmVBbGxDbGllbnRzRnJvbUNhY2hlKGJvb2wgbWFya0ZvckludmFsaWRhdGlvbikKIHsK ICAgICBtX21hc2tDb250ZW50Qm91bmRhcmllcyA9IEZsb2F0UmVjdCgpOwotICAgIGlmICghbV9t YXNrZXIuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGRlbGV0ZUFsbFZhbHVlcyhtX21hc2tlcik7Ci0g ICAgICAgIG1fbWFza2VyLmNsZWFyKCk7Ci0gICAgfQorICAgIG1fbWFza2VyLmNsZWFyKCk7CiAK ICAgICBtYXJrQWxsQ2xpZW50c0ZvckludmFsaWRhdGlvbihtYXJrRm9ySW52YWxpZGF0aW9uID8g TGF5b3V0QW5kQm91bmRhcmllc0ludmFsaWRhdGlvbiA6IFBhcmVudE9ubHlJbnZhbGlkYXRpb24p OwogfQpAQCAtNjksOSArNjEsNyBAQCB2b2lkIFJlbmRlclNWR1Jlc291cmNlTWFza2VyOjpyZW1v dmVBbGxDbGllbnRzRnJvbUNhY2hlKGJvb2wgbWFya0ZvckludmFsaWRhdGlvbgogdm9pZCBSZW5k ZXJTVkdSZXNvdXJjZU1hc2tlcjo6cmVtb3ZlQ2xpZW50RnJvbUNhY2hlKFJlbmRlck9iamVjdCog Y2xpZW50LCBib29sIG1hcmtGb3JJbnZhbGlkYXRpb24pCiB7CiAgICAgQVNTRVJUKGNsaWVudCk7 Ci0KLSAgICBpZiAobV9tYXNrZXIuY29udGFpbnMoY2xpZW50KSkKLSAgICAgICAgZGVsZXRlIG1f bWFza2VyLnRha2UoY2xpZW50KTsKKyAgICBtX21hc2tlci5yZW1vdmUoY2xpZW50KTsKIAogICAg IG1hcmtDbGllbnRGb3JJbnZhbGlkYXRpb24oY2xpZW50LCBtYXJrRm9ySW52YWxpZGF0aW9uID8g Qm91bmRhcmllc0ludmFsaWRhdGlvbiA6IFBhcmVudE9ubHlJbnZhbGlkYXRpb24pOwogfQpAQCAt ODQsNyArNzQsNyBAQCBib29sIFJlbmRlclNWR1Jlc291cmNlTWFza2VyOjphcHBseVJlc291cmNl KFJlbmRlck9iamVjdCogb2JqZWN0LCBSZW5kZXJTdHlsZSosCiAKICAgICBib29sIG1pc3NpbmdN YXNrZXJEYXRhID0gIW1fbWFza2VyLmNvbnRhaW5zKG9iamVjdCk7CiAgICAgaWYgKG1pc3NpbmdN YXNrZXJEYXRhKQotICAgICAgICBtX21hc2tlci5zZXQob2JqZWN0LCBuZXcgTWFza2VyRGF0YSk7 CisgICAgICAgIG1fbWFza2VyLnNldChvYmplY3QsIGNyZWF0ZU93bmVkPE1hc2tlckRhdGE+KCku cmVsZWFzZSgpKTsKIAogICAgIE1hc2tlckRhdGEqIG1hc2tlckRhdGEgPSBtX21hc2tlci5nZXQo b2JqZWN0KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5k ZXJTVkdSZXNvdXJjZU1hc2tlci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5k ZXJTVkdSZXNvdXJjZU1hc2tlci5oCmluZGV4IGE4OGJiMmY4NGJiZTA5MzllOWViYTI1ZGQ5MTMy YTkzNWQ1NWRhZjAuLjEzMzFjNTFiZTRjMGI0YTZlNjRhYTMzMjRjOTU1ODk3YWJjM2JkNGIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VN YXNrZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291 cmNlTWFza2VyLmgKQEAgLTYxLDcgKzYxLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNhbGN1bGF0 ZU1hc2tDb250ZW50UmVwYWludFJlY3QoKTsKIAogICAgIEZsb2F0UmVjdCBtX21hc2tDb250ZW50 Qm91bmRhcmllczsKLSAgICBIYXNoTWFwPFJlbmRlck9iamVjdCosIE1hc2tlckRhdGEqPiBtX21h c2tlcjsKKyAgICBIYXNoTWFwPFJlbmRlck9iamVjdCosIE93blB0cjxNYXNrZXJEYXRhPj4gbV9t YXNrZXI7CiB9OwogCiB9Cg==