Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(403)

Unified Diff: third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp

Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to latest Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp b/third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp
index ee60df3dcdedfef88bb996b50d8a887137531a8c..288bf003d59b5dc40765ae88e996969874e234bd 100644
--- a/third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp
+++ b/third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp
@@ -27,7 +27,9 @@ String TracedLayoutObject::asTraceFormat() const
}
TracedLayoutObject::TracedLayoutObject(const LayoutObject& object, bool traceGeometry)
- : m_address((unsigned long) &object)
+ // Cast through uintptr_t and then unsigned int to make the truncation
Will Harris 2015/11/10 18:05:14 looks like m_address should be a different type he
brucedawson 2015/11/10 18:43:26 Yes, ideally, but the setNumber function that they
Will Harris 2015/11/10 19:45:46 this code is crazy. I agree with not complicating
brucedawson 2015/11/10 19:54:33 I changed it to uintptr_t so it's at least portabl
+ // explicit.
+ : m_address(static_cast<unsigned long>(reinterpret_cast<uintptr_t>(&object)))
, m_isAnonymous(object.isAnonymous())
, m_isPositioned(object.isOutOfFlowPositioned())
, m_isRelPositioned(object.isRelPositioned())

Powered by Google App Engine
This is Rietveld 408576698