Fixing remaining VC++ 2015 64-bit build breaks

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/layout/TracedLayoutObject.h"
 
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutTableCell.h"
 #include "core/layout/LayoutText.h"
 #include "core/layout/LayoutView.h"
 #include "platform/JSONValues.h"
 
 namespace blink {
 
 PassRefPtr<TraceEvent::ConvertableToTraceFormat> TracedLayoutObject::create(const LayoutView& view, bool traceGeometry)
 {
     return adoptRef(new TracedLayoutObject(view, traceGeometry));
 }
 
 String TracedLayoutObject::asTraceFormat() const
 {
     StringBuilder builder;
     RefPtr<JSONObject> json(toJSON());
     json->writeJSON(&builder);
     return builder.toString();
 }
 
 TracedLayoutObject::TracedLayoutObject(const LayoutObject& object, bool traceGeometry)
-    : m_address((unsigned long) &object)
+    : m_address(reinterpret_cast<uintptr_t>(&object))

[Will Harris, 2015/11/10 23:01:31]

is a cast even needed here now?

[brucedawson, 2015/11/11 01:09:04]

The cast is still needed because we're changing from a pointer to an integer
type.

     , m_isAnonymous(object.isAnonymous())
     , m_isPositioned(object.isOutOfFlowPositioned())
     , m_isRelPositioned(object.isRelPositioned())
     , m_isStickyPositioned(object.isStickyPositioned())
     , m_isFloating(object.isFloating())
     , m_selfNeeds(object.selfNeedsLayout())
     , m_positionedMovement(object.needsPositionedMovementLayout())
     , m_childNeeds(object.normalChildNeedsLayout())
     , m_posChildNeeds(object.posChildNeedsLayout())
     , m_isTableCell(object.isTableCell())
@@ skipping 39 matching lines @@
     }
 
     for (LayoutObject* child = object.slowFirstChild(); child; child = child->nextSibling()) {
         m_children.append(adoptRef(new TracedLayoutObject(*child, traceGeometry)));
     }
 }
 
 PassRefPtr<JSONObject> TracedLayoutObject::toJSON() const
 {
     RefPtr<JSONObject> json(JSONObject::create());
     json->setNumber("address", m_address);

[Will Harris, 2015/11/10 23:01:30]

how does this code compile when m_address is now a uintptr_t and setNumber takes
a double?

[brucedawson, 2015/11/11 01:09:04]

Converting from uintptr_t to double is totally legal. Whether the compiler warns
is up to it. On Linux and OSX the code is identical to what we had before (since
unsigned long is the same size as uintptr_t) so it's just a matter of whether
VC++ warns about the possible loss of precision. And it doesn't.

     json->setString("name", m_name);
     if (!m_tag.isEmpty())
         json->setString("tag", m_tag);
     if (!m_id.isEmpty())
         json->setString("htmlId", m_id);
     if (m_classNames.size()) {
         RefPtr<JSONArray> classNames(JSONArray::create());
         for (const auto& className : m_classNames) {
             classNames->pushString(className);
         }
@@ skipping 35 matching lines @@
         RefPtr<JSONArray> children(JSONArray::create());
         for (const auto& child : m_children) {
             children->pushObject(child->toJSON());
         }
         json->setArray("children", children);
     }
     return json.release();
 }
 
 } // namespace blink