<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[236846] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/236846">236846</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2018-10-04 13:36:56 -0700 (Thu, 04 Oct 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebInspectorUI and WebKitLegacy parts of [Xcode] Update some build settings as recommended by Xcode 10
https://bugs.webkit.org/show_bug.cgi?id=190250

Reviewed by Andy Estes.

Source/WebCore/PAL:

* pal/spi/mac/NSWindowSPI.h: Added a private API declaration.

Source/WebInspectorUI:

* Configurations/Base.xcconfig: Enabled CLANG_WARN_COMMA, CLANG_WARN_INFINITE_RECURSION,
  CLANG_WARN_SUSPICIOUS_MOVE, CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS, and
  CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF.

* WebInspectorUI.xcodeproj/project.pbxproj: Let Xcode update LastUpgradeCheck.

Source/WebKitLegacy:

* WebKitLegacy.xcodeproj/project.pbxproj: Let Xcode update LastUpgradeCheck.

Source/WebKitLegacy/mac:
WebKitLegacy part of [Xcode] Update some build settings as recommended by Xcode 10
https://bugs.webkit.org/show_bug.cgi?id=190250

Reviewed by Andy Estes.

* Configurations/Base.xcconfig: Enabled CLANG_WARN_COMMA, CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF,
  CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS, and CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED.
  Also enabled GCC_WARN_UNDECLARED_SELECTOR by deleting the line that set it to NO, which let
  an earlier line set it to YES.

Enabling -Wundeclared-selector exposed some long-standing mistakes and required the most
changes below.

* DefaultDelegates/WebDefaultContextMenuDelegate.mm: Imported an internal header that
  provides some missing method declarations.

* Misc/WebDownload.mm:
(-[WebDownload initWithRequest:delegate:]): Suppressed warning about this implementation of
  a deprecated method.

* Misc/WebIconDatabase.mm: Suppressed warning around our implementation of a deprecated class.

* Misc/WebNSObjectExtras.mm: Declare a category that is implemented in this file, because
  other code in the file uses a method from it.

* Plugins/WebBaseNetscapePluginView.mm:
(-[WebBaseNetscapePluginView renewGState]): Suppressed warning about this implementation of
  a deprecated method.

* Plugins/WebPluginController.mm:
(installFlip4MacPlugInWorkaroundIfNecessary): Suppressed the undeclared selector warning
  around use of a selector that may be present in some WebKit client.

* Plugins/WebPluginDatabase.mm: Imported an internal header that provides some missing
  method declarations.

* WebCoreSupport/PopupMenuMac.mm: Imported a header that delcares delegate methods we call
  from here.

* WebCoreSupport/WebCachedFramePlatformData.h: Imported an internal header that provides some
  missing method declarations.

* WebCoreSupport/WebChromeClient.mm: Imported a header that declares delegate methods we call
  from here.

* WebCoreSupport/WebFrameLoaderClient.mm: Imported headers that declare delegate methods we
  call from here.
(WebFrameLoaderClient::setTitle): Suppressed the undeclared selector warning around use of
  an obsolete delegate method for binary compatibility.
(pluginView): Ditto.

* WebCoreSupport/WebVisitedLinkStore.mm: Imported a header that declares delegate methods we
  call from here.

* WebView/WebDeviceOrientationInternal.h: Declared -setController in a new
  WebDeviceOrientationProviderMock protocol.

* WebView/WebDeviceOrientationProviderMock.mm:
(-[WebDeviceOrientationProviderMock setController:]): Moved from an internal category to the
  main @implementation.

* WebView/WebDeviceOrientationProviderMockInternal.h: Declared that
  WebDeviceOrientationProviderMock conforms to WebDeviceOrientationProviderMock.

* WebView/WebDynamicScrollBarsView.mm:
(-[WebDynamicScrollBarsView accessibilityIsIgnored]): Suppressed warning about this implementation
  of a deprecated method.

* WebView/WebHTMLView.mm:
(-[WebHTMLView validateUserInterfaceItemWithoutDelegate:]): Suppressed the undeclared
  selector warning around action methods that are not declared anywhere in WebKit.

(-[WebHTMLView dragImage:at:offset:event:pasteboard:source:slideBack:]): Suppressed warning
  about implementing this deprecated method.
(-[WebHTMLView draggingSourceOperationMaskForLocal:]): Ditto.
(-[WebHTMLView draggedImage:endedAt:operation:]): Ditto.
(-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]): Ditto.
(-[WebHTMLView accessibilityAttributeValue:]): Ditto.
(-[WebHTMLView characterIndexForPoint:]): Ditto.
(-[WebHTMLView firstRectForCharacterRange:]): Ditto.
(-[WebHTMLView attributedSubstringFromRange:]): Ditto.
(-[WebHTMLView setMarkedText:selectedRange:]): Ditto.
(-[WebHTMLView doCommandBySelector:]): Ditto.
(-[WebHTMLView insertText:]): Ditto.

* WebView/WebHTMLViewInternal.h: Declared an internal method that’s used from another file.

* WebView/WebJSPDFDoc.mm: Imported a header that declares delegate methods we call from here.

* WebView/WebPDFView.h: Removed previewView ivar.

* WebView/WebPDFView.mm:
  Removed declaration of FileInternal category and merged its implementation with the main
  implementation.
(-[WebPDFView dealloc]): Removed previewView ivar.
(-[WebPDFView initWithFrame:]): Removed code to deal with PDFPreviewView, which doesn’t
  exist in macOS versions we support.
(+[WebPDFView _PDFPreviewViewClass]): Deleted. PDFPreviewView doesn’t exist anymore.
(-[WebPDFView _canLookUpInDictionary]): Suppressed undeclared selector warning around use of
  action methods internal to PDFKit.
(-[WebPDFView _lookUpInDictionaryFromMenu:]): Ditto.
(-[WebPDFView _menuItemsFromPDFKitForEvent:]): Ditto.

* WebView/WebUIDelegatePrivate.h: Restored declarations of the delegate methods we actually
  call on macOS, even though in <a href="http://trac.webkit.org/projects/webkit/changeset/86988">r86988</a> we started calling different methods on iOS.

* WebView/WebView.mm:
- Imported headers that declare delegate methods that we call.
- Removed declaration of WebFileInternal category and merged its implementation with the
  main implementation.
- Many internal methods were inexplicibly implemented as part of the WebViewEditingInMail
  category, which made them impossible to call from the main implementation. Moved those
  into the main implementation. One of those had to be declared in a class extension,
  because it is called from a method implemented in the WebPrivate category, and that
  category’s implementation appears first in the file.

(-[WebView _cacheHistoryDelegateImplementations]): Suppressed undeclared selector warning
  around use of obsolete delegate method for binary compatibility.

* WebView/WebViewInternal.h: Declared an internal method that’s used from another file.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorePALChangeLog">trunk/Source/WebCore/PAL/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALpalspimacNSWindowSPIh">trunk/Source/WebCore/PAL/pal/spi/mac/NSWindowSPI.h</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIConfigurationsBasexcconfig">trunk/Source/WebInspectorUI/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIxcodeprojprojectpbxproj">trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitLegacyChangeLog">trunk/Source/WebKitLegacy/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacyWebKitLegacyxcodeprojprojectpbxproj">trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitLegacyiosMiscWebGeolocationProviderIOSmm">trunk/Source/WebKitLegacy/ios/Misc/WebGeolocationProviderIOS.mm</a></li>
<li><a href="#trunkSourceWebKitLegacyiosWebViewWebPDFViewPlaceholdermm">trunk/Source/WebKitLegacy/ios/WebView/WebPDFViewPlaceholder.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacCarbonCarbonWindowAdaptermm">trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacChangeLog">trunk/Source/WebKitLegacy/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacymacConfigurationsBasexcconfig">trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebKitLegacymacDefaultDelegatesWebDefaultContextMenuDelegatemm">trunk/Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacMiscWebDownloadmm">trunk/Source/WebKitLegacy/mac/Misc/WebDownload.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacMiscWebIconDatabasemm">trunk/Source/WebKitLegacy/mac/Misc/WebIconDatabase.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacMiscWebNSObjectExtrasmm">trunk/Source/WebKitLegacy/mac/Misc/WebNSObjectExtras.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacPluginsWebBaseNetscapePluginViewmm">trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacPluginsWebPluginControllermm">trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacPluginsWebPluginDatabasemm">trunk/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebCoreSupportPopupMenuMacmm">trunk/Source/WebKitLegacy/mac/WebCoreSupport/PopupMenuMac.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebCoreSupportWebCachedFramePlatformDatah">trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebCachedFramePlatformData.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebCoreSupportWebChromeClienth">trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebCoreSupportWebChromeClientmm">trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebCoreSupportWebEditorClientmm">trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebCoreSupportWebVisitedLinkStoremm">trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebDeviceOrientationInternalh">trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationInternal.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebDeviceOrientationProviderMockmm">trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProviderMock.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebDeviceOrientationProviderMockInternalh">trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProviderMockInternal.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebDocumentPrivateh">trunk/Source/WebKitLegacy/mac/WebView/WebDocumentPrivate.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebDynamicScrollBarsViewmm">trunk/Source/WebKitLegacy/mac/WebView/WebDynamicScrollBarsView.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebHTMLViewmm">trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebHTMLViewInternalh">trunk/Source/WebKitLegacy/mac/WebView/WebHTMLViewInternal.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebJSPDFDocmm">trunk/Source/WebKitLegacy/mac/WebView/WebJSPDFDoc.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebPDFViewh">trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebPDFViewmm">trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebUIDelegatePrivateh">trunk/Source/WebKitLegacy/mac/WebView/WebUIDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebViewmm">trunk/Source/WebKitLegacy/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebViewInternalh">trunk/Source/WebKitLegacy/mac/WebView/WebViewInternal.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebViewPrivateh">trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog       2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebCore/PAL/ChangeLog  2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2018-10-04  Dan Bernstein  <mitz@apple.com>
</span><span class="cx"> 
</span><ins>+        PAL change for the WebKitLegacy part of [Xcode] Update some build settings as recommended by Xcode 10
+        https://bugs.webkit.org/show_bug.cgi?id=190250
+
+        Reviewed by Andy Estes.
+
+        * pal/spi/mac/NSWindowSPI.h: Added a private API declaration.
+
+2018-10-04  Dan Bernstein  <mitz@apple.com>
+
</ins><span class="cx">         PAL part of [Xcode] Update some build settings as recommended by Xcode 10
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=190250
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalspimacNSWindowSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/spi/mac/NSWindowSPI.h (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/spi/mac/NSWindowSPI.h       2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/NSWindowSPI.h  2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> @interface NSWindow ()
</span><span class="cx"> 
</span><span class="cx"> - (id)_newFirstResponderAfterResigning;
</span><ins>+- (void)_setCursorForMouseLocation:(NSPoint)point;
</ins><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog    2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebInspectorUI/ChangeLog       2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2018-10-04  Dan Bernstein  <mitz@apple.com>
+
+        WebInspectorUI part of [Xcode] Update some build settings as recommended by Xcode 10
+        https://bugs.webkit.org/show_bug.cgi?id=190250
+
+        Reviewed by Andy Estes.
+
+        * Configurations/Base.xcconfig: Enabled CLANG_WARN_COMMA, CLANG_WARN_INFINITE_RECURSION,
+          CLANG_WARN_SUSPICIOUS_MOVE, CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS, and
+          CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF.
+
+        * WebInspectorUI.xcodeproj/project.pbxproj: Let Xcode update LastUpgradeCheck.
+
</ins><span class="cx"> 2018-10-04  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: merge ProbeManager into DebuggerManager
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig    2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -19,14 +19,17 @@
</span><span class="cx"> CLANG_ENABLE_OBJC_WEAK = YES;
</span><span class="cx"> CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
</span><span class="cx"> CLANG_WARN_BOOL_CONVERSION = YES;
</span><ins>+CLANG_WARN_COMMA = YES;
</ins><span class="cx"> CLANG_WARN_CONSTANT_CONVERSION = YES;
</span><span class="cx"> CLANG_WARN_CXX0X_EXTENSIONS = NO;
</span><span class="cx"> CLANG_WARN_EMPTY_BODY = YES;
</span><span class="cx"> CLANG_WARN_ENUM_CONVERSION = YES;
</span><ins>+CLANG_WARN_INFINITE_RECURSION = YES;
</ins><span class="cx"> CLANG_WARN_INT_CONVERSION = YES;
</span><span class="cx"> CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
</span><span class="cx"> CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
</span><span class="cx"> CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
</span><ins>+CLANG_WARN_SUSPICIOUS_MOVE = YES;
</ins><span class="cx"> CLANG_WARN_STRICT_PROTOTYPES = YES;
</span><span class="cx"> CLANG_WARN_UNREACHABLE_CODE = YES;
</span><span class="cx"> CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
</span><span class="lines">@@ -52,7 +55,9 @@
</span><span class="cx"> GCC_WARN_ABOUT_RETURN_TYPE = YES
</span><span class="cx"> GCC_WARN_ABOUT_RETURN_TYPE = YES;
</span><span class="cx"> GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
</span><ins>+CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
</ins><span class="cx"> GCC_WARN_UNDECLARED_SELECTOR = YES;
</span><ins>+CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
</ins><span class="cx"> GCC_WARN_UNINITIALIZED_AUTOS = YES
</span><span class="cx"> GCC_WARN_UNUSED_FUNCTION = YES;
</span><span class="cx"> GCC_WARN_UNUSED_VARIABLE = YES
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj     2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj        2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">                  isa = PBXProject;
</span><span class="cx">                  attributes = {
</span><span class="cx">                          LastSwiftUpdateCheck = 0700;
</span><del>-                               LastUpgradeCheck = 0700;
</del><ins>+                                LastUpgradeCheck = 1000;
</ins><span class="cx">                           ORGANIZATIONNAME = Apple;
</span><span class="cx">                  };
</span><span class="cx">                  buildConfigurationList = A54C2250148B23DE00373FA3 /* Build configuration list for PBXProject "WebInspectorUI" */;
</span></span></pre></div>
<a id="trunkSourceWebKitLegacyChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/ChangeLog (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/ChangeLog      2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/ChangeLog 2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2018-10-04  Dan Bernstein  <mitz@apple.com>
+
+        WebKitLegacy part of [Xcode] Update some build settings as recommended by Xcode 10
+        https://bugs.webkit.org/show_bug.cgi?id=190250
+
+        Reviewed by Andy Estes.
+
+        * WebKitLegacy.xcodeproj/project.pbxproj: Let Xcode update LastUpgradeCheck.
+
</ins><span class="cx"> 2018-10-01  Dean Jackson  <dino@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [macOS] Switching to discrete GPU should be done in the UI process
</span></span></pre></div>
<a id="trunkSourceWebKitLegacyWebKitLegacyxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj    2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -3222,7 +3222,7 @@
</span><span class="cx">                  isa = PBXProject;
</span><span class="cx">                  attributes = {
</span><span class="cx">                          LastSwiftUpdateCheck = 0700;
</span><del>-                               LastUpgradeCheck = 0700;
</del><ins>+                                LastUpgradeCheck = 1000;
</ins><span class="cx">                   };
</span><span class="cx">                  buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKitLegacy" */;
</span><span class="cx">                  compatibilityVersion = "Xcode 3.2";
</span></span></pre></div>
<a id="trunkSourceWebKitLegacyiosMiscWebGeolocationProviderIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/ios/Misc/WebGeolocationProviderIOS.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/ios/Misc/WebGeolocationProviderIOS.mm  2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/ios/Misc/WebGeolocationProviderIOS.mm     2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #import "WebDelegateImplementationCaching.h"
</span><span class="cx"> #import "WebGeolocationCoreLocationProvider.h"
</span><span class="cx"> #import <WebGeolocationPosition.h>
</span><ins>+#import <WebUIDelegatePrivate.h>
</ins><span class="cx"> #import <WebCore/GeolocationPosition.h>
</span><span class="cx"> #import <WebCore/WebCoreThread.h>
</span><span class="cx"> #import <WebCore/WebCoreThreadRun.h>
</span></span></pre></div>
<a id="trunkSourceWebKitLegacyiosWebViewWebPDFViewPlaceholdermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/ios/WebView/WebPDFViewPlaceholder.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/ios/WebView/WebPDFViewPlaceholder.mm   2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/ios/WebView/WebPDFViewPlaceholder.mm      2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -52,10 +52,6 @@
</span><span class="cx"> 
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><del>-@interface WebPDFView (Secrets)
-+ (Class)_representationClassForWebFrame:(WebFrame *)webFrame;
-@end
-
</del><span class="cx"> #pragma mark Constants
</span><span class="cx"> 
</span><span class="cx"> static const float PAGE_WIDTH_INSET = 4.0f * 2.0f;
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacCarbonCarbonWindowAdaptermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm      2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm 2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -715,7 +715,9 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> // Do the right thing for a Carbon window.
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (id)initWithCoder:(NSCoder *)coder
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx"> 
</span><span class="cx">     // Actually, this will probably never be implemented.  M.P. Notice - 8/2/00
</span><span class="lines">@@ -817,6 +819,7 @@
</span><span class="cx">     // Initialize with the default return value.
</span><span class="cx">     UInt32 hiCommandID = 0;
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("undeclared-selector")
</ins><span class="cx">     // Pretty simple, if tedious.
</span><span class="cx">     if (inActionSelector == @selector(clear:))
</span><span class="cx">         hiCommandID = kHICommandClear;
</span><span class="lines">@@ -832,6 +835,7 @@
</span><span class="cx">         hiCommandID = kHICommandSelectAll;
</span><span class="cx">     else if (inActionSelector == @selector(undo:))
</span><span class="cx">         hiCommandID = kHICommandUndo;
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> 
</span><span class="cx">     // Done.
</span><span class="cx">     return hiCommandID;
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/ChangeLog  2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog     2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -1,3 +1,126 @@
</span><ins>+2018-10-04  Dan Bernstein  <mitz@apple.com>
+
+        WebKitLegacy part of [Xcode] Update some build settings as recommended by Xcode 10
+        https://bugs.webkit.org/show_bug.cgi?id=190250
+
+        Reviewed by Andy Estes.
+
+        * Configurations/Base.xcconfig: Enabled CLANG_WARN_COMMA, CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF,
+          CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS, and CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED.
+          Also enabled GCC_WARN_UNDECLARED_SELECTOR by deleting the line that set it to NO, which let
+          an earlier line set it to YES.
+
+        Enabling -Wundeclared-selector exposed some long-standing mistakes and required the most
+        changes below.
+
+        * DefaultDelegates/WebDefaultContextMenuDelegate.mm: Imported an internal header that
+          provides some missing method declarations.
+
+        * Misc/WebDownload.mm:
+        (-[WebDownload initWithRequest:delegate:]): Suppressed warning about this implementation of
+          a deprecated method.
+
+        * Misc/WebIconDatabase.mm: Suppressed warning around our implementation of a deprecated class.
+
+        * Misc/WebNSObjectExtras.mm: Declare a category that is implemented in this file, because
+          other code in the file uses a method from it.
+
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView renewGState]): Suppressed warning about this implementation of
+          a deprecated method.
+
+        * Plugins/WebPluginController.mm:
+        (installFlip4MacPlugInWorkaroundIfNecessary): Suppressed the undeclared selector warning
+          around use of a selector that may be present in some WebKit client.
+
+        * Plugins/WebPluginDatabase.mm: Imported an internal header that provides some missing
+          method declarations.
+
+        * WebCoreSupport/PopupMenuMac.mm: Imported a header that delcares delegate methods we call
+          from here.
+
+        * WebCoreSupport/WebCachedFramePlatformData.h: Imported an internal header that provides some
+          missing method declarations.
+
+        * WebCoreSupport/WebChromeClient.mm: Imported a header that declares delegate methods we call
+          from here.
+
+        * WebCoreSupport/WebFrameLoaderClient.mm: Imported headers that declare delegate methods we
+          call from here.
+        (WebFrameLoaderClient::setTitle): Suppressed the undeclared selector warning around use of
+          an obsolete delegate method for binary compatibility.
+        (pluginView): Ditto.
+
+        * WebCoreSupport/WebVisitedLinkStore.mm: Imported a header that declares delegate methods we
+          call from here.
+
+        * WebView/WebDeviceOrientationInternal.h: Declared -setController in a new
+          WebDeviceOrientationProviderMock protocol.
+
+        * WebView/WebDeviceOrientationProviderMock.mm:
+        (-[WebDeviceOrientationProviderMock setController:]): Moved from an internal category to the
+          main @implementation.
+
+        * WebView/WebDeviceOrientationProviderMockInternal.h: Declared that
+          WebDeviceOrientationProviderMock conforms to WebDeviceOrientationProviderMock.
+
+        * WebView/WebDynamicScrollBarsView.mm:
+        (-[WebDynamicScrollBarsView accessibilityIsIgnored]): Suppressed warning about this implementation
+          of a deprecated method.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView validateUserInterfaceItemWithoutDelegate:]): Suppressed the undeclared
+          selector warning around action methods that are not declared anywhere in WebKit.
+
+        (-[WebHTMLView dragImage:at:offset:event:pasteboard:source:slideBack:]): Suppressed warning
+          about implementing this deprecated method.
+        (-[WebHTMLView draggingSourceOperationMaskForLocal:]): Ditto.
+        (-[WebHTMLView draggedImage:endedAt:operation:]): Ditto.
+        (-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]): Ditto.
+        (-[WebHTMLView accessibilityAttributeValue:]): Ditto.
+        (-[WebHTMLView characterIndexForPoint:]): Ditto.
+        (-[WebHTMLView firstRectForCharacterRange:]): Ditto.
+        (-[WebHTMLView attributedSubstringFromRange:]): Ditto.
+        (-[WebHTMLView setMarkedText:selectedRange:]): Ditto.
+        (-[WebHTMLView doCommandBySelector:]): Ditto.
+        (-[WebHTMLView insertText:]): Ditto.
+
+        * WebView/WebHTMLViewInternal.h: Declared an internal method that’s used from another file.
+
+        * WebView/WebJSPDFDoc.mm: Imported a header that declares delegate methods we call from here.
+
+        * WebView/WebPDFView.h: Removed previewView ivar.
+
+        * WebView/WebPDFView.mm:
+          Removed declaration of FileInternal category and merged its implementation with the main
+          implementation.
+        (-[WebPDFView dealloc]): Removed previewView ivar.
+        (-[WebPDFView initWithFrame:]): Removed code to deal with PDFPreviewView, which doesn’t
+          exist in macOS versions we support.
+        (+[WebPDFView _PDFPreviewViewClass]): Deleted. PDFPreviewView doesn’t exist anymore.
+        (-[WebPDFView _canLookUpInDictionary]): Suppressed undeclared selector warning around use of
+          action methods internal to PDFKit.
+        (-[WebPDFView _lookUpInDictionaryFromMenu:]): Ditto.
+        (-[WebPDFView _menuItemsFromPDFKitForEvent:]): Ditto.
+
+        * WebView/WebUIDelegatePrivate.h: Restored declarations of the delegate methods we actually
+          call on macOS, even though in r86988 we started calling different methods on iOS.
+
+        * WebView/WebView.mm:
+        - Imported headers that declare delegate methods that we call.
+        - Removed declaration of WebFileInternal category and merged its implementation with the
+          main implementation.
+        - Many internal methods were inexplicibly implemented as part of the WebViewEditingInMail
+          category, which made them impossible to call from the main implementation. Moved those
+          into the main implementation. One of those had to be declared in a class extension,
+          because it is called from a method implemented in the WebPrivate category, and that
+          category’s implementation appears first in the file.
+
+        (-[WebView _cacheHistoryDelegateImplementations]): Suppressed undeclared selector warning
+          around use of obsolete delegate method for binary compatibility.
+
+        * WebView/WebViewInternal.h: Declared an internal method that’s used from another file.
+
</ins><span class="cx"> 2018-10-04  YUHAN WU  <yuhan_wu@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Runtime flag and IDL for MediaRecorder
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig       2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig  2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> CLANG_ENABLE_OBJC_WEAK = YES;
</span><span class="cx"> CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
</span><span class="cx"> CLANG_WARN_BOOL_CONVERSION = YES;
</span><ins>+CLANG_WARN_COMMA = YES;
</ins><span class="cx"> CLANG_WARN_CONSTANT_CONVERSION = YES;
</span><span class="cx"> CLANG_WARN_CXX0X_EXTENSIONS = NO;
</span><span class="cx"> CLANG_WARN_EMPTY_BODY = YES;
</span><span class="lines">@@ -51,6 +52,7 @@
</span><span class="cx"> CLANG_WARN_UNREACHABLE_CODE = YES;
</span><span class="cx"> CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
</span><span class="cx"> GCC_WARN_UNDECLARED_SELECTOR = YES;
</span><ins>+CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
</ins><span class="cx"> COMBINE_HIDPI_IMAGES = NO;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
</span><span class="cx"> ENABLE_STRICT_OBJC_MSGSEND = YES;
</span><span class="lines">@@ -76,13 +78,14 @@
</span><span class="cx"> GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
</span><span class="cx"> GCC_WARN_ABOUT_RETURN_TYPE = YES;
</span><span class="cx"> GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
</span><ins>+CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
</ins><span class="cx"> GCC_WARN_SIGN_COMPARE = YES;
</span><del>-GCC_WARN_UNDECLARED_SELECTOR = NO;
</del><span class="cx"> GCC_WARN_UNINITIALIZED_AUTOS = YES;
</span><span class="cx"> GCC_WARN_UNUSED_FUNCTION = YES;
</span><span class="cx"> GCC_WARN_UNUSED_VARIABLE = YES;
</span><span class="cx"> CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
</span><span class="cx"> OTHER_MIGFLAGS = -F$(BUILT_PRODUCTS_DIR);
</span><ins>+CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
</ins><span class="cx"> PREBINDING = NO;
</span><span class="cx"> WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacDefaultDelegatesWebDefaultContextMenuDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm  2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm     2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #import "WebDefaultUIDelegate.h"
</span><span class="cx"> #import "WebFrameInternal.h"
</span><span class="cx"> #import "WebFrameView.h"
</span><del>-#import "WebHTMLViewPrivate.h"
</del><ins>+#import "WebHTMLViewInternal.h"
</ins><span class="cx"> #import "WebLocalizableStringsInternal.h"
</span><span class="cx"> #import "WebNSPasteboardExtras.h"
</span><span class="cx"> #import "WebNSURLRequestExtras.h"
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacMiscWebDownloadmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/Misc/WebDownload.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/Misc/WebDownload.mm        2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebDownload.mm   2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -181,25 +181,31 @@
</span><span class="cx">     [super dealloc];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (id)initWithRequest:(NSURLRequest *)request delegate:(id<NSURLDownloadDelegate>)delegate
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     [self _setRealDelegate:delegate];
</span><span class="cx">     return [super initWithRequest:request delegate:_webInternal];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (id)_initWithLoadingConnection:(NSURLConnection *)connection
</span><span class="cx">                          request:(NSURLRequest *)request
</span><span class="cx">                         response:(NSURLResponse *)response
</span><span class="cx">                         delegate:(id)delegate
</span><span class="cx">                            proxy:(NSURLConnectionDelegateProxy *)proxy
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     [self _setRealDelegate:delegate];
</span><span class="cx">     return [super _initWithLoadingConnection:connection request:request response:response delegate:_webInternal proxy:proxy];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (id)_initWithRequest:(NSURLRequest *)request
</span><span class="cx">               delegate:(id)delegate
</span><span class="cx">              directory:(NSString *)directory
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     [self _setRealDelegate:delegate];
</span><span class="cx">     return [super _initWithRequest:request delegate:_webInternal directory:directory];
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacMiscWebIconDatabasemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/Misc/WebIconDatabase.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/Misc/WebIconDatabase.mm    2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebIconDatabase.mm       2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -91,7 +91,9 @@
</span><span class="cx">     0x00, 0x00, 0x01, 0x52, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x0A, 
</span><span class="cx">     0xFC, 0x80, 0x00, 0x00, 0x27, 0x10, 0x00, 0x0A, 0xFC, 0x80, 0x00, 0x00, 0x27, 0x10 };
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> @implementation WebIconDatabase
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> 
</span><span class="cx"> + (void)initialize
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacMiscWebNSObjectExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/Misc/WebNSObjectExtras.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/Misc/WebNSObjectExtras.mm  2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebNSObjectExtras.mm     2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -37,6 +37,10 @@
</span><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+@interface NSInvocation (WebMainThreadInvoker)
+- (void)_webkit_invokeAndHandleException:(WebMainThreadInvoker *)exceptionHandler;
+@end
+
</ins><span class="cx"> static bool returnTypeIsObject(NSInvocation *invocation)
</span><span class="cx"> {
</span><span class="cx">     // Could use either _C_ID or NSObjCObjectType, but it seems that neither is
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacPluginsWebBaseNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm       2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm  2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -613,7 +613,9 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (void)renewGState
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     [super renewGState];
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacPluginsWebPluginControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm     2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm        2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -679,7 +679,9 @@
</span><span class="cx">         if (!TSUpdateCheck)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("undeclared-selector")
</ins><span class="cx">         Method methodToPatch = class_getInstanceMethod(TSUpdateCheck, @selector(alertDidEnd:returnCode:contextInfo:));
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx">         if (!methodToPatch)
</span><span class="cx">             return;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacPluginsWebPluginDatabasemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm       2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm  2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #import "WebFrame.h"
</span><span class="cx"> #import "WebFrameViewInternal.h"
</span><span class="cx"> #import "WebHTMLRepresentation.h"
</span><del>-#import "WebHTMLView.h"
</del><ins>+#import "WebHTMLViewInternal.h"
</ins><span class="cx"> #import "WebKitLogging.h"
</span><span class="cx"> #import "WebNSFileManagerExtras.h"
</span><span class="cx"> #import "WebNetscapePluginPackage.h"
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebCoreSupportPopupMenuMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/PopupMenuMac.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/PopupMenuMac.mm     2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/PopupMenuMac.mm        2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> 
</span><span class="cx"> #import "WebDelegateImplementationCaching.h"
</span><span class="cx"> #import "WebFrameInternal.h"
</span><ins>+#import "WebUIDelegatePrivate.h"
</ins><span class="cx"> #import <WebCore/IntRect.h>
</span><span class="cx"> #import <WebCore/AXObjectCache.h>
</span><span class="cx"> #import <WebCore/Chrome.h>
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebCoreSupportWebCachedFramePlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebCachedFramePlatformData.h (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebCachedFramePlatformData.h        2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebCachedFramePlatformData.h   2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx">  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><ins>+#import "WebHTMLViewInternal.h"
</ins><span class="cx"> #import <WebCore/CachedFramePlatformData.h>
</span><span class="cx"> #import <wtf/ObjcRuntimeExtras.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h   2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h      2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -160,8 +160,10 @@
</span><span class="cx">     bool shouldReplaceWithGeneratedFileForUpload(const String& path, String &generatedFilename) final;
</span><span class="cx">     String generateReplacementFile(const String& path) final;
</span><span class="cx"> 
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx">     void elementDidFocus(WebCore::Element&) override;
</span><span class="cx">     void elementDidBlur(WebCore::Element&) override;
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx">     bool shouldPaintEntireContents() const final;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm  2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm     2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #import "WebDefaultUIDelegate.h"
</span><span class="cx"> #import "WebDelegateImplementationCaching.h"
</span><span class="cx"> #import "WebElementDictionary.h"
</span><ins>+#import "WebFormDelegate.h"
</ins><span class="cx"> #import "WebFrameInternal.h"
</span><span class="cx"> #import "WebFrameView.h"
</span><span class="cx"> #import "WebHTMLViewInternal.h"
</span><span class="lines">@@ -876,6 +877,7 @@
</span><span class="cx">     return [[m_webView _UIDelegateForwarder] webView:m_webView generateReplacementFile:path];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> void WebChromeClient::elementDidFocus(WebCore::Element& element)
</span><span class="cx"> {
</span><span class="cx">     CallUIDelegate(m_webView, @selector(webView:formDidFocusNode:), kit(&element));
</span><span class="lines">@@ -885,6 +887,7 @@
</span><span class="cx"> {
</span><span class="cx">     CallUIDelegate(m_webView, @selector(webView:formDidBlurNode:), kit(&element));
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> bool WebChromeClient::selectItemWritingDirectionIsNatural()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm  2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm     2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -843,6 +843,7 @@
</span><span class="cx">         return @selector(moveUp:);
</span><span class="cx">     if (key == "Down")
</span><span class="cx">         return @selector(moveDown:);
</span><ins>+IGNORE_WARNINGS_BEGIN("undeclared-selector")
</ins><span class="cx">     if (key == "U+001B")
</span><span class="cx">         return @selector(cancel:);
</span><span class="cx">     if (key == "U+0009") {
</span><span class="lines">@@ -852,6 +853,7 @@
</span><span class="cx">     }
</span><span class="cx">     if (key == "Enter")
</span><span class="cx">         return @selector(insertNewline:);
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx">     return 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm     2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm        2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -44,11 +44,12 @@
</span><span class="cx"> #import "WebElementDictionary.h"
</span><span class="cx"> #import "WebFormDelegate.h"
</span><span class="cx"> #import "WebFrameInternal.h"
</span><del>-#import "WebFrameLoadDelegate.h"
</del><ins>+#import "WebFrameLoadDelegatePrivate.h"
</ins><span class="cx"> #import "WebFrameNetworkingContext.h"
</span><span class="cx"> #import "WebFrameViewInternal.h"
</span><span class="cx"> #import "WebHTMLRepresentationPrivate.h"
</span><span class="cx"> #import "WebHTMLViewInternal.h"
</span><ins>+#import "WebHistoryDelegate.h"
</ins><span class="cx"> #import "WebHistoryInternal.h"
</span><span class="cx"> #import "WebHistoryItemInternal.h"
</span><span class="cx"> #import "WebKitErrorsPrivate.h"
</span><span class="lines">@@ -67,6 +68,7 @@
</span><span class="cx"> #import "WebPolicyDelegatePrivate.h"
</span><span class="cx"> #import "WebPreferences.h"
</span><span class="cx"> #import "WebResourceLoadDelegate.h"
</span><ins>+#import "WebResourceLoadDelegatePrivate.h"
</ins><span class="cx"> #import "WebScriptWorldInternal.h"
</span><span class="cx"> #import "WebSecurityOriginInternal.h"
</span><span class="cx"> #import "WebUIDelegate.h"
</span><span class="lines">@@ -1365,8 +1367,11 @@
</span><span class="cx">         // FIXME: Use direction of title.
</span><span class="cx">         if (implementations->setTitleFunc)
</span><span class="cx">             CallHistoryDelegate(implementations->setTitleFunc, view, @selector(webView:updateHistoryTitle:forURL:inFrame:), (NSString *)title.string, (NSString *)url, m_webFrame.get());
</span><del>-        else if (implementations->deprecatedSetTitleFunc)
</del><ins>+        else if (implementations->deprecatedSetTitleFunc) {
+IGNORE_WARNINGS_BEGIN("undeclared-selector")
</ins><span class="cx">             CallHistoryDelegate(implementations->deprecatedSetTitleFunc, view, @selector(webView:updateHistoryTitle:forURL:), (NSString *)title.string, (NSString *)url);
</span><ins>+IGNORE_WARNINGS_END
+        }
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1749,7 +1754,9 @@
</span><span class="cx">             element, WebPlugInContainingElementKey,
</span><span class="cx">             nil];
</span><span class="cx">         LOG(Plugins, "arguments:\n%@", arguments);
</span><ins>+IGNORE_WARNINGS_BEGIN("undeclared-selector")
</ins><span class="cx">     } else if ([viewFactory respondsToSelector:@selector(pluginViewWithArguments:)]) {
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx">         arguments = [NSDictionary dictionaryWithObjectsAndKeys:
</span><span class="cx">             baseURL, WebPluginBaseURLKey,
</span><span class="cx">             attributes, WebPluginAttributesKey,
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebCoreSupportWebVisitedLinkStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.mm      2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.mm 2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> #import "WebDelegateImplementationCaching.h"
</span><span class="cx"> #import "WebFrameInternal.h"
</span><ins>+#import "WebHistoryDelegate.h"
</ins><span class="cx"> #import "WebHistoryInternal.h"
</span><span class="cx"> #import "WebViewInternal.h"
</span><span class="cx"> #import <WebCore/PageCache.h>
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebDeviceOrientationInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationInternal.h (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationInternal.h     2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationInternal.h        2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx"> 
</span><span class="cx"> #import "WebDeviceOrientation.h"
</span><span class="cx"> 
</span><ins>+#import "WebDeviceOrientationProvider.h"
+#import <WebCore/DeviceOrientationClientMock.h>
</ins><span class="cx"> #import <WebCore/DeviceOrientationData.h>
</span><span class="cx"> #import <wtf/RefPtr.h>
</span><span class="cx"> 
</span><span class="lines">@@ -43,3 +45,7 @@
</span><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> WebCore::DeviceOrientationData* core(WebDeviceOrientation*);
</span><ins>+
+@protocol WebDeviceOrientationProviderMock <WebDeviceOrientationProvider>
+- (void)setController:(WebCore::DeviceOrientationController*)controller;
+@end
</ins></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebDeviceOrientationProviderMockmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProviderMock.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProviderMock.mm        2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProviderMock.mm   2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -67,15 +67,6 @@
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span><del>-@implementation WebDeviceOrientationProviderMock (Internal)
-
-- (void)setController:(WebCore::DeviceOrientationController*)controller
-{
-   [m_internal setController:controller];
-}
-
-@end
-
</del><span class="cx"> @implementation WebDeviceOrientationProviderMock
</span><span class="cx"> 
</span><span class="cx"> + (WebDeviceOrientationProviderMock *)shared
</span><span class="lines">@@ -119,4 +110,9 @@
</span><span class="cx">     return [m_internal lastOrientation];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (void)setController:(WebCore::DeviceOrientationController*)controller
+{
+   [m_internal setController:controller];
+}
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebDeviceOrientationProviderMockInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProviderMockInternal.h (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProviderMockInternal.h 2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProviderMockInternal.h    2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx">  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><ins>+#import "WebDeviceOrientationInternal.h"
</ins><span class="cx"> #import "WebDeviceOrientationProviderMock.h"
</span><span class="cx"> #import <WebCore/DeviceOrientationClientMock.h>
</span><span class="cx"> 
</span><span class="lines">@@ -41,6 +42,5 @@
</span><span class="cx"> - (WebDeviceOrientation*)lastOrientation;
</span><span class="cx"> @end
</span><span class="cx"> 
</span><del>-@interface WebDeviceOrientationProviderMock (Internal)
-- (void)setController:(WebCore::DeviceOrientationController*)controller;
</del><ins>+@interface WebDeviceOrientationProviderMock () <WebDeviceOrientationProviderMock>
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebDocumentPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebDocumentPrivate.h (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebDocumentPrivate.h       2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebDocumentPrivate.h  2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> #import <WebKitLegacy/WebDocument.h>
</span><ins>+#import <WebKitLegacy/WebFrame.h>
</ins><span class="cx"> #import <WebKitLegacy/WebHTMLView.h>
</span><span class="cx"> 
</span><span class="cx"> @class DOMDocument;
</span><span class="lines">@@ -102,6 +103,7 @@
</span><span class="cx">     @result Array of strings representing the supported MIME types.
</span><span class="cx"> */
</span><span class="cx"> + (NSArray *)supportedMIMETypes;
</span><ins>++ (Class)_representationClassForWebFrame:(WebFrame *)webFrame;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @protocol WebPDFDocumentView <WebDocumentView>
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebDynamicScrollBarsViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebDynamicScrollBarsView.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebDynamicScrollBarsView.mm        2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebDynamicScrollBarsView.mm   2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -580,7 +580,9 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // This object will be the parent of the web area in WK1, so it should not be ignored.
</span><del>-- (BOOL)accessibilityIsIgnored 
</del><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
+- (BOOL)accessibilityIsIgnored
+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     return NO;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm     2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm        2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -2900,9 +2900,10 @@
</span><span class="cx">             return NO;
</span><span class="cx">         }
</span><span class="cx">     }
</span><del>-
</del><span class="cx">     if (action == @selector(changeSpelling:)
</span><ins>+IGNORE_WARNINGS_BEGIN("undeclared-selector")
</ins><span class="cx">             || action == @selector(_changeSpellingFromMenu:)
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx">             || action == @selector(checkSpelling:)
</span><span class="cx">             || action == @selector(complete:)
</span><span class="cx">             || action == @selector(pasteFont:))
</span><span class="lines">@@ -2978,8 +2979,10 @@
</span><span class="cx">     if (action == @selector(changeDocumentBackgroundColor:))
</span><span class="cx">         return [[self _webView] isEditable] && [self _canEditRichly];
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("undeclared-selector")
</ins><span class="cx">     if (action == @selector(_ignoreSpellingFromMenu:)
</span><span class="cx">             || action == @selector(_learnSpellingFromMenu:)
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx">             || action == @selector(takeFindStringFromSelection:))
</span><span class="cx">         return [self _hasSelection];
</span><span class="cx"> 
</span><span class="lines">@@ -4251,6 +4254,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (void)dragImage:(NSImage *)dragImage
</span><span class="cx">                at:(NSPoint)at
</span><span class="cx">            offset:(NSSize)offset
</span><span class="lines">@@ -4258,6 +4262,7 @@
</span><span class="cx">        pasteboard:(NSPasteboard *)pasteboard
</span><span class="cx">            source:(id)source
</span><span class="cx">         slideBack:(BOOL)slideBack
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(self == [self _topHTMLView]);
</span><span class="cx">     [pasteboard setString:@"" forType:[WebHTMLView _dummyPasteboardType]];
</span><span class="lines">@@ -4290,7 +4295,9 @@
</span><span class="cx">     [self release];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(![self _webView] || [self _isTopHTMLView]);
</span><span class="cx">     
</span><span class="lines">@@ -4301,7 +4308,9 @@
</span><span class="cx">     return (NSDragOperation)page->dragController().sourceDragOperation();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(![self _webView] || [self _isTopHTMLView]);
</span><span class="cx">     
</span><span class="lines">@@ -4338,7 +4347,9 @@
</span><span class="cx">         && [filename _webkit_hasCaseInsensitiveSuffix:@".jpg"]);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     NSFileWrapper *wrapper = nil;
</span><span class="cx">     NSURL *draggingElementURL = nil;
</span><span class="lines">@@ -4996,7 +5007,9 @@
</span><span class="cx">     [super flagsChanged:event];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (id)accessibilityAttributeValue:(NSString*)attributeName
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     if ([attributeName isEqualToString: NSAccessibilityChildrenAttribute]) {
</span><span class="cx">         id accTree = [[self _frame] accessibilityRoot];
</span><span class="lines">@@ -5668,6 +5681,73 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS)
+- (void)markedTextUpdate:(NSNotification *)notification
+{
+    NSString *text = [notification object];
+    NSRange range = NSMakeRange(0, [text length]);
+    [self setMarkedText:text selectedRange:range];
+}
+#endif
+
+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
+- (void)setMarkedText:(id)string selectedRange:(NSRange)newSelRange
+IGNORE_WARNINGS_END
+{
+    [self _executeSavedKeypressCommands];
+
+#if PLATFORM(MAC)
+    BOOL isAttributedString = [string isKindOfClass:[NSAttributedString class]];
+    ASSERT(isAttributedString || [string isKindOfClass:[NSString class]]);
+
+    LOG(TextInput, "setMarkedText:\"%@\" selectedRange:(%u, %u)", isAttributedString ? [string string] : string, newSelRange.location, newSelRange.length);
+#endif
+
+    // Use pointer to get parameters passed to us by the caller of interpretKeyEvents.
+    auto* parameters = _private->interpretKeyEventsParameters;
+
+    if (parameters) {
+        parameters->eventInterpretationHadSideEffects = true;
+        parameters->consumedByIM = false;
+    }
+    
+    Frame* coreFrame = core([self _frame]);
+    if (!coreFrame)
+        return;
+
+    if (![self _isEditable])
+        return;
+
+    Vector<CompositionUnderline> underlines;
+    NSString *text;
+    NSRange replacementRange = { NSNotFound, 0 };
+
+#if PLATFORM(MAC)
+    if (isAttributedString) {
+        // FIXME: We ignore most attributes from the string, so an input method cannot specify e.g. a font or a glyph variation.
+        text = [string string];
+        NSString *rangeString = [string attribute:NSTextInputReplacementRangeAttributeName atIndex:0 longestEffectiveRange:0 inRange:NSMakeRange(0, [text length])];
+        LOG(TextInput, "    ReplacementRange: %@", rangeString);
+        // The AppKit adds a 'secret' property to the string that contains the replacement range.
+        // The replacement range is the range of the text that should be replaced with the new string.
+        if (rangeString)
+            replacementRange = NSRangeFromString(rangeString);
+
+        extractUnderlines(string, underlines);
+    } else {
+        text = string;
+        underlines.append(CompositionUnderline(0, [text length], CompositionUnderlineColor::TextColor, Color::black, false));
+    }
+#else
+    text = string;
+#endif
+
+    if (replacementRange.location != NSNotFound)
+        [[self _frame] _selectNSRange:replacementRange];
+
+    coreFrame->editor().setComposition(text, underlines, newSelRange.location, NSMaxRange(newSelRange));
+}
+
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @implementation WebHTMLView (WebInternal)
</span><span class="lines">@@ -6242,7 +6322,9 @@
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (NSArray *)validAttributesForMarkedText
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     static NSArray *validAttributes = [[NSArray alloc] initWithObjects:
</span><span class="cx">         NSUnderlineStyleAttributeName,
</span><span class="lines">@@ -6283,7 +6365,9 @@
</span><span class="cx"> 
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (NSUInteger)characterIndexForPoint:(NSPoint)thePoint
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     [self _executeSavedKeypressCommands];
</span><span class="cx"> 
</span><span class="lines">@@ -6307,7 +6391,9 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (NSRect)firstRectForCharacterRange:(NSRange)theRange
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     [self _executeSavedKeypressCommands];
</span><span class="cx"> 
</span><span class="lines">@@ -6339,7 +6425,9 @@
</span><span class="cx">     return resultRect;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (NSRange)selectedRange
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     [self _executeSavedKeypressCommands];
</span><span class="cx"> 
</span><span class="lines">@@ -6353,7 +6441,9 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (NSRange)markedRange
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     [self _executeSavedKeypressCommands];
</span><span class="cx"> 
</span><span class="lines">@@ -6369,7 +6459,9 @@
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (NSAttributedString *)attributedSubstringFromRange:(NSRange)nsRange
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     [self _executeSavedKeypressCommands];
</span><span class="cx"> 
</span><span class="lines">@@ -6401,7 +6493,9 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (NSInteger)conversationIdentifier
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     return (NSInteger)self;
</span><span class="cx"> }
</span><span class="lines">@@ -6421,7 +6515,9 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (void)unmarkText
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     [self _executeSavedKeypressCommands];
</span><span class="cx"> 
</span><span class="lines">@@ -6466,72 +6562,9 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-- (void)setMarkedText:(id)string selectedRange:(NSRange)newSelRange
-{
-    [self _executeSavedKeypressCommands];
-
-#if PLATFORM(MAC)
-    BOOL isAttributedString = [string isKindOfClass:[NSAttributedString class]];
-    ASSERT(isAttributedString || [string isKindOfClass:[NSString class]]);
-
-    LOG(TextInput, "setMarkedText:\"%@\" selectedRange:(%u, %u)", isAttributedString ? [string string] : string, newSelRange.location, newSelRange.length);
-#endif
-
-    // Use pointer to get parameters passed to us by the caller of interpretKeyEvents.
-    auto* parameters = _private->interpretKeyEventsParameters;
-
-    if (parameters) {
-        parameters->eventInterpretationHadSideEffects = true;
-        parameters->consumedByIM = false;
-    }
-    
-    Frame* coreFrame = core([self _frame]);
-    if (!coreFrame)
-        return;
-
-    if (![self _isEditable])
-        return;
-
-    Vector<CompositionUnderline> underlines;
-    NSString *text;
-    NSRange replacementRange = { NSNotFound, 0 };
-
-#if PLATFORM(MAC)
-    if (isAttributedString) {
-        // FIXME: We ignore most attributes from the string, so an input method cannot specify e.g. a font or a glyph variation.
-        text = [string string];
-        NSString *rangeString = [string attribute:NSTextInputReplacementRangeAttributeName atIndex:0 longestEffectiveRange:0 inRange:NSMakeRange(0, [text length])];
-        LOG(TextInput, "    ReplacementRange: %@", rangeString);
-        // The AppKit adds a 'secret' property to the string that contains the replacement range.
-        // The replacement range is the range of the text that should be replaced with the new string.
-        if (rangeString)
-            replacementRange = NSRangeFromString(rangeString);
-
-        extractUnderlines(string, underlines);
-    } else {
-        text = string;
-        underlines.append(CompositionUnderline(0, [text length], CompositionUnderlineColor::TextColor, Color::black, false));
-    }
-#else
-    text = string;
-#endif
-
-    if (replacementRange.location != NSNotFound)
-        [[self _frame] _selectNSRange:replacementRange];
-
-    coreFrame->editor().setComposition(text, underlines, newSelRange.location, NSMaxRange(newSelRange));
-}
-
-#if PLATFORM(IOS)
-- (void)markedTextUpdate:(NSNotification *)notification
-{
-    NSString *text = [notification object];
-    NSRange range = NSMakeRange(0, [text length]);
-    [self setMarkedText:text selectedRange:range];
-}
-#endif
-
</del><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (void)doCommandBySelector:(SEL)selector
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx">     LOG(TextInput, "doCommandBySelector:\"%s\"", sel_getName(selector));
</span><span class="cx"> 
</span><span class="lines">@@ -6589,7 +6622,9 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
</ins><span class="cx"> - (void)insertText:(id)string
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">     BOOL isAttributedString = [string isKindOfClass:[NSAttributedString class]];
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebHTMLViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLViewInternal.h (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLViewInternal.h      2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLViewInternal.h 2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> - (BOOL)_canSmartCopyOrDelete;
</span><span class="cx"> 
</span><span class="cx"> - (WebFrame *)_frame;
</span><ins>+- (void)closeIfNotCurrentView;
</ins><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> - (void)_lookUpInDictionaryFromMenu:(id)sender;
</span><span class="lines">@@ -98,6 +99,8 @@
</span><span class="cx"> 
</span><span class="cx"> - (WebPluginController *)_pluginController;
</span><span class="cx"> 
</span><ins>+- (void)_executeSavedKeypressCommands;
+
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @interface WebHTMLView (RemovedAppKitSuperclassMethods)
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebJSPDFDocmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebJSPDFDoc.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebJSPDFDoc.mm     2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebJSPDFDoc.mm        2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #import "WebDataSource.h"
</span><span class="cx"> #import "WebDelegateImplementationCaching.h"
</span><span class="cx"> #import "WebFrame.h"
</span><ins>+#import "WebUIDelegate.h"
</ins><span class="cx"> #import "WebView.h"
</span><span class="cx"> #import <JavaScriptCore/JSObjectRef.h>
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebPDFViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h       2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h  2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> 
</span><span class="cx"> @interface WebPDFView : NSView <PDFViewDelegate, WebDocumentView, WebDocumentSearching, WebDocumentIncrementalSearching, WebMultipleTextMatches, WebDocumentSelection, WebDocumentElement, WebDocumentPDF, _WebDocumentViewState, _WebDocumentZooming>
</span><span class="cx"> {
</span><del>-    NSView *previewView;
</del><span class="cx">     PDFView *PDFSubview;
</span><span class="cx">     NSString *path;
</span><span class="cx">     BOOL firstResponderIsPDFDocumentView;
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebPDFViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm      2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm 2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -84,27 +84,6 @@
</span><span class="cx"> 
</span><span class="cx"> extern "C" NSString *_NSPathForSystemFramework(NSString *framework);
</span><span class="cx"> 
</span><del>-@interface WebPDFView (FileInternal)
-+ (Class)_PDFPreviewViewClass;
-+ (Class)_PDFViewClass;
-- (void)_applyPDFDefaults;
-- (BOOL)_canLookUpInDictionary;
-- (NSClipView *)_clipViewForPDFDocumentView;
-- (NSEvent *)_fakeKeyEventWithFunctionKey:(unichar)functionKey;
-- (NSMutableArray *)_menuItemsFromPDFKitForEvent:(NSEvent *)theEvent;
-- (PDFSelection *)_nextMatchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag fromSelection:(PDFSelection *)initialSelection startInSelection:(BOOL)startInSelection;
-- (void)_openWithFinder:(id)sender;
-- (NSString *)_path;
-- (void)_PDFDocumentViewMightHaveScrolled:(NSNotification *)notification;
-- (BOOL)_pointIsInSelection:(NSPoint)point;
-- (NSAttributedString *)_scaledAttributedString:(NSAttributedString *)unscaledAttributedString;
-- (void)_setTextMatches:(NSArray *)array;
-- (NSString *)_temporaryPDFDirectoryPath;
-- (void)_trackFirstResponder;
-- (void)_updatePreferencesSoon;
-- (NSSet *)_visiblePDFPages;
-@end;
-
</del><span class="cx"> @interface NSView ()
</span><span class="cx"> - (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView;
</span><span class="cx"> - (void)_recursiveDisplayAllDirtyWithLockFocus:(BOOL)needsLockFocus visRect:(NSRect)visRect;
</span><span class="lines">@@ -211,7 +190,6 @@
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><span class="cx">     [dataSource release];
</span><del>-    [previewView release];
</del><span class="cx">     [PDFSubview setDelegate:nil];
</span><span class="cx">     [PDFSubview release];
</span><span class="cx">     [path release];
</span><span class="lines">@@ -327,31 +305,12 @@
</span><span class="cx">     if (self) {
</span><span class="cx">         [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
</span><span class="cx">         
</span><del>-        Class previewViewClass = [[self class] _PDFPreviewViewClass];
-        
-        // We might not have found a previewViewClass, but if we did find it
-        // then we should be able to create an instance.
-        if (previewViewClass) {
-            previewView = [[previewViewClass alloc] initWithFrame:frame];
-            ASSERT(previewView);
-        }
-        
-        NSView *topLevelPDFKitView = nil;
-        if (previewView) {
-            // We'll retain the PDFSubview here so that it is equally retained in all
-            // code paths. That way we don't need to worry about conditionally releasing
-            // it later.
-            PDFSubview = [[previewView performSelector:@selector(pdfView)] retain];
-            topLevelPDFKitView = previewView;
-        } else {
-            PDFSubview = [[[[self class] _PDFViewClass] alloc] initWithFrame:frame];
-            topLevelPDFKitView = PDFSubview;
-        }
-        
</del><ins>+        PDFSubview = [[[[self class] _PDFViewClass] alloc] initWithFrame:frame];
+
</ins><span class="cx">         ASSERT(PDFSubview);
</span><span class="cx">         
</span><del>-        [topLevelPDFKitView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-        [self addSubview:topLevelPDFKitView];
</del><ins>+        [PDFSubview setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+        [self addSubview:PDFSubview];
</ins><span class="cx">         
</span><span class="cx">         [PDFSubview setDelegate:self];
</span><span class="cx">         written = NO;
</span><span class="lines">@@ -1060,24 +1019,6 @@
</span><span class="cx">     CallUIDelegate([self _webView], @selector(webView:saveFrameView:showingPanel:), [[dataSource webFrame] frameView], NO);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-@end
-
-@implementation WebPDFView (FileInternal)
-
-+ (Class)_PDFPreviewViewClass
-{
-    static Class PDFPreviewViewClass = nil;
-    static BOOL checkedForPDFPreviewViewClass = NO;
-    
-    if (!checkedForPDFPreviewViewClass) {
-        checkedForPDFPreviewViewClass = YES;
-        PDFPreviewViewClass = [[WebPDFView PDFKitBundle] classNamed:@"PDFPreviewView"];
-    }
-    
-    // This class might not be available; callers need to deal with a nil return here.
-    return PDFPreviewViewClass;
-}
-
</del><span class="cx"> + (Class)_PDFViewClass
</span><span class="cx"> {
</span><span class="cx">     static Class PDFViewClass = nil;
</span><span class="lines">@@ -1116,7 +1057,9 @@
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)_canLookUpInDictionary
</span><span class="cx"> {
</span><ins>+IGNORE_WARNINGS_BEGIN("undeclared-selector")
</ins><span class="cx">     return [PDFSubview respondsToSelector:@selector(_searchInDictionary:)];
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (NSClipView *)_clipViewForPDFDocumentView
</span><span class="lines">@@ -1152,8 +1095,10 @@
</span><span class="cx">     // This method is used by WebKit's context menu item. Here we map to the method that
</span><span class="cx">     // PDFView uses. Since the PDFView method isn't API, and isn't available on all versions
</span><span class="cx">     // of PDFKit, we use performSelector after a respondsToSelector check, rather than calling it directly.
</span><ins>+IGNORE_WARNINGS_BEGIN("undeclared-selector")
</ins><span class="cx">     if ([self _canLookUpInDictionary])
</span><span class="cx">         [PDFSubview performSelector:@selector(_searchInDictionary:) withObject:sender];
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void removeUselessMenuItemSeparators(NSMutableArray *menuItems)
</span><span class="lines">@@ -1185,6 +1130,7 @@
</span><span class="cx"> {
</span><span class="cx">     NSMutableArray *copiedItems = [NSMutableArray array];
</span><span class="cx">     NSDictionary *actionsToTags = [[NSDictionary alloc] initWithObjectsAndKeys:
</span><ins>+IGNORE_WARNINGS_BEGIN("undeclared-selector")
</ins><span class="cx">         [NSNumber numberWithInt:WebMenuItemPDFActualSize], NSStringFromSelector(@selector(_setActualSize:)),
</span><span class="cx">         [NSNumber numberWithInt:WebMenuItemPDFZoomIn], NSStringFromSelector(@selector(zoomIn:)),
</span><span class="cx">         [NSNumber numberWithInt:WebMenuItemPDFZoomOut], NSStringFromSelector(@selector(zoomOut:)),
</span><span class="lines">@@ -1196,6 +1142,7 @@
</span><span class="cx">         [NSNumber numberWithInt:WebMenuItemPDFContinuous], NSStringFromSelector(@selector(_toggleContinuous:)),
</span><span class="cx">         [NSNumber numberWithInt:WebMenuItemPDFNextPage], NSStringFromSelector(@selector(goToNextPage:)),
</span><span class="cx">         [NSNumber numberWithInt:WebMenuItemPDFPreviousPage], NSStringFromSelector(@selector(goToPreviousPage:)),
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx">         nil];
</span><span class="cx">     
</span><span class="cx">     // Leave these menu items out, since WebKit inserts equivalent ones. Note that we leave out PDFKit's "Look Up in Dictionary"
</span><span class="lines">@@ -1202,9 +1149,11 @@
</span><span class="cx">     // item here because WebKit already includes an item with the same title and purpose. We map WebKit's to PDFKit's 
</span><span class="cx">     // "Look Up in Dictionary" via the implementation of -[WebPDFView _lookUpInDictionaryFromMenu:].
</span><span class="cx">     NSSet *unwantedActions = [[NSSet alloc] initWithObjects:
</span><ins>+IGNORE_WARNINGS_BEGIN("undeclared-selector")
</ins><span class="cx">                               NSStringFromSelector(@selector(_searchInSpotlight:)),
</span><span class="cx">                               NSStringFromSelector(@selector(_searchInGoogle:)),
</span><span class="cx">                               NSStringFromSelector(@selector(_searchInDictionary:)),
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx">                               NSStringFromSelector(@selector(copy:)),
</span><span class="cx">                               nil];
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebUIDelegatePrivate.h (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebUIDelegatePrivate.h     2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebUIDelegatePrivate.h        2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -265,8 +265,13 @@
</span><span class="cx"> - (void)webView:(WebView *)webView decidePolicyForUserMediaRequestFromOrigin:(WebSecurityOrigin *)origin listener:(id<WebAllowDenyPolicyListener>)listener;
</span><span class="cx"> - (void)webView:(WebView *)webView checkPolicyForUserMediaRequestFromOrigin:(WebSecurityOrigin *)origin listener:(id<WebAllowDenyPolicyListener>)listener;
</span><span class="cx"> 
</span><ins>+#if !TARGET_OS_IPHONE
+- (void)webView:(WebView *)sender formDidFocusNode:(DOMNode *)node;
+- (void)webView:(WebView *)sender formDidBlurNode:(DOMNode *)node;
+#else
</ins><span class="cx"> - (void)webView:(WebView *)sender elementDidFocusNode:(DOMNode *)node;
</span><span class="cx"> - (void)webView:(WebView *)sender elementDidBlurNode:(DOMNode *)node;
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> /*!
</span><span class="cx">     @method webView:printFrame:
</span><span class="lines">@@ -278,9 +283,10 @@
</span><span class="cx"> - (void)webView:(WebView *)sender printFrame:(WebFrame *)frame;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE_FULLSCREEN_API
</span><del>-- (BOOL)webView:(WebView *)sender supportsFullScreenForElement:(DOMElement *)element;
-- (void)webView:(WebView *)sender enterFullScreenForElement:(DOMElement *)element;
-- (void)webView:(WebView *)sender exitFullScreenForElement:(DOMElement *)element;
</del><ins>+- (BOOL)webView:(WebView *)sender supportsFullScreenForElement:(DOMElement *)element withKeyboard:(BOOL)withKeyboard;
+- (void)webView:(WebView *)sender enterFullScreenForElement:(DOMElement *)element listener:(id <WebKitFullScreenListener>)listener;
+- (void)webView:(WebView *)sender exitFullScreenForElement:(DOMElement *)element listener:(id <WebKitFullScreenListener>)listener;
+- (void)webView:(WebView *)sender closeFullScreenWithListener:(id <WebKitFullScreenListener>)listener;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> - (void)webView:(WebView *)sender didDrawFrame:(WebFrame *)frame;
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm    2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> #import "WebEditorClient.h"
</span><span class="cx"> #import "WebFormDelegatePrivate.h"
</span><span class="cx"> #import "WebFrameInternal.h"
</span><ins>+#import "WebFrameLoadDelegatePrivate.h"
</ins><span class="cx"> #import "WebFrameLoaderClient.h"
</span><span class="cx"> #import "WebFrameNetworkingContext.h"
</span><span class="cx"> #import "WebFrameViewInternal.h"
</span><span class="lines">@@ -71,6 +72,7 @@
</span><span class="cx"> #import "WebGeolocationPositionInternal.h"
</span><span class="cx"> #import "WebHTMLRepresentation.h"
</span><span class="cx"> #import "WebHTMLViewInternal.h"
</span><ins>+#import "WebHistoryDelegate.h"
</ins><span class="cx"> #import "WebHistoryItemInternal.h"
</span><span class="cx"> #import "WebIconDatabase.h"
</span><span class="cx"> #import "WebInspector.h"
</span><span class="lines">@@ -99,6 +101,8 @@
</span><span class="cx"> #import "WebPreferenceKeysPrivate.h"
</span><span class="cx"> #import "WebPreferencesPrivate.h"
</span><span class="cx"> #import "WebProgressTrackerClient.h"
</span><ins>+#import "WebResourceLoadDelegate.h"
+#import "WebResourceLoadDelegatePrivate.h"
</ins><span class="cx"> #import "WebResourceLoadScheduler.h"
</span><span class="cx"> #import "WebScriptDebugDelegate.h"
</span><span class="cx"> #import "WebScriptWorldInternal.h"
</span><span class="lines">@@ -392,9 +396,12 @@
</span><span class="cx"> macro(capitalizeWord) \
</span><span class="cx"> macro(centerSelectionInVisibleArea) \
</span><span class="cx"> macro(changeAttributes) \
</span><ins>+_Pragma("clang diagnostic push") \
+_Pragma("clang diagnostic ignored \"-Wundeclared-selector\"") \
</ins><span class="cx"> macro(changeBaseWritingDirection) \
</span><span class="cx"> macro(changeBaseWritingDirectionToLTR) \
</span><span class="cx"> macro(changeBaseWritingDirectionToRTL) \
</span><ins>+_Pragma("clang diagnostic pop") \
</ins><span class="cx"> macro(changeColor) \
</span><span class="cx"> macro(changeDocumentBackgroundColor) \
</span><span class="cx"> macro(changeFont) \
</span><span class="lines">@@ -503,7 +510,10 @@
</span><span class="cx"> macro(subscript) \
</span><span class="cx"> macro(superscript) \
</span><span class="cx"> macro(swapWithMark) \
</span><ins>+_Pragma("clang diagnostic push") \
+_Pragma("clang diagnostic ignored \"-Wundeclared-selector\"") \
</ins><span class="cx"> macro(takeFindStringFromSelection) \
</span><ins>+_Pragma("clang diagnostic pop") \
</ins><span class="cx"> macro(toggleBaseWritingDirection) \
</span><span class="cx"> macro(transpose) \
</span><span class="cx"> macro(underline) \
</span><span class="lines">@@ -510,7 +520,10 @@
</span><span class="cx"> macro(unscript) \
</span><span class="cx"> macro(uppercaseWord) \
</span><span class="cx"> macro(yank) \
</span><ins>+_Pragma("clang diagnostic push") \
+_Pragma("clang diagnostic ignored \"-Wundeclared-selector\"") \
</ins><span class="cx"> macro(yankAndSelect) \
</span><ins>+_Pragma("clang diagnostic pop") \
</ins><span class="cx"> 
</span><span class="cx"> #define WebKitOriginalTopPrintingMarginKey @"WebKitOriginalTopMargin"
</span><span class="cx"> #define WebKitOriginalBottomPrintingMarginKey @"WebKitOriginalBottomMargin"
</span><span class="lines">@@ -727,18 +740,6 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif // ENABLE(DATA_INTERACTION)
</span><span class="cx"> 
</span><del>-@interface WebView (WebFileInternal)
-#if !PLATFORM(IOS)
-- (float)_deviceScaleFactor;
-#endif
-- (BOOL)_isLoading;
-- (WebFrameView *)_frameViewAtWindowPoint:(NSPoint)point;
-- (WebFrame *)_focusedFrame;
-+ (void)_preflightSpellChecker;
-- (BOOL)_continuousCheckingAllowed;
-- (NSResponder *)_responderForResponderOperations;
-@end
-
</del><span class="cx"> NSString *WebElementDOMNodeKey =            @"WebElementDOMNode";
</span><span class="cx"> NSString *WebElementFrameKey =              @"WebElementFrame";
</span><span class="cx"> NSString *WebElementImageKey =              @"WebElementImage";
</span><span class="lines">@@ -1097,6 +1098,15 @@
</span><span class="cx"> 
</span><span class="cx"> #endif // HAVE(TOUCH_BAR)
</span><span class="cx"> 
</span><ins>+@interface WebView ()
+#if PLATFORM(IOS)
+- (void)_wakWindowScreenScaleChanged:(NSNotification *)notification;
+- (void)_wakWindowVisibilityChanged:(NSNotification *)notification;
+#else
+- (float)_deviceScaleFactor;
+#endif
+@end
+
</ins><span class="cx"> @implementation WebView (AllWebViews)
</span><span class="cx"> 
</span><span class="cx"> static CFSetCallBacks NonRetainingSetCallbacks = {
</span><span class="lines">@@ -3339,7 +3349,9 @@
</span><span class="cx">     cache->navigatedFunc = getMethod(delegate, @selector(webView:didNavigateWithNavigationData:inFrame:));
</span><span class="cx">     cache->clientRedirectFunc = getMethod(delegate, @selector(webView:didPerformClientRedirectFromURL:toURL:inFrame:));
</span><span class="cx">     cache->serverRedirectFunc = getMethod(delegate, @selector(webView:didPerformServerRedirectFromURL:toURL:inFrame:));
</span><ins>+IGNORE_WARNINGS_BEGIN("undeclared-selector")
</ins><span class="cx">     cache->deprecatedSetTitleFunc = getMethod(delegate, @selector(webView:updateHistoryTitle:forURL:));
</span><ins>+IGNORE_WARNINGS_END
</ins><span class="cx">     cache->setTitleFunc = getMethod(delegate, @selector(webView:updateHistoryTitle:forURL:inFrame:));
</span><span class="cx">     cache->populateVisitedLinksFunc = getMethod(delegate, @selector(populateVisitedLinksForWebView:));
</span><span class="cx"> }
</span><span class="lines">@@ -3397,11 +3409,6 @@
</span><span class="cx">     return _private->editingDelegateForwarder;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)_closeWindow
-{
-    [[self _UIDelegateForwarder] webViewClose:self];
-}
-
</del><span class="cx"> + (void)_unregisterViewClassAndRepresentationClassForMIMEType:(NSString *)MIMEType
</span><span class="cx"> {
</span><span class="cx">     [[WebFrameView _viewTypesAllowImageTypeOmission:NO] removeObjectForKey:MIMEType];
</span><span class="lines">@@ -7344,6 +7351,155 @@
</span><span class="cx"> 
</span><span class="cx"> #endif // HAVE(TOUCH_BAR)
</span><span class="cx"> 
</span><ins>+static WebFrameView *containingFrameView(NSView *view)
+{
+    while (view && ![view isKindOfClass:[WebFrameView class]])
+        view = [view superview];
+    return (WebFrameView *)view;
+}
+
+#if !PLATFORM(IOS)
+- (float)_deviceScaleFactor
+{
+    if (_private->customDeviceScaleFactor != 0)
+        return _private->customDeviceScaleFactor;
+
+    NSWindow *window = [self window];
+    NSWindow *hostWindow = [self hostWindow];
+    if (window)
+        return [window backingScaleFactor];
+    if (hostWindow)
+        return [hostWindow backingScaleFactor];
+    return [[NSScreen mainScreen] backingScaleFactor];
+}
+#endif
+
++ (BOOL)_didSetCacheModel
+{
+    return s_didSetCacheModel;
+}
+
++ (WebCacheModel)_maxCacheModelInAnyInstance
+{
+    WebCacheModel cacheModel = WebCacheModelDocumentViewer;
+    NSEnumerator *enumerator = [(NSMutableSet *)allWebViewsSet objectEnumerator];
+    while (WebPreferences *preferences = [[enumerator nextObject] preferences])
+        cacheModel = std::max(cacheModel, [preferences cacheModel]);
+    return cacheModel;
+}
+
++ (void)_cacheModelChangedNotification:(NSNotification *)notification
+{
+#if PLATFORM(IOS)
+    // This needs to happen on the Web Thread
+    WebThreadRun(^{
+#endif
+    WebPreferences *preferences = (WebPreferences *)[notification object];
+    ASSERT([preferences isKindOfClass:[WebPreferences class]]);
+
+    WebCacheModel cacheModel = [preferences cacheModel];
+    if (![self _didSetCacheModel] || cacheModel > [self _cacheModel])
+        [self _setCacheModel:cacheModel];
+    else if (cacheModel < [self _cacheModel])
+        [self _setCacheModel:std::max([[WebPreferences standardPreferences] cacheModel], [self _maxCacheModelInAnyInstance])];
+#if PLATFORM(IOS)
+    });
+#endif
+}
+
++ (void)_preferencesRemovedNotification:(NSNotification *)notification
+{
+    WebPreferences *preferences = (WebPreferences *)[notification object];
+    ASSERT([preferences isKindOfClass:[WebPreferences class]]);
+
+    if ([preferences cacheModel] == [self _cacheModel])
+        [self _setCacheModel:std::max([[WebPreferences standardPreferences] cacheModel], [self _maxCacheModelInAnyInstance])];
+}
+
+- (WebFrame *)_focusedFrame
+{
+    NSResponder *resp = [[self window] firstResponder];
+    if (resp && [resp isKindOfClass:[NSView class]] && [(NSView *)resp isDescendantOf:[[self mainFrame] frameView]]) {
+        WebFrameView *frameView = containingFrameView((NSView *)resp);
+        ASSERT(frameView != nil);
+        return [frameView webFrame];
+    }
+
+    return nil;
+}
+
+- (BOOL)_isLoading
+{
+    WebFrame *mainFrame = [self mainFrame];
+    return [[mainFrame _dataSource] isLoading]
+        || [[mainFrame provisionalDataSource] isLoading];
+}
+
+- (WebFrameView *)_frameViewAtWindowPoint:(NSPoint)point
+{
+    if (_private->closed)
+        return nil;
+#if !PLATFORM(IOS)
+    NSView *view = [self hitTest:[[self superview] convertPoint:point fromView:nil]];
+#else
+    //[WebView superview] on iOS is nil, don't do a convertPoint
+    NSView *view = [self hitTest:point];
+#endif
+    if (![view isDescendantOf:[[self mainFrame] frameView]])
+        return nil;
+    WebFrameView *frameView = containingFrameView(view);
+    ASSERT(frameView);
+    return frameView;
+}
+
++ (void)_preflightSpellCheckerNow:(id)sender
+{
+#if !PLATFORM(IOS)
+    [[NSSpellChecker sharedSpellChecker] _preflightChosenSpellServer];
+#endif
+}
+
++ (void)_preflightSpellChecker
+{
+#if !PLATFORM(IOS)
+    // As AppKit does, we wish to delay tickling the shared spellchecker into existence on application launch.
+    if ([NSSpellChecker sharedSpellCheckerExists]) {
+        [self _preflightSpellCheckerNow:self];
+    } else {
+        [self performSelector:@selector(_preflightSpellCheckerNow:) withObject:self afterDelay:2.0];
+    }
+#endif
+}
+
+- (BOOL)_continuousCheckingAllowed
+{
+    static BOOL allowContinuousSpellChecking = YES;
+    static BOOL readAllowContinuousSpellCheckingDefault = NO;
+    if (!readAllowContinuousSpellCheckingDefault) {
+        if ([[NSUserDefaults standardUserDefaults] objectForKey:@"NSAllowContinuousSpellChecking"]) {
+            allowContinuousSpellChecking = [[NSUserDefaults standardUserDefaults] boolForKey:@"NSAllowContinuousSpellChecking"];
+        }
+        readAllowContinuousSpellCheckingDefault = YES;
+    }
+    return allowContinuousSpellChecking;
+}
+
+- (NSResponder *)_responderForResponderOperations
+{
+    NSResponder *responder = [[self window] firstResponder];
+    WebFrameView *mainFrameView = [[self mainFrame] frameView];
+
+    // If the current responder is outside of the webview, use our main frameView or its
+    // document view. We also do this for subviews of self that are siblings of the main
+    // frameView since clients might insert non-webview-related views there (see 4552713).
+    if (responder != self && ![mainFrameView _web_firstResponderIsSelfOrDescendantView]) {
+        responder = [mainFrameView documentView];
+        if (!responder)
+            responder = mainFrameView;
+    }
+    return responder;
+}
+
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @implementation WebView (WebIBActions)
</span><span class="lines">@@ -8676,33 +8832,6 @@
</span><span class="cx">     return coreFrame->editor().simplifyMarkup(coreStartNode, core(endNode));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-@end
-
-static WebFrameView *containingFrameView(NSView *view)
-{
-    while (view && ![view isKindOfClass:[WebFrameView class]])
-        view = [view superview];
-    return (WebFrameView *)view;    
-}
-
-@implementation WebView (WebFileInternal)
-
-#if !PLATFORM(IOS)
-- (float)_deviceScaleFactor
-{
-    if (_private->customDeviceScaleFactor != 0)
-        return _private->customDeviceScaleFactor;
-
-    NSWindow *window = [self window];
-    NSWindow *hostWindow = [self hostWindow];
-    if (window)
-        return [window backingScaleFactor];
-    if (hostWindow)
-        return [hostWindow backingScaleFactor];
-    return [[NSScreen mainScreen] backingScaleFactor];
-}
-#endif
-
</del><span class="cx"> + (void)_setCacheModel:(WebCacheModel)cacheModel
</span><span class="cx"> {
</span><span class="cx">     if (s_didSetCacheModel && cacheModel == s_cacheModel)
</span><span class="lines">@@ -8931,133 +9060,7 @@
</span><span class="cx">     return s_cacheModel;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-+ (BOOL)_didSetCacheModel
-{
-    return s_didSetCacheModel;
-}
-
-+ (WebCacheModel)_maxCacheModelInAnyInstance
-{
-    WebCacheModel cacheModel = WebCacheModelDocumentViewer;
-    NSEnumerator *enumerator = [(NSMutableSet *)allWebViewsSet objectEnumerator];
-    while (WebPreferences *preferences = [[enumerator nextObject] preferences])
-        cacheModel = std::max(cacheModel, [preferences cacheModel]);
-    return cacheModel;
-}
-
-+ (void)_cacheModelChangedNotification:(NSNotification *)notification
-{
-#if PLATFORM(IOS)
-    // This needs to happen on the Web Thread
-    WebThreadRun(^{
-#endif    
-    WebPreferences *preferences = (WebPreferences *)[notification object];
-    ASSERT([preferences isKindOfClass:[WebPreferences class]]);
-
-    WebCacheModel cacheModel = [preferences cacheModel];
-    if (![self _didSetCacheModel] || cacheModel > [self _cacheModel])
-        [self _setCacheModel:cacheModel];
-    else if (cacheModel < [self _cacheModel])
-        [self _setCacheModel:std::max([[WebPreferences standardPreferences] cacheModel], [self _maxCacheModelInAnyInstance])];
-#if PLATFORM(IOS)
-    });
-#endif
-}
-
-+ (void)_preferencesRemovedNotification:(NSNotification *)notification
-{
-    WebPreferences *preferences = (WebPreferences *)[notification object];
-    ASSERT([preferences isKindOfClass:[WebPreferences class]]);
-
-    if ([preferences cacheModel] == [self _cacheModel])
-        [self _setCacheModel:std::max([[WebPreferences standardPreferences] cacheModel], [self _maxCacheModelInAnyInstance])];
-}
-
-- (WebFrame *)_focusedFrame
-{
-    NSResponder *resp = [[self window] firstResponder];
-    if (resp && [resp isKindOfClass:[NSView class]] && [(NSView *)resp isDescendantOf:[[self mainFrame] frameView]]) {
-        WebFrameView *frameView = containingFrameView((NSView *)resp);
-        ASSERT(frameView != nil);
-        return [frameView webFrame];
-    }
-    
-    return nil;
-}
-
-- (BOOL)_isLoading
-{
-    WebFrame *mainFrame = [self mainFrame];
-    return [[mainFrame _dataSource] isLoading]
-        || [[mainFrame provisionalDataSource] isLoading];
-}
-
-- (WebFrameView *)_frameViewAtWindowPoint:(NSPoint)point
-{
-    if (_private->closed)
-        return nil;
</del><span class="cx"> #if !PLATFORM(IOS)
</span><del>-    NSView *view = [self hitTest:[[self superview] convertPoint:point fromView:nil]];
-#else
-    //[WebView superview] on iOS is nil, don't do a convertPoint
-    NSView *view = [self hitTest:point];    
-#endif
-    if (![view isDescendantOf:[[self mainFrame] frameView]])
-        return nil;
-    WebFrameView *frameView = containingFrameView(view);
-    ASSERT(frameView);
-    return frameView;
-}
-
-+ (void)_preflightSpellCheckerNow:(id)sender
-{
-#if !PLATFORM(IOS)
-    [[NSSpellChecker sharedSpellChecker] _preflightChosenSpellServer];
-#endif
-}
-
-+ (void)_preflightSpellChecker
-{
-#if !PLATFORM(IOS)
-    // As AppKit does, we wish to delay tickling the shared spellchecker into existence on application launch.
-    if ([NSSpellChecker sharedSpellCheckerExists]) {
-        [self _preflightSpellCheckerNow:self];
-    } else {
-        [self performSelector:@selector(_preflightSpellCheckerNow:) withObject:self afterDelay:2.0];
-    }
-#endif
-}
-
-- (BOOL)_continuousCheckingAllowed
-{
-    static BOOL allowContinuousSpellChecking = YES;
-    static BOOL readAllowContinuousSpellCheckingDefault = NO;
-    if (!readAllowContinuousSpellCheckingDefault) {
-        if ([[NSUserDefaults standardUserDefaults] objectForKey:@"NSAllowContinuousSpellChecking"]) {
-            allowContinuousSpellChecking = [[NSUserDefaults standardUserDefaults] boolForKey:@"NSAllowContinuousSpellChecking"];
-        }
-        readAllowContinuousSpellCheckingDefault = YES;
-    }
-    return allowContinuousSpellChecking;
-}
-
-- (NSResponder *)_responderForResponderOperations
-{
-    NSResponder *responder = [[self window] firstResponder];
-    WebFrameView *mainFrameView = [[self mainFrame] frameView];
-    
-    // If the current responder is outside of the webview, use our main frameView or its
-    // document view. We also do this for subviews of self that are siblings of the main
-    // frameView since clients might insert non-webview-related views there (see 4552713).
-    if (responder != self && ![mainFrameView _web_firstResponderIsSelfOrDescendantView]) {
-        responder = [mainFrameView documentView];
-        if (!responder)
-            responder = mainFrameView;
-    }
-    return responder;
-}
-
-#if !PLATFORM(IOS)
</del><span class="cx"> - (void)_openFrameInNewWindowFromMenu:(NSMenuItem *)sender
</span><span class="cx"> {
</span><span class="cx">     ASSERT_ARG(sender, [sender isKindOfClass:[NSMenuItem class]]);
</span><span class="lines">@@ -10063,6 +10066,11 @@
</span><span class="cx">     [self _updateVisibilityState];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (void)_closeWindow
+{
+    [[self _UIDelegateForwarder] webViewClose:self];
+}
+
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @implementation WebView (WebViewDeviceOrientation)
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebViewInternal.h (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebViewInternal.h  2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebViewInternal.h     2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -148,6 +148,8 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)_windowVisibilityChanged:(NSNotification *)notification;
</span><span class="cx"> 
</span><ins>+- (void)_closeWindow;
+
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h (236845 => 236846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h   2018-10-04 20:27:45 UTC (rev 236845)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h      2018-10-04 20:36:56 UTC (rev 236846)
</span><span class="lines">@@ -1085,6 +1085,10 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)webView:(WebView *)sender didLayout:(WebLayoutMilestones)milestones;
</span><span class="cx"> 
</span><ins>+#if TARGET_OS_IPHONE
+- (void)webThreadWebView:(WebView *)sender didLayout:(WebLayoutMilestones)milestones;
+#endif
+
</ins><span class="cx"> // For implementing the WebInspector's test harness
</span><span class="cx"> - (void)webView:(WebView *)webView didClearInspectorWindowObject:(WebScriptObject *)windowObject forFrame:(WebFrame *)frame;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>