Attachment 341790 Details for Bug 186197 – Patch

[patch] Patch

bug-186197-20180601150606.patch (text/plain), 4.42 KB, created by Chris Dumez on 2018-06-01 15:06:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-06-01 15:06:07 PDT

Size: 4.42 KB

patch

obsolete

>Subversion Revision: 232397
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1cbb31d3f7ae0b794656073ef19ddfd79acc9127..d372d1348ad8efdb1b5251ee781eefb41b90fed0 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-06-01  Chris Dumez  <cdumez@apple.com>
>+
>+        REGRESSION (r231456): Colloquy is broken
>+        https://bugs.webkit.org/show_bug.cgi?id=186197
>+        <rdar://problem/40722960>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Restore pre-r231456 behavior for Colloquy app so that it works again.
>+
>+        * html/HTMLFrameElementBase.cpp:
>+        (WebCore::HTMLFrameElementBase::openURL):
>+        * page/Settings.yaml:
>+
> 2018-06-01  Chris Dumez  <cdumez@apple.com>
> 
>         Regression(r230567): Unable to log into twitter.com in private sessions
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 21de4c0ee2d4565f29307255030b1509963e0687..27a0699fa39a2064396653502b7c1bc41bd8302e 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-06-01  Chris Dumez  <cdumez@apple.com>
>+
>+        REGRESSION (r231456): Colloquy is broken
>+        https://bugs.webkit.org/show_bug.cgi?id=186197
>+        <rdar://problem/40722960>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Restore pre-r231456 behavior for Colloquy app so that it works again.
>+
>+        * WebView/WebView.mm:
>+        (-[WebView _needsFrameNameFallbackToIdQuirk]):
>+        (-[WebView _preferencesChanged:]):
>+
> 2018-05-30  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         [JSC] Pass VM& parameter as much as possible
>diff --git a/Source/WebCore/html/HTMLFrameElementBase.cpp b/Source/WebCore/html/HTMLFrameElementBase.cpp
>index 091b35a67b42f640d97a0ea16c0f7df52b544e46..f122deea373f0999d9598329af2cb18b0d353f21 100644
>--- a/Source/WebCore/html/HTMLFrameElementBase.cpp
>+++ b/Source/WebCore/html/HTMLFrameElementBase.cpp
>@@ -96,7 +96,11 @@ void HTMLFrameElementBase::openURL(LockHistory lockHistory, LockBackForwardList
>     if (!parentFrame)
>         return;
> 
>-    parentFrame->loader().subframeLoader().requestFrame(*this, m_URL, getNameAttribute(), lockHistory, lockBackForwardList);
>+    String frameName = getNameAttribute();
>+    if (frameName.isNull() && UNLIKELY(document().settings().needsFrameNameFallbackToIdQuirk()))
>+        frameName = getIdAttribute();
>+
>+    parentFrame->loader().subframeLoader().requestFrame(*this, m_URL, frameName, lockHistory, lockBackForwardList);
> }
> 
> void HTMLFrameElementBase::parseAttribute(const QualifiedName& name, const AtomicString& value)
>diff --git a/Source/WebCore/page/Settings.yaml b/Source/WebCore/page/Settings.yaml
>index ff770d1ace7bde7caa446df097aa854296f3da3d..4b7465fcd0b6172bb995320647cbdf4c3ed8f03e 100644
>--- a/Source/WebCore/page/Settings.yaml
>+++ b/Source/WebCore/page/Settings.yaml
>@@ -105,6 +105,8 @@ allowCrossOriginSubresourcesToAskForCredentials:
>   initial: false
> needsStorageAccessFromFileURLsQuirk:
>   initial: true
>+needsFrameNameFallbackToIdQuirk:
>+  initial: false
> useAnonymousModeWhenFetchingMaskImages:
>   initial: true
> javaScriptCanOpenWindowsAutomatically:
>diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
>index b4020d9adbf867e6a52ca419ceb658d31e66ef4a..3b60a0b4c50ae8936692040183b29371886ef0fb 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebView.mm
>+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
>@@ -2704,6 +2704,12 @@ - (BOOL)_needsLinkElementTextCSSQuirk
>     return needsQuirk;
> }
> 
>+- (BOOL)_needsFrameNameFallbackToIdQuirk
>+{
>+    static BOOL needsQuirk = _CFAppVersionCheckLessThan(CFSTR("info.colloquy"), -1, 2.5);
>+    return needsQuirk;
>+}
>+
> - (BOOL)_needsIsLoadingInAPISenseQuirk
> {
>     static BOOL needsQuirk = _CFAppVersionCheckLessThan(CFSTR("com.apple.iAdProducer"), -1, 2.1);
>@@ -3004,6 +3010,7 @@ - (void)_preferencesChanged:(WebPreferences *)preferences
> 
>     settings.setNeedsAdobeFrameReloadingQuirk([self _needsAdobeFrameReloadingQuirk]);
>     settings.setTreatsAnyTextCSSLinkAsStylesheet([self _needsLinkElementTextCSSQuirk]);
>+    settings.setNeedsFrameNameFallbackToIdQuirk([self _needsFrameNameFallbackToIdQuirk]);
>     settings.setNeedsKeyboardEventDisambiguationQuirks([self _needsKeyboardEventDisambiguationQuirks]);
>     settings.setEnforceCSSMIMETypeInNoQuirksMode(!_CFAppVersionCheckLessThan(CFSTR("com.apple.iWeb"), -1, 2.1));
>     settings.setNeedsIsLoadingInAPISenseQuirk([self _needsIsLoadingInAPISenseQuirk]);

Actions: View | Formatted Diff | Diff

Attachments on bug 186197: 341790