Title: [198883] trunk/Source/WebCore
- Revision
- 198883
- Author
- [email protected]
- Date
- 2016-03-30 22:44:58 -0700 (Wed, 30 Mar 2016)
Log Message
Fix GTK and Windows builds after r198869.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::blobIsOutOfDate):
(WebCore::addEncodedBlobItemToSoupMessageBody):
* platform/text/LineEnding.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (198882 => 198883)
--- trunk/Source/WebCore/ChangeLog 2016-03-31 04:18:39 UTC (rev 198882)
+++ trunk/Source/WebCore/ChangeLog 2016-03-31 05:44:58 UTC (rev 198883)
@@ -1,3 +1,12 @@
+2016-03-30 Alex Christensen <[email protected]>
+
+ Fix GTK and Windows builds after r198869.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::blobIsOutOfDate):
+ (WebCore::addEncodedBlobItemToSoupMessageBody):
+ * platform/text/LineEnding.cpp:
+
2016-03-30 Simon Fraser <[email protected]>
[iOS WK2] Avoid creating tiles that are too large for rendering
Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (198882 => 198883)
--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2016-03-31 04:18:39 UTC (rev 198882)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2016-03-31 05:44:58 UTC (rev 198883)
@@ -769,7 +769,7 @@
static bool blobIsOutOfDate(const BlobDataItem& blobItem)
{
- ASSERT(blobItem.type == BlobDataItem::Type::File);
+ ASSERT(blobItem.type() == BlobDataItem::Type::File);
if (!isValidFileTime(blobItem.file()->expectedModificationTime()))
return false;
@@ -788,7 +788,7 @@
return;
}
- ASSERT(blobItem.type == BlobDataItem::Type::File);
+ ASSERT(blobItem.type() == BlobDataItem::Type::File);
if (blobIsOutOfDate(blobItem))
return;
Modified: trunk/Source/WebCore/platform/text/LineEnding.cpp (198882 => 198883)
--- trunk/Source/WebCore/platform/text/LineEnding.cpp 2016-03-31 04:18:39 UTC (rev 198882)
+++ trunk/Source/WebCore/platform/text/LineEnding.cpp 2016-03-31 05:44:58 UTC (rev 198883)
@@ -72,7 +72,7 @@
class VectorCharAppendBuffer : public OutputBuffer {
public:
- VectorCharAppendBuffer(Vector<char>& buffer)
+ VectorCharAppendBuffer(Vector<uint8_t>& buffer)
: m_buffer(buffer)
{
}
@@ -91,7 +91,7 @@
}
private:
- Vector<char>& m_buffer;
+ Vector<uint8_t>& m_buffer;
};
void internalNormalizeLineEndingsToCRLF(const CString& from, OutputBuffer& buffer)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
