<!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>[198179] trunk/Source/WebCore</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/198179">198179</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2016-03-14 17:47:11 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>iOS: RTFD format is not available in the pasteboard after copy/cut.
https://bugs.webkit.org/show_bug.cgi?id=155477
rdar://problem/23500600
Reviewed by Tim Horton.
WebKit is using UTTypeRTFD instead of UTTypeFlatRTFD that is the
proper RTFD format for pastedboard. I also discovered that, when
we create the NSTextAttachment in the NSAttributedString we produce
from the DOM range, we are not generating a file name with the
appropriate extension for the MIME type. The iOS specific implementation
of the MIMETypeRegistry functions were empty.
There is no need to have a differentiation between OS X and iOS, so
we now have only one file called MIMETypeRegistryCocoa.mm.
* WebCore.xcodeproj/project.pbxproj:
* platform/cocoa/MIMETypeRegistryCocoa.mm: Added.
(WebCore::MIMETypeRegistry::getMIMETypeForExtension):
(WebCore::MIMETypeRegistry::getExtensionsForMIMEType):
(WebCore::MIMETypeRegistry::getPreferredExtensionForMIMEType):
(WebCore::MIMETypeRegistry::isApplicationPluginMIMEType):
* platform/ios/MIMETypeRegistryIOS.mm: Removed.
* platform/ios/PasteboardIOS.mm:
(WebCore::Pasteboard::read):
(WebCore::Pasteboard::supportedPasteboardTypes):
(WebCore::Pasteboard::hasData):
* platform/ios/PlatformPasteboardIOS.mm:
(WebCore::PlatformPasteboard::write):
* platform/mac/MIMETypeRegistryMac.mm: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPasteboardIOSmm">trunk/Source/WebCore/platform/ios/PasteboardIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlatformPasteboardIOSmm">trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformcocoaMIMETypeRegistryCocoamm">trunk/Source/WebCore/platform/cocoa/MIMETypeRegistryCocoa.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformiosMIMETypeRegistryIOSmm">trunk/Source/WebCore/platform/ios/MIMETypeRegistryIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacMIMETypeRegistryMacmm">trunk/Source/WebCore/platform/mac/MIMETypeRegistryMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198178 => 198179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-15 00:39:59 UTC (rev 198178)
+++ trunk/Source/WebCore/ChangeLog 2016-03-15 00:47:11 UTC (rev 198179)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-03-14 Enrica Casucci <enrica@apple.com>
+
+ iOS: RTFD format is not available in the pasteboard after copy/cut.
+ https://bugs.webkit.org/show_bug.cgi?id=155477
+ rdar://problem/23500600
+
+ Reviewed by Tim Horton.
+
+ WebKit is using UTTypeRTFD instead of UTTypeFlatRTFD that is the
+ proper RTFD format for pastedboard. I also discovered that, when
+ we create the NSTextAttachment in the NSAttributedString we produce
+ from the DOM range, we are not generating a file name with the
+ appropriate extension for the MIME type. The iOS specific implementation
+ of the MIMETypeRegistry functions were empty.
+ There is no need to have a differentiation between OS X and iOS, so
+ we now have only one file called MIMETypeRegistryCocoa.mm.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/cocoa/MIMETypeRegistryCocoa.mm: Added.
+ (WebCore::MIMETypeRegistry::getMIMETypeForExtension):
+ (WebCore::MIMETypeRegistry::getExtensionsForMIMEType):
+ (WebCore::MIMETypeRegistry::getPreferredExtensionForMIMEType):
+ (WebCore::MIMETypeRegistry::isApplicationPluginMIMEType):
+ * platform/ios/MIMETypeRegistryIOS.mm: Removed.
+ * platform/ios/PasteboardIOS.mm:
+ (WebCore::Pasteboard::read):
+ (WebCore::Pasteboard::supportedPasteboardTypes):
+ (WebCore::Pasteboard::hasData):
+ * platform/ios/PlatformPasteboardIOS.mm:
+ (WebCore::PlatformPasteboard::write):
+ * platform/mac/MIMETypeRegistryMac.mm: Removed.
+
</ins><span class="cx"> 2016-03-14 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Display Content Security Policy hash in details sidebar for script and style elements
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (198178 => 198179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-03-15 00:39:59 UTC (rev 198178)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-03-15 00:47:11 UTC (rev 198179)
</span><span class="lines">@@ -5629,7 +5629,6 @@
</span><span class="cx"> BC772C470C4EB2C60083285F /* XMLHttpRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = BC772C450C4EB2C60083285F /* XMLHttpRequest.h */; };
</span><span class="cx"> BC772C4E0C4EB3040083285F /* MIMETypeRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC772C4C0C4EB3040083285F /* MIMETypeRegistry.cpp */; };
</span><span class="cx"> BC772C4F0C4EB3040083285F /* MIMETypeRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = BC772C4D0C4EB3040083285F /* MIMETypeRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- BC772C5E0C4EB3440083285F /* MIMETypeRegistryMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC772C5D0C4EB3440083285F /* MIMETypeRegistryMac.mm */; };
</del><span class="cx"> BC772E131331620C001EC9CE /* CSSLineBoxContainValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC772E121331620C001EC9CE /* CSSLineBoxContainValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC772E16133162C2001EC9CE /* CSSLineBoxContainValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC772E15133162C2001EC9CE /* CSSLineBoxContainValue.cpp */; };
</span><span class="cx"> BC779E141BB215BB00CAA8BF /* CSSCustomPropertyValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC779E131BB215BB00CAA8BF /* CSSCustomPropertyValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -5943,6 +5942,7 @@
</span><span class="cx"> C5227DF11C3C6DF100F5ED54 /* DataDetection.h in Headers */ = {isa = PBXBuildFile; fileRef = C5227DEF1C3C6DD700F5ED54 /* DataDetection.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C5227DF21C3C6DF900F5ED54 /* DataDetection.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5227DF01C3C6DD700F5ED54 /* DataDetection.mm */; };
</span><span class="cx"> C5278B0C17F212EA003A2998 /* PlatformPasteboardIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5278B0B17F212EA003A2998 /* PlatformPasteboardIOS.mm */; };
</span><ins>+ C53D39341C978A45007F3AE9 /* MIMETypeRegistryCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = C53D39331C97892D007F3AE9 /* MIMETypeRegistryCocoa.mm */; };
</ins><span class="cx"> C544274B11A57E7A0063A749 /* DOMStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = C544274911A57E7A0063A749 /* DOMStringList.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C55610F111A704EB00B82D27 /* DOMStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C55610F011A704EB00B82D27 /* DOMStringList.cpp */; };
</span><span class="cx"> C5592F781A92AA28001F8862 /* CharacterProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = C5592F771A92AA28001F8862 /* CharacterProperties.h */; };
</span><span class="lines">@@ -6620,7 +6620,6 @@
</span><span class="cx"> E44FA1871BCA91560091B6EF /* ComposedTreeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E44FA1861BCA91560091B6EF /* ComposedTreeIterator.cpp */; };
</span><span class="cx"> E45322AB140CE267005A0F92 /* SelectorQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45322A9140CE267005A0F92 /* SelectorQuery.cpp */; };
</span><span class="cx"> E45322AC140CE267005A0F92 /* SelectorQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = E45322AA140CE267005A0F92 /* SelectorQuery.h */; };
</span><del>- E453901D0EAFCACA003695C8 /* MIMETypeRegistryIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390180EAFCACA003695C8 /* MIMETypeRegistryIOS.mm */; };
</del><span class="cx"> E453901E0EAFCACA003695C8 /* PasteboardIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390190EAFCACA003695C8 /* PasteboardIOS.mm */; };
</span><span class="cx"> E45390430EAFD637003695C8 /* PlatformScreenIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390320EAFD637003695C8 /* PlatformScreenIOS.mm */; };
</span><span class="cx"> E45390450EAFD637003695C8 /* ScrollViewIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390340EAFD637003695C8 /* ScrollViewIOS.mm */; };
</span><span class="lines">@@ -13546,7 +13545,6 @@
</span><span class="cx"> BC772C450C4EB2C60083285F /* XMLHttpRequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XMLHttpRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> BC772C4C0C4EB3040083285F /* MIMETypeRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MIMETypeRegistry.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC772C4D0C4EB3040083285F /* MIMETypeRegistry.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MIMETypeRegistry.h; sourceTree = "<group>"; };
</span><del>- BC772C5D0C4EB3440083285F /* MIMETypeRegistryMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = MIMETypeRegistryMac.mm; sourceTree = "<group>"; };
</del><span class="cx"> BC772E121331620C001EC9CE /* CSSLineBoxContainValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSLineBoxContainValue.h; sourceTree = "<group>"; };
</span><span class="cx"> BC772E15133162C2001EC9CE /* CSSLineBoxContainValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSLineBoxContainValue.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC779E131BB215BB00CAA8BF /* CSSCustomPropertyValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSCustomPropertyValue.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -13898,6 +13896,7 @@
</span><span class="cx"> C5227DEF1C3C6DD700F5ED54 /* DataDetection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataDetection.h; sourceTree = "<group>"; };
</span><span class="cx"> C5227DF01C3C6DD700F5ED54 /* DataDetection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DataDetection.mm; sourceTree = "<group>"; };
</span><span class="cx"> C5278B0B17F212EA003A2998 /* PlatformPasteboardIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformPasteboardIOS.mm; sourceTree = "<group>"; };
</span><ins>+ C53D39331C97892D007F3AE9 /* MIMETypeRegistryCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MIMETypeRegistryCocoa.mm; sourceTree = "<group>"; };
</ins><span class="cx"> C544274911A57E7A0063A749 /* DOMStringList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMStringList.h; sourceTree = "<group>"; };
</span><span class="cx"> C544274A11A57E7A0063A749 /* DOMStringList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMStringList.idl; sourceTree = "<group>"; };
</span><span class="cx"> C55610F011A704EB00B82D27 /* DOMStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMStringList.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -14662,7 +14661,6 @@
</span><span class="cx"> E44FA1861BCA91560091B6EF /* ComposedTreeIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComposedTreeIterator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E45322A9140CE267005A0F92 /* SelectorQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectorQuery.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E45322AA140CE267005A0F92 /* SelectorQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectorQuery.h; sourceTree = "<group>"; };
</span><del>- E45390180EAFCACA003695C8 /* MIMETypeRegistryIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MIMETypeRegistryIOS.mm; sourceTree = "<group>"; };
</del><span class="cx"> E45390190EAFCACA003695C8 /* PasteboardIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PasteboardIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> E45390320EAFD637003695C8 /* PlatformScreenIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformScreenIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> E45390340EAFD637003695C8 /* ScrollViewIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollViewIOS.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -17865,7 +17863,6 @@
</span><span class="cx"> 06E81ED60AB5D5E900C87837 /* LocalCurrentGraphicsContext.h */,
</span><span class="cx"> 06E81EEB0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm */,
</span><span class="cx"> 1402645D0AFDC19B005919E2 /* LoggingMac.mm */,
</span><del>- BC772C5D0C4EB3440083285F /* MIMETypeRegistryMac.mm */,
</del><span class="cx"> 93500F3113FDE3BE0099EC24 /* NSScrollerImpDetails.h */,
</span><span class="cx"> 52F52E1014A0134F00ACC397 /* NSScrollerImpDetails.mm */,
</span><span class="cx"> 4B2709810AF2E5E00065127F /* PasteboardMac.mm */,
</span><span class="lines">@@ -19977,7 +19974,6 @@
</span><span class="cx"> E4B65A5D132FADB60070E7BE /* LegacyTileLayer.mm */,
</span><span class="cx"> E4E39AFA1330EFA8003AB274 /* LegacyTileLayerPool.h */,
</span><span class="cx"> E4E39AFC1330EFC5003AB274 /* LegacyTileLayerPool.mm */,
</span><del>- E45390180EAFCACA003695C8 /* MIMETypeRegistryIOS.mm */,
</del><span class="cx"> E45390190EAFCACA003695C8 /* PasteboardIOS.mm */,
</span><span class="cx"> 26601EBD14B3B9AD0012C0FE /* PlatformEventFactoryIOS.h */,
</span><span class="cx"> 26601EBE14B3B9AD0012C0FE /* PlatformEventFactoryIOS.mm */,
</span><span class="lines">@@ -20035,6 +20031,7 @@
</span><span class="cx"> 1A0409F21A43675C009E47F3 /* MachSendRight.cpp */,
</span><span class="cx"> 1A0409DB1A4360B5009E47F3 /* MachSendRight.h */,
</span><span class="cx"> ADB6B29718FB90240081963E /* MemoryPressureHandlerCocoa.mm */,
</span><ins>+ C53D39331C97892D007F3AE9 /* MIMETypeRegistryCocoa.mm */,
</ins><span class="cx"> A19D93491AA11B1E00B46C24 /* NetworkExtensionContentFilter.h */,
</span><span class="cx"> A19D93481AA11B1E00B46C24 /* NetworkExtensionContentFilter.mm */,
</span><span class="cx"> A18890AD1AA13F250026C301 /* ParentalControlsContentFilter.h */,
</span><span class="lines">@@ -29966,6 +29963,7 @@
</span><span class="cx"> A81369D7097374F600D74463 /* HTMLTextAreaElement.cpp in Sources */,
</span><span class="cx"> 9BC6C21C13CCC97B008E0337 /* HTMLTextFormControlElement.cpp in Sources */,
</span><span class="cx"> 830519951BB0F11000F3772E /* HTMLTimeElement.cpp in Sources */,
</span><ins>+ C53D39341C978A45007F3AE9 /* MIMETypeRegistryCocoa.mm in Sources */,
</ins><span class="cx"> A871DC290A15205700B12A68 /* HTMLTitleElement.cpp in Sources */,
</span><span class="cx"> 977B3877122883E900B81FF8 /* HTMLTokenizer.cpp in Sources */,
</span><span class="cx"> 0707568B142262D600414161 /* HTMLTrackElement.cpp in Sources */,
</span><span class="lines">@@ -31002,8 +31000,6 @@
</span><span class="cx"> CB8CF0181A9358D4000D510B /* Microtasks.cpp in Sources */,
</span><span class="cx"> 37DDCD9413844FD50008B793 /* MIMEHeader.cpp in Sources */,
</span><span class="cx"> BC772C4E0C4EB3040083285F /* MIMETypeRegistry.cpp in Sources */,
</span><del>- E453901D0EAFCACA003695C8 /* MIMETypeRegistryIOS.mm in Sources */,
- BC772C5E0C4EB3440083285F /* MIMETypeRegistryMac.mm in Sources */,
</del><span class="cx"> 52F10865162B6DA4009AC81E /* MixedContentChecker.cpp in Sources */,
</span><span class="cx"> CDF2B0101820540600F2B424 /* MockBox.cpp in Sources */,
</span><span class="cx"> CDF2B0121820540600F2B424 /* MockMediaPlayerMediaSource.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMIMETypeRegistryCocoamm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/cocoa/MIMETypeRegistryCocoa.mm (0 => 198179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MIMETypeRegistryCocoa.mm (rev 0)
+++ trunk/Source/WebCore/platform/cocoa/MIMETypeRegistryCocoa.mm 2016-03-15 00:47:11 UTC (rev 198179)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+/*
+ * Copyright (C) 2006 Apple Inc. All rights reserved.
+ * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "MIMETypeRegistry.h"
+
+#include "NSURLFileTypeMappingsSPI.h"
+
+namespace WebCore {
+
+String MIMETypeRegistry::getMIMETypeForExtension(const String& extension)
+{
+ return [[NSURLFileTypeMappings sharedMappings] MIMETypeForExtension:(NSString *)extension];
+}
+
+Vector<String> MIMETypeRegistry::getExtensionsForMIMEType(const String& type)
+{
+ NSArray *stringsArray = [[NSURLFileTypeMappings sharedMappings] extensionsForMIMEType:(NSString *)type];
+ Vector<String> stringsVector = Vector<String>();
+ unsigned count = [stringsArray count];
+ if (count > 0) {
+ NSEnumerator* enumerator = [stringsArray objectEnumerator];
+ NSString* string;
+ while ((string = [enumerator nextObject]) != nil)
+ stringsVector.append(string);
+ }
+ return stringsVector;
+}
+
+String MIMETypeRegistry::getPreferredExtensionForMIMEType(const String& type)
+{
+ return [[NSURLFileTypeMappings sharedMappings] preferredExtensionForMIMEType:(NSString *)type];
+}
+
+bool MIMETypeRegistry::isApplicationPluginMIMEType(const String& MIMEType)
+{
+#if ENABLE(PDFKIT_PLUGIN)
+ // FIXME: This should test if we're actually going to use PDFPlugin,
+ // but we only know that in WebKit2 at the moment. This is not a problem
+ // in practice because if we don't have PDFPlugin and we go to instantiate the
+ // plugin, there won't exist an application plugin supporting these MIME types.
+ if (isPDFOrPostScriptMIMEType(MIMEType))
+ return true;
+#else
+ UNUSED_PARAM(MIMEType);
+#endif
+
+ return false;
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformiosMIMETypeRegistryIOSmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/ios/MIMETypeRegistryIOS.mm (198178 => 198179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/MIMETypeRegistryIOS.mm 2016-03-15 00:39:59 UTC (rev 198178)
+++ trunk/Source/WebCore/platform/ios/MIMETypeRegistryIOS.mm 2016-03-15 00:47:11 UTC (rev 198179)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "MIMETypeRegistry.h"
-
-#include "NSURLFileTypeMappingsSPI.h"
-
-namespace WebCore
-{
-String MIMETypeRegistry::getMIMETypeForExtension(const String& extension)
-{
- return [[NSURLFileTypeMappings sharedMappings] MIMETypeForExtension:(NSString *)extension];
-}
-
-Vector<String> MIMETypeRegistry::getExtensionsForMIMEType(const String& /*type*/)
-{
- return Vector<String>();
-}
-
-String MIMETypeRegistry::getPreferredExtensionForMIMEType(const String& /*type*/)
-{
- return String();
-}
-
-bool MIMETypeRegistry::isApplicationPluginMIMEType(const String&)
-{
- return false;
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPasteboardIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (198178 => 198179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2016-03-15 00:39:59 UTC (rev 198178)
+++ trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2016-03-15 00:47:11 UTC (rev 198179)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassMIMEType, CFStringRef)
</span><span class="cx"> SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassFilenameExtension, CFStringRef)
</span><span class="cx"> SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeHTML, CFStringRef)
</span><del>-SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeRTFD, CFStringRef)
</del><ins>+SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeFlatRTFD, CFStringRef)
</ins><span class="cx"> SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeRTF, CFStringRef)
</span><span class="cx">
</span><span class="cx"> #define kUTTypeText getkUTTypeText()
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> #define kUTTagClassMIMEType getkUTTagClassMIMEType()
</span><span class="cx"> #define kUTTagClassFilenameExtension getkUTTagClassFilenameExtension()
</span><span class="cx"> #define kUTTypeHTML getkUTTypeHTML()
</span><del>-#define kUTTypeRTFD getkUTTypeRTFD()
</del><ins>+#define kUTTypeFlatRTFD getkUTTypeFlatRTFD()
</ins><span class="cx"> #define kUTTypeRTF getkUTTypeRTF()
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -207,8 +207,8 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ([type isEqualToString:(NSString *)kUTTypeRTFD]) {
- if (RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(i, kUTTypeRTFD)) {
</del><ins>+ if ([type isEqualToString:(NSString *)kUTTypeFlatRTFD]) {
+ if (RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(i, kUTTypeFlatRTFD)) {
</ins><span class="cx"> if (reader.readRTFD(*buffer))
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx">
</span><span class="cx"> NSArray* Pasteboard::supportedPasteboardTypes()
</span><span class="cx"> {
</span><del>- return @[(id)WebArchivePboardType, (id)kUTTypeRTFD, (id)kUTTypeRTF, (id)kUTTypeHTML, (id)kUTTypePNG, (id)kUTTypeTIFF, (id)kUTTypeJPEG, (id)kUTTypeGIF, (id)kUTTypeURL, (id)kUTTypeText];
</del><ins>+ return @[(id)WebArchivePboardType, (id)kUTTypeFlatRTFD, (id)kUTTypeRTF, (id)kUTTypeHTML, (id)kUTTypePNG, (id)kUTTypeTIFF, (id)kUTTypeJPEG, (id)kUTTypeGIF, (id)kUTTypeURL, (id)kUTTypeText];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Pasteboard::hasData()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlatformPasteboardIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (198178 => 198179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2016-03-15 00:39:59 UTC (rev 198178)
+++ trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2016-03-15 00:47:11 UTC (rev 198179)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeGIF, CFStringRef)
</span><span class="cx"> SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassMIMEType, CFStringRef)
</span><span class="cx"> SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassFilenameExtension, CFStringRef)
</span><del>-SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeRTFD, CFStringRef)
</del><ins>+SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeFlatRTFD, CFStringRef)
</ins><span class="cx"> SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeRTF, CFStringRef)
</span><span class="cx">
</span><span class="cx"> #define kUTTypeText getkUTTypeText()
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> #define kUTTypeGIF getkUTTypeGIF()
</span><span class="cx"> #define kUTTagClassMIMEType getkUTTagClassMIMEType()
</span><span class="cx"> #define kUTTagClassFilenameExtension getkUTTagClassFilenameExtension()
</span><del>-#define kUTTypeRTFD getkUTTypeRTFD()
</del><ins>+#define kUTTypeFlatRTFD getkUTTypeFlatRTFD()
</ins><span class="cx"> #define kUTTypeRTF getkUTTypeRTF()
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (content.dataInRTFDFormat)
</span><del>- [representations setValue:content.dataInRTFDFormat->createNSData().get() forKey:(NSString *)kUTTypeRTFD];
</del><ins>+ [representations setValue:content.dataInRTFDFormat->createNSData().get() forKey:(NSString *)kUTTypeFlatRTFD];
</ins><span class="cx"> if (content.dataInRTFFormat)
</span><span class="cx"> [representations setValue:content.dataInRTFFormat->createNSData().get() forKey:(NSString *)kUTTypeRTF];
</span><span class="cx"> [representations setValue:content.dataInStringFormat forKey:(NSString *)kUTTypeText];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacMIMETypeRegistryMacmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mac/MIMETypeRegistryMac.mm (198178 => 198179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/MIMETypeRegistryMac.mm 2016-03-15 00:39:59 UTC (rev 198178)
+++ trunk/Source/WebCore/platform/mac/MIMETypeRegistryMac.mm 2016-03-15 00:47:11 UTC (rev 198179)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006 Apple Inc. All rights reserved.
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "MIMETypeRegistry.h"
-
-#include "NSURLFileTypeMappingsSPI.h"
-#include <wtf/Assertions.h>
-#include <wtf/MainThread.h>
-
-namespace WebCore
-{
-
-String MIMETypeRegistry::getMIMETypeForExtension(const String& extension)
-{
- ASSERT(isMainThread());
- return [[NSURLFileTypeMappings sharedMappings] MIMETypeForExtension:(NSString *)extension];
-}
-
-Vector<String> MIMETypeRegistry::getExtensionsForMIMEType(const String& type)
-{
- NSArray *stringsArray = [[NSURLFileTypeMappings sharedMappings] extensionsForMIMEType:(NSString *)type];
- Vector<String> stringsVector = Vector<String>();
- unsigned count = [stringsArray count];
- if (count > 0) {
- NSEnumerator* enumerator = [stringsArray objectEnumerator];
- NSString* string;
- while ((string = [enumerator nextObject]) != nil)
- stringsVector.append(string);
- }
- return stringsVector;
-}
-
-String MIMETypeRegistry::getPreferredExtensionForMIMEType(const String& type)
-{
- return [[NSURLFileTypeMappings sharedMappings] preferredExtensionForMIMEType:(NSString *)type];
-}
-
-bool MIMETypeRegistry::isApplicationPluginMIMEType(const String& MIMEType)
-{
-#if ENABLE(PDFKIT_PLUGIN)
- // FIXME: This should test if we're actually going to use PDFPlugin,
- // but we only know that in WebKit2 at the moment. This is not a problem
- // in practice because if we don't have PDFPlugin and we go to instantiate the
- // plugin, there won't exist an application plugin supporting these MIME types.
- if (isPDFOrPostScriptMIMEType(MIMEType))
- return true;
-#endif
-
- return false;
-}
-
-}
</del></span></pre>
</div>
</div>
</body>
</html>