| Index: content/renderer/render_widget.cc
|
| ===================================================================
|
| --- content/renderer/render_widget.cc (revision 163007)
|
| +++ content/renderer/render_widget.cc (working copy)
|
| @@ -35,9 +35,7 @@
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
|
| #include "third_party/skia/include/core/SkShader.h"
|
| #include "ui/base/ui_base_switches.h"
|
| -#include "ui/gfx/point.h"
|
| #include "ui/gfx/rect_conversions.h"
|
| -#include "ui/gfx/size.h"
|
| #include "ui/gfx/size_conversions.h"
|
| #include "ui/gfx/skia_util.h"
|
| #include "ui/gl/gl_switches.h"
|
| @@ -72,8 +70,9 @@
|
| using WebKit::WebTouchEvent;
|
| using WebKit::WebVector;
|
| using WebKit::WebWidget;
|
| -using content::RenderThread;
|
|
|
| +namespace content {
|
| +
|
| static const float kStandardDPI = 160;
|
|
|
| RenderWidget::RenderWidget(WebKit::WebPopupType popup_type,
|
| @@ -265,7 +264,7 @@
|
| // Don't send any messages after the browser has told us to close, and filter
|
| // most outgoing messages while swapped out.
|
| if ((is_swapped_out_ &&
|
| - !content::SwappedOutMessages::CanSendWhileSwappedOut(message)) ||
|
| + !SwappedOutMessages::CanSendWhileSwappedOut(message)) ||
|
| closing_) {
|
| delete message;
|
| return false;
|
| @@ -1868,8 +1867,7 @@
|
| stats.totalPaintTimeInSeconds += software_stats_.totalPaintTimeInSeconds;
|
| }
|
|
|
| -bool RenderWidget::GetGpuRenderingStats(
|
| - content::GpuRenderingStats* stats) const {
|
| +bool RenderWidget::GetGpuRenderingStats(GpuRenderingStats* stats) const {
|
| GpuChannelHost* gpu_channel = RenderThreadImpl::current()->GetGpuChannel();
|
| if (!gpu_channel)
|
| return false;
|
| @@ -1897,3 +1895,5 @@
|
| bool RenderWidget::WebWidgetHandlesCompositorScheduling() const {
|
| return false;
|
| }
|
| +
|
| +} // namespace content
|
|
|