130119 2014-03-12 00:09:17 -0700 Web Inspector: OS X View Indication 2014-03-12 16:40:41 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned graouts joepeck timothy webkit-bug-importer oldest_to_newest 989549 0 joepeck 2014-03-12 00:09:17 -0700 Implement the WebView indication for OS X. This way, a debugger can indicates a WebView when choosing a debug target. E.g. the WebView can visibly get a blue highlight like a node highlight. 989550 1 joepeck 2014-03-12 00:09:53 -0700 <rdar://problem/16292728> 989551 2 226480 joepeck 2014-03-12 00:15:40 -0700 Created attachment 226480 [PATCH] Proposed Fix 989556 3 226480 graouts 2014-03-12 01:14:43 -0700 Comment on attachment 226480 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=226480&action=review > Source/WebCore/inspector/InspectorOverlayPage.js:648 > +function showPageIndication() > +{ > + document.body.classList.add("indicate"); > +} > + > +function hidePageIndication() > +{ > + document.body.classList.remove("indicate"); > +} > + Why not use a property a "showsPageIndication" property here? Is it because it's simpler to call a JS method from C++ code? 989728 4 joepeck 2014-03-12 11:08:12 -0700 (In reply to comment #3) > Why not use a "showsPageIndication" property here? Is it because it's simpler to call a JS method from C++ code? Correct. I was just being consistent with existing code, which keeps things simple. Also, this means that the "dispatch" function is a nice funnel for all incoming messages to the overlay page. 989789 5 226480 timothy 2014-03-12 12:07:28 -0700 Comment on attachment 226480 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=226480&action=review > Source/WebCore/inspector/InspectorOverlay.cpp:330 > + return m_highlightNode || m_highlightNode || m_indicating || !m_pausedInDebuggerMessage.isNull(); We could remove m_pausedInDebuggerMessage (and friends), it is dead code to us. 989856 6 joepeck 2014-03-12 16:40:41 -0700 <http://trac.webkit.org/changeset/165510> 226480 2014-03-12 00:15:40 -0700 2014-03-12 15:25:33 -0700 [PATCH] Proposed Fix indicate.patch text/plain 9025 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmOWZjMzljLi5kM2NhZGE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQg QEAKKzIwMTQtMDMtMTIgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBPUyBYIFZpZXcgSW5kaWNhdGlvbgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMTE5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpz ZXRJbmRpY2F0aW5nKToKKyAgICAgICAgT1MgWCB3aWxsIGhhbmRsZXMgdGhpcyBpbiB0aGUgSW5z cGVjdG9yT3ZlcmxheS4gaU9TIGRvZXMgbm90IHVzZSB0aGUKKyAgICAgICAgb3ZlcmxheSwgc28g aXQgaGFuZGxlcyB0aGlzIGluIHRoZSBjbGllbnQgKGFscmVhZHkgaW1wbGVtZW50ZWQpLgorCisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuaDoKKyAgICAgICAgUmVtb3ZlIHVu dXNlZCBtX3NpemUsIGFuZCBhZGQgYSBib29sZWFuIGZvciB0aGUgaW5kaWNhdGluZyBzdGF0ZS4K KworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6Okluc3BlY3Rvck92ZXJsYXkpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6c2hvdWxkU2hvd092ZXJsYXkpOgorICAgICAgICBIZWxw ZXIgZm9yIGRldGVybWluaW5nIGlmIHdlIHNob3VsZCBzaG93IHRoZSBvdmVybGF5IG9yIG5vdC4K KworICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6c2V0SW5kaWNhdGluZyk6Cisg ICAgICAgIFNldCB0aGUgc3RhdGUgYW5kIHRyaWdnZXIgYW4gb3ZlcmxheSB1cGRhdGUuCisKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6OnBhaW50KToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3Rvck92ZXJsYXk6OnVwZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JPdmVybGF5OjpkcmF3R3V0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvck92ZXJs YXk6OmV2YWx1YXRlSW5PdmVybGF5KToKKyAgICAgICAgU2ltcGxpZmljYXRpb24gb2YgZXhpc3Rp bmcgbWV0aG9kcy4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5UGFnZS5j c3M6CisgICAgICAgICguaW5kaWNhdGUpOgorICAgICAgICBHaXZlIHRoZSBwYWdlIGEgYmx1ZSB0 aW50LCBtYXRjaGluZyB0aGUgbm9kZSBoaWdobGlnaHQgY29sb3IuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yT3ZlcmxheVBhZ2UuanM6CisgICAgICAgIChzaG93UGFnZUluZGljYXRp b24pOgorICAgICAgICAoaGlkZVBhZ2VJbmRpY2F0aW9uKToKKyAgICAgICAgQWRkIC8gcmVtb3Zl IGEgYm9keSBzdHlsZSBjbGFzcy4KKworICAgICAgICAoZHJhd05vZGVIaWdobGlnaHQpOgorICAg ICAgICBSZW1vdmUgdW51c2VkIHBhcmFtZXRlcnMuCisKIDIwMTQtMDMtMTEgIEpvc2VwaCBQZWNv cmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBEaXNh YmxlIFJFTU9URV9JTlNQRUNUT1IgaW4gZWFybGllciBPUyBYIHJlbGVhc2VzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggNTVkOTRh NC4uNzgyNmE4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcApAQCAtMzcwLDExICszNzAsMTQgQEAgTm9kZSogSW5zcGVjdG9yQ29udHJv bGxlcjo6aGlnaGxpZ2h0ZWROb2RlKCkgY29uc3QKIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVy OjpzZXRJbmRpY2F0aW5nKGJvb2wgaW5kaWNhdGluZykKIHsKLSAgICAvLyBGSVhNRTogRm9yIG5v bi1pT1MgY2xpZW50cywgd2Ugc2hvdWxkIGhhdmUgSW5zcGVjdG9yT3ZlcmxheSBkbyBzb21ldGhp bmcgaGVyZS4KKyNpZiAhUExBVEZPUk0oSU9TKQorICAgIG1fb3ZlcmxheS0+c2V0SW5kaWNhdGlu ZyhpbmRpY2F0aW5nKTsKKyNlbHNlCiAgICAgaWYgKGluZGljYXRpbmcpCiAgICAgICAgIG1faW5z cGVjdG9yQ2xpZW50LT5pbmRpY2F0ZSgpOwogICAgIGVsc2UKICAgICAgICAgbV9pbnNwZWN0b3JD bGllbnQtPmhpZGVJbmRpY2F0aW9uKCk7CisjZW5kaWYKIH0KIAogYm9vbCBJbnNwZWN0b3JDb250 cm9sbGVyOjpwcm9maWxlckVuYWJsZWQoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwCmluZGV4IGJhZGI0M2YuLjY0YWFlYzkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKQEAgLTIzNiw2ICsy MzYsNyBAQCBzdGF0aWMgdm9pZCBidWlsZFF1YWRIaWdobGlnaHQoY29uc3QgRmxvYXRRdWFkJiBx dWFkLCBjb25zdCBIaWdobGlnaHRDb25maWcmIGhpZwogSW5zcGVjdG9yT3ZlcmxheTo6SW5zcGVj dG9yT3ZlcmxheShQYWdlJiBwYWdlLCBJbnNwZWN0b3JDbGllbnQqIGNsaWVudCkKICAgICA6IG1f cGFnZShwYWdlKQogICAgICwgbV9jbGllbnQoY2xpZW50KQorICAgICwgbV9pbmRpY2F0aW5nKGZh bHNlKQogewogfQogCkBAIC0yNDUsOCArMjQ2LDkgQEAgSW5zcGVjdG9yT3ZlcmxheTo6fkluc3Bl Y3Rvck92ZXJsYXkoKQogCiB2b2lkIEluc3BlY3Rvck92ZXJsYXk6OnBhaW50KEdyYXBoaWNzQ29u dGV4dCYgY29udGV4dCkKIHsKLSAgICBpZiAobV9wYXVzZWRJbkRlYnVnZ2VyTWVzc2FnZS5pc051 bGwoKSAmJiAhbV9oaWdobGlnaHROb2RlICYmICFtX2hpZ2hsaWdodFF1YWQgJiYgbV9zaXplLmlz RW1wdHkoKSkKKyAgICBpZiAoIXNob3VsZFNob3dPdmVybGF5KCkpCiAgICAgICAgIHJldHVybjsK KwogICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihjb250ZXh0KTsKICAg ICBGcmFtZVZpZXcqIHZpZXcgPSBvdmVybGF5UGFnZSgpLT5tYWluRnJhbWUoKS52aWV3KCk7CiAg ICAgdmlldy0+dXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5lZWRlZFJlY3Vyc2l2ZSgpOwpAQCAtMzEx LDkgKzMxMywyNiBAQCB2b2lkIEluc3BlY3Rvck92ZXJsYXk6OmRpZFNldFNlYXJjaGluZ0Zvck5v ZGUoYm9vbCBlbmFibGVkKQogICAgIG1fY2xpZW50LT5kaWRTZXRTZWFyY2hpbmdGb3JOb2RlKGVu YWJsZWQpOwogfQogCit2b2lkIEluc3BlY3Rvck92ZXJsYXk6OnNldEluZGljYXRpbmcoYm9vbCBp bmRpY2F0aW5nKQoreworICAgIG1faW5kaWNhdGluZyA9IGluZGljYXRpbmc7CisKKyAgICBpZiAo bV9pbmRpY2F0aW5nKQorICAgICAgICBldmFsdWF0ZUluT3ZlcmxheShBU0NJSUxpdGVyYWwoInNo b3dQYWdlSW5kaWNhdGlvbiIpKTsKKyAgICBlbHNlCisgICAgICAgIGV2YWx1YXRlSW5PdmVybGF5 KEFTQ0lJTGl0ZXJhbCgiaGlkZVBhZ2VJbmRpY2F0aW9uIikpOworCisgICAgdXBkYXRlKCk7Cit9 CisKK2Jvb2wgSW5zcGVjdG9yT3ZlcmxheTo6c2hvdWxkU2hvd092ZXJsYXkoKSBjb25zdAorewor ICAgIHJldHVybiBtX2hpZ2hsaWdodE5vZGUgfHwgbV9oaWdobGlnaHROb2RlIHx8IG1faW5kaWNh dGluZyB8fCAhbV9wYXVzZWRJbkRlYnVnZ2VyTWVzc2FnZS5pc051bGwoKTsKK30KKwogdm9pZCBJ bnNwZWN0b3JPdmVybGF5Ojp1cGRhdGUoKQogewotICAgIGlmICghbV9oaWdobGlnaHROb2RlICYm ICFtX2hpZ2hsaWdodFF1YWQgJiYgbV9wYXVzZWRJbkRlYnVnZ2VyTWVzc2FnZS5pc051bGwoKSAm JiBtX3NpemUuaXNFbXB0eSgpKSB7CisgICAgaWYgKCFzaG91bGRTaG93T3ZlcmxheSgpKSB7CiAg ICAgICAgIG1fY2xpZW50LT5oaWRlSGlnaGxpZ2h0KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CkBAIC0zMjUsMTMgKzM0NCwxMyBAQCB2b2lkIEluc3BlY3Rvck92ZXJsYXk6OnVwZGF0ZSgpCiAg ICAgRnJhbWVWaWV3KiBvdmVybGF5VmlldyA9IG92ZXJsYXlQYWdlKCktPm1haW5GcmFtZSgpLnZp ZXcoKTsKICAgICBJbnRTaXplIHZpZXdwb3J0U2l6ZSA9IHZpZXctPnZpc2libGVDb250ZW50UmVj dCgpLnNpemUoKTsKICAgICBJbnRTaXplIGZyYW1lVmlld0Z1bGxTaXplID0gdmlldy0+dmlzaWJs ZUNvbnRlbnRSZWN0SW5jbHVkaW5nU2Nyb2xsYmFycygpLnNpemUoKTsKLSAgICBJbnRTaXplIHNp emUgPSBtX3NpemUuaXNFbXB0eSgpID8gZnJhbWVWaWV3RnVsbFNpemUgOiBtX3NpemU7CiAgICAg b3ZlcmxheVBhZ2UoKS0+c2V0UGFnZVNjYWxlRmFjdG9yKG1fcGFnZS5wYWdlU2NhbGVGYWN0b3Io KSwgSW50UG9pbnQoKSk7Ci0gICAgc2l6ZS5zY2FsZShtX3BhZ2UucGFnZVNjYWxlRmFjdG9yKCkp OwotICAgIG92ZXJsYXlWaWV3LT5yZXNpemUoc2l6ZSk7CisgICAgZnJhbWVWaWV3RnVsbFNpemUu c2NhbGUobV9wYWdlLnBhZ2VTY2FsZUZhY3RvcigpKTsKKyAgICBvdmVybGF5Vmlldy0+cmVzaXpl KGZyYW1lVmlld0Z1bGxTaXplKTsKIAogICAgIC8vIENsZWFyIGNhbnZhcyBhbmQgcGFpbnQgdGhp bmdzLgotICAgIHJlc2V0KHZpZXdwb3J0U2l6ZSwgbV9zaXplLmlzRW1wdHkoKSA/IEludFNpemUo KSA6IGZyYW1lVmlld0Z1bGxTaXplKTsKKyAgICAvLyBGSVhNRTogUmVtb3ZlIGV4dHJhIHBhcmFt ZXRlcj8KKyAgICByZXNldCh2aWV3cG9ydFNpemUsIEludFNpemUoKSk7CiAKICAgICAvLyBJbmNs dWRlIHNjcm9sbGJhcnMgdG8gYXZvaWQgbWFza2luZyB0aGVtIGJ5IHRoZSBndXR0ZXIuCiAgICAg ZHJhd0d1dHRlcigpOwpAQCAtNDgxLDcgKzUwMCw3IEBAIHN0YXRpYyBQYXNzUmVmUHRyPEluc3Bl Y3Rvck9iamVjdD4gYnVpbGRPYmplY3RGb3JDU1NSZWdpb25Db250ZW50Q2xpcChSZW5kZXJSZWdp CiAKIHZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6ZHJhd0d1dHRlcigpCiB7Ci0gICAgZXZhbHVhdGVJ bk92ZXJsYXkoImRyYXdHdXR0ZXIiLCAiIik7CisgICAgZXZhbHVhdGVJbk92ZXJsYXkoImRyYXdH dXR0ZXIiKTsKIH0KIAogc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGJ1aWxkT2Jq ZWN0Rm9yUmVuZGVyZXJGcmFnbWVudHMoUmVuZGVyT2JqZWN0KiByZW5kZXJlciwgY29uc3QgSGln aGxpZ2h0Q29uZmlnJiBjb25maWcpCkBAIC03OTcsNiArODE2LDEzIEBAIHZvaWQgSW5zcGVjdG9y T3ZlcmxheTo6cmVzZXQoY29uc3QgSW50U2l6ZSYgdmlld3BvcnRTaXplLCBjb25zdCBJbnRTaXpl JiBmcmFtZVZpCiAgICAgZXZhbHVhdGVJbk92ZXJsYXkoInJlc2V0IiwgcmVzZXREYXRhLnJlbGVh c2UoKSk7CiB9CiAKK3ZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6ZXZhbHVhdGVJbk92ZXJsYXkoY29u c3QgU3RyaW5nJiBtZXRob2QpCit7CisgICAgUmVmUHRyPEluc3BlY3RvckFycmF5PiBjb21tYW5k ID0gSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgpOworICAgIGNvbW1hbmQtPnB1c2hTdHJpbmcobWV0 aG9kKTsKKyAgICBvdmVybGF5UGFnZSgpLT5tYWluRnJhbWUoKS5zY3JpcHQoKS5ldmFsdWF0ZShT Y3JpcHRTb3VyY2VDb2RlKG1ha2VTdHJpbmcoImRpc3BhdGNoKCIsIGNvbW1hbmQtPnRvSlNPTlN0 cmluZygpLCAiKSIpKSk7Cit9CisKIHZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6ZXZhbHVhdGVJbk92 ZXJsYXkoY29uc3QgU3RyaW5nJiBtZXRob2QsIGNvbnN0IFN0cmluZyYgYXJndW1lbnQpCiB7CiAg ICAgUmVmUHRyPEluc3BlY3RvckFycmF5PiBjb21tYW5kID0gSW5zcGVjdG9yQXJyYXk6OmNyZWF0 ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJs YXkuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmgKaW5kZXgg YTdlNmM3OC4uNDc1NjkyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvck92ZXJsYXkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y T3ZlcmxheS5oCkBAIC0xMjEsMTYgKzEyMSwyMCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGRpZFNl dFNlYXJjaGluZ0Zvck5vZGUoYm9vbCBlbmFibGVkKTsKIAorICAgIHZvaWQgc2V0SW5kaWNhdGlu Zyhib29sIGluZGljYXRpbmcpOworCiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rv ck9iamVjdD4gYnVpbGRPYmplY3RGb3JIaWdobGlnaHRlZE5vZGUoKSBjb25zdDsKIAogICAgIHZv aWQgZnJlZVBhZ2UoKTsKIHByaXZhdGU6CisgICAgYm9vbCBzaG91bGRTaG93T3ZlcmxheSgpIGNv bnN0OwogICAgIHZvaWQgZHJhd0d1dHRlcigpOwogICAgIHZvaWQgZHJhd05vZGVIaWdobGlnaHQo KTsKICAgICB2b2lkIGRyYXdRdWFkSGlnaGxpZ2h0KCk7CiAgICAgdm9pZCBkcmF3UGF1c2VkSW5E ZWJ1Z2dlck1lc3NhZ2UoKTsKICAgICBQYWdlKiBvdmVybGF5UGFnZSgpOwogICAgIHZvaWQgcmVz ZXQoY29uc3QgSW50U2l6ZSYgdmlld3BvcnRTaXplLCBjb25zdCBJbnRTaXplJiBmcmFtZVZpZXdG dWxsU2l6ZSk7CisgICAgdm9pZCBldmFsdWF0ZUluT3ZlcmxheShjb25zdCBTdHJpbmcmIG1ldGhv ZCk7CiAgICAgdm9pZCBldmFsdWF0ZUluT3ZlcmxheShjb25zdCBTdHJpbmcmIG1ldGhvZCwgY29u c3QgU3RyaW5nJiBhcmd1bWVudCk7CiAgICAgdm9pZCBldmFsdWF0ZUluT3ZlcmxheShjb25zdCBT dHJpbmcmIG1ldGhvZCwgUGFzc1JlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3RvclZhbHVlPiBhcmd1 bWVudCk7CiAKQEAgLTE0Miw3ICsxNDYsNyBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0 cjxGbG9hdFF1YWQ+IG1faGlnaGxpZ2h0UXVhZDsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8UGFnZT4g bV9vdmVybGF5UGFnZTsKICAgICBIaWdobGlnaHRDb25maWcgbV9xdWFkSGlnaGxpZ2h0Q29uZmln OwotICAgIEludFNpemUgbV9zaXplOworICAgIGJvb2wgbV9pbmRpY2F0aW5nOwogfTsKIAogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvck92ZXJsYXlQYWdlLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JPdmVybGF5UGFnZS5jc3MKaW5kZXggYWU2Mjk2OC4uNzMxMjA1MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXlQYWdlLmNzcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheVBhZ2UuY3NzCkBAIC0yNiw2 ICsyNiwxMCBAQCBib2R5LnBsYXRmb3JtLWxpbnV4IHsKICAgICBsZWZ0OiAwOwogfQogCisuaW5k aWNhdGUgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoMTExLCAxNjgsIDIyMCwgMC42Nikg IWltcG9ydGFudDsKK30KKwogLmRpbW1lZCB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgw LCAwLCAwLCAwLjMxKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JPdmVybGF5UGFnZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JPdmVybGF5UGFnZS5qcwppbmRleCBhZDAxOTAwLi4yOTgzZTI0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheVBhZ2UuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXlQYWdlLmpzCkBAIC02MzYsMTYgKzYz NiwyNiBAQCBmdW5jdGlvbiBfZHJhd0ZyYWdtZW50SGlnaGxpZ2h0KGhpZ2hsaWdodCkKICAgICBf ZHJhd1J1bGVycyhoaWdobGlnaHQsIHJ1bGVyQXRSaWdodCwgcnVsZXJBdEJvdHRvbSk7CiB9CiAK K2Z1bmN0aW9uIHNob3dQYWdlSW5kaWNhdGlvbigpCit7CisgICAgZG9jdW1lbnQuYm9keS5jbGFz c0xpc3QuYWRkKCJpbmRpY2F0ZSIpOworfQorCitmdW5jdGlvbiBoaWRlUGFnZUluZGljYXRpb24o KQoreworICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LnJlbW92ZSgiaW5kaWNhdGUiKTsKK30K KwogZnVuY3Rpb24gZHJhd05vZGVIaWdobGlnaHQoaGlnaGxpZ2h0KQogewogICAgIGNvbnRleHQu c2F2ZSgpOwogICAgIGNvbnRleHQudHJhbnNsYXRlKC1oaWdobGlnaHQuc2Nyb2xsLngsIC1oaWdo bGlnaHQuc2Nyb2xsLnkpOwogCiAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBoaWdobGlnaHQuZnJh Z21lbnRzLmxlbmd0aDsgKytpKQotICAgICAgICBfZHJhd0ZyYWdtZW50SGlnaGxpZ2h0KGhpZ2hs aWdodC5mcmFnbWVudHNbaV0sIGhpZ2hsaWdodCk7CisgICAgICAgIF9kcmF3RnJhZ21lbnRIaWdo bGlnaHQoaGlnaGxpZ2h0LmZyYWdtZW50c1tpXSk7CiAKICAgICBpZiAoaGlnaGxpZ2h0LmVsZW1l bnRJbmZvICYmIGhpZ2hsaWdodC5lbGVtZW50SW5mby5yZWdpb25GbG93SW5mbykKLSAgICAgICAg X2RyYXdSZWdpb25zSGlnaGxpZ2h0KGhpZ2hsaWdodC5lbGVtZW50SW5mby5yZWdpb25GbG93SW5m by5yZWdpb25zLCBoaWdobGlnaHQpOworICAgICAgICBfZHJhd1JlZ2lvbnNIaWdobGlnaHQoaGln aGxpZ2h0LmVsZW1lbnRJbmZvLnJlZ2lvbkZsb3dJbmZvLnJlZ2lvbnMpOwogCiAgICAgaWYgKGhp Z2hsaWdodC5lbGVtZW50SW5mbyAmJiBoaWdobGlnaHQuZWxlbWVudEluZm8uc2hhcGVPdXRzaWRl SW5mbykKICAgICAgICAgX2RyYXdTaGFwZUhpZ2hsaWdodChoaWdobGlnaHQuZWxlbWVudEluZm8u c2hhcGVPdXRzaWRlSW5mbyk7Cg==