summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/renderer_host/render_view_host.cc7
-rw-r--r--chrome/browser/renderer_host/render_view_host.h8
-rw-r--r--chrome/browser/ssl/ssl_manager.cc7
-rw-r--r--chrome/browser/ssl/ssl_manager.h8
-rw-r--r--chrome/browser/ssl/ssl_policy.cc11
-rw-r--r--chrome/common/ipc_message_utils.h18
-rw-r--r--chrome/common/render_messages.h40
-rw-r--r--chrome/common/render_messages_internal.h6
-rw-r--r--chrome/renderer/render_view.cc12
-rw-r--r--chrome/renderer/render_view.h5
10 files changed, 75 insertions, 47 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 0f0a889..cd08a0c 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -34,10 +34,12 @@
#include "chrome/common/thumbnail_score.h"
#include "net/base/net_util.h"
#include "skia/include/SkBitmap.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFindInPageRequest.h"
#include "webkit/glue/autofill_form.h"
using base::TimeDelta;
+using WebKit::WebConsoleMessage;
using WebKit::WebFindInPageRequest;
using WebKit::WebInputEvent;
@@ -434,9 +436,8 @@ void RenderViewHost::InsertCSSInWebFrame(
}
void RenderViewHost::AddMessageToConsole(
- const std::wstring& frame_xpath, const std::wstring& msg,
- ConsoleMessageLevel level) {
- Send(new ViewMsg_AddMessageToConsole(routing_id(), frame_xpath, msg, level));
+ const std::wstring& frame_xpath, const WebConsoleMessage& message) {
+ Send(new ViewMsg_AddMessageToConsole(routing_id(), frame_xpath, message));
}
void RenderViewHost::DebugCommand(const std::wstring& cmd) {
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 718c585..6cfe2b2 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -18,7 +18,6 @@
#include "chrome/personalization/personalization.h"
#endif
#include "webkit/glue/autofill_form.h"
-#include "webkit/glue/console_message_level.h"
#include "webkit/glue/password_form_dom_manager.h"
#include "webkit/glue/window_open_disposition.h"
@@ -50,6 +49,10 @@ namespace webkit_glue {
struct WebApplicationInfo;
}
+namespace WebKit {
+struct WebConsoleMessage;
+}
+
//
// RenderViewHost
//
@@ -236,8 +239,7 @@ class RenderViewHost : public RenderWidgetHost {
// Logs a message to the console of a frame in the page.
void AddMessageToConsole(const std::wstring& frame_xpath,
- const std::wstring& msg,
- ConsoleMessageLevel level);
+ const WebKit::WebConsoleMessage&);
// Send command to the debugger
void DebugCommand(const std::wstring& cmd);
diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc
index 461979d..57ee3f8 100644
--- a/chrome/browser/ssl/ssl_manager.cc
+++ b/chrome/browser/ssl/ssl_manager.cc
@@ -28,6 +28,7 @@
#include "net/base/cert_status_flags.h"
#include "net/base/net_errors.h"
#include "net/url_request/url_request.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
#include "webkit/glue/resource_type.h"
#if defined(OS_WIN)
@@ -40,6 +41,7 @@
#include "chrome/common/temp_scaffolding_stubs.h"
#endif
+using WebKit::WebConsoleMessage;
class SSLInfoBarDelegate : public ConfirmInfoBarDelegate {
public:
@@ -177,8 +179,7 @@ bool SSLManager::SetMaxSecurityStyle(SecurityStyle style) {
}
// Delegate API method.
-void SSLManager::AddMessageToConsole(const std::wstring& msg,
- ConsoleMessageLevel level) {
+void SSLManager::AddMessageToConsole(const WebConsoleMessage& message) {
TabContents* tab_contents = controller_->GetTabContents(TAB_CONTENTS_WEB);
if (!tab_contents)
return;
@@ -187,7 +188,7 @@ void SSLManager::AddMessageToConsole(const std::wstring& msg,
return;
web_contents->render_view_host()->AddMessageToConsole(
- std::wstring(), msg, level);
+ std::wstring(), message);
}
// Delegate API method.
diff --git a/chrome/browser/ssl/ssl_manager.h b/chrome/browser/ssl/ssl_manager.h
index b72f1377f..14baf7a 100644
--- a/chrome/browser/ssl/ssl_manager.h
+++ b/chrome/browser/ssl/ssl_manager.h
@@ -21,7 +21,6 @@
#include "net/base/net_errors.h"
#include "net/base/ssl_info.h"
#include "net/base/x509_certificate.h"
-#include "webkit/glue/console_message_level.h"
#include "webkit/glue/resource_type.h"
class AutomationProvider;
@@ -38,6 +37,10 @@ class Task;
class URLRequest;
class WebContents;
+namespace WebKit {
+struct WebConsoleMessage;
+}
+
// The SSLManager SSLManager controls the SSL UI elements in a TabContents. It
// listens for various events that influence when these elements should or
// should not be displayed and adjusts them accordingly.
@@ -373,8 +376,7 @@ class SSLManager : public NotificationObserver {
bool SetMaxSecurityStyle(SecurityStyle style);
// Logs a message to the console of the page.
- void AddMessageToConsole(const std::wstring& msg,
- ConsoleMessageLevel level);
+ void AddMessageToConsole(const WebKit::WebConsoleMessage&);
// Records that |cert| is permitted to be used for |host| in the future.
void DenyCertForHost(net::X509Certificate* cert, const std::string& host);
diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc
index 5221c04..0b2bcfe 100644
--- a/chrome/browser/ssl/ssl_policy.cc
+++ b/chrome/browser/ssl/ssl_policy.cc
@@ -25,7 +25,7 @@
#include "grit/generated_resources.h"
#include "net/base/cert_status_flags.h"
#include "net/base/ssl_info.h"
-#include "webkit/glue/console_message_level.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
#include "webkit/glue/resource_type.h"
#if defined(OS_WIN)
@@ -35,6 +35,8 @@
#include "chrome/common/temp_scaffolding_stubs.h"
#endif
+using WebKit::WebConsoleMessage;
+
// Wrap all these helper classes in an anonymous namespace.
namespace {
@@ -159,11 +161,14 @@ static void InitializeEntryIfNeeded(NavigationEntry* entry) {
static void AddMixedContentWarningToConsole(
SSLManager::MixedContentHandler* handler) {
- const std::wstring& msg = l10n_util::GetStringF(
+ const std::wstring& text = l10n_util::GetStringF(
IDS_MIXED_CONTENT_LOG_MESSAGE,
UTF8ToWide(handler->frame_origin()),
UTF8ToWide(handler->request_url().spec()));
- handler->manager()->AddMessageToConsole(msg, MESSAGE_LEVEL_WARNING);
+ WebConsoleMessage message;
+ message.text = WideToUTF16Hack(text);
+ message.level = WebConsoleMessage::LevelWarning;
+ handler->manager()->AddMessageToConsole(message);
}
} // namespace
diff --git a/chrome/common/ipc_message_utils.h b/chrome/common/ipc_message_utils.h
index bfdc54d..ac3cbef 100644
--- a/chrome/common/ipc_message_utils.h
+++ b/chrome/common/ipc_message_utils.h
@@ -19,7 +19,6 @@
#include "chrome/common/ipc_sync_message.h"
#include "chrome/common/thumbnail_score.h"
#include "chrome/common/transport_dib.h"
-#include "webkit/glue/console_message_level.h"
#include "webkit/glue/webcursor.h"
#include "webkit/glue/window_open_disposition.h"
@@ -789,23 +788,6 @@ struct ParamTraits<WindowOpenDisposition> {
}
};
-template <>
-struct ParamTraits<ConsoleMessageLevel> {
- typedef ConsoleMessageLevel param_type;
- static void Write(Message* m, const param_type& p) {
- m->WriteInt(p);
- }
- static bool Read(const Message* m, void** iter, param_type* r) {
- int temp;
- bool res = m->ReadInt(iter, &temp);
- *r = static_cast<ConsoleMessageLevel>(temp);
- return res;
- }
- static void Log(const param_type& p, std::wstring* l) {
- l->append(StringPrintf(L"%d", p));
- }
-};
-
#if defined(OS_WIN)
template <>
struct ParamTraits<XFORM> {
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 530e311..717303b 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -25,6 +25,7 @@
#include "net/http/http_response_headers.h"
#include "net/url_request/url_request_status.h"
#include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFindInPageRequest.h"
#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
#include "webkit/glue/autofill_form.h"
@@ -392,6 +393,45 @@ struct ParamTraits<WebKit::WebString> {
};
template <>
+struct ParamTraits<WebKit::WebConsoleMessage::Level> {
+ typedef WebKit::WebConsoleMessage::Level param_type;
+ static void Write(Message* m, const param_type& p) {
+ WriteParam(m, static_cast<int>(p));
+ }
+ static bool Read(const Message* m, void** iter, param_type* r) {
+ int value;
+ if (!ReadParam(m, iter, &value))
+ return false;
+ *r = static_cast<param_type>(value);
+ return true;
+ }
+ static void Log(const param_type& p, std::wstring* l) {
+ LogParam(static_cast<int>(p), l);
+ }
+};
+
+template <>
+struct ParamTraits<WebKit::WebConsoleMessage> {
+ typedef WebKit::WebConsoleMessage param_type;
+ static void Write(Message* m, const param_type& p) {
+ WriteParam(m, p.level);
+ WriteParam(m, p.text);
+ }
+ static bool Read(const Message* m, void** iter, param_type* r) {
+ return
+ ReadParam(m, iter, &r->level) &&
+ ReadParam(m, iter, &r->text);
+ }
+ static void Log(const param_type& p, std::wstring* l) {
+ l->append(L"(");
+ LogParam(p.level, l);
+ l->append(L", ");
+ LogParam(p.text, l);
+ l->append(L")");
+ }
+};
+
+template <>
struct ParamTraits<ResourceType::Type> {
typedef ResourceType::Type param_type;
static void Write(Message* m, const param_type& p) {
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 2dda292..ff0217d 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -18,7 +18,6 @@
#include "chrome/common/ipc_message_macros.h"
#include "chrome/common/transport_dib.h"
#include "skia/include/SkBitmap.h"
-#include "webkit/glue/console_message_level.h"
#include "webkit/glue/dom_operations.h"
#include "webkit/glue/screen_info.h"
#include "webkit/glue/webcursor.h"
@@ -228,10 +227,9 @@ IPC_BEGIN_MESSAGES(View)
std::string /* css string */)
// Log a message to the console of the target frame
- IPC_MESSAGE_ROUTED3(ViewMsg_AddMessageToConsole,
+ IPC_MESSAGE_ROUTED2(ViewMsg_AddMessageToConsole,
std::wstring, /* frame_xpath */
- std::wstring, /* msg */
- ConsoleMessageLevel /* level */)
+ WebKit::WebConsoleMessage /* message */)
// Initialize the V8 debugger in the renderer.
IPC_MESSAGE_ROUTED0(ViewMsg_DebugAttach)
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 29f6340..d2c052c 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -85,6 +85,7 @@
using base::TimeDelta;
using webkit_glue::WebAccessibility;
+using WebKit::WebConsoleMessage;
using WebKit::WebScriptSource;
//-----------------------------------------------------------------------------
@@ -465,7 +466,7 @@ void RenderView::PrintPage(const ViewMsg_PrintPage_Params& params,
DCHECK(hdc);
skia::PlatformDeviceWin::InitializeDC(hdc);
// Since WebKit extends the page width depending on the magical shrink
- // factor we make sure the canvas covers the worst case scenario
+ // factor we make sure the canvas covers the worst case scenario
// (x2.0 currently). PrintContext will then set the correct clipping region.
int size_x = static_cast<int>(canvas_size.width() * params.params.max_shrink);
int size_y = static_cast<int>(canvas_size.height() *
@@ -2464,13 +2465,10 @@ void RenderView::OnCSSInsertRequest(const std::wstring& frame_xpath,
}
void RenderView::OnAddMessageToConsole(const std::wstring& frame_xpath,
- const std::wstring& msg,
- ConsoleMessageLevel level) {
+ const WebConsoleMessage& message) {
WebFrame* web_frame = GetChildFrame(frame_xpath);
- if (!web_frame)
- return;
-
- web_frame->AddMessageToConsole(msg, level);
+ if (web_frame)
+ web_frame->AddMessageToConsole(message);
}
#if defined(OS_WIN)
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index a9b4b9a..d6bf327 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -26,7 +26,6 @@
#include "chrome/renderer/render_widget.h"
#include "media/audio/audio_output.h"
#include "testing/gtest/include/gtest/gtest_prod.h"
-#include "webkit/glue/console_message_level.h"
#include "webkit/glue/dom_serializer_delegate.h"
#include "webkit/glue/feed.h"
#include "webkit/glue/form_data.h"
@@ -75,6 +74,7 @@ struct FileUploadData;
}
namespace WebKit {
+struct WebConsoleMessage;
struct WebFindInPageRequest;
}
@@ -519,8 +519,7 @@ class RenderView : public RenderWidget,
void OnCSSInsertRequest(const std::wstring& frame_xpath,
const std::string& css);
void OnAddMessageToConsole(const std::wstring& frame_xpath,
- const std::wstring& msg,
- ConsoleMessageLevel level);
+ const WebKit::WebConsoleMessage&);
void OnDebugAttach();
void OnReservePageIDRange(int size_of_range);
generated by cgit v1.1 at 2025-02-13 00:57:36 +0000