| Index: content/browser/frame_host/render_widget_host_view_guest.cc
|
| diff --git a/content/browser/frame_host/render_widget_host_view_guest.cc b/content/browser/frame_host/render_widget_host_view_guest.cc
|
| index f3ba93da06bd4ef84b5a63e8717cf7a9fc1e5f81..48a6284b30726277b6d2bc408c4778b8b39b798b 100644
|
| --- a/content/browser/frame_host/render_widget_host_view_guest.cc
|
| +++ b/content/browser/frame_host/render_widget_host_view_guest.cc
|
| @@ -6,6 +6,7 @@
|
| #include "base/command_line.h"
|
| #include "base/logging.h"
|
| #include "base/message_loop/message_loop.h"
|
| +#include "build/build_config.h"
|
| #include "cc/surfaces/surface.h"
|
| #include "cc/surfaces/surface_factory.h"
|
| #include "cc/surfaces/surface_manager.h"
|
| @@ -228,7 +229,7 @@ void RenderWidgetHostViewGuest::SetTooltipText(
|
| }
|
|
|
| void RenderWidgetHostViewGuest::OnSwapCompositorFrame(
|
| - uint32 output_surface_id,
|
| + uint32_t output_surface_id,
|
| scoped_ptr<cc::CompositorFrame> frame) {
|
| if (!guest_ || !guest_->attached()) {
|
| // We shouldn't hang on to a surface while we are detached.
|
|
|