129857 2014-03-06 18:13:44 -0800 Web Inspector: JSContext inspection - TypeError: null is not an object (evaluating 'contentView.showSourceCode') 2014-04-04 20:52:34 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 987983 0 joepeck 2014-03-06 18:13:44 -0800 There is no "MainFrame" when inspecting a JSContext. [Error] TypeError: null is not an object (evaluating 'contentView.showSourceCode') showMainFrameSourceCode (ResourceSidebarPanel.js, line 123) showDefaultContentView (DebuggerSidebarPanel.js, line 134) _revealAndSelectRepresentedObjectInNavigationSidebar (Main.js, line 911) _updateNavigationSidebarForCurrentContentView (Main.js, line 940) _navigationSidebarPanelSelected (Main.js, line 949) dispatch (Object.js, line 180) dispatchEventToListeners (Object.js, line 187) selectedSidebarPanel (Sidebar.js, line 153) show (SidebarPanel.js, line 96) show (NavigationSidebarPanel.js, line 397) _debuggerDidPause (Main.js, line 748) dispatch (Object.js, line 180) dispatchEventToListeners (Object.js, line 187) debuggerDidPause (DebuggerManager.js, line 378) paused (DebuggerObserver.js, line 58) dispatch (InspectorBackend.js, line 256) dispatchNextQueuedMessageFromBackend (MessageDispatcher.js, line 31) (anonymous function) ([native code], line 0) 987997 1 226074 joepeck 2014-03-06 19:01:17 -0800 Created attachment 226074 [PATCH] Proposed Fix I'm open to better ideas. This seemed to work okay. 988006 2 226074 joepeck 2014-03-06 19:52:48 -0800 Comment on attachment 226074 [PATCH] Proposed Fix Hmmm, no I think this might break split console toggling. 989745 3 226074 timothy 2014-03-12 11:23:13 -0700 Comment on attachment 226074 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=226074&action=review I think this is fine. Only concern I have is the use of this.parentSidebar.selectedSidebarPanel.show(). > Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js:112 > + this.parentSidebar.selectedSidebarPanel.show(); I am not sure this is right. Why do we need to force the sidebar to show? A comment would be good about why it is forced to show and why this uses this.parentSidebar.selectedSidebarPanel. > Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js:117 > + this.parentSidebar.selectedSidebarPanel.show(); Ditto. 997741 4 joepeck 2014-04-04 16:22:18 -0700 This patch still hasn't landed yet. I still don't like the patch, let me investigate some more. 997742 5 webkit-bug-importer 2014-04-04 16:23:32 -0700 <rdar://problem/16530662> 997785 6 228642 joepeck 2014-04-04 18:44:21 -0700 Created attachment 228642 [PATCH] Simpler Solution 997786 7 228644 joepeck 2014-04-04 18:53:20 -0700 Created attachment 228644 [PATCH] Rebaselined 997814 8 228644 commit-queue 2014-04-04 20:52:31 -0700 Comment on attachment 228644 [PATCH] Rebaselined Clearing flags on attachment: 228644 Committed r166824: <http://trac.webkit.org/changeset/166824> 997815 9 commit-queue 2014-04-04 20:52:34 -0700 All reviewed patches have been landed. Closing bug. 226074 2014-03-06 19:01:17 -0800 2014-04-04 18:44:21 -0700 [PATCH] Proposed Fix proposed.patch text/plain 3892 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDExZmY1YjguLmZhZDdmNDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTAzLTA2ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSlNDb250 ZXh0IGluc3BlY3Rpb24gLSBUeXBlRXJyb3I6IG51bGwgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVh dGluZyAnY29udGVudFZpZXcuc2hvd1NvdXJjZUNvZGUnKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5ODU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBpbnNwZWN0aW5nIGEgSlNDb250ZXh0LCB0 aGVyZSBpcyBubyBtYWluIGZyYW1lIHJlc291cmNlLCBzbworICAgICAgICBhdHRlbXB0aW5nIHRv IHNob3cgaXQgd2FzIHJlc3VsdGluZyBpbiBhIEphdmFTY3JpcHQgZXJyb3IuCisgICAgICAgIElu c3RlYWQsIGNoZWNrIHRvIHNlZSBpZiB0aGVyZSBpcyBhIG1haW4gZnJhbWUgcmVzb3VyY2UsIGZh bGxiYWNrCisgICAgICAgIHRvIHNlbGVjdGluZyB0aGUgZmlyc3QgdHJlZSBlbGVtZW50LCBhbmQg ZmFsbGJhY2sgdG8gc2ltcGx5CisgICAgICAgIHNob3dpbmcgdGhlIHNpZGViYXIuIEluIHRoZSBm YWxsYmFjayBjYXNlcywgYWxzbyByZXZlYWwgd2hhdGV2ZXIKKyAgICAgICAgc2lkZWJhciBpcyBz ZWxlY3RlZCBhdCB0aGUgc2FtZSB0aW1lIChEZWJ1Z2dlciAvIFJlc291cmNlKS4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnRv Z2dsZUNvbnNvbGVWaWV3KToKKyAgICAgICAgV2hlbiB0b2dnbGluZyB0aGUgY29uc29sZSBhbmQg dGhlcmUgaXMgbm8gaGlzdG9yeSwgc2hvdyB0aGUgZGVmYXVsdAorICAgICAgICBjb250ZW50IHZp ZXcgaW4gdGhlIFJlc291cmNlcyBzaWRlYmFyLiBEb24ndCBhc3N1bWUgYSBtYWluIGZyYW1lLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbC5wcm90b3R5cGUuc2hv d0RlZmF1bHRDb250ZW50Vmlldyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNv dXJjZVNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGVi YXJQYW5lbC5wcm90b3R5cGUuc2hvd0RlZmF1bHRDb250ZW50Vmlldyk6CisgICAgICAgIEJldHRl ciBmYWxsYmFja3MgZm9yIGEgZGVmYXVsdCBjb250ZW50IHZpZXcuCisKIDIwMTQtMDMtMDQgIEJy aWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgSW5zcGVjdG9yIGRvZXMgbm90 IHJlc3RvcmUgYnJlYWtwb2ludHMgYWZ0ZXIgYSBwYWdlIHJlbG9hZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IGMyNzA1NWQuLjJh YWJmYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jh c2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNl L01haW4uanMKQEAgLTY1OSw3ICs2NTksNyBAQCBXZWJJbnNwZWN0b3IudG9nZ2xlQ29uc29sZVZp ZXcgPSBmdW5jdGlvbigpCiAgICAgICAgIGlmICh0aGlzLmNvbnRlbnRCcm93c2VyLmNhbkdvQmFj aygpKQogICAgICAgICAgICAgdGhpcy5jb250ZW50QnJvd3Nlci5nb0JhY2soKTsKICAgICAgICAg ZWxzZQotICAgICAgICAgICAgdGhpcy5yZXNvdXJjZVNpZGViYXJQYW5lbC5zaG93TWFpbkZyYW1l U291cmNlQ29kZSgpOworICAgICAgICAgICAgdGhpcy5yZXNvdXJjZVNpZGViYXJQYW5lbC5zaG93 RGVmYXVsdENvbnRlbnRWaWV3KCk7CiAKICAgICAgICAgaWYgKHRoaXMuX3dhc1Nob3dpbmdOYXZp Z2F0aW9uU2lkZWJhckJlZm9yZUZ1bGxIZWlnaHRDb25zb2xlKQogICAgICAgICAgICAgdGhpcy5u YXZpZ2F0aW9uU2lkZWJhci5jb2xsYXBzZWQgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRl YmFyUGFuZWwuanMKaW5kZXggOTJkNjA3Zi4uODEyNGQ5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJT aWRlYmFyUGFuZWwuanMKQEAgLTEzMSw3ICsxMzEsNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJT aWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgc2hvd0RlZmF1bHRDb250ZW50Vmlldzog ZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlU2lkZWJhclBh bmVsLnNob3dNYWluRnJhbWVTb3VyY2VDb2RlKCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5yZXNv dXJjZVNpZGViYXJQYW5lbC5zaG93RGVmYXVsdENvbnRlbnRWaWV3KCk7CiAgICAgfSwKIAogICAg IHRyZWVFbGVtZW50Rm9yUmVwcmVzZW50ZWRPYmplY3Q6IGZ1bmN0aW9uKHJlcHJlc2VudGVkT2Jq ZWN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcwppbmRleCBlN2I4MzEwLi5lZGRl MjBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcwpAQCAtMTAyLDcgKzEwMiwx OSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogCiAg ICAgc2hvd0RlZmF1bHRDb250ZW50VmlldzogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhp cy5zaG93TWFpbkZyYW1lRE9NVHJlZSgpOworICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLmZyYW1l UmVzb3VyY2VNYW5hZ2VyLm1haW5GcmFtZSkgeworICAgICAgICAgICAgdGhpcy5zaG93TWFpbkZy YW1lU291cmNlQ29kZSgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAg ICAgdmFyIGZpcnN0VHJlZUVsZW1lbnQgPSB0aGlzLl9yZXNvdXJjZXNDb250ZW50VHJlZU91dGxp bmUuY2hpbGRyZW5bMF07CisgICAgICAgIGlmIChmaXJzdFRyZWVFbGVtZW50KSB7CisgICAgICAg ICAgICB0aGlzLnBhcmVudFNpZGViYXIuc2VsZWN0ZWRTaWRlYmFyUGFuZWwuc2hvdygpOworICAg ICAgICAgICAgZmlyc3RUcmVlRWxlbWVudC5yZXZlYWxBbmRTZWxlY3QoKTsKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMucGFyZW50U2lkZWJhci5zZWxlY3Rl ZFNpZGViYXJQYW5lbC5zaG93KCk7CiAgICAgfSwKIAogICAgIGdldCBjb250ZW50VHJlZU91dGxp bmVUb0F1dG9QcnVuZSgpCg== 228642 2014-04-04 18:44:21 -0700 2014-04-04 18:53:20 -0700 [PATCH] Simpler Solution basic.patch text/plain 3362 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDFkZjlkMDIuLjExZDc4MmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTA0LTA0ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSlNDb250 ZXh0IGluc3BlY3Rpb24gLSBUeXBlRXJyb3I6IG51bGwgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVh dGluZyAnY29udGVudFZpZXcuc2hvd1NvdXJjZUNvZGUnKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5ODU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBpbnNwZWN0aW5nIGEgSlNDb250ZXh0LCB0 aGVyZSBpcyBubyBtYWluIGZyYW1lIHJlc291cmNlLCBzbworICAgICAgICBhdHRlbXB0aW5nIHRv IHNob3cgaXQgd2FzIHJlc3VsdGluZyBpbiBhIHJ1bnRpbWUgZXJyb3IuCisgICAgICAgIEluc3Rl YWQsIGNoZWNrIHRvIHNlZSBpZiB0aGVyZSBpcyBhIG1haW4gZnJhbWUgcmVzb3VyY2UsIGZhbGxi YWNrCisgICAgICAgIHRvIHNlbGVjdGluZyB0aGUgZmlyc3QgdHJlZSBlbGVtZW50LgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu dG9nZ2xlQ29uc29sZVZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdn ZXJTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFy UGFuZWwucHJvdG90eXBlLnNob3dEZWZhdWx0Q29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VTaWRlYmFyUGFuZWwucHJvdG90eXBlLnNob3dEZWZhdWx0Q29udGVudFZp ZXcpOgorCiAyMDE0LTA0LTAyICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4K IAogICAgICAgICBSZW1vdmUgSW5wdXQgZG9tYWluIGZyb20gdGhlIFdlYiBJbnNwZWN0b3IgcHJv dG9jb2wuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01h aW4uanMKaW5kZXggYTc4MmEwOS4uYTdkODYzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtNjY2LDcgKzY2Niw3IEBAIFdlYklu c3BlY3Rvci50b2dnbGVDb25zb2xlVmlldyA9IGZ1bmN0aW9uKCkKICAgICAgICAgaWYgKHRoaXMu Y29udGVudEJyb3dzZXIuY2FuR29CYWNrKCkpCiAgICAgICAgICAgICB0aGlzLmNvbnRlbnRCcm93 c2VyLmdvQmFjaygpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLnJlc291cmNlU2lk ZWJhclBhbmVsLnNob3dNYWluRnJhbWVTb3VyY2VDb2RlKCk7CisgICAgICAgICAgICB0aGlzLnJl c291cmNlU2lkZWJhclBhbmVsLnNob3dEZWZhdWx0Q29udGVudFZpZXcoKTsKIAogICAgICAgICBp ZiAodGhpcy5fd2FzU2hvd2luZ05hdmlnYXRpb25TaWRlYmFyQmVmb3JlRnVsbEhlaWdodENvbnNv bGUpCiAgICAgICAgICAgICB0aGlzLm5hdmlnYXRpb25TaWRlYmFyLmNvbGxhcHNlZCA9IGZhbHNl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RGVidWdnZXJTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5qcwppbmRleCA1OGIwMzY4Li41NGMwMjg3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E ZWJ1Z2dlclNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5qcwpAQCAtMTMxLDcgKzEzMSw3IEBA IFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBz aG93RGVmYXVsdENvbnRlbnRWaWV3OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBXZWJJbnNw ZWN0b3IucmVzb3VyY2VTaWRlYmFyUGFuZWwuc2hvd01haW5GcmFtZVNvdXJjZUNvZGUoKTsKKyAg ICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlU2lkZWJhclBhbmVsLnNob3dEZWZhdWx0Q29udGVu dFZpZXcoKTsKICAgICB9LAogCiAgICAgdHJlZUVsZW1lbnRGb3JSZXByZXNlbnRlZE9iamVjdDog ZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmplY3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVs LmpzCmluZGV4IGU3YjgzMTAuLjYxMGRmNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBh bmVsLmpzCkBAIC0xMDIsNyArMTAyLDE0IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJQ YW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBzaG93RGVmYXVsdENvbnRlbnRWaWV3OiBmdW5jdGlv bigpCiAgICAgewotICAgICAgICB0aGlzLnNob3dNYWluRnJhbWVET01UcmVlKCk7CisgICAgICAg IGlmIChXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lKSB7CisgICAg ICAgICAgICB0aGlzLnNob3dNYWluRnJhbWVTb3VyY2VDb2RlKCk7CisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIH0KKworICAgICAgICB2YXIgZmlyc3RUcmVlRWxlbWVudCA9IHRoaXMuX3Jl c291cmNlc0NvbnRlbnRUcmVlT3V0bGluZS5jaGlsZHJlblswXTsKKyAgICAgICAgaWYgKGZpcnN0 VHJlZUVsZW1lbnQpCisgICAgICAgICAgICBmaXJzdFRyZWVFbGVtZW50LnJldmVhbEFuZFNlbGVj dCgpOwogICAgIH0sCiAKICAgICBnZXQgY29udGVudFRyZWVPdXRsaW5lVG9BdXRvUHJ1bmUoKQo= 228644 2014-04-04 18:53:20 -0700 2014-04-04 20:52:31 -0700 [PATCH] Rebaselined basic2.patch text/plain 3354 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDYwOGVmNDguLmZjOGE3ODEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTA0LTA0ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSlNDb250 ZXh0IGluc3BlY3Rpb24gLSBUeXBlRXJyb3I6IG51bGwgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVh dGluZyAnY29udGVudFZpZXcuc2hvd1NvdXJjZUNvZGUnKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5ODU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBpbnNwZWN0aW5nIGEgSlNDb250ZXh0LCB0 aGVyZSBpcyBubyBtYWluIGZyYW1lIHJlc291cmNlLCBzbworICAgICAgICBhdHRlbXB0aW5nIHRv IHNob3cgaXQgd2FzIHJlc3VsdGluZyBpbiBhIHJ1bnRpbWUgZXJyb3IuCisgICAgICAgIEluc3Rl YWQsIGNoZWNrIHRvIHNlZSBpZiB0aGVyZSBpcyBhIG1haW4gZnJhbWUgcmVzb3VyY2UsIGZhbGxi YWNrCisgICAgICAgIHRvIHNlbGVjdGluZyB0aGUgZmlyc3QgdHJlZSBlbGVtZW50LgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu dG9nZ2xlQ29uc29sZVZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdn ZXJTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFy UGFuZWwucHJvdG90eXBlLnNob3dEZWZhdWx0Q29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VTaWRlYmFyUGFuZWwucHJvdG90eXBlLnNob3dEZWZhdWx0Q29udGVudFZp ZXcpOgorCiAyMDE0LTA0LTA0ICBJb24gUm9zY2EgIDxyb3NjYUBhZG9iZS5jb20+CiAKICAgICAg ICAgW0NTUyBCbGVuZGluZ10gQWRkIGNvbXBvc2l0aW5nIHJlYXNvbiBmb3IgaXNvbGF0aW9uLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWlu LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmlu ZGV4IGE3ODJhMDkuLmE3ZDg2MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL01haW4uanMKQEAgLTY2Niw3ICs2NjYsNyBAQCBXZWJJbnNwZWN0b3Iu dG9nZ2xlQ29uc29sZVZpZXcgPSBmdW5jdGlvbigpCiAgICAgICAgIGlmICh0aGlzLmNvbnRlbnRC cm93c2VyLmNhbkdvQmFjaygpKQogICAgICAgICAgICAgdGhpcy5jb250ZW50QnJvd3Nlci5nb0Jh Y2soKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5yZXNvdXJjZVNpZGViYXJQYW5l bC5zaG93TWFpbkZyYW1lU291cmNlQ29kZSgpOworICAgICAgICAgICAgdGhpcy5yZXNvdXJjZVNp ZGViYXJQYW5lbC5zaG93RGVmYXVsdENvbnRlbnRWaWV3KCk7CiAKICAgICAgICAgaWYgKHRoaXMu X3dhc1Nob3dpbmdOYXZpZ2F0aW9uU2lkZWJhckJlZm9yZUZ1bGxIZWlnaHRDb25zb2xlKQogICAg ICAgICAgICAgdGhpcy5uYXZpZ2F0aW9uU2lkZWJhci5jb2xsYXBzZWQgPSBmYWxzZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2Vy U2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKaW5kZXggNThiMDM2OC4uNTRjMDI4NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJT aWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKQEAgLTEzMSw3ICsxMzEsNyBAQCBXZWJJbnNw ZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgc2hvd0RlZmF1 bHRDb250ZW50VmlldzogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnJl c291cmNlU2lkZWJhclBhbmVsLnNob3dNYWluRnJhbWVTb3VyY2VDb2RlKCk7CisgICAgICAgIFdl Ykluc3BlY3Rvci5yZXNvdXJjZVNpZGViYXJQYW5lbC5zaG93RGVmYXVsdENvbnRlbnRWaWV3KCk7 CiAgICAgfSwKIAogICAgIHRyZWVFbGVtZW50Rm9yUmVwcmVzZW50ZWRPYmplY3Q6IGZ1bmN0aW9u KHJlcHJlc2VudGVkT2JqZWN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcwppbmRl eCBlN2I4MzEwLi42MTBkZjRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcwpA QCAtMTAyLDcgKzEwMiwxNCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyUGFuZWwucHJv dG90eXBlID0gewogCiAgICAgc2hvd0RlZmF1bHRDb250ZW50VmlldzogZnVuY3Rpb24oKQogICAg IHsKLSAgICAgICAgdGhpcy5zaG93TWFpbkZyYW1lRE9NVHJlZSgpOworICAgICAgICBpZiAoV2Vi SW5zcGVjdG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLm1haW5GcmFtZSkgeworICAgICAgICAgICAg dGhpcy5zaG93TWFpbkZyYW1lU291cmNlQ29kZSgpOworICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICB9CisKKyAgICAgICAgdmFyIGZpcnN0VHJlZUVsZW1lbnQgPSB0aGlzLl9yZXNvdXJjZXND b250ZW50VHJlZU91dGxpbmUuY2hpbGRyZW5bMF07CisgICAgICAgIGlmIChmaXJzdFRyZWVFbGVt ZW50KQorICAgICAgICAgICAgZmlyc3RUcmVlRWxlbWVudC5yZXZlYWxBbmRTZWxlY3QoKTsKICAg ICB9LAogCiAgICAgZ2V0IGNvbnRlbnRUcmVlT3V0bGluZVRvQXV0b1BydW5lKCkK