Attachment 357292 Details for Bug 192691 – [PATCH] Proposed Fix

[patch] [PATCH] Proposed Fix

about-blank-1.patch (text/plain), 1.49 KB, created by Joseph Pecoraro on 2018-12-13 20:05:42 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2018-12-13 20:05:42 PST

Size: 1.49 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 09f36e1faf1..801d92af841 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-12-13  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        Web Inspector: Prefer "about:blank" instead of an empty string for WebPageDebuggable url
>+        https://bugs.webkit.org/show_bug.cgi?id=192691
>+        <rdar://problem/46719798>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/WebPageDebuggable.cpp:
>+        (WebKit::WebPageDebuggable::url const):
>+        Instead of an empty string, return "about:blank" in bail cases.
>+        When inspecting the page that matches the contents.
>+
> 2018-12-13  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         [iOS] Web Inspector: Occasional UIProcess crashes under WebPageProxy::showInspectorIndication
>diff --git a/Source/WebKit/UIProcess/WebPageDebuggable.cpp b/Source/WebKit/UIProcess/WebPageDebuggable.cpp
>index 166417b7ba7..351f9235242 100644
>--- a/Source/WebKit/UIProcess/WebPageDebuggable.cpp
>+++ b/Source/WebKit/UIProcess/WebPageDebuggable.cpp
>@@ -55,10 +55,13 @@ String WebPageDebuggable::name() const
> String WebPageDebuggable::url() const
> {
>     if (!m_page.mainFrame())
>-        return String();
>+        return "about:blank"_s;
> 
>     String url = m_page.mainFrame()->url().string();
>-    return url.isEmpty() ? "about:blank"_s : url;
>+    if (url.isEmpty())
>+        return "about:blank"_s;
>+
>+    return url;
> }
> 
> bool WebPageDebuggable::hasLocalDebugger() const

Actions: View | Formatted Diff | Diff

Attachments on bug 192691: 357292