Attachment 339737 Details for Bug 185388 – Patch

[patch] Patch

bug-185388-20180507120621.patch (text/plain), 1.67 KB, created by BJ Burg on 2018-05-07 12:06:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: BJ Burg

Created: 2018-05-07 12:06:22 PDT

Size: 1.67 KB

patch

obsolete

>Subversion Revision: 231392
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 82a03283a4edd8deb0b674aae0e4c4c483002d81..d8b9a4970fc75c3a368e38ce1b7f5e1efe84804e 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-05-07  Brian Burg  <bburg@apple.com>
>+
>+        REGRESSION(r211075): Web Inspector throws an exception when inspecting WebViews on iOS 8.4 simulator
>+        https://bugs.webkit.org/show_bug.cgi?id=185388
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Views/LogContentView.js:
>+        (WI.LogContentView.prototype.get navigationItems):
>+        Add guard for HeapAgent, which was added in iOS 9.
>+
> 2018-05-04  Devin Rousso  <webkit@devinrousso.com>
> 
>         Web Inspector: simplify the WI.Collection interface
>diff --git a/Source/WebInspectorUI/UserInterface/Views/LogContentView.js b/Source/WebInspectorUI/UserInterface/Views/LogContentView.js
>index 3c86f9ee35388bf7023176eb9a59b8188af8e277..b1955477ba60307e5479c1934394ac0d13e92eaa 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/LogContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/LogContentView.js
>@@ -128,7 +128,8 @@ WI.LogContentView = class LogContentView extends WI.ContentView
>         if (this._hasNonDefaultLogChannelMessage && this._messageSourceBar)
>             navigationItems.push(this._messageSourceBar, new WI.DividerNavigationItem);
> 
>-        if (HeapAgent.gc)
>+        // COMPATIBILITY (iOS 9): HeapAgent did not exist.
>+        if (WI.mainTarget.HeapAgent)
>             navigationItems.push(this._garbageCollectNavigationItem);
> 
>         navigationItems.push(this._clearLogNavigationItem);

Flags:

joepeck: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 185388: 339737