diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
| commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
| tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/third_party/blink/renderer/platform/mhtml | |
| parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
| download | qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz | |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/platform/mhtml')
| -rw-r--r-- | chromium/third_party/blink/renderer/platform/mhtml/DEPS | 19 | ||||
| -rw-r--r-- | chromium/third_party/blink/renderer/platform/mhtml/mhtml_archive.cc | 10 |
2 files changed, 20 insertions, 9 deletions
diff --git a/chromium/third_party/blink/renderer/platform/mhtml/DEPS b/chromium/third_party/blink/renderer/platform/mhtml/DEPS new file mode 100644 index 00000000000..85ca52ba41f --- /dev/null +++ b/chromium/third_party/blink/renderer/platform/mhtml/DEPS @@ -0,0 +1,19 @@ +include_rules = [ + # Don't depend on platform/. + "-third_party/blink/renderer/platform", + + # Module. + "+third_party/blink/renderer/platform/mhtml", + + # Dependencies. + "+third_party/blink/renderer/platform/date_components.h", + "+third_party/blink/renderer/platform/heap", + "+third_party/blink/renderer/platform/network", + "+third_party/blink/renderer/platform/serialized_resource.h", + "+third_party/blink/renderer/platform/shared_buffer_chunk_reader.h", + "+third_party/blink/renderer/platform/shared_buffer.h", + "+third_party/blink/renderer/platform/testing", + "+third_party/blink/renderer/platform/text", + "+third_party/blink/renderer/platform/weborigin", + "+third_party/blink/renderer/platform/wtf", +] diff --git a/chromium/third_party/blink/renderer/platform/mhtml/mhtml_archive.cc b/chromium/third_party/blink/renderer/platform/mhtml/mhtml_archive.cc index 5d3cc087814..94fd391718c 100644 --- a/chromium/third_party/blink/renderer/platform/mhtml/mhtml_archive.cc +++ b/chromium/third_party/blink/renderer/platform/mhtml/mhtml_archive.cc @@ -40,7 +40,6 @@ #include "third_party/blink/renderer/platform/text/quoted_printable.h" #include "third_party/blink/renderer/platform/weborigin/scheme_registry.h" #include "third_party/blink/renderer/platform/wtf/assertions.h" -#include "third_party/blink/renderer/platform/wtf/cryptographically_random_number.h" #include "third_party/blink/renderer/platform/wtf/date_math.h" #include "third_party/blink/renderer/platform/wtf/text/base64.h" #include "third_party/blink/renderer/platform/wtf/text/string_builder.h" @@ -222,14 +221,7 @@ void MHTMLArchive::GenerateMHTMLHeader(const String& boundary, DCHECK(!boundary.IsEmpty()); DCHECK(!mime_type.IsEmpty()); - // TODO(lukasza): Passing individual date/time components seems fragile. - base::Time::Exploded date_components; - date.UTCExplode(&date_components); - String date_string = MakeRFC2822DateString( - date_components.day_of_week, date_components.day_of_month, - // |month| is 1-based in Exploded, but 0-based in MakeRFC2822DateString. - date_components.month - 1, date_components.year, date_components.hour, - date_components.minute, date_components.second, 0); + String date_string = MakeRFC2822DateString(date, 0); StringBuilder string_builder; string_builder.Append("From: <Saved by Blink>\r\n"); |