Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (87798 => 87799)
--- trunk/Source/_javascript_Core/ChangeLog 2011-06-01 12:44:40 UTC (rev 87798)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-06-01 13:04:43 UTC (rev 87799)
@@ -1,3 +1,16 @@
+2011-06-01 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r87788.
+ http://trac.webkit.org/changeset/87788
+ https://bugs.webkit.org/show_bug.cgi?id=61856
+
+ breaks windows chromium canary (Requested by jknotten on
+ #webkit).
+
+ * wtf/DateMath.cpp:
+ (WTF::timeClip):
+ * wtf/DateMath.h:
+
2011-06-01 Jay Civelli <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/Source/_javascript_Core/wtf/DateMath.cpp (87798 => 87799)
--- trunk/Source/_javascript_Core/wtf/DateMath.cpp 2011-06-01 12:44:40 UTC (rev 87798)
+++ trunk/Source/_javascript_Core/wtf/DateMath.cpp 2011-06-01 13:04:43 UTC (rev 87799)
@@ -90,8 +90,8 @@
#include <limits>
#include <stdint.h>
#include <time.h>
-#include <wtf/text/StringBuilder.h>
+
#if HAVE(ERRNO_H)
#include <errno.h>
#endif
@@ -180,14 +180,6 @@
return floor(ms / msPerDay);
}
-static String twoDigitStringFromNumber(int number)
-{
- ASSERT(number >= 0 && number < 100);
- if (number > 9)
- return String::number(number);
- return makeString("0", String::number(number));
-}
-
int msToYear(double ms)
{
int approxYear = static_cast<int>(floor(ms / (msPerDay * 365.2425)) + 1970);
@@ -1036,34 +1028,6 @@
return NaN;
return trunc(t);
}
-
-// See http://tools.ietf.org/html/rfc2822#section-3.3 for more information.
-String makeRFC2822DateString(unsigned dayOfWeek, unsigned day, unsigned month, unsigned year, unsigned hours, unsigned minutes, unsigned seconds, int utcOffset)
-{
- StringBuilder stringBuilder;
- stringBuilder.append(weekdayName[dayOfWeek]);
- stringBuilder.append(", ");
- stringBuilder.append(String::number(day));
- stringBuilder.append(" ");
- stringBuilder.append(monthName[month]);
- stringBuilder.append(" ");
- stringBuilder.append(String::number(year));
- stringBuilder.append(" ");
-
- stringBuilder.append(twoDigitStringFromNumber(hours));
- stringBuilder.append(':');
- stringBuilder.append(twoDigitStringFromNumber(minutes));
- stringBuilder.append(':');
- stringBuilder.append(twoDigitStringFromNumber(seconds));
- stringBuilder.append(' ');
-
- stringBuilder.append(utcOffset > 0 ? "+" : "-");
- int absoluteUTCOffset = abs(utcOffset);
- stringBuilder.append(twoDigitStringFromNumber(absoluteUTCOffset / 60));
- stringBuilder.append(twoDigitStringFromNumber(absoluteUTCOffset % 60));
-
- return stringBuilder.toString();
-}
} // namespace WTF
#if USE(JSC)
Modified: trunk/Source/_javascript_Core/wtf/DateMath.h (87798 => 87799)
--- trunk/Source/_javascript_Core/wtf/DateMath.h 2011-06-01 12:44:40 UTC (rev 87798)
+++ trunk/Source/_javascript_Core/wtf/DateMath.h 2011-06-01 13:04:43 UTC (rev 87799)
@@ -51,7 +51,6 @@
#include <wtf/Noncopyable.h>
#include <wtf/OwnArrayPtr.h>
#include <wtf/PassOwnArrayPtr.h>
-#include <wtf/text/WTFString.h>
#include <wtf/UnusedParam.h>
namespace WTF {
@@ -62,8 +61,6 @@
double parseES5DateFromNullTerminatedCharacters(const char* dateString);
double parseDateFromNullTerminatedCharacters(const char* dateString);
double timeClip(double);
-// dayOfWeek: [0, 6] 0 being Monday, day: [1, 31], month: [0, 11], year: ex: 2011, hours: [0, 23], minutes: [0, 59], seconds: [0, 59], utcOffset: [-720,720].
-String makeRFC2822DateString(unsigned dayOfWeek, unsigned day, unsigned month, unsigned year, unsigned hours, unsigned minutes, unsigned seconds, int utcOffset);
inline double jsCurrentTime()
{
@@ -109,7 +106,6 @@
using WTF::msToYear;
using WTF::secondsPerMinute;
using WTF::parseDateFromNullTerminatedCharacters;
-using WTF::makeRFC2822DateString;
using WTF::calculateUTCOffset;
using WTF::calculateDSTOffset;
Modified: trunk/Source/WebCore/ChangeLog (87798 => 87799)
--- trunk/Source/WebCore/ChangeLog 2011-06-01 12:44:40 UTC (rev 87798)
+++ trunk/Source/WebCore/ChangeLog 2011-06-01 13:04:43 UTC (rev 87799)
@@ -1,3 +1,20 @@
+2011-06-01 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r87788.
+ http://trac.webkit.org/changeset/87788
+ https://bugs.webkit.org/show_bug.cgi?id=61856
+
+ breaks windows chromium canary (Requested by jknotten on
+ #webkit).
+
+ * loader/archive/mhtml/MHTMLArchive.cpp:
+ * loader/archive/mhtml/MHTMLArchive.h:
+ * page/PageSerializer.cpp:
+ (WebCore::PageSerializer::serializeFrame):
+ (WebCore::PageSerializer::serializeCSSStyleSheet):
+ * platform/SharedBuffer.cpp:
+ * platform/SharedBuffer.h:
+
2011-06-01 Joseph Pecoraro <[email protected]>
Reviewed by Pavel Feldman.
Modified: trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp (87798 => 87799)
--- trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp 2011-06-01 12:44:40 UTC (rev 87798)
+++ trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp 2011-06-01 13:04:43 UTC (rev 87799)
@@ -33,57 +33,11 @@
#if ENABLE(MHTML)
#include "MHTMLArchive.h"
-#include "Base64.h"
-#include "CryptographicallyRandomNumber.h"
-#include "DateMath.h"
-#include "Document.h"
-#include "Frame.h"
#include "MHTMLParser.h"
-#include "MIMETypeRegistry.h"
-#include "Page.h"
-#include "PageSerializer.h"
-#include "QuotedPrintable.h"
-#include "SharedBuffer.h"
-#include <sys/time.h>
-#include <wtf/StdLibExtras.h>
-#include <wtf/text/StringBuilder.h>
+#include "MIMEHeader.h"
namespace WebCore {
-const char* const quotedPrintable = "quoted-printable";
-const char* const base64 = "base64";
-
-static String generateRandomBoundary()
-{
- // Trying to generate random boundaries similar to IE/UnMHT (ex: ----=_NextPart_000_001B_01CC157B.96F808A0).
- const size_t randomValuesLength = 10;
- char randomValues[randomValuesLength];
- cryptographicallyRandomValues(&randomValues, randomValuesLength);
- StringBuilder stringBuilder;
- stringBuilder.append("----=_NextPart_000_");
- for (size_t i = 0; i < randomValuesLength; ++i) {
- if (i == 2)
- stringBuilder.append('_');
- else if (i == 6)
- stringBuilder.append('.');
- stringBuilder.append(lowerNibbleToASCIIHexDigit(randomValues[i]));
- stringBuilder.append(upperNibbleToASCIIHexDigit(randomValues[i]));
- }
- return stringBuilder.toString();
-}
-
-static String replaceNonPrintableCharacters(const String& text)
-{
- StringBuilder stringBuilder;
- for (size_t i = 0; i < text.length(); ++i) {
- if (isASCIIPrintable(text[i]))
- stringBuilder.append(text[i]);
- else
- stringBuilder.append('?');
- }
- return stringBuilder.toString();
-}
-
MHTMLArchive::MHTMLArchive()
{
}
@@ -117,97 +71,5 @@
return mainArchive.release();
}
-PassRefPtr<SharedBuffer> MHTMLArchive::generateMHTMLData(Page* page)
-{
- Vector<PageSerializer::Resource> resources;
- PageSerializer pageSerializer(&resources);
- pageSerializer.serialize(page);
-
- String boundary = generateRandomBoundary();
- String endOfResourceBoundary = makeString("--", boundary, "\r\n");
-
- String dateString;
- timeval timeValue = { 0 };
- if (!gettimeofday(&timeValue, 0)) {
- tm timeAndDate = { 0 };
- if (localtime_r(&(timeValue.tv_sec), &timeAndDate))
- dateString = makeRFC2822DateString(timeAndDate.tm_wday, timeAndDate.tm_mday, timeAndDate.tm_mon, 1900 + timeAndDate.tm_year, timeAndDate.tm_hour, timeAndDate.tm_min, timeAndDate.tm_sec, calculateUTCOffset() / (1000 * 60));
- else
- ASSERT_NOT_REACHED();
- } else
- ASSERT_NOT_REACHED();
-
- StringBuilder stringBuilder;
- stringBuilder.append("From: <Saved by WebKit>\r\n");
- stringBuilder.append("Subject: ");
- // We replace non ASCII characters with '?' characters to match IE's behavior.
- stringBuilder.append(replaceNonPrintableCharacters(page->mainFrame()->document()->title()));
- if (!dateString.isEmpty()) {
- stringBuilder.append("\r\nDate: ");
- stringBuilder.append(dateString);
- }
- stringBuilder.append("\r\nMIME-Version: 1.0\r\n");
- stringBuilder.append("Content-Type: multipart/related;\r\n");
- stringBuilder.append("\ttype=\"");
- stringBuilder.append(page->mainFrame()->document()->suggestedMIMEType());
- stringBuilder.append("\";\r\n");
- stringBuilder.append("\tboundary=\"");
- stringBuilder.append(boundary);
- stringBuilder.append("\"\r\n\r\n");
-
- // We use utf8() below instead of ascii() as ascii() replaces CRLFs with ?? (we still only have put ASCII characters in it).
- ASSERT(stringBuilder.toString().containsOnlyASCII());
- CString asciiString = stringBuilder.toString().utf8();
- RefPtr<SharedBuffer> mhtmlData = SharedBuffer::create();
- mhtmlData->append(asciiString.data(), asciiString.length());
-
- for (size_t i = 0; i < resources.size(); ++i) {
- const PageSerializer::Resource& resource = resources[i];
-
- stringBuilder.clear();
- stringBuilder.append(endOfResourceBoundary);
- stringBuilder.append("Content-Type: ");
- stringBuilder.append(resource.mimeType);
-
- const char* contentEncoding = MIMETypeRegistry::isSupportedJavaScriptMIMEType(resource.mimeType) || MIMETypeRegistry::isSupportedNonImageMIMEType(resource.mimeType) ? quotedPrintable : base64;
- stringBuilder.append("\r\nContent-Transfer-Encoding: ");
- stringBuilder.append(contentEncoding);
- stringBuilder.append("\r\nContent-Location: ");
- stringBuilder.append(resource.url);
- stringBuilder.append("\r\n\r\n");
-
- asciiString = stringBuilder.toString().utf8();
- mhtmlData->append(asciiString.data(), asciiString.length());
-
- // FIXME: ideally we would encode the content as a stream without having to fetch it all.
- const char* data = ""
- size_t dataLength = resource.data->size();
- Vector<char> encodedData;
- if (!strcmp(contentEncoding, quotedPrintable)) {
- quotedPrintableEncode(data, dataLength, encodedData);
- mhtmlData->append(encodedData.data(), encodedData.size());
- mhtmlData->append("\r\n", 2);
- } else {
- ASSERT(!strcmp(contentEncoding, base64));
- // We are not specifying insertLFs = true below as it would cut the lines with LFs and MHTML requires CRLFs.
- base64Encode(data, dataLength, encodedData);
- const size_t maximumLineLength = 76;
- size_t index = 0;
- size_t encodedDataLength = encodedData.size();
- do {
- size_t lineLength = std::min(encodedDataLength - index, maximumLineLength);
- mhtmlData->append(encodedData.data() + index, lineLength);
- mhtmlData->append("\r\n", 2);
- index += maximumLineLength;
- } while (index < encodedDataLength);
- }
- }
-
- asciiString = makeString("--", boundary, "--\r\n").utf8();
- mhtmlData->append(asciiString.data(), asciiString.length());
-
- return mhtmlData.release();
}
-
-}
#endif
Modified: trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h (87798 => 87799)
--- trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h 2011-06-01 12:44:40 UTC (rev 87798)
+++ trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h 2011-06-01 13:04:43 UTC (rev 87799)
@@ -38,8 +38,6 @@
namespace WebCore {
class MHTMLParser;
-class Page;
-class SharedBuffer;
class MHTMLArchive : public Archive {
public:
@@ -48,8 +46,6 @@
static PassRefPtr<MHTMLArchive> create();
static PassRefPtr<MHTMLArchive> create(const KURL&, SharedBuffer*);
- static PassRefPtr<SharedBuffer> generateMHTMLData(Page*);
-
private:
friend class MHTMLParser;
MHTMLArchive();
Modified: trunk/Source/WebCore/page/PageSerializer.cpp (87798 => 87799)
--- trunk/Source/WebCore/page/PageSerializer.cpp 2011-06-01 12:44:40 UTC (rev 87798)
+++ trunk/Source/WebCore/page/PageSerializer.cpp 2011-06-01 13:04:43 UTC (rev 87799)
@@ -206,12 +206,8 @@
Vector<Node*> nodes;
SerializerMarkupAccumulator accumulator(this, document, &nodes);
- TextEncoding textEncoding(document->charset());
- CString data;
- if (!textEncoding.isValid()) {
- // FIXME: iframes used as images trigger this. We should deal with them correctly.
- return;
- }
+ TextEncoding textEncoding(TextEncoding(document->charset()));
+ ASSERT(textEncoding.isValid());
String text = accumulator.serializeNodes(document->documentElement(), 0, IncludeNode);
CString frameHTML = textEncoding.encode(text.characters(), text.length(), EntitiesForUnencodables);
m_resources->append(Resource(url, document->suggestedMIMEType(), SharedBuffer::create(frameHTML.data(), frameHTML.length())));
@@ -278,7 +274,7 @@
if (url.isValid() && !m_resourceURLs.contains(url)) {
// FIXME: We should check whether a charset has been specified and if none was found add one.
- TextEncoding textEncoding(styleSheet->charset());
+ TextEncoding textEncoding = TextEncoding(styleSheet->charset());
ASSERT(textEncoding.isValid());
String textString = cssText.toString();
CString text = textEncoding.encode(textString.characters(), textString.length(), EntitiesForUnencodables);
Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (87798 => 87799)
--- trunk/Source/WebCore/platform/SharedBuffer.cpp 2011-06-01 12:44:40 UTC (rev 87798)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp 2011-06-01 13:04:43 UTC (rev 87799)
@@ -117,16 +117,6 @@
return buffer().data();
}
-void SharedBuffer::append(SharedBuffer* data)
-{
- const char* segment;
- size_t position = 0;
- while (size_t length = data->getSomeData(segment, position)) {
- append(segment, length);
- position += length;
- }
-}
-
void SharedBuffer::append(const char* data, unsigned length)
{
ASSERT(!m_purgeableBuffer);
Modified: trunk/Source/WebCore/platform/SharedBuffer.h (87798 => 87799)
--- trunk/Source/WebCore/platform/SharedBuffer.h 2011-06-01 12:44:40 UTC (rev 87798)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2011-06-01 13:04:43 UTC (rev 87799)
@@ -84,7 +84,6 @@
bool isEmpty() const { return !size(); }
- void append(SharedBuffer*);
void append(const char*, unsigned);
void clear();
const char* platformData() const;
Modified: trunk/Source/WebKit/chromium/ChangeLog (87798 => 87799)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-01 12:44:40 UTC (rev 87798)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-01 13:04:43 UTC (rev 87799)
@@ -1,3 +1,15 @@
+2011-06-01 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r87788.
+ http://trac.webkit.org/changeset/87788
+ https://bugs.webkit.org/show_bug.cgi?id=61856
+
+ breaks windows chromium canary (Requested by jknotten on
+ #webkit).
+
+ * public/WebPageSerializer.h:
+ * src/WebPageSerializer.cpp:
+
2011-06-01 Jay Civelli <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/Source/WebKit/chromium/public/WebPageSerializer.h (87798 => 87799)
--- trunk/Source/WebKit/chromium/public/WebPageSerializer.h 2011-06-01 12:44:40 UTC (rev 87798)
+++ trunk/Source/WebKit/chromium/public/WebPageSerializer.h 2011-06-01 13:04:43 UTC (rev 87799)
@@ -58,9 +58,6 @@
// Note that this also strips-out any script tag or link to _javascript_.
WEBKIT_API static void serialize(WebView*, WebVector<Resource>*);
- // Serializes the WebView contents to a MHTML representation.
- WEBKIT_API static WebCString serializeToMHTML(WebView*);
-
// IMPORTANT:
// The API below is an older implementation of a pageserialization that
// will be removed soon.
Modified: trunk/Source/WebKit/chromium/src/WebPageSerializer.cpp (87798 => 87799)
--- trunk/Source/WebKit/chromium/src/WebPageSerializer.cpp 2011-06-01 12:44:40 UTC (rev 87798)
+++ trunk/Source/WebKit/chromium/src/WebPageSerializer.cpp 2011-06-01 13:04:43 UTC (rev 87799)
@@ -39,7 +39,6 @@
#include "HTMLInputElement.h"
#include "HTMLNames.h"
#include "KURL.h"
-#include "MHTMLArchive.h"
#include "PageSerializer.h"
#include "Vector.h"
@@ -201,13 +200,6 @@
*resourcesParam = result;
}
-WebCString WebPageSerializer::serializeToMHTML(WebView* view)
-{
- RefPtr<SharedBuffer> mhtml = MHTMLArchive::generateMHTMLData(static_cast<WebViewImpl*>(view)->page());
- // FIXME: we are copying all the data here. Idealy we would have a WebSharedData().
- return WebCString(mhtml->data(), mhtml->size());
-}
-
bool WebPageSerializer::serialize(WebFrame* frame,
bool recursive,
WebPageSerializerClient* client,
