| Index: content/browser/renderer_host/render_widget_host_impl.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/render_widget_host_impl.cc (revision 147462)
|
| +++ content/browser/renderer_host/render_widget_host_impl.cc (working copy)
|
| @@ -64,16 +64,17 @@
|
| using WebKit::WebMouseWheelEvent;
|
| using WebKit::WebTextDirection;
|
|
|
| +namespace content {
|
| namespace {
|
|
|
| // How long to (synchronously) wait for the renderer to respond with a
|
| // PaintRect message, when our backing-store is invalid, before giving up and
|
| // returning a null or incorrectly sized backing-store from GetBackingStore.
|
| // This timeout impacts the "choppiness" of our window resize perf.
|
| -static const int kPaintMsgTimeoutMS = 50;
|
| +const int kPaintMsgTimeoutMS = 50;
|
|
|
| // How long to wait before we consider a renderer hung.
|
| -static const int kHungRendererDelayMs = 30000;
|
| +const int kHungRendererDelayMs = 30000;
|
|
|
| // How many milliseconds apart synthetic scroll messages should be sent.
|
| static const int kSyntheticScrollMessageIntervalMs = 8;
|
| @@ -99,8 +100,6 @@
|
|
|
| } // namespace
|
|
|
| -namespace content {
|
| -
|
| // static
|
| void RenderWidgetHost::RemoveAllBackingStores() {
|
| BackingStoreManager::RemoveAllBackingStores();
|
| @@ -1120,10 +1119,9 @@
|
| void RenderWidgetHostImpl::GetWebScreenInfo(WebKit::WebScreenInfo* result) {
|
| #if defined(OS_POSIX) || defined(USE_AURA)
|
| if (GetView()) {
|
| - static_cast<content::RenderWidgetHostViewPort*>(
|
| - GetView())->GetScreenInfo(result);
|
| + static_cast<RenderWidgetHostViewPort*>(GetView())->GetScreenInfo(result);
|
| } else {
|
| - content::RenderWidgetHostViewPort::GetDefaultScreenInfo(result);
|
| + RenderWidgetHostViewPort::GetDefaultScreenInfo(result);
|
| }
|
| #else
|
| *result = WebKit::WebScreenInfoFactory::screenInfo(
|
|
|