.gypi and base and webkit change

third_party/WebKit/Source/platform/TraceEvent.h

Index: third_party/WebKit/Source/platform/TraceEvent.h
diff --git a/third_party/WebKit/Source/platform/TraceEvent.h b/third_party/WebKit/Source/platform/TraceEvent.h
index c7eda727580cb5d26954f95ce0d12cb2a9f95b91..20b6b7bc17caaa5fd2bf686401dbbb25811e5311 100644
--- a/third_party/WebKit/Source/platform/TraceEvent.h
+++ b/third_party/WebKit/Source/platform/TraceEvent.h
@@ -269,8 +269,8 @@ public:
     typedef MangleBehavior<false> DontMangle;
     typedef MangleBehavior<true> ForceMangle;
 
-    TraceID(const void* id, unsigned* flags) :
-        m_data(static_cast<unsigned long long>(reinterpret_cast<unsigned long>(id)))
+    TraceID(const void* id, unsigned* flags)
+        : m_data(static_cast<unsigned long long>(reinterpret_cast<uintptr_t>(id)))
     {
         *flags |= TRACE_EVENT_FLAG_MANGLE_ID;
     }