Revert 268218 "Add support for mapping node tree on the client."

trunk/src/mojo/services/view_manager/ids.h

 // Copyright 2014 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.
 
 #ifndef MOJO_SERVICES_VIEW_MANAGER_IDS_H_
 #define MOJO_SERVICES_VIEW_MANAGER_IDS_H_
 
-#include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_types.h"
 #include "mojo/services/view_manager/view_manager_export.h"
 
 namespace mojo {
 namespace services {
 namespace view_manager {
 
 // Adds a bit of type safety to node ids.
 struct MOJO_VIEW_MANAGER_EXPORT NodeId {
   NodeId(TransportConnectionId connection_id,
@@ skipping 30 matching lines @@
 
   bool operator!=(const ViewId& other) const {
     return !(*this == other);
   }
 
   TransportConnectionId connection_id;
   TransportConnectionSpecificViewId view_id;
 };
 
 // Functions for converting to/from structs and transport values.
+inline uint16_t FirstIdFromTransportId(uint32_t id) {
+  return static_cast<uint16_t>((id >> 16) & 0xFFFF);
+}
+
+inline uint16_t SecondIdFromTransportId(uint32_t id) {
+  return static_cast<uint16_t>(id & 0xFFFF);
+}
+
 inline NodeId NodeIdFromTransportId(TransportNodeId id) {
-  return NodeId(HiWord(id), LoWord(id));
+  return NodeId(FirstIdFromTransportId(id), SecondIdFromTransportId(id));
 }
 
 inline TransportNodeId NodeIdToTransportId(const NodeId& id) {
   return (id.connection_id << 16) | id.node_id;
 }
 
 inline ViewId ViewIdFromTransportId(TransportViewId id) {
-  return ViewId(HiWord(id), LoWord(id));
+  return ViewId(FirstIdFromTransportId(id), SecondIdFromTransportId(id));
 }
 
 inline TransportViewId ViewIdToTransportId(const ViewId& id) {
   return (id.connection_id << 16) | id.view_id;
 }
 
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_IDS_H_