| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index c0ef9d4cee1999455a8a45d2cf484fdad4357c8d..013eafaad613b658c99ead5d8c620a2a348983dc 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -367,7 +367,6 @@ static bool DeviceScaleEnsuresTextQuality(float device_scale_factor) {
|
| // devices main thread antialiasing is a heavy burden.
|
| return device_scale_factor >= 1.5f;
|
| #endif
|
| -
|
| }
|
|
|
| static bool PreferCompositingToLCDText(CompositorDependencies* compositor_deps,
|
| @@ -674,7 +673,7 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
|
| if (opener_view_routing_id != MSG_ROUTING_NONE && was_created_by_renderer)
|
| opener_id_ = opener_view_routing_id;
|
|
|
| - display_mode_= params.initial_size.display_mode;
|
| + display_mode_ = params.initial_size.display_mode;
|
|
|
| // Ensure we start with a valid next_page_id_ from the browser.
|
| DCHECK_GE(next_page_id_, 0);
|
| @@ -2293,6 +2292,8 @@ blink::WebPlugin* RenderViewImpl::GetWebPluginForFind() {
|
| void RenderViewImpl::OnFind(int request_id,
|
| const base::string16& search_text,
|
| const WebFindOptions& options) {
|
| + DCHECK(!search_text.empty());
|
| +
|
| WebFrame* main_frame = webview()->mainFrame();
|
| blink::WebPlugin* plugin = GetWebPluginForFind();
|
| // Check if the plugin still exists in the document.
|
| @@ -3081,7 +3082,7 @@ void RenderViewImpl::OnWasHidden() {
|
| (*plugin_it)->SetContainerVisibility(false);
|
| }
|
| #endif // OS_MACOSX
|
| -#endif // ENABLE_PLUGINS
|
| +#endif // ENABLE_PLUGINS
|
| }
|
|
|
| void RenderViewImpl::OnWasShown(bool needs_repainting,
|
|
|