<!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>[277666] 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/277666">277666</a></dd>
<dt>Author</dt> <dd>said@apple.com</dd>
<dt>Date</dt> <dd>2021-05-18 11:48:48 -0700 (Tue, 18 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Allow logging minimal info about uploading media files
https://bugs.webkit.org/show_bug.cgi?id=225636
<rdar://problem/76639138>

Reviewed by Alex Christensen.

Source/WebCore:

Files can be uploaded to a server by many different ways: through a form
submit, an xhr, a file fetch or through a worker. <a href="http://trac.webkit.org/projects/webkit/changeset/275103">r275103</a> handled the
form submit only. Instead of handling this case by case, we can add the
logging code in a shared place where all the file uploading goes through.

* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::submit):
Delete the code which was part of <a href="http://trac.webkit.org/projects/webkit/changeset/275103">r275103</a>.

* page/Page.cpp:
(WebCore::Page::logMediaDiagnosticMessage const):
* page/Page.h:
Make the Page be responsible for logging the media files info.

* platform/network/FormData.cpp:
(WebCore::FormData::imageOrMediaFilesCount const):
* platform/network/FormData.h:
Make the FormData count how many images or media files it has.

Source/WebKit:

* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::addParametersShared):
Centralize logging uploading the images and media files.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementcpp">trunk/Source/WebCore/html/HTMLFormElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkFormDatacpp">trunk/Source/WebCore/platform/network/FormData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkFormDatah">trunk/Source/WebCore/platform/network/FormData.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessNetworkWebLoaderStrategycpp">trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (277665 => 277666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-05-18 18:01:45 UTC (rev 277665)
+++ trunk/Source/WebCore/ChangeLog      2021-05-18 18:48:48 UTC (rev 277666)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2021-05-18  Said Abou-Hallawa  <said@apple.com>
+
+        Allow logging minimal info about uploading media files
+        https://bugs.webkit.org/show_bug.cgi?id=225636
+        <rdar://problem/76639138>
+
+        Reviewed by Alex Christensen.
+
+        Files can be uploaded to a server by many different ways: through a form
+        submit, an xhr, a file fetch or through a worker. r275103 handled the
+        form submit only. Instead of handling this case by case, we can add the
+        logging code in a shared place where all the file uploading goes through.
+
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::submit):
+        Delete the code which was part of r275103.
+
+        * page/Page.cpp:
+        (WebCore::Page::logMediaDiagnosticMessage const):
+        * page/Page.h:
+        Make the Page be responsible for logging the media files info.
+
+        * platform/network/FormData.cpp:
+        (WebCore::FormData::imageOrMediaFilesCount const):
+        * platform/network/FormData.h:
+        Make the FormData count how many images or media files it has.
+
</ins><span class="cx"> 2021-05-18  Keith Miller  <keith_miller@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Temporarily revert r276592 as it breaks some native apps
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (277665 => 277666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.cpp    2021-05-18 18:01:45 UTC (rev 277665)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp       2021-05-18 18:48:48 UTC (rev 277666)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><span class="cx"> #include "HTMLTableElement.h"
</span><span class="cx"> #include "InputTypeNames.h"
</span><del>-#include "MIMETypeRegistry.h"
</del><span class="cx"> #include "MixedContentChecker.h"
</span><span class="cx"> #include "NodeRareData.h"
</span><span class="cx"> #include "Page.h"
</span><span class="lines">@@ -399,17 +398,6 @@
</span><span class="cx">     if (m_plannedFormSubmission)
</span><span class="cx">         m_plannedFormSubmission->cancel();
</span><span class="cx"> 
</span><del>-    unsigned imageOrMediaFiles = 0;
-    for (auto& dataElement : formSubmission->data().elements()) {
-        auto* encodedFileData = WTF::get_if<FormDataElement::EncodedFileData>(dataElement.data);
-        if (!encodedFileData)
-            continue;
-
-        auto mimeType = MIMETypeRegistry::mimeTypeForPath(encodedFileData->filename);
-        if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType) || MIMETypeRegistry::isSupportedMediaMIMEType(mimeType))
-            ++imageOrMediaFiles;
-    }
-
</del><span class="cx">     m_plannedFormSubmission = makeWeakPtr(formSubmission.get());
</span><span class="cx">     frame->loader().submitForm(WTFMove(formSubmission));
</span><span class="cx"> 
</span><span class="lines">@@ -416,12 +404,6 @@
</span><span class="cx">     if (firstSuccessfulSubmitButton)
</span><span class="cx">         firstSuccessfulSubmitButton->setActivatedSubmit(false);
</span><span class="cx"> 
</span><del>-    if (imageOrMediaFiles) {
-        auto& diagnosticLoggingClient = document().page()->diagnosticLoggingClient();
-        auto message = makeString(imageOrMediaFiles, imageOrMediaFiles == 1 ? " media file has been submitted" : " media files have been submitted");
-        diagnosticLoggingClient.logDiagnosticMessageWithDomain(message, DiagnosticLoggingDomain::Media);
-    }
-
</del><span class="cx">     m_shouldSubmit = false;
</span><span class="cx">     m_isSubmittingOrPreparingForSubmission = false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (277665 => 277666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp       2021-05-18 18:01:45 UTC (rev 277665)
+++ trunk/Source/WebCore/page/Page.cpp  2021-05-18 18:48:48 UTC (rev 277666)
</span><span class="lines">@@ -1059,6 +1059,15 @@
</span><span class="cx">     return *m_diagnosticLoggingClient;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void Page::logMediaDiagnosticMessage(const FormData* formData) const
+{
+    unsigned imageOrMediaFilesCount = formData ? formData->imageOrMediaFilesCount() : 0;
+    if (!imageOrMediaFilesCount)
+        return;
+    auto message = makeString(imageOrMediaFilesCount, imageOrMediaFilesCount == 1 ? " media file has been submitted" : " media files have been submitted");
+    diagnosticLoggingClient().logDiagnosticMessageWithDomain(message, DiagnosticLoggingDomain::Media);
+}
+
</ins><span class="cx"> void Page::setMediaVolume(float volume)
</span><span class="cx"> {
</span><span class="cx">     if (!(volume >= 0 && volume <= 1))
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (277665 => 277666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2021-05-18 18:01:45 UTC (rev 277665)
+++ trunk/Source/WebCore/page/Page.h    2021-05-18 18:48:48 UTC (rev 277666)
</span><span class="lines">@@ -105,6 +105,7 @@
</span><span class="cx"> class EditorClient;
</span><span class="cx"> class Element;
</span><span class="cx"> class FocusController;
</span><ins>+class FormData;
</ins><span class="cx"> class Frame;
</span><span class="cx"> class HTMLMediaElement;
</span><span class="cx"> class HistoryItem;
</span><span class="lines">@@ -496,6 +497,8 @@
</span><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT DiagnosticLoggingClient& diagnosticLoggingClient() const;
</span><span class="cx"> 
</span><ins>+    WEBCORE_EXPORT void logMediaDiagnosticMessage(const FormData*) const;
+
</ins><span class="cx">     PerformanceLoggingClient* performanceLoggingClient() const { return m_performanceLoggingClient.get(); }
</span><span class="cx"> 
</span><span class="cx">     WheelEventDeltaFilter* wheelEventDeltaFilter() { return m_recentWheelEventDeltaFilter.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkFormDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/FormData.cpp (277665 => 277666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/FormData.cpp       2021-05-18 18:01:45 UTC (rev 277665)
+++ trunk/Source/WebCore/platform/network/FormData.cpp  2021-05-18 18:48:48 UTC (rev 277666)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "DOMFormData.h"
</span><span class="cx"> #include "File.h"
</span><span class="cx"> #include "FormDataBuilder.h"
</span><ins>+#include "MIMETypeRegistry.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx"> #include "TextEncoding.h"
</span><span class="lines">@@ -123,6 +124,21 @@
</span><span class="cx">     return formData;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+unsigned FormData::imageOrMediaFilesCount() const
+{
+    unsigned imageOrMediaFilesCount = 0;
+    for (auto& element : m_elements) {
+        auto* encodedFileData = WTF::get_if<FormDataElement::EncodedFileData>(element.data);
+        if (!encodedFileData)
+            continue;
+
+        auto mimeType = MIMETypeRegistry::mimeTypeForPath(encodedFileData->filename);
+        if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType) || MIMETypeRegistry::isSupportedMediaMIMEType(mimeType))
+            ++imageOrMediaFilesCount;
+    }
+    return imageOrMediaFilesCount;
+}
+
</ins><span class="cx"> uint64_t FormDataElement::lengthInBytes(const Function<uint64_t(const URL&)>& blobSize) const
</span><span class="cx"> {
</span><span class="cx">     return switchOn(data,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkFormDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/FormData.h (277665 => 277666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/FormData.h 2021-05-18 18:01:45 UTC (rev 277665)
+++ trunk/Source/WebCore/platform/network/FormData.h    2021-05-18 18:48:48 UTC (rev 277666)
</span><span class="lines">@@ -241,6 +241,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool containsPasswordData() const { return m_containsPasswordData; }
</span><span class="cx">     void setContainsPasswordData(bool containsPasswordData) { m_containsPasswordData = containsPasswordData; }
</span><ins>+    unsigned imageOrMediaFilesCount() const;
</ins><span class="cx"> 
</span><span class="cx">     static EncodingType parseEncodingType(const String& type)
</span><span class="cx">     {
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (277665 => 277666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-05-18 18:01:45 UTC (rev 277665)
+++ trunk/Source/WebKit/ChangeLog       2021-05-18 18:48:48 UTC (rev 277666)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-05-18  Said Abou-Hallawa  <said@apple.com>
+
+        Allow logging minimal info about uploading media files
+        https://bugs.webkit.org/show_bug.cgi?id=225636
+        <rdar://problem/76639138>
+
+        Reviewed by Alex Christensen.
+
+        * WebProcess/Network/WebLoaderStrategy.cpp:
+        (WebKit::addParametersShared):
+        Centralize logging uploading the images and media files.
+
</ins><span class="cx"> 2021-05-18  Keith Miller  <keith_miller@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Temporarily revert r276592 as it breaks some native apps
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessNetworkWebLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (277665 => 277666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp     2021-05-18 18:01:45 UTC (rev 277665)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp        2021-05-18 18:48:48 UTC (rev 277666)
</span><span class="lines">@@ -283,6 +283,7 @@
</span><span class="cx">     if (auto* page = frame->page()) {
</span><span class="cx">         parameters.pageHasResourceLoadClient = page->hasResourceLoadClient();
</span><span class="cx">         parameters.shouldRelaxThirdPartyCookieBlocking = page->shouldRelaxThirdPartyCookieBlocking();
</span><ins>+        page->logMediaDiagnosticMessage(parameters.request.httpBody());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (auto* ownerElement = frame->ownerElement()) {
</span></span></pre>
</div>
</div>

</body>
</html>