Snapshot of all changes to get jumbo in blink and content.

content/browser/renderer_host/render_widget_host_impl.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 
 #include <set>
 #include <tuple>
@@ skipping 96 matching lines @@
 #endif
 
 #if defined(OS_MACOSX)
 #include "content/public/common/service_manager_connection.h"
 #include "services/device/public/interfaces/constants.mojom.h"
 #include "services/device/public/interfaces/wake_lock_provider.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
 #endif
 
-using base::Time;
+//using base::Time; // Collides with X11 Time and is also not used.
 using base::TimeDelta;
 using base::TimeTicks;
 using blink::WebDragOperation;
 using blink::WebDragOperationsMask;
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 using blink::WebKeyboardEvent;
 using blink::WebMouseEvent;
 using blink::WebMouseWheelEvent;
 using blink::WebTextDirection;
@@ skipping 2588 matching lines @@
       sequence_number >= saved_frame_.max_shared_bitmap_sequence_number) {
     SubmitCompositorFrame(saved_frame_.local_surface_id,
                           std::move(saved_frame_.frame));
     saved_frame_.local_surface_id = viz::LocalSurfaceId();
     compositor_frame_sink_binding_.ResumeIncomingMethodCallProcessing();
     TRACE_EVENT_ASYNC_END0("renderer_host", "PauseCompositorFrameSink", this);
   }
 }
 
 }  // namespace content