Title: [132807] trunk/Source/WebCore
- Revision
- 132807
- Author
- [email protected]
- Date
- 2012-10-29 09:42:48 -0700 (Mon, 29 Oct 2012)
Log Message
Try to fix 32-bit builds after my incompletely tested m_identifier change.
Not reviewed.
* loader/ResourceLoader.h:
(WebCore::ResourceLoader::identifier): Revert my "unsigned long" -> "uint64_t" change in two places.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (132806 => 132807)
--- trunk/Source/WebCore/ChangeLog 2012-10-29 16:40:33 UTC (rev 132806)
+++ trunk/Source/WebCore/ChangeLog 2012-10-29 16:42:48 UTC (rev 132807)
@@ -1,3 +1,12 @@
+2012-10-29 Brady Eidson <[email protected]>
+
+ Try to fix 32-bit builds after my incompletely tested m_identifier change.
+
+ Not reviewed.
+
+ * loader/ResourceLoader.h:
+ (WebCore::ResourceLoader::identifier): Revert my "unsigned long" -> "uint64_t" change in two places.
+
2012-10-29 Csaba Osztrogonác <[email protected]>
[Qt] Text with zero font size renders as X px sometimes, causing fast/text/zero-font-size-2.html to fail
Modified: trunk/Source/WebCore/loader/ResourceLoader.h (132806 => 132807)
--- trunk/Source/WebCore/loader/ResourceLoader.h 2012-10-29 16:40:33 UTC (rev 132806)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2012-10-29 16:42:48 UTC (rev 132807)
@@ -66,7 +66,7 @@
virtual void setDefersLoading(bool);
- uint64_t identifier() const { return m_identifier; }
+ unsigned long identifier() const { return m_identifier; }
virtual void releaseResources();
const ResourceResponse& response() const;
@@ -182,7 +182,7 @@
ResourceRequest m_originalRequest; // Before redirects.
RefPtr<ResourceBuffer> m_resourceData;
- uint64_t m_identifier;
+ unsigned long m_identifier;
bool m_reachedTerminalState;
bool m_calledWillCancel;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
