third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp - Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Removing unnecessary #if defined(s) 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:

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..34dc0cf289f5a02f60c46293e07691a2fc845ec2 100644

--- a/third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp

+++ b/third_party/WebKit/Source/core/layout/TracedLayoutObject.cpp

@@ -27,7 +27,7 @@ String TracedLayoutObject::asTraceFormat() const

}

TracedLayoutObject::TracedLayoutObject(const LayoutObject& object, bool traceGeometry)

- : m_address((unsigned long) &object)

+ : m_address(reinterpret_cast<uintptr_t>(&object))

, m_isAnonymous(object.isAnonymous())

, m_isPositioned(object.isOutOfFlowPositioned())

, m_isRelPositioned(object.isRelPositioned())