Index: content/browser/webui/web_ui_message_handler.cc |
diff --git a/content/browser/webui/web_ui_message_handler.cc b/content/browser/webui/web_ui_message_handler.cc |
index 73f780f5ea8daab61a31f874a344120ca2af8edd..56e0adcbbaa7a1919749123f767746c17f0069fa 100644 |
--- a/content/browser/webui/web_ui_message_handler.cc |
+++ b/content/browser/webui/web_ui_message_handler.cc |
@@ -21,6 +21,16 @@ void WebUIMessageHandler::AllowJavascript() { |
OnJavascriptAllowed(); |
} |
+void WebUIMessageHandler::DisallowJavascript() { |
+ if (!javascript_allowed_) |
+ return; |
+ |
+ javascript_allowed_ = false; |
+ DCHECK(!IsJavascriptAllowed()); |
+ |
+ OnJavascriptDisallowed(); |
+} |
+ |
bool WebUIMessageHandler::IsJavascriptAllowed() const { |
return javascript_allowed_ && web_ui() && web_ui()->CanCallJavascript(); |
} |
@@ -60,11 +70,7 @@ base::string16 WebUIMessageHandler::ExtractStringValue( |
} |
void WebUIMessageHandler::RenderViewReused() { |
- if (!javascript_allowed_) |
- return; |
- |
- javascript_allowed_ = false; |
- OnJavascriptDisallowed(); |
+ DisallowJavascript(); |
} |
} // namespace content |