<!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>[180601] trunk</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/180601">180601</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2015-02-24 17:49:59 -0800 (Tue, 24 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Attachment] Give <attachment> elements an underlying File
https://bugs.webkit.org/show_bug.cgi?id=141993
Reviewed by Tim Horton.
Source/WebCore:
- Add a JS subclass for attachments so that <attachment>s are
instances of HTMLAttachmentElement rather than HTMLElement.
- Give HTMLAttachmentElements an underlying File that they
are the representation of. Expose it via a new 'file' property.
- Expose a new Internals function called window.internals.createFile(url)
that allows creating File objects for testing.
* CMakeLists.txt:
* DerivedSources.cpp:
* DerivedSources.make:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* fileapi/File.h:
* html/HTMLAttachmentElement.cpp:
(WebCore::HTMLAttachmentElement::~HTMLAttachmentElement):
(WebCore::HTMLAttachmentElement::file):
(WebCore::HTMLAttachmentElement::setFile):
* html/HTMLAttachmentElement.h:
* html/HTMLAttachmentElement.idl: Added.
* html/HTMLTagNames.in:
* testing/Internals.cpp:
(WebCore::Internals::createFile):
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
Update attachment-dom.html to test setting and getting the
underlying file.
* fast/attachment/attachment-dom-expected.txt:
* fast/attachment/attachment-dom.html:
* fast/attachment/resources: Added.
* fast/attachment/resources/test-file.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastattachmentattachmentdomexpectedtxt">trunk/LayoutTests/fast/attachment/attachment-dom-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastattachmentattachmentdomhtml">trunk/LayoutTests/fast/attachment/attachment-dom.html</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorefileapiFileh">trunk/Source/WebCore/fileapi/File.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAttachmentElementcpp">trunk/Source/WebCore/html/HTMLAttachmentElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAttachmentElementh">trunk/Source/WebCore/html/HTMLAttachmentElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTagNamesin">trunk/Source/WebCore/html/HTMLTagNames.in</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/fast/attachment/resources/</li>
<li><a href="#trunkLayoutTestsfastattachmentresourcestestfiletxt">trunk/LayoutTests/fast/attachment/resources/test-file.txt</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAttachmentElementidl">trunk/Source/WebCore/html/HTMLAttachmentElement.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/LayoutTests/ChangeLog 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-02-24 Sam Weinig <sam@webkit.org>
+
+ [Attachment] Give <attachment> elements an underlying File
+ https://bugs.webkit.org/show_bug.cgi?id=141993
+
+ Reviewed by Tim Horton.
+
+ Update attachment-dom.html to test setting and getting the
+ underlying file.
+
+ * fast/attachment/attachment-dom-expected.txt:
+ * fast/attachment/attachment-dom.html:
+ * fast/attachment/resources: Added.
+ * fast/attachment/resources/test-file.txt: Added.
+
</ins><span class="cx"> 2015-02-24 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: Implement support for ARIA 1.1 'switch' role
</span></span></pre></div>
<a id="trunkLayoutTestsfastattachmentattachmentdomexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/attachment/attachment-dom-expected.txt (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/attachment/attachment-dom-expected.txt 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/LayoutTests/fast/attachment/attachment-dom-expected.txt 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -3,7 +3,11 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS attachment is an instance of HTMLElement
</del><ins>+PASS attachment is an instance of HTMLAttachmentElement
+PASS attachment.file is null
+Setting attachment.file to a file created from resources/test-file.txt
+PASS attachment.file is file
+PASS attachment.file.name is 'test-file.txt'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastattachmentattachmentdomhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/attachment/attachment-dom.html (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/attachment/attachment-dom.html 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/LayoutTests/fast/attachment/attachment-dom.html 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -10,8 +10,19 @@
</span><span class="cx"> description("This tests that attachments have an instance type of HTMLElement.");
</span><span class="cx">
</span><span class="cx"> var attachment = document.createElement("attachment");
</span><del>-shouldBeType("attachment", "HTMLElement");
</del><ins>+shouldBeType("attachment", "HTMLAttachmentElement");
</ins><span class="cx">
</span><ins>+var file;
+if (window.internals) {
+ file = window.internals.createFile("resources/test-file.txt");
+}
+
+shouldBeNull("attachment.file");
+
+debug("Setting attachment.file to a file created from resources/test-file.txt")
+attachment.file = file;
+shouldBe("attachment.file", "file");
+shouldBe("attachment.file.name", "'test-file.txt'");
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsfastattachmentresourcestestfiletxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/attachment/resources/test-file.txt ( => )</h4>
<pre class="diff"><span>
<span class="info">Modified: trunk/Source/WebCore/CMakeLists.txt
===================================================================
</span><del>--- trunk/Source/WebCore/CMakeLists.txt 2015-02-25 01:43:42 UTC (rev 180600)
</del><ins>+++ trunk/Source/WebCore/CMakeLists.txt 2015-02-25 01:49:59 UTC (rev 180601)
</ins><span class="lines">@@ -445,6 +445,7 @@
</span><span class="cx"> html/HTMLAnchorElement.idl
</span><span class="cx"> html/HTMLAppletElement.idl
</span><span class="cx"> html/HTMLAreaElement.idl
</span><ins>+ html/HTMLAttachmentElement.idl
</ins><span class="cx"> html/HTMLAudioElement.idl
</span><span class="cx"> html/HTMLBRElement.idl
</span><span class="cx"> html/HTMLBaseElement.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/Source/WebCore/ChangeLog 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-02-24 Sam Weinig <sam@webkit.org>
+
+ [Attachment] Give <attachment> elements an underlying File
+ https://bugs.webkit.org/show_bug.cgi?id=141993
+
+ Reviewed by Tim Horton.
+
+ - Add a JS subclass for attachments so that <attachment>s are
+ instances of HTMLAttachmentElement rather than HTMLElement.
+ - Give HTMLAttachmentElements an underlying File that they
+ are the representation of. Expose it via a new 'file' property.
+ - Expose a new Internals function called window.internals.createFile(url)
+ that allows creating File objects for testing.
+
+ * CMakeLists.txt:
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * fileapi/File.h:
+ * html/HTMLAttachmentElement.cpp:
+ (WebCore::HTMLAttachmentElement::~HTMLAttachmentElement):
+ (WebCore::HTMLAttachmentElement::file):
+ (WebCore::HTMLAttachmentElement::setFile):
+ * html/HTMLAttachmentElement.h:
+ * html/HTMLAttachmentElement.idl: Added.
+ * html/HTMLTagNames.in:
+ * testing/Internals.cpp:
+ (WebCore::Internals::createFile):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2015-02-24 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: Implement support for ARIA 1.1 'switch' role
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/Source/WebCore/DerivedSources.cpp 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -171,6 +171,9 @@
</span><span class="cx"> #include "JSHTMLAnchorElement.cpp"
</span><span class="cx"> #include "JSHTMLAppletElement.cpp"
</span><span class="cx"> #include "JSHTMLAreaElement.cpp"
</span><ins>+#if ENABLE(ATTACHMENT_ELEMENT)
+#include "JSHTMLAttachmentElement.cpp"
+#endif
</ins><span class="cx"> #include "JSHTMLAudioElement.cpp"
</span><span class="cx"> #include "JSHTMLBaseElement.cpp"
</span><span class="cx"> #include "JSHTMLBaseFontElement.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/Source/WebCore/DerivedSources.make 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -331,6 +331,7 @@
</span><span class="cx"> $(WebCore)/html/HTMLAnchorElement.idl \
</span><span class="cx"> $(WebCore)/html/HTMLAppletElement.idl \
</span><span class="cx"> $(WebCore)/html/HTMLAreaElement.idl \
</span><ins>+ $(WebCore)/html/HTMLAttachmentElement.idl \
</ins><span class="cx"> $(WebCore)/html/HTMLAudioElement.idl \
</span><span class="cx"> $(WebCore)/html/HTMLBRElement.idl \
</span><span class="cx"> $(WebCore)/html/HTMLBaseElement.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -2227,6 +2227,20 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLAttachmentElement.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLAudioElement.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -18616,6 +18630,7 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLAnchorElement.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLAppletElement.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLAreaElement.h" />
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLAttachmentElement.h" />
</ins><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLAudioElement.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLBaseElement.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLBaseFontElement.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -5323,6 +5323,9 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLAreaElement.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLAttachmentElement.cpp">
+ <Filter>DerivedSources</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLAudioElement.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -12677,6 +12680,9 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLAreaElement.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLAttachmentElement.h">
+ <Filter>DerivedSources</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHTMLAudioElement.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -2492,6 +2492,8 @@
</span><span class="cx"> 7C74D43818823B1900E5ED57 /* UTextProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C74D43618823B1900E5ED57 /* UTextProvider.h */; };
</span><span class="cx"> 7C74D43B1882400400E5ED57 /* UTextProviderUTF16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C74D4391882400400E5ED57 /* UTextProviderUTF16.cpp */; };
</span><span class="cx"> 7C74D43C1882400400E5ED57 /* UTextProviderUTF16.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C74D43A1882400400E5ED57 /* UTextProviderUTF16.h */; };
</span><ins>+ 7C9DBFED1A9C49B1000D6B25 /* JSHTMLAttachmentElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C9DBFEB1A9C49B1000D6B25 /* JSHTMLAttachmentElement.cpp */; };
+ 7C9DBFEE1A9C49B1000D6B25 /* JSHTMLAttachmentElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C9DBFEC1A9C49B1000D6B25 /* JSHTMLAttachmentElement.h */; };
</ins><span class="cx"> 7CC564B818BABEA6001B9652 /* TelephoneNumberDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CC564B618BABEA6001B9652 /* TelephoneNumberDetector.h */; };
</span><span class="cx"> 7CC564BA18BAC720001B9652 /* TelephoneNumberDetectorCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC564B918BAC720001B9652 /* TelephoneNumberDetectorCocoa.cpp */; };
</span><span class="cx"> 7CC69940191EC5F500AF2270 /* JSWebKitNamespace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC6993E191EC5F500AF2270 /* JSWebKitNamespace.cpp */; };
</span><span class="lines">@@ -9683,6 +9685,9 @@
</span><span class="cx"> 7C74D43618823B1900E5ED57 /* UTextProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UTextProvider.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C74D4391882400400E5ED57 /* UTextProviderUTF16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UTextProviderUTF16.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C74D43A1882400400E5ED57 /* UTextProviderUTF16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UTextProviderUTF16.h; sourceTree = "<group>"; };
</span><ins>+ 7C9DBFEA1A9C489F000D6B25 /* HTMLAttachmentElement.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = HTMLAttachmentElement.idl; sourceTree = "<group>"; };
+ 7C9DBFEB1A9C49B1000D6B25 /* JSHTMLAttachmentElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSHTMLAttachmentElement.cpp; path = JSHTMLAttachmentElement.cpp; sourceTree = "<group>"; };
+ 7C9DBFEC1A9C49B1000D6B25 /* JSHTMLAttachmentElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSHTMLAttachmentElement.h; path = JSHTMLAttachmentElement.h; sourceTree = "<group>"; };
</ins><span class="cx"> 7CC564B618BABEA6001B9652 /* TelephoneNumberDetector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TelephoneNumberDetector.h; sourceTree = "<group>"; };
</span><span class="cx"> 7CC564B918BAC720001B9652 /* TelephoneNumberDetectorCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TelephoneNumberDetectorCocoa.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7CC6993E191EC5F500AF2270 /* JSWebKitNamespace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitNamespace.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -17777,6 +17782,7 @@
</span><span class="cx"> 1AE2A9F00A1CDA5700B42B25 /* HTMLAreaElement.idl */,
</span><span class="cx"> 7C5F28F91A827D8400C0F31F /* HTMLAttachmentElement.cpp */,
</span><span class="cx"> 7C5F28FA1A827D8400C0F31F /* HTMLAttachmentElement.h */,
</span><ins>+ 7C9DBFEA1A9C489F000D6B25 /* HTMLAttachmentElement.idl */,
</ins><span class="cx"> 519FE0A10DAD446E00A08F21 /* HTMLAttributeNames.in */,
</span><span class="cx"> E446138F0CD6331000FADA75 /* HTMLAudioElement.cpp */,
</span><span class="cx"> E44613900CD6331000FADA75 /* HTMLAudioElement.h */,
</span><span class="lines">@@ -18776,6 +18782,8 @@
</span><span class="cx"> 1A4A2DEE0A1B852A00C807F8 /* JSHTMLAppletElement.h */,
</span><span class="cx"> 1AE2AA0A0A1CDAB300B42B25 /* JSHTMLAreaElement.cpp */,
</span><span class="cx"> 1AE2AA0B0A1CDAB300B42B25 /* JSHTMLAreaElement.h */,
</span><ins>+ 7C9DBFEB1A9C49B1000D6B25 /* JSHTMLAttachmentElement.cpp */,
+ 7C9DBFEC1A9C49B1000D6B25 /* JSHTMLAttachmentElement.h */,
</ins><span class="cx"> E4B4237D0CBFB73C00AF2ECE /* JSHTMLAudioElement.cpp */,
</span><span class="cx"> E4B4237E0CBFB73C00AF2ECE /* JSHTMLAudioElement.h */,
</span><span class="cx"> A80E7B080A19D606007FB8C5 /* JSHTMLBaseElement.cpp */,
</span><span class="lines">@@ -23717,6 +23725,7 @@
</span><span class="cx"> 9746AF2114F4DDE6003E7A71 /* Coordinates.h in Headers */,
</span><span class="cx"> CE1252371A15BDBE00864480 /* CoreGraphicsSPI.h in Headers */,
</span><span class="cx"> 443818001A91B2F8006E04F2 /* CoreMediaSoftLink.h in Headers */,
</span><ins>+ 7C9DBFEE1A9C49B1000D6B25 /* JSHTMLAttachmentElement.h in Headers */,
</ins><span class="cx"> 4449A4051A964B0000B64AD5 /* CoreMediaSPI.h in Headers */,
</span><span class="cx"> 1C6466251A12C38E0094603C /* CoreTextSPI.h in Headers */,
</span><span class="cx"> 862F129E18C1576F005C54AF /* CountedUserActivity.h in Headers */,
</span><span class="lines">@@ -29363,6 +29372,7 @@
</span><span class="cx"> 99CC0B5518BE9849006CEBCC /* ReplayingInputCursor.cpp in Sources */,
</span><span class="cx"> 267725FC1A5B3AD9003C24DD /* DFA.cpp in Sources */,
</span><span class="cx"> 99CC0B5718BE984A006CEBCC /* ReplayInputCreationMethods.cpp in Sources */,
</span><ins>+ 7C9DBFED1A9C49B1000D6B25 /* JSHTMLAttachmentElement.cpp in Sources */,
</ins><span class="cx"> 99CC0B5818BE984A006CEBCC /* ReplayInputDispatchMethods.cpp in Sources */,
</span><span class="cx"> 99CC0B5918BE984A006CEBCC /* ReplaySession.cpp in Sources */,
</span><span class="cx"> 99CC0B5B18BE984A006CEBCC /* ReplaySessionSegment.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/File.h (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/File.h 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/Source/WebCore/fileapi/File.h 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit File(const String& path);
</del><ins>+ WEBCORE_EXPORT explicit File(const String& path);
</ins><span class="cx"> File(const String& path, const String& nameOverride);
</span><span class="cx">
</span><span class="cx"> File(DeserializationContructor, const String& path, const URL& srcURL, const String& type, const String& name);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttachmentElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttachmentElement.cpp (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttachmentElement.cpp 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/Source/WebCore/html/HTMLAttachmentElement.cpp 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><span class="cx">
</span><ins>+#include "File.h"
</ins><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "RenderAttachment.h"
</span><span class="cx">
</span><span class="lines">@@ -41,6 +42,10 @@
</span><span class="cx"> ASSERT(hasTagName(attachmentTag));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+HTMLAttachmentElement::~HTMLAttachmentElement()
+{
+}
+
</ins><span class="cx"> Ref<HTMLAttachmentElement> HTMLAttachmentElement::create(const QualifiedName& tagName, Document& document)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new HTMLAttachmentElement(tagName, document));
</span><span class="lines">@@ -50,7 +55,17 @@
</span><span class="cx"> {
</span><span class="cx"> return createRenderer<RenderAttachment>(*this, WTF::move(style));
</span><span class="cx"> }
</span><del>-
</del><ins>+
+File* HTMLAttachmentElement::file()
+{
+ return m_file.get();
+}
+
+void HTMLAttachmentElement::setFile(File* file)
+{
+ m_file = file;
+}
+
</ins><span class="cx"> void HTMLAttachmentElement::setFocus(bool shouldBeFocused)
</span><span class="cx"> {
</span><span class="cx"> if (focused() == shouldBeFocused)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttachmentElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttachmentElement.h (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttachmentElement.h 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/Source/WebCore/html/HTMLAttachmentElement.h 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -32,17 +32,25 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class File;
+
</ins><span class="cx"> class HTMLAttachmentElement final : public HTMLElement {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<HTMLAttachmentElement> create(const QualifiedName&, Document&);
</span><del>-
</del><ins>+
+ File* file();
+ void setFile(File*);
+
</ins><span class="cx"> private:
</span><span class="cx"> HTMLAttachmentElement(const QualifiedName&, Document&);
</span><ins>+ virtual ~HTMLAttachmentElement();
</ins><span class="cx">
</span><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&) override;
</span><span class="cx">
</span><span class="cx"> virtual bool isFocusable() const override { return true; }
</span><span class="cx"> virtual void setFocus(bool shouldBeFocused) override;
</span><ins>+
+ RefPtr<File> m_file;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttachmentElementidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/HTMLAttachmentElement.idl (0 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttachmentElement.idl (rev 0)
+++ trunk/Source/WebCore/html/HTMLAttachmentElement.idl 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+[
+ Conditional=ATTACHMENT_ELEMENT
+] interface HTMLAttachmentElement : HTMLElement {
+ attribute File file;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTagNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTagNames.in (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTagNames.in 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/Source/WebCore/html/HTMLTagNames.in 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> area
</span><span class="cx"> article interfaceName=HTMLElement
</span><span class="cx"> aside interfaceName=HTMLElement
</span><del>-attachment JSInterfaceName=HTMLElement, conditional=ATTACHMENT_ELEMENT, settingsConditional=attachmentElementEnabled
</del><ins>+attachment conditional=ATTACHMENT_ELEMENT, settingsConditional=attachmentElementEnabled
</ins><span class="cx"> audio wrapperOnlyIfMediaIsAvailable, conditional=VIDEO, constructorNeedsCreatedByParser, customTypeHelper
</span><span class="cx"> b interfaceName=HTMLElement
</span><span class="cx"> base
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "EventHandler.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include "File.h"
</ins><span class="cx"> #include "FontCache.h"
</span><span class="cx"> #include "FormController.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="lines">@@ -2516,4 +2517,17 @@
</span><span class="cx"> return document->page()->isPlayingAudio();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<File> Internals::createFile(const String& path)
+{
+ Document* document = contextDocument();
+ if (!document)
+ return nullptr;
+
+ URL url = document->completeURL(path);
+ if (!url.isLocalFile())
+ return nullptr;
+
+ return File::create(url.fileSystemPath());
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/Source/WebCore/testing/Internals.h 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> class DOMWindow;
</span><span class="cx"> class Document;
</span><span class="cx"> class Element;
</span><ins>+class File;
</ins><span class="cx"> class Frame;
</span><span class="cx"> class InspectorFrontendChannelDummy;
</span><span class="cx"> class InspectorFrontendClientDummy;
</span><span class="lines">@@ -364,6 +365,8 @@
</span><span class="cx"> void setPageMuted(bool);
</span><span class="cx"> bool isPagePlayingAudio();
</span><span class="cx">
</span><ins>+ RefPtr<File> createFile(const String&);
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit Internals(Document*);
</span><span class="cx"> Document* contextDocument() const;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (180600 => 180601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2015-02-25 01:43:42 UTC (rev 180600)
+++ trunk/Source/WebCore/testing/Internals.idl 2015-02-25 01:49:59 UTC (rev 180601)
</span><span class="lines">@@ -320,4 +320,6 @@
</span><span class="cx">
</span><span class="cx"> void setPageMuted(boolean muted);
</span><span class="cx"> boolean isPagePlayingAudio();
</span><ins>+
+ File createFile(DOMString url);
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>