38635 2010-05-06 02:33:31 -0700 Web Inspector: Do not show content tab for resources not supporting content preview. 2010-05-06 10:25:43 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein commit-queue joepeck keishi pfeldman pmuellr rik timothy yurys oldest_to_newest 221593 0 pfeldman 2010-05-06 02:33:31 -0700 Patch to follow. 221594 1 55220 pfeldman 2010-05-06 02:40:38 -0700 Created attachment 55220 [PATCH] Proposed change. 221595 2 55221 pfeldman 2010-05-06 02:50:15 -0700 Created attachment 55221 [PATCH] Same with binary diff for removed localized string. 221675 3 55221 timothy 2010-05-06 07:45:23 -0700 Comment on attachment 55221 [PATCH] Same with binary diff for removed localized string. So what views/resource types will no have a content tab now? 221682 4 pfeldman 2010-05-06 07:55:19 -0700 (In reply to comment #3) > (From update of attachment 55221 [details]) > So what views/resource types will no have a content tab now? Resources that had ResourceView as a renderer (and resulted in "No content available" at all times) will have no content tab. No other changes here. 221710 5 55221 commit-queue 2010-05-06 09:01:27 -0700 Comment on attachment 55221 [PATCH] Same with binary diff for removed localized string. Rejecting patch 55221 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Timothy Hatcher', u'--force']" exit_code: 255 Parsed 6 diffs from patch file(s). patching file WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. only literal type is supported now at /Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply line 254. Full output: http://webkit-commit-queue.appspot.com/results/2161024 221728 6 pfeldman 2010-05-06 09:31:03 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/English.lproj/localizedStrings.js M WebCore/inspector/front-end/FontView.js M WebCore/inspector/front-end/ImageView.js M WebCore/inspector/front-end/ResourceView.js M WebCore/inspector/front-end/SourceView.js Committed r58884 221733 7 joepeck 2010-05-06 09:38:29 -0700 > WebInspector.FontView.prototype = { > + hasContentTab: function() > + { > + return true; > + }, > + Why a function and not just a boolean? hasContentTab: true, Then those that don't include the boolean would still work (undefined ~~ false). > @@ -118,6 +119,8 @@ WebInspector.ResourceView = function(resource) > this._refreshRequestHeaders(); > this._refreshResponseHeaders(); > this._refreshHTTPInformation(); > + if (!this.hasContentTab()) > + this.contentTabElement.addStyleClass("hidden"); > this._selectTab(); How does this affect tab preferences? If you want to see the content, and you click (1) resource with preview, (2) resource without preview, (3) resource with preview? > + hasContentTab: function() > + { > + // Ancestors should override this method and define this.contentTabSelected for content rendering. > + return false; > + }, I think "Ancestors" is the wrong direction. "Children" or "Sub-something" might be better. 221736 8 timothy 2010-05-06 09:39:55 -0700 Subclasses. 221740 9 pfeldman 2010-05-06 09:43:25 -0700 (In reply to comment #7) > > WebInspector.FontView.prototype = { > > + hasContentTab: function() > > + { > > + return true; > > + }, > > + > > Why a function and not just a boolean? Well, I want it to be immutable. > How does this affect tab preferences? If you want to see the content, and you > click (1) resource with preview, (2) resource without preview, (3) resource > with preview? > I think it'll reset preferences to Headers in that case. Now sure which way is more predictable though. > > I think "Ancestors" is the wrong direction. "Children" or "Sub-something" might > be better. I surely meant derived classes. 221767 10 joepeck 2010-05-06 10:01:50 -0700 > > Why a function and not just a boolean? > > Well, I want it to be immutable. Bad argument. Making this a function doesn't protect against this. Both are easily mutable. > WebInspector.FontView.prototype.hasContentTab = function() { return false; } > I think it'll reset preferences to Headers in that case. Now sure which way is > more predictable though. I certainly wouldn't like that! I think I'd prefer seeing "No Content" instead. 221783 11 pfeldman 2010-05-06 10:25:43 -0700 > > > I think it'll reset preferences to Headers in that case. Now sure which way is > > more predictable though. > > I certainly wouldn't like that! I think I'd prefer seeing "No Content" instead. "No Content" is bad because "Content" tab is being default even for entries with no content. I was demoing inspector's redirects functionality and it was very silly of resources tab to default to "Content" for "Moved permanently" resources having no content. At the same time, preserving "Content" as last selected while traversing through content-less entries should be feasible. 55220 2010-05-06 02:40:38 -0700 2010-05-06 02:50:15 -0700 [PATCH] Proposed change. content_tab text/plain 5312 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OGQxYjFkZC4uYmVhYmVkNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wNS0wNiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBEbyBub3Qgc2hvdyBjb250ZW50IHRh YiBmb3IgcmVzb3VyY2VzIG5vdCBzdXBwb3J0aW5nIGNvbnRlbnQgcHJldmlldy4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg2MzUKKworICAgICAg ICAqIEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0ZvbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZvbnRWaWV3 LnByb3RvdHlwZS5oYXNDb250ZW50VGFiKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0ltYWdlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5JbWFnZVZpZXcucHJvdG90eXBl Lmhhc0NvbnRlbnRUYWIpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VW aWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZS5fc2VsZWN0VGFiKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcucHJvdG90eXBlLmhhc0NvbnRlbnRUYWIpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZS5oYXNDb250ZW50VGFiKToKKwogMjAxMC0wNS0w NSAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAgICBO b3QgcmV2aWV3ZWQuIEFkZCBtaXNzaW5nIGZpbGVzIGdlbmVyYXRlZCBieSAicnVuLWJpbmRpbmdz LXRlc3QiLCBhZnRlciB0aGUgRE9NVGVzdENhbGxiYWNrLmlkbCBhZGRpdGlvbi4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvV2ViQ29yZS9F bmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggYWMwNDA4Yy4uNzIwZTA5YyAx MDA2NDQKQmluYXJ5IGZpbGVzIGEvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanMgYW5kIGIvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgZGlm ZmVyCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRm9udFZpZXcuanMg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRm9udFZpZXcuanMKaW5kZXggODRkYTAxNi4u YjAxMTIwNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZvbnRWaWV3 LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Gb250Vmlldy5qcwpAQCAtMzQs NiArMzQsMTEgQEAgV2ViSW5zcGVjdG9yLkZvbnRWaWV3ID0gZnVuY3Rpb24ocmVzb3VyY2UpCiB9 CiAKIFdlYkluc3BlY3Rvci5Gb250Vmlldy5wcm90b3R5cGUgPSB7CisgICAgaGFzQ29udGVudFRh YjogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfSwKKwogICAg IGNvbnRlbnRUYWJTZWxlY3RlZDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMu Zm9udFByZXZpZXdFbGVtZW50KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0ltYWdlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbWFnZVZpZXcu anMKaW5kZXggYzEzYzlhNS4uMGMxNWE0MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0ltYWdlVmlldy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SW1hZ2VWaWV3LmpzCkBAIC0zNCw2ICszNCwxMSBAQCBXZWJJbnNwZWN0b3IuSW1hZ2VWaWV3ID0g ZnVuY3Rpb24ocmVzb3VyY2UpCiB9CiAKIFdlYkluc3BlY3Rvci5JbWFnZVZpZXcucHJvdG90eXBl ID0geworICAgIGhhc0NvbnRlbnRUYWI6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVy biB0cnVlOworICAgIH0sCisKICAgICBjb250ZW50VGFiU2VsZWN0ZWQ6IGZ1bmN0aW9uKCkKICAg ICB7CiAgICAgICAgIGlmICh0aGlzLl9jb250YWluZXIpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlVmlldy5qcwppbmRleCA2MThhOTM1Li4wZDk3NWUyIDEwMDY0NAotLS0g YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzCisrKyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKQEAgLTQzLDYgKzQzLDcgQEAg V2ViSW5zcGVjdG9yLlJlc291cmNlVmlldyA9IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHRoaXMu aGVhZGVyc1RhYkVsZW1lbnQudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkhl YWRlcnMiKTsKICAgICB0aGlzLmNvbnRlbnRUYWJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgibGkiKTsKICAgICB0aGlzLmNvbnRlbnRUYWJFbGVtZW50LnRleHRDb250ZW50ID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJDb250ZW50Iik7CisKICAgICB0aGlzLnRhYnNFbGVtZW50LmFw cGVuZENoaWxkKHRoaXMuaGVhZGVyc1RhYkVsZW1lbnQpOwogICAgIHRoaXMudGFic0VsZW1lbnQu YXBwZW5kQ2hpbGQodGhpcy5jb250ZW50VGFiRWxlbWVudCk7CiAKQEAgLTExOCw2ICsxMTksOCBA QCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3ID0gZnVuY3Rpb24ocmVzb3VyY2UpCiAgICAgdGhp cy5fcmVmcmVzaFJlcXVlc3RIZWFkZXJzKCk7CiAgICAgdGhpcy5fcmVmcmVzaFJlc3BvbnNlSGVh ZGVycygpOwogICAgIHRoaXMuX3JlZnJlc2hIVFRQSW5mb3JtYXRpb24oKTsKKyAgICBpZiAoIXRo aXMuaGFzQ29udGVudFRhYigpKQorICAgICAgICB0aGlzLmNvbnRlbnRUYWJFbGVtZW50LmFkZFN0 eWxlQ2xhc3MoImhpZGRlbiIpOwogICAgIHRoaXMuX3NlbGVjdFRhYigpOwogfQogCkBAIC0xNTIs NyArMTU1LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5wcm90b3R5cGUgPSB7CiAgICAg X3NlbGVjdFRhYjogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2hlYWRlcnNW aXNpYmxlKSB7Ci0gICAgICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnNldHRpbmdzLnJlc291cmNl Vmlld1RhYiA9PT0gImhlYWRlcnMiKQorICAgICAgICAgICAgaWYgKCF0aGlzLmhhc0NvbnRlbnRU YWIoKSB8fCBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MucmVzb3VyY2VWaWV3VGFiID09PSAiaGVhZGVy cyIpCiAgICAgICAgICAgICAgICAgdGhpcy5fc2VsZWN0SGVhZGVyc1RhYigpOwogICAgICAgICAg ICAgZWxzZQogICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0Q29udGVudFRhYigpOwpAQCAtMTc1 LDYgKzE3OCwxMiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZSA9IHsKICAg ICAgICAgdGhpcy5faW5uZXJTZWxlY3RDb250ZW50VGFiKCk7CiAgICAgfSwKIAorICAgIGhhc0Nv bnRlbnRUYWI6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIC8vIEFuY2VzdG9ycyBzaG91bGQg b3ZlcnJpZGUgdGhpcyBtZXRob2QgYW5kIGRlZmluZSB0aGlzLmNvbnRlbnRUYWJTZWxlY3RlZCBm b3IgY29udGVudCByZW5kZXJpbmcuCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9LAorCiAg ICAgX2lubmVyU2VsZWN0Q29udGVudFRhYjogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhp cy5jb250ZW50VGFiRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzZWxlY3RlZCIpOwpAQCAtMTg2LDE2 ICsxOTUsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZSA9IHsKICAgICAg ICAgdGhpcy5jb250ZW50VGFiU2VsZWN0ZWQoKTsKICAgICB9LAogCi0gICAgY29udGVudFRhYlNl bGVjdGVkOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAoIXRoaXMuX2NvbnRlbnRQbGFj ZWhvbGRlckVsZW1lbnQpIHsKLSAgICAgICAgICAgIHRoaXMuX2NvbnRlbnRQbGFjZWhvbGRlckVs ZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgICAgIHRoaXMu X2NvbnRlbnRQbGFjZWhvbGRlckVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291cmNlLWNvbnRlbnQt dW5hdmFpbGFibGUiOwotICAgICAgICAgICAgdGhpcy5fY29udGVudFBsYWNlaG9sZGVyRWxlbWVu dC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTm8gQ29udGVudCBBdmFpbGFi bGUiKTsKLSAgICAgICAgICAgIHRoaXMuY29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5f Y29udGVudFBsYWNlaG9sZGVyRWxlbWVudCk7Ci0gICAgICAgIH0KLSAgICB9LAotCiAgICAgX3Jl ZnJlc2hVUkw6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMudXJsVHJlZUVsZW1lbnQu dGl0bGUgPSAiPGRpdiBjbGFzcz1cImhlYWRlci1uYW1lXCI+IiArIFdlYkluc3BlY3Rvci5VSVN0 cmluZygiUmVxdWVzdCBVUkwiKSArICI6PC9kaXY+IiArCmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Tb3VyY2VWaWV3LmpzCmluZGV4IDhhYThiZDIuLjM2MjExODcgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzCkBAIC03OCw2ICs3OCwxMSBAQCBXZWJJbnNw ZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5nZXRS ZXNvdXJjZUNvbnRlbnQodGhpcy5yZXNvdXJjZS5pZGVudGlmaWVyLCB0aGlzLl9jb250ZW50TG9h ZGVkLmJpbmQodGhpcykpOwogICAgIH0sCiAKKyAgICBoYXNDb250ZW50VGFiOiBmdW5jdGlvbigp CisgICAgeworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9LAorCiAgICAgY29udGVudFRhYlNl bGVjdGVkOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLnNldHVwU291cmNlRnJhbWVJ Zk5lZWRlZCgpOwo= 55221 2010-05-06 02:50:15 -0700 2010-05-06 09:01:27 -0700 [PATCH] Same with binary diff for removed localized string. content_tab text/plain 5434 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OGQxYjFkZC4uYmVhYmVkNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wNS0wNiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBEbyBub3Qgc2hvdyBjb250ZW50IHRh YiBmb3IgcmVzb3VyY2VzIG5vdCBzdXBwb3J0aW5nIGNvbnRlbnQgcHJldmlldy4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg2MzUKKworICAgICAg ICAqIEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0ZvbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZvbnRWaWV3 LnByb3RvdHlwZS5oYXNDb250ZW50VGFiKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0ltYWdlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5JbWFnZVZpZXcucHJvdG90eXBl Lmhhc0NvbnRlbnRUYWIpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VW aWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZS5fc2VsZWN0VGFiKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcucHJvdG90eXBlLmhhc0NvbnRlbnRUYWIpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZS5oYXNDb250ZW50VGFiKToKKwogMjAxMC0wNS0w NSAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAgICBO b3QgcmV2aWV3ZWQuIEFkZCBtaXNzaW5nIGZpbGVzIGdlbmVyYXRlZCBieSAicnVuLWJpbmRpbmdz LXRlc3QiLCBhZnRlciB0aGUgRE9NVGVzdENhbGxiYWNrLmlkbCBhZGRpdGlvbi4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvV2ViQ29yZS9F bmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggYWMwNDA4Y2E4YjdlMGQ0OWVl MzVlNTJlZDU1OGEyMzA1OGM3ZWE3MC4uNzIwZTA5YzNjMmNlMzQ2OTRkNmNmZDM5MzRiZWZiMzIz OTFjYjNjOCAxMDA2NDQKR0lUIGJpbmFyeSBwYXRjaApkZWx0YSAxOAphY21kbjdtVEEpKHJWWW9Z T3VvUil3bUUyTzhZMkshaHpMZ2oKCmRlbHRhIDk2CnpjbWRuQWhIMXhJclZZb1lzUVdTR0dia2BQ MUlhdnc1ezZWVHNsZWRLUHt4cVJramFuKEIkSSQtPmcwb1ohbUBaKApTTypSek1wTH5JdlpTJEVh WF5hNTlhdX11bgoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Gb250 Vmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Gb250Vmlldy5qcwppbmRleCA4 NGRhMDE2Li5iMDExMjA0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Rm9udFZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZvbnRWaWV3Lmpz CkBAIC0zNCw2ICszNCwxMSBAQCBXZWJJbnNwZWN0b3IuRm9udFZpZXcgPSBmdW5jdGlvbihyZXNv dXJjZSkKIH0KIAogV2ViSW5zcGVjdG9yLkZvbnRWaWV3LnByb3RvdHlwZSA9IHsKKyAgICBoYXND b250ZW50VGFiOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9 LAorCiAgICAgY29udGVudFRhYlNlbGVjdGVkOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBp ZiAodGhpcy5mb250UHJldmlld0VsZW1lbnQpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvSW1hZ2VWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0lt YWdlVmlldy5qcwppbmRleCBjMTNjOWE1Li4wYzE1YTQwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvSW1hZ2VWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9JbWFnZVZpZXcuanMKQEAgLTM0LDYgKzM0LDExIEBAIFdlYkluc3BlY3Rvci5JbWFn ZVZpZXcgPSBmdW5jdGlvbihyZXNvdXJjZSkKIH0KIAogV2ViSW5zcGVjdG9yLkltYWdlVmlldy5w cm90b3R5cGUgPSB7CisgICAgaGFzQ29udGVudFRhYjogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgfSwKKwogICAgIGNvbnRlbnRUYWJTZWxlY3RlZDogZnVuY3Rp b24oKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2NvbnRhaW5lcikKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMgYi9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzCmluZGV4IDYxOGE5MzUuLjBkOTc1ZTIgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKKysr IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcwpAQCAtNDMsNiAr NDMsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3ID0gZnVuY3Rpb24ocmVzb3VyY2UpCiAg ICAgdGhpcy5oZWFkZXJzVGFiRWxlbWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiSGVhZGVycyIpOwogICAgIHRoaXMuY29udGVudFRhYkVsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJsaSIpOwogICAgIHRoaXMuY29udGVudFRhYkVsZW1lbnQudGV4dENvbnRl bnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvbnRlbnQiKTsKKwogICAgIHRoaXMudGFic0Vs ZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5oZWFkZXJzVGFiRWxlbWVudCk7CiAgICAgdGhpcy50YWJz RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmNvbnRlbnRUYWJFbGVtZW50KTsKIApAQCAtMTE4LDYg KzExOSw4IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcgPSBmdW5jdGlvbihyZXNvdXJjZSkK ICAgICB0aGlzLl9yZWZyZXNoUmVxdWVzdEhlYWRlcnMoKTsKICAgICB0aGlzLl9yZWZyZXNoUmVz cG9uc2VIZWFkZXJzKCk7CiAgICAgdGhpcy5fcmVmcmVzaEhUVFBJbmZvcm1hdGlvbigpOworICAg IGlmICghdGhpcy5oYXNDb250ZW50VGFiKCkpCisgICAgICAgIHRoaXMuY29udGVudFRhYkVsZW1l bnQuYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CiAgICAgdGhpcy5fc2VsZWN0VGFiKCk7CiB9CiAK QEAgLTE1Miw3ICsxNTUsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZSA9 IHsKICAgICBfc2VsZWN0VGFiOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBpZiAodGhpcy5f aGVhZGVyc1Zpc2libGUpIHsKLSAgICAgICAgICAgIGlmIChXZWJJbnNwZWN0b3Iuc2V0dGluZ3Mu cmVzb3VyY2VWaWV3VGFiID09PSAiaGVhZGVycyIpCisgICAgICAgICAgICBpZiAoIXRoaXMuaGFz Q29udGVudFRhYigpIHx8IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5yZXNvdXJjZVZpZXdUYWIgPT09 ICJoZWFkZXJzIikKICAgICAgICAgICAgICAgICB0aGlzLl9zZWxlY3RIZWFkZXJzVGFiKCk7CiAg ICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgdGhpcy5zZWxlY3RDb250ZW50VGFiKCk7 CkBAIC0xNzUsNiArMTc4LDEyIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcucHJvdG90eXBl ID0gewogICAgICAgICB0aGlzLl9pbm5lclNlbGVjdENvbnRlbnRUYWIoKTsKICAgICB9LAogCisg ICAgaGFzQ29udGVudFRhYjogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgLy8gQW5jZXN0b3Jz IHNob3VsZCBvdmVycmlkZSB0aGlzIG1ldGhvZCBhbmQgZGVmaW5lIHRoaXMuY29udGVudFRhYlNl bGVjdGVkIGZvciBjb250ZW50IHJlbmRlcmluZy4KKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAg IH0sCisKICAgICBfaW5uZXJTZWxlY3RDb250ZW50VGFiOiBmdW5jdGlvbigpCiAgICAgewogICAg ICAgICB0aGlzLmNvbnRlbnRUYWJFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInNlbGVjdGVkIik7CkBA IC0xODYsMTYgKzE5NSw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcucHJvdG90eXBlID0g ewogICAgICAgICB0aGlzLmNvbnRlbnRUYWJTZWxlY3RlZCgpOwogICAgIH0sCiAKLSAgICBjb250 ZW50VGFiU2VsZWN0ZWQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fY29u dGVudFBsYWNlaG9sZGVyRWxlbWVudCkgewotICAgICAgICAgICAgdGhpcy5fY29udGVudFBsYWNl aG9sZGVyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICAg ICAgdGhpcy5fY29udGVudFBsYWNlaG9sZGVyRWxlbWVudC5jbGFzc05hbWUgPSAicmVzb3VyY2Ut Y29udGVudC11bmF2YWlsYWJsZSI7Ci0gICAgICAgICAgICB0aGlzLl9jb250ZW50UGxhY2Vob2xk ZXJFbGVtZW50LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJObyBDb250ZW50 IEF2YWlsYWJsZSIpOwotICAgICAgICAgICAgdGhpcy5jb250ZW50RWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLl9jb250ZW50UGxhY2Vob2xkZXJFbGVtZW50KTsKLSAgICAgICAgfQotICAgIH0sCi0K ICAgICBfcmVmcmVzaFVSTDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy51cmxUcmVl RWxlbWVudC50aXRsZSA9ICI8ZGl2IGNsYXNzPVwiaGVhZGVyLW5hbWVcIj4iICsgV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJSZXF1ZXN0IFVSTCIpICsgIjo8L2Rpdj4iICsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMKaW5kZXggOGFhOGJkMi4uMzYyMTE4NyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMKKysrIGIvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMKQEAgLTc4LDYgKzc4LDExIEBA IFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgV2ViSW5zcGVj dG9yLmdldFJlc291cmNlQ29udGVudCh0aGlzLnJlc291cmNlLmlkZW50aWZpZXIsIHRoaXMuX2Nv bnRlbnRMb2FkZWQuYmluZCh0aGlzKSk7CiAgICAgfSwKIAorICAgIGhhc0NvbnRlbnRUYWI6IGZ1 bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0sCisKICAgICBjb250 ZW50VGFiU2VsZWN0ZWQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuc2V0dXBTb3Vy Y2VGcmFtZUlmTmVlZGVkKCk7Cg==