Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Unified Diff: content/renderer/render_view_impl.cc

Issue 1365563003: Prevent guest views from issuing a search for empty text. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: parens Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index d0a0f806f74539567d5ac1db32ebc591199399fc..4d6bdcc4a25e178b0918610f4acbc5349289e42b 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -364,7 +364,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,
@@ -673,7 +672,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);
@@ -2270,6 +2269,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.
@@ -3043,7 +3044,7 @@ void RenderViewImpl::OnWasHidden() {
(*plugin_it)->SetContainerVisibility(false);
}
#endif // OS_MACOSX
-#endif // ENABLE_PLUGINS
+#endif // ENABLE_PLUGINS
}
void RenderViewImpl::OnWasShown(bool needs_repainting,
« no previous file with comments | « content/public/browser/web_contents.h ('k') | extensions/browser/guest_view/web_view/web_view_find_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698