92096 2012-07-24 04:30:20 -0700 Move PagePopupClient helper functions so they can be shared 2012-07-24 19:35:25 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 92075 1 keishi keishi tkent webkit.review.bot oldest_to_newest 676648 0 keishi 2012-07-24 04:30:20 -0700 Move PagePopupClient helper functions so they can be shared 676729 1 154036 keishi 2012-07-24 06:06:15 -0700 Created attachment 154036 Patch 676769 2 154036 tkent 2012-07-24 06:53:50 -0700 Comment on attachment 154036 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154036&action=review > Source/WebCore/page/PagePopupClient.h:52 > + // Helper functions to be used in PagePopupClient::writeDocument(). > + static void addString(const String&, DocumentWriter&); > + static void addJavaScriptString(const String&, DocumentWriter&); > + static void addProperty(const char* name, const String& value, DocumentWriter&); > + static void addProperty(const char* name, unsigned value, DocumentWriter&); > + static void addProperty(const char* name, bool value, DocumentWriter&); > + static void addProperty(const char* name, const Vector<String>& values, DocumentWriter&); Please move them to the bottom of the class definition. Pure virtual functions are more important than static helper functions. 676776 3 154050 keishi 2012-07-24 07:04:42 -0700 Created attachment 154050 Patch 676780 4 keishi 2012-07-24 07:07:18 -0700 (In reply to comment #2) > (From update of attachment 154036 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=154036&action=review > > > Source/WebCore/page/PagePopupClient.h:52 > > + // Helper functions to be used in PagePopupClient::writeDocument(). > > + static void addString(const String&, DocumentWriter&); > > + static void addJavaScriptString(const String&, DocumentWriter&); > > + static void addProperty(const char* name, const String& value, DocumentWriter&); > > + static void addProperty(const char* name, unsigned value, DocumentWriter&); > > + static void addProperty(const char* name, bool value, DocumentWriter&); > > + static void addProperty(const char* name, const Vector<String>& values, DocumentWriter&); > > Please move them to the bottom of the class definition. Pure virtual functions are more important than static helper functions. Done. 676789 5 154050 tkent 2012-07-24 07:21:46 -0700 Comment on attachment 154050 Patch ok 677536 6 154050 webkit.review.bot 2012-07-24 19:35:22 -0700 Comment on attachment 154050 Patch Clearing flags on attachment: 154050 Committed r123568: <http://trac.webkit.org/changeset/123568> 677537 7 webkit.review.bot 2012-07-24 19:35:25 -0700 All reviewed patches have been landed. Closing bug. 154036 2012-07-24 06:06:15 -0700 2012-07-24 07:04:38 -0700 Patch bug-92096-20120724220606.patch text/plain 11416 keishi U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODM5ODFkMTFjNGRhZWRm Yjg3MjA1YzI1ODhkMDI4OTgxYTY1N2U0MC4uNzA2NTAyZWZkMzkwMjk1MzU4N2RhMjlmMGY5NzVi NTE4ZTdjMTQ3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA3LTI0ICBLZWlz aGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgorCisgICAgICAgIE1vdmUgUGFnZVBvcHVw Q2xpZW50IGhlbHBlciBmdW5jdGlvbnMgc28gdGhleSBjYW4gYmUgc2hhcmVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjA5NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgUGFnZVBvcHVwQ2xpZW50 IGhlbHBlciBmdW5jdGlvbnMgdG8gYSBzZXBhcmF0ZSBmaWxlLAorICAgICAgICBzbyB0aGV5IGNh biBiZSBzaGFyZWQgd2l0aCBuZXcgUGFnZVBvcHVwQ2xpZW50cy4KKworICAgICAgICBObyBuZXcg dGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUuZ3lwaTogQWRkZWQgUGFnZVBvcHVw Q2xpZW50LmNwcAorICAgICAgICAqIGh0bWwvc2hhZG93L0NhbGVuZGFyUGlja2VyRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDYWxlbmRhclBpY2tlckVsZW1lbnQ6OndyaXRlRG9jdW1l bnQpOiBNb2RpZmllZCB0byB1c2UgUGFnZVBvcHVwQ2xpZW50LgorICAgICAgICAqIHBhZ2UvUGFn ZVBvcHVwQ2xpZW50LmNwcDogQWRkZWQuCisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdl YkNvcmU6OlBhZ2VQb3B1cENsaWVudDo6YWRkSmF2YVNjcmlwdFN0cmluZyk6CisgICAgICAgIChX ZWJDb3JlOjpQYWdlUG9wdXBDbGllbnQ6OmFkZFByb3BlcnR5KToKKyAgICAgICAgKiBwYWdlL1Bh Z2VQb3B1cENsaWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6UGFnZVBvcHVwQ2xpZW50OjphZGRT dHJpbmcpOgorCiAyMDEyLTA3LTI0ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXBsYWNlIHNvbWUgY2FsbHNpdGVzIG9mIHNoYWRvd0FuY2VzdG9yTm9kZSgp IHdpdGggc2hhZG93SG9zdCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5 cGkgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXggZTI4NjYxNWE5ZDgwNzdmZTA5 NmZkZmEwMzMyOGZmNmNiYjNmZWRkNS4uMmI5MDcyNjg5NzgxM2I3OGRjNzJkNWFjNGRlNWI1Mzk0 ODgxMTdjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCisrKyBiL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQpAQCAtMjQzLDcgKzI0Myw2IEBACiAgICAgICAgICAg ICAncGFnZS9QYWdlLmgnLAogICAgICAgICAgICAgJ3BhZ2UvUGFnZUdyb3VwLmgnLAogICAgICAg ICAgICAgJ3BhZ2UvUGFnZVBvcHVwLmgnLAotICAgICAgICAgICAgJ3BhZ2UvUGFnZVBvcHVwQ2xp ZW50LmgnLAogICAgICAgICAgICAgJ3BhZ2UvUGFnZVBvcHVwRHJpdmVyLmgnLAogICAgICAgICAg ICAgJ3BhZ2UvUGFnZVNlcmlhbGl6ZXIuaCcsCiAgICAgICAgICAgICAncGFnZS9QYWdlVmlzaWJp bGl0eVN0YXRlLmgnLApAQCAtMzA4Myw2ICszMDgyLDggQEAKICAgICAgICAgICAgICdwYWdlL1Bh Z2VHcm91cExvYWREZWZlcnJlci5oJywKICAgICAgICAgICAgICdwYWdlL1BhZ2VQb3B1cENvbnRy b2xsZXIuY3BwJywKICAgICAgICAgICAgICdwYWdlL1BhZ2VQb3B1cENvbnRyb2xsZXIuaCcsCisg ICAgICAgICAgICAncGFnZS9QYWdlUG9wdXBDbGllbnQuY3BwJywKKyAgICAgICAgICAgICdwYWdl L1BhZ2VQb3B1cENsaWVudC5oJywKICAgICAgICAgICAgICdwYWdlL1BhZ2VTZXJpYWxpemVyLmNw cCcsCiAgICAgICAgICAgICAncGFnZS9QYWdlVmlzaWJpbGl0eVN0YXRlLmNwcCcsCiAgICAgICAg ICAgICAncGFnZS9QZXJmb3JtYW5jZS5jcHAnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvQ2FsZW5kYXJQaWNrZXJFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L0NhbGVuZGFyUGlja2VyRWxlbWVudC5jcHAKaW5kZXggZWE5ZmJiN2IzNWNkYmYy MTUzOWQ0Y2FjNWM2ZTE2MzVjZmJkZDFmOC4uYjdlYTMyZjI4Y2JlZGQ0YTM3ZTJkN2I4YzBhZmNh ZTM2ZWI4OTRmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvQ2FsZW5k YXJQaWNrZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9DYWxl bmRhclBpY2tlckVsZW1lbnQuY3BwCkBAIC0zNyw3ICszNyw2IEBACiAjaW5jbHVkZSAiQ2hyb21l LmgiCiAjaW5jbHVkZSAiQ2hyb21lQ2xpZW50LmgiCiAjaW5jbHVkZSAiRGF0ZUNvbXBvbmVudHMu aCIKLSNpbmNsdWRlICJEb2N1bWVudFdyaXRlci5oIgogI2luY2x1ZGUgIkV2ZW50LmgiCiAjaW5j bHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiSFRNTElucHV0RWxlbWVudC5oIgpAQCAtMTQz LDY3ICsxNDIsNiBAQCBJbnRTaXplIENhbGVuZGFyUGlja2VyRWxlbWVudDo6Y29udGVudFNpemUo KQogICAgIHJldHVybiBJbnRTaXplKDEwMCwgMTAwKTsKIH0KIAotI2RlZmluZSBhZGRMaXRlcmFs KGxpdGVyYWwsIHdyaXRlcikgICAgd3JpdGVyLmFkZERhdGEobGl0ZXJhbCwgc2l6ZW9mKGxpdGVy YWwpIC0gMSkKLQotc3RhdGljIGlubGluZSB2b2lkIGFkZFN0cmluZyhjb25zdCBTdHJpbmcmIHN0 ciwgRG9jdW1lbnRXcml0ZXImIHdyaXRlcikKLXsKLSAgICBDU3RyaW5nIHN0cjggPSBzdHIudXRm OCgpOwotICAgIHdyaXRlci5hZGREYXRhKHN0cjguZGF0YSgpLCBzdHI4Lmxlbmd0aCgpKTsKLX0K LQotc3RhdGljIHZvaWQgYWRkSmF2YVNjcmlwdFN0cmluZyhjb25zdCBTdHJpbmcmIHN0ciwgRG9j dW1lbnRXcml0ZXImIHdyaXRlcikKLXsKLSAgICBhZGRMaXRlcmFsKCJcIiIsIHdyaXRlcik7Ci0g ICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOwotICAgIGJ1aWxkZXIucmVzZXJ2ZUNhcGFjaXR5KHN0 ci5sZW5ndGgoKSk7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHN0ci5sZW5ndGgoKTsg KytpKSB7Ci0gICAgICAgIGlmIChzdHJbaV0gPT0gJ1xcJyB8fCBzdHJbaV0gPT0gJyInKQotICAg ICAgICAgICAgYnVpbGRlci5hcHBlbmQoJ1xcJyk7Ci0gICAgICAgIGJ1aWxkZXIuYXBwZW5kKHN0 cltpXSk7Ci0gICAgfQotICAgIGFkZFN0cmluZyhidWlsZGVyLnRvU3RyaW5nKCksIHdyaXRlcik7 Ci0gICAgYWRkTGl0ZXJhbCgiXCIiLCB3cml0ZXIpOwotfQotCi1zdGF0aWMgdm9pZCBhZGRQcm9w ZXJ0eShjb25zdCBjaGFyKiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlLCBEb2N1bWVudFdyaXRl ciYgd3JpdGVyKQotewotICAgIHdyaXRlci5hZGREYXRhKG5hbWUsIHN0cmxlbihuYW1lKSk7Ci0g ICAgYWRkTGl0ZXJhbCgiOiAiLCB3cml0ZXIpOwotICAgIGFkZEphdmFTY3JpcHRTdHJpbmcodmFs dWUsIHdyaXRlcik7Ci0gICAgYWRkTGl0ZXJhbCgiLFxuIiwgd3JpdGVyKTsKLX0KLQotc3RhdGlj IHZvaWQgYWRkUHJvcGVydHkoY29uc3QgY2hhciogbmFtZSwgdW5zaWduZWQgdmFsdWUsIERvY3Vt ZW50V3JpdGVyJiB3cml0ZXIpCi17Ci0gICAgd3JpdGVyLmFkZERhdGEobmFtZSwgc3RybGVuKG5h bWUpKTsKLSAgICBhZGRMaXRlcmFsKCI6ICIsIHdyaXRlcik7Ci0gICAgYWRkU3RyaW5nKFN0cmlu Zzo6bnVtYmVyKHZhbHVlKSwgd3JpdGVyKTsKLSAgICBhZGRMaXRlcmFsKCIsXG4iLCB3cml0ZXIp OwotfQotCi1zdGF0aWMgdm9pZCBhZGRQcm9wZXJ0eShjb25zdCBjaGFyKiBuYW1lLCBib29sIHZh bHVlLCBEb2N1bWVudFdyaXRlciYgd3JpdGVyKQotewotICAgIHdyaXRlci5hZGREYXRhKG5hbWUs IHN0cmxlbihuYW1lKSk7Ci0gICAgYWRkTGl0ZXJhbCgiOiAiLCB3cml0ZXIpOwotICAgIGlmICh2 YWx1ZSkKLSAgICAgICAgYWRkTGl0ZXJhbCgidHJ1ZSIsIHdyaXRlcik7Ci0gICAgZWxzZQotICAg ICAgICBhZGRMaXRlcmFsKCJmYWxzZSIsIHdyaXRlcik7Ci0gICAgYWRkTGl0ZXJhbCgiLFxuIiwg d3JpdGVyKTsKLX0KLQotc3RhdGljIHZvaWQgYWRkUHJvcGVydHkoY29uc3QgY2hhciogbmFtZSwg Y29uc3QgVmVjdG9yPFN0cmluZz4mIHZhbHVlcywgRG9jdW1lbnRXcml0ZXImIHdyaXRlcikKLXsK LSAgICB3cml0ZXIuYWRkRGF0YShuYW1lLCBzdHJsZW4obmFtZSkpOwotICAgIGFkZExpdGVyYWwo IjogWyIsIHdyaXRlcik7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHZhbHVlcy5zaXpl KCk7ICsraSkgewotICAgICAgICBpZiAoaSkKLSAgICAgICAgICAgIGFkZExpdGVyYWwoIiwiLCB3 cml0ZXIpOwotICAgICAgICBhZGRKYXZhU2NyaXB0U3RyaW5nKHZhbHVlc1tpXSwgd3JpdGVyKTsK LSAgICB9Ci0gICAgYWRkTGl0ZXJhbCgiXSxcbiIsIHdyaXRlcik7Ci19Ci0KIHZvaWQgQ2FsZW5k YXJQaWNrZXJFbGVtZW50Ojp3cml0ZURvY3VtZW50KERvY3VtZW50V3JpdGVyJiB3cml0ZXIpCiB7 CiAgICAgSFRNTElucHV0RWxlbWVudCogaW5wdXQgPSBob3N0SW5wdXQoKTsKQEAgLTIxNywxNCAr MTU1LDE0IEBAIHZvaWQgQ2FsZW5kYXJQaWNrZXJFbGVtZW50Ojp3cml0ZURvY3VtZW50KERvY3Vt ZW50V3JpdGVyJiB3cml0ZXIpCiAgICAgaWYgKHN0ZXBTdHJpbmcuaXNFbXB0eSgpIHx8ICFpbnB1 dC0+Z2V0QWxsb3dlZFZhbHVlU3RlcCgmc3RlcCkpCiAgICAgICAgIHN0ZXBTdHJpbmcgPSAiMSI7 CiAKLSAgICBhZGRMaXRlcmFsKCI8IURPQ1RZUEUgaHRtbD48aGVhZD48bWV0YSBjaGFyc2V0PSdV VEYtOCc+PHN0eWxlPlxuIiwgd3JpdGVyKTsKKyAgICBhZGRTdHJpbmcoIjwhRE9DVFlQRSBodG1s PjxoZWFkPjxtZXRhIGNoYXJzZXQ9J1VURi04Jz48c3R5bGU+XG4iLCB3cml0ZXIpOwogICAgIHdy aXRlci5hZGREYXRhKGNhbGVuZGFyUGlja2VyQ3NzLCBzaXplb2YoY2FsZW5kYXJQaWNrZXJDc3Mp KTsKICAgICBpZiAoZG9jdW1lbnQoKS0+cGFnZSgpKSB7CiAgICAgICAgIENTdHJpbmcgZXh0cmFT dHlsZSA9IGRvY3VtZW50KCktPnBhZ2UoKS0+dGhlbWUoKS0+ZXh0cmFDYWxlbmRhclBpY2tlclN0 eWxlU2hlZXQoKTsKICAgICAgICAgaWYgKGV4dHJhU3R5bGUubGVuZ3RoKCkpCiAgICAgICAgICAg ICB3cml0ZXIuYWRkRGF0YShleHRyYVN0eWxlLmRhdGEoKSwgZXh0cmFTdHlsZS5sZW5ndGgoKSk7 CiAgICAgfQotICAgIGFkZExpdGVyYWwoIjwvc3R5bGU+PC9oZWFkPjxib2R5PjxkaXYgaWQ9bWFp bj5Mb2FkaW5nLi4uPC9kaXY+PHNjcmlwdD5cbiIKKyAgICBhZGRTdHJpbmcoIjwvc3R5bGU+PC9o ZWFkPjxib2R5PjxkaXYgaWQ9bWFpbj5Mb2FkaW5nLi4uPC9kaXY+PHNjcmlwdD5cbiIKICAgICAg ICAgICAgICAgICJ3aW5kb3cuZGlhbG9nQXJndW1lbnRzID0ge1xuIiwgd3JpdGVyKTsKICAgICBh ZGRQcm9wZXJ0eSgibWluIiwgbWluU3RyaW5nLCB3cml0ZXIpOwogICAgIGFkZFByb3BlcnR5KCJt YXgiLCBtYXhTdHJpbmcsIHdyaXRlcik7CkBAIC0yMzksMTAgKzE3NywxMCBAQCB2b2lkIENhbGVu ZGFyUGlja2VyRWxlbWVudDo6d3JpdGVEb2N1bWVudChEb2N1bWVudFdyaXRlciYgd3JpdGVyKQog ICAgIGFkZFByb3BlcnR5KCJkYXlMYWJlbHMiLCB3ZWVrRGF5U2hvcnRMYWJlbHMoKSwgd3JpdGVy KTsKICAgICBEaXJlY3Rpb24gZGlyID0gZGlyZWN0aW9uKG1vbnRoTGFiZWxzKClbMF1bMF0pOwog ICAgIGFkZFByb3BlcnR5KCJpc1JUTCIsIGRpciA9PSBSaWdodFRvTGVmdCB8fCBkaXIgPT0gUmln aHRUb0xlZnRBcmFiaWMsIHdyaXRlcik7Ci0gICAgYWRkTGl0ZXJhbCgifVxuIiwgd3JpdGVyKTsK KyAgICBhZGRTdHJpbmcoIn1cbiIsIHdyaXRlcik7CiAKICAgICB3cml0ZXIuYWRkRGF0YShjYWxl bmRhclBpY2tlckpzLCBzaXplb2YoY2FsZW5kYXJQaWNrZXJKcykpOwotICAgIGFkZExpdGVyYWwo Ijwvc2NyaXB0PjwvYm9keT5cbiIsIHdyaXRlcik7CisgICAgYWRkU3RyaW5nKCI8L3NjcmlwdD48 L2JvZHk+XG4iLCB3cml0ZXIpOwogfQogCiB2b2lkIENhbGVuZGFyUGlja2VyRWxlbWVudDo6c2V0 VmFsdWVBbmRDbG9zZVBvcHVwKGludCBudW1WYWx1ZSwgY29uc3QgU3RyaW5nJiBzdHJpbmdWYWx1 ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVBvcHVwQ2xpZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVBvcHVwQ2xpZW50LmNwcApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41YjY2 NmVhNDU5NWJkNmY2Yjc2MjFmMjg2YjEzMjYxY2YzY2MxY2M1Ci0tLSAvZGV2L251bGwKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9QYWdlUG9wdXBDbGllbnQuY3BwCkBAIC0wLDAgKzEsOTcgQEAK Ky8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoKKyAqCisgKiAg ICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3Zl IGNvcHlyaWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBm b3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhl IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQor ICogZGlzdHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5j LiBub3IgdGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVu ZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUg d2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBT T0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJV VE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJ TkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMg T0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBP U0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9X TkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFH RVMgKElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9G SVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkK KyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFC SUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFS SVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisj aW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUGFnZVBvcHVwQ2xpZW50LmgiCisKKyNpZiBF TkFCTEUoUEFHRV9QT1BVUCkKKworI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4K KworbmFtZXNwYWNlIFdlYkNvcmUgeworCisjZGVmaW5lIGFkZExpdGVyYWwobGl0ZXJhbCwgd3Jp dGVyKSAgICB3cml0ZXIuYWRkRGF0YShsaXRlcmFsLCBzaXplb2YobGl0ZXJhbCkgLSAxKQorCit2 b2lkIFBhZ2VQb3B1cENsaWVudDo6YWRkSmF2YVNjcmlwdFN0cmluZyhjb25zdCBTdHJpbmcmIHN0 ciwgRG9jdW1lbnRXcml0ZXImIHdyaXRlcikKK3sKKyAgICBhZGRMaXRlcmFsKCJcIiIsIHdyaXRl cik7CisgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOworICAgIGJ1aWxkZXIucmVzZXJ2ZUNhcGFj aXR5KHN0ci5sZW5ndGgoKSk7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHN0ci5sZW5n dGgoKTsgKytpKSB7CisgICAgICAgIGlmIChzdHJbaV0gPT0gJ1xcJyB8fCBzdHJbaV0gPT0gJyIn KQorICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoJ1xcJyk7CisgICAgICAgIGJ1aWxkZXIuYXBw ZW5kKHN0cltpXSk7CisgICAgfQorICAgIGFkZFN0cmluZyhidWlsZGVyLnRvU3RyaW5nKCksIHdy aXRlcik7CisgICAgYWRkTGl0ZXJhbCgiXCIiLCB3cml0ZXIpOworfQorCit2b2lkIFBhZ2VQb3B1 cENsaWVudDo6YWRkUHJvcGVydHkoY29uc3QgY2hhciogbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1 ZSwgRG9jdW1lbnRXcml0ZXImIHdyaXRlcikKK3sKKyAgICB3cml0ZXIuYWRkRGF0YShuYW1lLCBz dHJsZW4obmFtZSkpOworICAgIGFkZExpdGVyYWwoIjogIiwgd3JpdGVyKTsKKyAgICBhZGRKYXZh U2NyaXB0U3RyaW5nKHZhbHVlLCB3cml0ZXIpOworICAgIGFkZExpdGVyYWwoIixcbiIsIHdyaXRl cik7Cit9CisKK3ZvaWQgUGFnZVBvcHVwQ2xpZW50OjphZGRQcm9wZXJ0eShjb25zdCBjaGFyKiBu YW1lLCB1bnNpZ25lZCB2YWx1ZSwgRG9jdW1lbnRXcml0ZXImIHdyaXRlcikKK3sKKyAgICB3cml0 ZXIuYWRkRGF0YShuYW1lLCBzdHJsZW4obmFtZSkpOworICAgIGFkZExpdGVyYWwoIjogIiwgd3Jp dGVyKTsKKyAgICBhZGRTdHJpbmcoU3RyaW5nOjpudW1iZXIodmFsdWUpLCB3cml0ZXIpOworICAg IGFkZExpdGVyYWwoIixcbiIsIHdyaXRlcik7Cit9CisKK3ZvaWQgUGFnZVBvcHVwQ2xpZW50Ojph ZGRQcm9wZXJ0eShjb25zdCBjaGFyKiBuYW1lLCBib29sIHZhbHVlLCBEb2N1bWVudFdyaXRlciYg d3JpdGVyKQoreworICAgIHdyaXRlci5hZGREYXRhKG5hbWUsIHN0cmxlbihuYW1lKSk7CisgICAg YWRkTGl0ZXJhbCgiOiAiLCB3cml0ZXIpOworICAgIGlmICh2YWx1ZSkKKyAgICAgICAgYWRkTGl0 ZXJhbCgidHJ1ZSIsIHdyaXRlcik7CisgICAgZWxzZQorICAgICAgICBhZGRMaXRlcmFsKCJmYWxz ZSIsIHdyaXRlcik7CisgICAgYWRkTGl0ZXJhbCgiLFxuIiwgd3JpdGVyKTsKK30KKwordm9pZCBQ YWdlUG9wdXBDbGllbnQ6OmFkZFByb3BlcnR5KGNvbnN0IGNoYXIqIG5hbWUsIGNvbnN0IFZlY3Rv cjxTdHJpbmc+JiB2YWx1ZXMsIERvY3VtZW50V3JpdGVyJiB3cml0ZXIpCit7CisgICAgd3JpdGVy LmFkZERhdGEobmFtZSwgc3RybGVuKG5hbWUpKTsKKyAgICBhZGRMaXRlcmFsKCI6IFsiLCB3cml0 ZXIpOworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCB2YWx1ZXMuc2l6ZSgpOyArK2kpIHsK KyAgICAgICAgaWYgKGkpCisgICAgICAgICAgICBhZGRMaXRlcmFsKCIsIiwgd3JpdGVyKTsKKyAg ICAgICAgYWRkSmF2YVNjcmlwdFN0cmluZyh2YWx1ZXNbaV0sIHdyaXRlcik7CisgICAgfQorICAg IGFkZExpdGVyYWwoIl0sXG4iLCB3cml0ZXIpOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CisKKyNlbmRpZiAvLyBFTkFCTEUoUEFHRV9QT1BVUCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUGFnZVBvcHVwQ2xpZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VQb3B1 cENsaWVudC5oCmluZGV4IGQzMjlhZGE5MWEzOTA1MDRiYTk2OGYwYjQxNWUxODU4YTgyOGM5ZmYu Ljk5ZDA4YTIyMGU0ZWQ2NmNmMmYxNWUxZmI1N2E1MDljYWM1NzBlMDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVBvcHVwQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlUG9wdXBDbGllbnQuaApAQCAtMzMsNiArMzMsNyBAQAogCiAjaWYgRU5BQkxFKFBB R0VfUE9QVVApCiAKKyNpbmNsdWRlICJEb2N1bWVudFdyaXRlci5oIgogI2luY2x1ZGUgIkludFNp emUuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApAQCAtNDIsNiArNDMsMTQg QEAgY2xhc3MgRG9jdW1lbnRXcml0ZXI7CiAKIGNsYXNzIFBhZ2VQb3B1cENsaWVudCB7CiBwdWJs aWM6CisgICAgLy8gSGVscGVyIGZ1bmN0aW9ucyB0byBiZSB1c2VkIGluIFBhZ2VQb3B1cENsaWVu dDo6d3JpdGVEb2N1bWVudCgpLgorICAgIHN0YXRpYyB2b2lkIGFkZFN0cmluZyhjb25zdCBTdHJp bmcmLCBEb2N1bWVudFdyaXRlciYpOworICAgIHN0YXRpYyB2b2lkIGFkZEphdmFTY3JpcHRTdHJp bmcoY29uc3QgU3RyaW5nJiwgRG9jdW1lbnRXcml0ZXImKTsKKyAgICBzdGF0aWMgdm9pZCBhZGRQ cm9wZXJ0eShjb25zdCBjaGFyKiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlLCBEb2N1bWVudFdy aXRlciYpOworICAgIHN0YXRpYyB2b2lkIGFkZFByb3BlcnR5KGNvbnN0IGNoYXIqIG5hbWUsIHVu c2lnbmVkIHZhbHVlLCBEb2N1bWVudFdyaXRlciYpOworICAgIHN0YXRpYyB2b2lkIGFkZFByb3Bl cnR5KGNvbnN0IGNoYXIqIG5hbWUsIGJvb2wgdmFsdWUsIERvY3VtZW50V3JpdGVyJik7CisgICAg c3RhdGljIHZvaWQgYWRkUHJvcGVydHkoY29uc3QgY2hhciogbmFtZSwgY29uc3QgVmVjdG9yPFN0 cmluZz4mIHZhbHVlcywgRG9jdW1lbnRXcml0ZXImKTsKKwogICAgIHZpcnR1YWwgSW50U2l6ZSBj b250ZW50U2l6ZSgpID0gMDsKIAogICAgIC8vIFByb3ZpZGUgYW4gSFRNTCBzb3VyY2UgdGhyb3Vn aCB0aGUgc3BlY2lmaWVkIERvY3VtZW50V3JpdGVyLiBUaGUgSFRNTApAQCAtNjEsNiArNzAsMTIg QEAgcHVibGljOgogICAgIHZpcnR1YWwgflBhZ2VQb3B1cENsaWVudCgpIHsgfQogfTsKIAoraW5s aW5lIHZvaWQgUGFnZVBvcHVwQ2xpZW50OjphZGRTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHIsIERv Y3VtZW50V3JpdGVyJiB3cml0ZXIpCit7CisgICAgQ1N0cmluZyBzdHI4ID0gc3RyLnV0ZjgoKTsK KyAgICB3cml0ZXIuYWRkRGF0YShzdHI4LmRhdGEoKSwgc3RyOC5sZW5ndGgoKSk7Cit9CisKIH0K ICNlbmRpZgogI2VuZGlmCg== 154050 2012-07-24 07:04:42 -0700 2012-07-24 19:35:22 -0700 Patch bug-92096-20120724230433.patch text/plain 11311 keishi U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODM5ODFkMTFjNGRhZWRm Yjg3MjA1YzI1ODhkMDI4OTgxYTY1N2U0MC4uNzgwMmE4ZmNkMDJmMGVkZjA4ZTEzMjRhZWNiMDc4 NmExOGQ0ZTAwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA3LTI0ICBLZWlz aGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgorCisgICAgICAgIE1vdmUgUGFnZVBvcHVw Q2xpZW50IGhlbHBlciBmdW5jdGlvbnMgc28gdGhleSBjYW4gYmUgc2hhcmVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjA5NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgUGFnZVBvcHVwQ2xpZW50 IGhlbHBlciBmdW5jdGlvbnMgdG8gYSBzZXBhcmF0ZSBmaWxlLAorICAgICAgICBzbyB0aGV5IGNh biBiZSBzaGFyZWQgd2l0aCBuZXcgUGFnZVBvcHVwQ2xpZW50cy4KKworICAgICAgICBObyBuZXcg dGVzdHMuIENvdmVyZWQgYnkgZmFzdC9mb3Jtcy9kYXRlL2NhbGVuZGFyLXBpY2tlci1hcHBlYXJh bmNlLmh0bWwKKworICAgICAgICAqIFdlYkNvcmUuZ3lwaTogQWRkZWQgUGFnZVBvcHVwQ2xpZW50 LmNwcAorICAgICAgICAqIGh0bWwvc2hhZG93L0NhbGVuZGFyUGlja2VyRWxlbWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDYWxlbmRhclBpY2tlckVsZW1lbnQ6OndyaXRlRG9jdW1lbnQpOiBN b2RpZmllZCB0byB1c2UgUGFnZVBvcHVwQ2xpZW50LgorICAgICAgICAqIHBhZ2UvUGFnZVBvcHVw Q2xpZW50LmNwcDogQWRkZWQuCisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6 OlBhZ2VQb3B1cENsaWVudDo6YWRkSmF2YVNjcmlwdFN0cmluZyk6CisgICAgICAgIChXZWJDb3Jl OjpQYWdlUG9wdXBDbGllbnQ6OmFkZFByb3BlcnR5KToKKyAgICAgICAgKiBwYWdlL1BhZ2VQb3B1 cENsaWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6UGFnZVBvcHVwQ2xpZW50OjphZGRTdHJpbmcp OgorCiAyMDEyLTA3LTI0ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXBsYWNlIHNvbWUgY2FsbHNpdGVzIG9mIHNoYWRvd0FuY2VzdG9yTm9kZSgpIHdpdGgg c2hhZG93SG9zdCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkgYi9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXggZTI4NjYxNWE5ZDgwNzdmZTA5NmZkZmEw MzMyOGZmNmNiYjNmZWRkNS4uMmI5MDcyNjg5NzgxM2I3OGRjNzJkNWFjNGRlNWI1Mzk0ODgxMTdj OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCisrKyBiL1NvdXJjZS9X ZWJDb3JlL1dlYkNvcmUuZ3lwaQpAQCAtMjQzLDcgKzI0Myw2IEBACiAgICAgICAgICAgICAncGFn ZS9QYWdlLmgnLAogICAgICAgICAgICAgJ3BhZ2UvUGFnZUdyb3VwLmgnLAogICAgICAgICAgICAg J3BhZ2UvUGFnZVBvcHVwLmgnLAotICAgICAgICAgICAgJ3BhZ2UvUGFnZVBvcHVwQ2xpZW50Lmgn LAogICAgICAgICAgICAgJ3BhZ2UvUGFnZVBvcHVwRHJpdmVyLmgnLAogICAgICAgICAgICAgJ3Bh Z2UvUGFnZVNlcmlhbGl6ZXIuaCcsCiAgICAgICAgICAgICAncGFnZS9QYWdlVmlzaWJpbGl0eVN0 YXRlLmgnLApAQCAtMzA4Myw2ICszMDgyLDggQEAKICAgICAgICAgICAgICdwYWdlL1BhZ2VHcm91 cExvYWREZWZlcnJlci5oJywKICAgICAgICAgICAgICdwYWdlL1BhZ2VQb3B1cENvbnRyb2xsZXIu Y3BwJywKICAgICAgICAgICAgICdwYWdlL1BhZ2VQb3B1cENvbnRyb2xsZXIuaCcsCisgICAgICAg ICAgICAncGFnZS9QYWdlUG9wdXBDbGllbnQuY3BwJywKKyAgICAgICAgICAgICdwYWdlL1BhZ2VQ b3B1cENsaWVudC5oJywKICAgICAgICAgICAgICdwYWdlL1BhZ2VTZXJpYWxpemVyLmNwcCcsCiAg ICAgICAgICAgICAncGFnZS9QYWdlVmlzaWJpbGl0eVN0YXRlLmNwcCcsCiAgICAgICAgICAgICAn cGFnZS9QZXJmb3JtYW5jZS5jcHAnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvQ2FsZW5kYXJQaWNrZXJFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L0NhbGVuZGFyUGlja2VyRWxlbWVudC5jcHAKaW5kZXggZWE5ZmJiN2IzNWNkYmYyMTUzOWQ0 Y2FjNWM2ZTE2MzVjZmJkZDFmOC4uYjdlYTMyZjI4Y2JlZGQ0YTM3ZTJkN2I4YzBhZmNhZTM2ZWI4 OTRmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvQ2FsZW5kYXJQaWNr ZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9DYWxlbmRhclBp Y2tlckVsZW1lbnQuY3BwCkBAIC0zNyw3ICszNyw2IEBACiAjaW5jbHVkZSAiQ2hyb21lLmgiCiAj aW5jbHVkZSAiQ2hyb21lQ2xpZW50LmgiCiAjaW5jbHVkZSAiRGF0ZUNvbXBvbmVudHMuaCIKLSNp bmNsdWRlICJEb2N1bWVudFdyaXRlci5oIgogI2luY2x1ZGUgIkV2ZW50LmgiCiAjaW5jbHVkZSAi RnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiSFRNTElucHV0RWxlbWVudC5oIgpAQCAtMTQzLDY3ICsx NDIsNiBAQCBJbnRTaXplIENhbGVuZGFyUGlja2VyRWxlbWVudDo6Y29udGVudFNpemUoKQogICAg IHJldHVybiBJbnRTaXplKDEwMCwgMTAwKTsKIH0KIAotI2RlZmluZSBhZGRMaXRlcmFsKGxpdGVy YWwsIHdyaXRlcikgICAgd3JpdGVyLmFkZERhdGEobGl0ZXJhbCwgc2l6ZW9mKGxpdGVyYWwpIC0g MSkKLQotc3RhdGljIGlubGluZSB2b2lkIGFkZFN0cmluZyhjb25zdCBTdHJpbmcmIHN0ciwgRG9j dW1lbnRXcml0ZXImIHdyaXRlcikKLXsKLSAgICBDU3RyaW5nIHN0cjggPSBzdHIudXRmOCgpOwot ICAgIHdyaXRlci5hZGREYXRhKHN0cjguZGF0YSgpLCBzdHI4Lmxlbmd0aCgpKTsKLX0KLQotc3Rh dGljIHZvaWQgYWRkSmF2YVNjcmlwdFN0cmluZyhjb25zdCBTdHJpbmcmIHN0ciwgRG9jdW1lbnRX cml0ZXImIHdyaXRlcikKLXsKLSAgICBhZGRMaXRlcmFsKCJcIiIsIHdyaXRlcik7Ci0gICAgU3Ry aW5nQnVpbGRlciBidWlsZGVyOwotICAgIGJ1aWxkZXIucmVzZXJ2ZUNhcGFjaXR5KHN0ci5sZW5n dGgoKSk7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHN0ci5sZW5ndGgoKTsgKytpKSB7 Ci0gICAgICAgIGlmIChzdHJbaV0gPT0gJ1xcJyB8fCBzdHJbaV0gPT0gJyInKQotICAgICAgICAg ICAgYnVpbGRlci5hcHBlbmQoJ1xcJyk7Ci0gICAgICAgIGJ1aWxkZXIuYXBwZW5kKHN0cltpXSk7 Ci0gICAgfQotICAgIGFkZFN0cmluZyhidWlsZGVyLnRvU3RyaW5nKCksIHdyaXRlcik7Ci0gICAg YWRkTGl0ZXJhbCgiXCIiLCB3cml0ZXIpOwotfQotCi1zdGF0aWMgdm9pZCBhZGRQcm9wZXJ0eShj b25zdCBjaGFyKiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlLCBEb2N1bWVudFdyaXRlciYgd3Jp dGVyKQotewotICAgIHdyaXRlci5hZGREYXRhKG5hbWUsIHN0cmxlbihuYW1lKSk7Ci0gICAgYWRk TGl0ZXJhbCgiOiAiLCB3cml0ZXIpOwotICAgIGFkZEphdmFTY3JpcHRTdHJpbmcodmFsdWUsIHdy aXRlcik7Ci0gICAgYWRkTGl0ZXJhbCgiLFxuIiwgd3JpdGVyKTsKLX0KLQotc3RhdGljIHZvaWQg YWRkUHJvcGVydHkoY29uc3QgY2hhciogbmFtZSwgdW5zaWduZWQgdmFsdWUsIERvY3VtZW50V3Jp dGVyJiB3cml0ZXIpCi17Ci0gICAgd3JpdGVyLmFkZERhdGEobmFtZSwgc3RybGVuKG5hbWUpKTsK LSAgICBhZGRMaXRlcmFsKCI6ICIsIHdyaXRlcik7Ci0gICAgYWRkU3RyaW5nKFN0cmluZzo6bnVt YmVyKHZhbHVlKSwgd3JpdGVyKTsKLSAgICBhZGRMaXRlcmFsKCIsXG4iLCB3cml0ZXIpOwotfQot Ci1zdGF0aWMgdm9pZCBhZGRQcm9wZXJ0eShjb25zdCBjaGFyKiBuYW1lLCBib29sIHZhbHVlLCBE b2N1bWVudFdyaXRlciYgd3JpdGVyKQotewotICAgIHdyaXRlci5hZGREYXRhKG5hbWUsIHN0cmxl bihuYW1lKSk7Ci0gICAgYWRkTGl0ZXJhbCgiOiAiLCB3cml0ZXIpOwotICAgIGlmICh2YWx1ZSkK LSAgICAgICAgYWRkTGl0ZXJhbCgidHJ1ZSIsIHdyaXRlcik7Ci0gICAgZWxzZQotICAgICAgICBh ZGRMaXRlcmFsKCJmYWxzZSIsIHdyaXRlcik7Ci0gICAgYWRkTGl0ZXJhbCgiLFxuIiwgd3JpdGVy KTsKLX0KLQotc3RhdGljIHZvaWQgYWRkUHJvcGVydHkoY29uc3QgY2hhciogbmFtZSwgY29uc3Qg VmVjdG9yPFN0cmluZz4mIHZhbHVlcywgRG9jdW1lbnRXcml0ZXImIHdyaXRlcikKLXsKLSAgICB3 cml0ZXIuYWRkRGF0YShuYW1lLCBzdHJsZW4obmFtZSkpOwotICAgIGFkZExpdGVyYWwoIjogWyIs IHdyaXRlcik7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHZhbHVlcy5zaXplKCk7ICsr aSkgewotICAgICAgICBpZiAoaSkKLSAgICAgICAgICAgIGFkZExpdGVyYWwoIiwiLCB3cml0ZXIp OwotICAgICAgICBhZGRKYXZhU2NyaXB0U3RyaW5nKHZhbHVlc1tpXSwgd3JpdGVyKTsKLSAgICB9 Ci0gICAgYWRkTGl0ZXJhbCgiXSxcbiIsIHdyaXRlcik7Ci19Ci0KIHZvaWQgQ2FsZW5kYXJQaWNr ZXJFbGVtZW50Ojp3cml0ZURvY3VtZW50KERvY3VtZW50V3JpdGVyJiB3cml0ZXIpCiB7CiAgICAg SFRNTElucHV0RWxlbWVudCogaW5wdXQgPSBob3N0SW5wdXQoKTsKQEAgLTIxNywxNCArMTU1LDE0 IEBAIHZvaWQgQ2FsZW5kYXJQaWNrZXJFbGVtZW50Ojp3cml0ZURvY3VtZW50KERvY3VtZW50V3Jp dGVyJiB3cml0ZXIpCiAgICAgaWYgKHN0ZXBTdHJpbmcuaXNFbXB0eSgpIHx8ICFpbnB1dC0+Z2V0 QWxsb3dlZFZhbHVlU3RlcCgmc3RlcCkpCiAgICAgICAgIHN0ZXBTdHJpbmcgPSAiMSI7CiAKLSAg ICBhZGRMaXRlcmFsKCI8IURPQ1RZUEUgaHRtbD48aGVhZD48bWV0YSBjaGFyc2V0PSdVVEYtOCc+ PHN0eWxlPlxuIiwgd3JpdGVyKTsKKyAgICBhZGRTdHJpbmcoIjwhRE9DVFlQRSBodG1sPjxoZWFk PjxtZXRhIGNoYXJzZXQ9J1VURi04Jz48c3R5bGU+XG4iLCB3cml0ZXIpOwogICAgIHdyaXRlci5h ZGREYXRhKGNhbGVuZGFyUGlja2VyQ3NzLCBzaXplb2YoY2FsZW5kYXJQaWNrZXJDc3MpKTsKICAg ICBpZiAoZG9jdW1lbnQoKS0+cGFnZSgpKSB7CiAgICAgICAgIENTdHJpbmcgZXh0cmFTdHlsZSA9 IGRvY3VtZW50KCktPnBhZ2UoKS0+dGhlbWUoKS0+ZXh0cmFDYWxlbmRhclBpY2tlclN0eWxlU2hl ZXQoKTsKICAgICAgICAgaWYgKGV4dHJhU3R5bGUubGVuZ3RoKCkpCiAgICAgICAgICAgICB3cml0 ZXIuYWRkRGF0YShleHRyYVN0eWxlLmRhdGEoKSwgZXh0cmFTdHlsZS5sZW5ndGgoKSk7CiAgICAg fQotICAgIGFkZExpdGVyYWwoIjwvc3R5bGU+PC9oZWFkPjxib2R5PjxkaXYgaWQ9bWFpbj5Mb2Fk aW5nLi4uPC9kaXY+PHNjcmlwdD5cbiIKKyAgICBhZGRTdHJpbmcoIjwvc3R5bGU+PC9oZWFkPjxi b2R5PjxkaXYgaWQ9bWFpbj5Mb2FkaW5nLi4uPC9kaXY+PHNjcmlwdD5cbiIKICAgICAgICAgICAg ICAgICJ3aW5kb3cuZGlhbG9nQXJndW1lbnRzID0ge1xuIiwgd3JpdGVyKTsKICAgICBhZGRQcm9w ZXJ0eSgibWluIiwgbWluU3RyaW5nLCB3cml0ZXIpOwogICAgIGFkZFByb3BlcnR5KCJtYXgiLCBt YXhTdHJpbmcsIHdyaXRlcik7CkBAIC0yMzksMTAgKzE3NywxMCBAQCB2b2lkIENhbGVuZGFyUGlj a2VyRWxlbWVudDo6d3JpdGVEb2N1bWVudChEb2N1bWVudFdyaXRlciYgd3JpdGVyKQogICAgIGFk ZFByb3BlcnR5KCJkYXlMYWJlbHMiLCB3ZWVrRGF5U2hvcnRMYWJlbHMoKSwgd3JpdGVyKTsKICAg ICBEaXJlY3Rpb24gZGlyID0gZGlyZWN0aW9uKG1vbnRoTGFiZWxzKClbMF1bMF0pOwogICAgIGFk ZFByb3BlcnR5KCJpc1JUTCIsIGRpciA9PSBSaWdodFRvTGVmdCB8fCBkaXIgPT0gUmlnaHRUb0xl ZnRBcmFiaWMsIHdyaXRlcik7Ci0gICAgYWRkTGl0ZXJhbCgifVxuIiwgd3JpdGVyKTsKKyAgICBh ZGRTdHJpbmcoIn1cbiIsIHdyaXRlcik7CiAKICAgICB3cml0ZXIuYWRkRGF0YShjYWxlbmRhclBp Y2tlckpzLCBzaXplb2YoY2FsZW5kYXJQaWNrZXJKcykpOwotICAgIGFkZExpdGVyYWwoIjwvc2Ny aXB0PjwvYm9keT5cbiIsIHdyaXRlcik7CisgICAgYWRkU3RyaW5nKCI8L3NjcmlwdD48L2JvZHk+ XG4iLCB3cml0ZXIpOwogfQogCiB2b2lkIENhbGVuZGFyUGlja2VyRWxlbWVudDo6c2V0VmFsdWVB bmRDbG9zZVBvcHVwKGludCBudW1WYWx1ZSwgY29uc3QgU3RyaW5nJiBzdHJpbmdWYWx1ZSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVBvcHVwQ2xpZW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUGFnZVBvcHVwQ2xpZW50LmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41YjY2NmVhNDU5 NWJkNmY2Yjc2MjFmMjg2YjEzMjYxY2YzY2MxY2M1Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlUG9wdXBDbGllbnQuY3BwCkBAIC0wLDAgKzEsOTcgQEAKKy8qCisg KiBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq CisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoKKyAqCisgKiAgICAgKiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorICogZGlz dHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3Ig dGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ug b3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUgd2l0aG91 dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZUV0FS RSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwor ICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJ TkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVS Q0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJF IERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVSIE9S IENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElO Q0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBP UiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRI RU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVk ZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUGFnZVBvcHVwQ2xpZW50LmgiCisKKyNpZiBFTkFCTEUo UEFHRV9QT1BVUCkKKworI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KKworbmFt ZXNwYWNlIFdlYkNvcmUgeworCisjZGVmaW5lIGFkZExpdGVyYWwobGl0ZXJhbCwgd3JpdGVyKSAg ICB3cml0ZXIuYWRkRGF0YShsaXRlcmFsLCBzaXplb2YobGl0ZXJhbCkgLSAxKQorCit2b2lkIFBh Z2VQb3B1cENsaWVudDo6YWRkSmF2YVNjcmlwdFN0cmluZyhjb25zdCBTdHJpbmcmIHN0ciwgRG9j dW1lbnRXcml0ZXImIHdyaXRlcikKK3sKKyAgICBhZGRMaXRlcmFsKCJcIiIsIHdyaXRlcik7Cisg ICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOworICAgIGJ1aWxkZXIucmVzZXJ2ZUNhcGFjaXR5KHN0 ci5sZW5ndGgoKSk7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHN0ci5sZW5ndGgoKTsg KytpKSB7CisgICAgICAgIGlmIChzdHJbaV0gPT0gJ1xcJyB8fCBzdHJbaV0gPT0gJyInKQorICAg ICAgICAgICAgYnVpbGRlci5hcHBlbmQoJ1xcJyk7CisgICAgICAgIGJ1aWxkZXIuYXBwZW5kKHN0 cltpXSk7CisgICAgfQorICAgIGFkZFN0cmluZyhidWlsZGVyLnRvU3RyaW5nKCksIHdyaXRlcik7 CisgICAgYWRkTGl0ZXJhbCgiXCIiLCB3cml0ZXIpOworfQorCit2b2lkIFBhZ2VQb3B1cENsaWVu dDo6YWRkUHJvcGVydHkoY29uc3QgY2hhciogbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgRG9j dW1lbnRXcml0ZXImIHdyaXRlcikKK3sKKyAgICB3cml0ZXIuYWRkRGF0YShuYW1lLCBzdHJsZW4o bmFtZSkpOworICAgIGFkZExpdGVyYWwoIjogIiwgd3JpdGVyKTsKKyAgICBhZGRKYXZhU2NyaXB0 U3RyaW5nKHZhbHVlLCB3cml0ZXIpOworICAgIGFkZExpdGVyYWwoIixcbiIsIHdyaXRlcik7Cit9 CisKK3ZvaWQgUGFnZVBvcHVwQ2xpZW50OjphZGRQcm9wZXJ0eShjb25zdCBjaGFyKiBuYW1lLCB1 bnNpZ25lZCB2YWx1ZSwgRG9jdW1lbnRXcml0ZXImIHdyaXRlcikKK3sKKyAgICB3cml0ZXIuYWRk RGF0YShuYW1lLCBzdHJsZW4obmFtZSkpOworICAgIGFkZExpdGVyYWwoIjogIiwgd3JpdGVyKTsK KyAgICBhZGRTdHJpbmcoU3RyaW5nOjpudW1iZXIodmFsdWUpLCB3cml0ZXIpOworICAgIGFkZExp dGVyYWwoIixcbiIsIHdyaXRlcik7Cit9CisKK3ZvaWQgUGFnZVBvcHVwQ2xpZW50OjphZGRQcm9w ZXJ0eShjb25zdCBjaGFyKiBuYW1lLCBib29sIHZhbHVlLCBEb2N1bWVudFdyaXRlciYgd3JpdGVy KQoreworICAgIHdyaXRlci5hZGREYXRhKG5hbWUsIHN0cmxlbihuYW1lKSk7CisgICAgYWRkTGl0 ZXJhbCgiOiAiLCB3cml0ZXIpOworICAgIGlmICh2YWx1ZSkKKyAgICAgICAgYWRkTGl0ZXJhbCgi dHJ1ZSIsIHdyaXRlcik7CisgICAgZWxzZQorICAgICAgICBhZGRMaXRlcmFsKCJmYWxzZSIsIHdy aXRlcik7CisgICAgYWRkTGl0ZXJhbCgiLFxuIiwgd3JpdGVyKTsKK30KKwordm9pZCBQYWdlUG9w dXBDbGllbnQ6OmFkZFByb3BlcnR5KGNvbnN0IGNoYXIqIG5hbWUsIGNvbnN0IFZlY3RvcjxTdHJp bmc+JiB2YWx1ZXMsIERvY3VtZW50V3JpdGVyJiB3cml0ZXIpCit7CisgICAgd3JpdGVyLmFkZERh dGEobmFtZSwgc3RybGVuKG5hbWUpKTsKKyAgICBhZGRMaXRlcmFsKCI6IFsiLCB3cml0ZXIpOwor ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCB2YWx1ZXMuc2l6ZSgpOyArK2kpIHsKKyAgICAg ICAgaWYgKGkpCisgICAgICAgICAgICBhZGRMaXRlcmFsKCIsIiwgd3JpdGVyKTsKKyAgICAgICAg YWRkSmF2YVNjcmlwdFN0cmluZyh2YWx1ZXNbaV0sIHdyaXRlcik7CisgICAgfQorICAgIGFkZExp dGVyYWwoIl0sXG4iLCB3cml0ZXIpOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKKyNl bmRpZiAvLyBFTkFCTEUoUEFHRV9QT1BVUCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGFnZVBvcHVwQ2xpZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VQb3B1cENsaWVu dC5oCmluZGV4IGQzMjlhZGE5MWEzOTA1MDRiYTk2OGYwYjQxNWUxODU4YTgyOGM5ZmYuLjAyYWVl MzIyNTZjZGFmYTk2ZTE2ZDRlM2ZiNDhkNGY4NmYzMGEzZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZVBvcHVwQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Q YWdlUG9wdXBDbGllbnQuaApAQCAtMzMsNiArMzMsNyBAQAogCiAjaWYgRU5BQkxFKFBBR0VfUE9Q VVApCiAKKyNpbmNsdWRlICJEb2N1bWVudFdyaXRlci5oIgogI2luY2x1ZGUgIkludFNpemUuaCIK ICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApAQCAtNTksOCArNjAsMjIgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgdm9pZCBkaWRDbG9zZVBvcHVwKCkgPSAwOwogCiAgICAgdmlydHVh bCB+UGFnZVBvcHVwQ2xpZW50KCkgeyB9CisKKyAgICAvLyBIZWxwZXIgZnVuY3Rpb25zIHRvIGJl IHVzZWQgaW4gUGFnZVBvcHVwQ2xpZW50Ojp3cml0ZURvY3VtZW50KCkuCisgICAgc3RhdGljIHZv aWQgYWRkU3RyaW5nKGNvbnN0IFN0cmluZyYsIERvY3VtZW50V3JpdGVyJik7CisgICAgc3RhdGlj IHZvaWQgYWRkSmF2YVNjcmlwdFN0cmluZyhjb25zdCBTdHJpbmcmLCBEb2N1bWVudFdyaXRlciYp OworICAgIHN0YXRpYyB2b2lkIGFkZFByb3BlcnR5KGNvbnN0IGNoYXIqIG5hbWUsIGNvbnN0IFN0 cmluZyYgdmFsdWUsIERvY3VtZW50V3JpdGVyJik7CisgICAgc3RhdGljIHZvaWQgYWRkUHJvcGVy dHkoY29uc3QgY2hhciogbmFtZSwgdW5zaWduZWQgdmFsdWUsIERvY3VtZW50V3JpdGVyJik7Cisg ICAgc3RhdGljIHZvaWQgYWRkUHJvcGVydHkoY29uc3QgY2hhciogbmFtZSwgYm9vbCB2YWx1ZSwg RG9jdW1lbnRXcml0ZXImKTsKKyAgICBzdGF0aWMgdm9pZCBhZGRQcm9wZXJ0eShjb25zdCBjaGFy KiBuYW1lLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgdmFsdWVzLCBEb2N1bWVudFdyaXRlciYpOwog fTsKIAoraW5saW5lIHZvaWQgUGFnZVBvcHVwQ2xpZW50OjphZGRTdHJpbmcoY29uc3QgU3RyaW5n JiBzdHIsIERvY3VtZW50V3JpdGVyJiB3cml0ZXIpCit7CisgICAgQ1N0cmluZyBzdHI4ID0gc3Ry LnV0ZjgoKTsKKyAgICB3cml0ZXIuYWRkRGF0YShzdHI4LmRhdGEoKSwgc3RyOC5sZW5ndGgoKSk7 Cit9CisKIH0KICNlbmRpZgogI2VuZGlmCg==