summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/renderer_host/render_view_host.cc21
-rw-r--r--chrome/common/render_messages_internal.h8
-rw-r--r--chrome/renderer/render_view.cc43
-rw-r--r--chrome/renderer/render_view.h9
-rw-r--r--chrome/renderer/renderer_glue.cc4
-rw-r--r--chrome/test/worker/test_worker_main.cc4
6 files changed, 51 insertions, 38 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index fa009e2..014737c 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -390,15 +390,16 @@ void RenderViewHost::FillPasswordForm(
Send(new ViewMsg_FillPasswordForm(routing_id(), form_data));
}
-void RenderViewHost::DragTargetDragEnter(const WebDropData& drop_data,
- const gfx::Point& client_pt, const gfx::Point& screen_pt) {
+void RenderViewHost::DragTargetDragEnter(
+ const WebDropData& drop_data,
+ const gfx::Point& client_pt,
+ const gfx::Point& screen_pt) {
// Grant the renderer the ability to load the drop_data.
RendererSecurityPolicy* policy = RendererSecurityPolicy::GetInstance();
policy->GrantRequestURL(process()->pid(), drop_data.url);
- for (std::vector<std::wstring>::const_iterator
- iter(drop_data.filenames.begin());
+ for (std::vector<string16>::const_iterator iter(drop_data.filenames.begin());
iter != drop_data.filenames.end(); ++iter) {
- FilePath path = FilePath::FromWStringHack(*iter);
+ FilePath path = FilePath::FromWStringHack(UTF16ToWideHack(*iter));
policy->GrantRequestURL(process()->pid(), net::FilePathToFileURL(path));
policy->GrantUploadFile(process()->pid(), path);
}
@@ -571,13 +572,19 @@ void RenderViewHost::ShowJavaScriptConsole() {
void RenderViewHost::DragSourceEndedAt(
int client_x, int client_y, int screen_x, int screen_y) {
Send(new ViewMsg_DragSourceEndedOrMoved(
- routing_id(), client_x, client_y, screen_x, screen_y, true));
+ routing_id(),
+ gfx::Point(client_x, client_y),
+ gfx::Point(screen_x, screen_y),
+ true));
}
void RenderViewHost::DragSourceMovedTo(
int client_x, int client_y, int screen_x, int screen_y) {
Send(new ViewMsg_DragSourceEndedOrMoved(
- routing_id(), client_x, client_y, screen_x, screen_y, false));
+ routing_id(),
+ gfx::Point(client_x, client_y),
+ gfx::Point(screen_x, screen_y),
+ false));
}
void RenderViewHost::DragSourceSystemDragEnded() {
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index cec72e5..38184f8 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -309,11 +309,9 @@ IPC_BEGIN_MESSAGES(View)
// Notifies the renderer of updates in mouse position of an in-progress
// drag. if |ended| is true, then the user has ended the drag operation.
- IPC_MESSAGE_ROUTED5(ViewMsg_DragSourceEndedOrMoved,
- int /* client_x */,
- int /* client_y */,
- int /* screen_x */,
- int /* screen_y */,
+ IPC_MESSAGE_ROUTED3(ViewMsg_DragSourceEndedOrMoved,
+ gfx::Point /* client_pt */,
+ gfx::Point /* screen_pt */,
bool /* ended */)
// Notifies the renderer that the system DoDragDrop call has ended.
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 99ad017..3ed10cf 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -49,6 +49,8 @@
#include "printing/units.h"
#include "skia/ext/bitmap_platform_device.h"
#include "skia/ext/image_operations.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h"
#include "webkit/default_plugin/default_plugin_shared.h"
#include "webkit/glue/dom_operations.h"
@@ -87,6 +89,7 @@ using base::Time;
using base::TimeDelta;
using webkit_glue::WebAccessibility;
using WebKit::WebConsoleMessage;
+using WebKit::WebDragData;
using WebKit::WebScriptSource;
//-----------------------------------------------------------------------------
@@ -2031,8 +2034,9 @@ void RenderView::ShowContextMenu(WebView* webview,
Send(new ViewHostMsg_ContextMenu(routing_id_, params));
}
-void RenderView::StartDragging(WebView* webview, const WebDropData& drop_data) {
- Send(new ViewHostMsg_StartDragging(routing_id_, drop_data));
+void RenderView::StartDragging(WebView* webview,
+ const WebDragData& drag_data) {
+ Send(new ViewHostMsg_StartDragging(routing_id_, WebDropData(drag_data)));
}
void RenderView::TakeFocus(WebView* webview, bool reverse) {
@@ -2570,15 +2574,13 @@ void RenderView::OnReservePageIDRange(int size_of_range) {
next_page_id_ += size_of_range + 1;
}
-void RenderView::OnDragSourceEndedOrMoved(int client_x,
- int client_y,
- int screen_x,
- int screen_y,
+void RenderView::OnDragSourceEndedOrMoved(const gfx::Point& client_point,
+ const gfx::Point& screen_point,
bool ended) {
if (ended)
- webview()->DragSourceEndedAt(client_x, client_y, screen_x, screen_y);
+ webview()->DragSourceEndedAt(client_point, screen_point);
else
- webview()->DragSourceMovedTo(client_x, client_y, screen_x, screen_y);
+ webview()->DragSourceMovedTo(client_point, screen_point);
}
void RenderView::OnDragSourceSystemDragEnded() {
@@ -2631,17 +2633,21 @@ void RenderView::OnFillPasswordForm(
}
void RenderView::OnDragTargetDragEnter(const WebDropData& drop_data,
- const gfx::Point& client_pt, const gfx::Point& screen_pt) {
- bool is_drop_target = webview()->DragTargetDragEnter(drop_data,
- client_pt.x(), client_pt.y(), screen_pt.x(), screen_pt.y());
+ const gfx::Point& client_point,
+ const gfx::Point& screen_point) {
+ bool is_drop_target = webview()->DragTargetDragEnter(
+ drop_data.ToDragData(),
+ drop_data.identity,
+ client_point,
+ screen_point);
Send(new ViewHostMsg_UpdateDragCursor(routing_id_, is_drop_target));
}
-void RenderView::OnDragTargetDragOver(const gfx::Point& client_pt,
- const gfx::Point& screen_pt) {
- bool is_drop_target = webview()->DragTargetDragOver(client_pt.x(),
- client_pt.y(), screen_pt.x(), screen_pt.y());
+void RenderView::OnDragTargetDragOver(const gfx::Point& client_point,
+ const gfx::Point& screen_point) {
+ bool is_drop_target =
+ webview()->DragTargetDragOver(client_point, screen_point);
Send(new ViewHostMsg_UpdateDragCursor(routing_id_, is_drop_target));
}
@@ -2650,10 +2656,9 @@ void RenderView::OnDragTargetDragLeave() {
webview()->DragTargetDragLeave();
}
-void RenderView::OnDragTargetDrop(const gfx::Point& client_pt,
- const gfx::Point& screen_pt) {
- webview()->DragTargetDrop(client_pt.x(), client_pt.y(), screen_pt.x(),
- screen_pt.y());
+void RenderView::OnDragTargetDrop(const gfx::Point& client_point,
+ const gfx::Point& screen_point) {
+ webview()->DragTargetDrop(client_point, screen_point);
}
void RenderView::OnUpdateWebPreferences(const WebPreferences& prefs) {
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 3fe9dbb..6a499ad 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -67,6 +67,7 @@ struct ViewMsg_PrintPage_Params;
struct ViewMsg_PrintPages_Params;
struct ViewMsg_Print_Params;
struct ViewMsg_UploadFile_Params;
+struct WebDropData;
namespace base {
class WaitableEvent;
@@ -77,6 +78,7 @@ struct FileUploadData;
}
namespace WebKit {
+class WebDragData;
struct WebFindOptions;
}
@@ -274,7 +276,7 @@ class RenderView : public RenderWidget,
int edit_flags,
const std::string& security_info);
virtual void StartDragging(WebView* webview,
- const WebDropData& drag_data);
+ const WebKit::WebDragData& drag_data);
virtual void TakeFocus(WebView* webview, bool reverse);
virtual void JSOutOfMemory();
@@ -536,8 +538,9 @@ class RenderView : public RenderWidget,
void OnReservePageIDRange(int size_of_range);
- void OnDragSourceEndedOrMoved(
- int client_x, int client_y, int screen_x, int screen_y, bool ended);
+ void OnDragSourceEndedOrMoved(const gfx::Point& client_point,
+ const gfx::Point& screen_point,
+ bool ended);
void OnDragSourceSystemDragEnded();
void OnInstallMissingPlugin();
void OnFileChooserResponse(const std::vector<FilePath>& file_names);
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index c907c23..d072dce 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -171,8 +171,8 @@ void AppendToLog(const char* file, int line, const char* msg) {
logging::LogMessage(file, line).stream() << msg;
}
-std::string GetDataResource(int resource_id) {
- return ResourceBundle::GetSharedInstance().GetDataResource(resource_id);
+StringPiece GetDataResource(int resource_id) {
+ return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
}
#if defined(OS_WIN)
diff --git a/chrome/test/worker/test_worker_main.cc b/chrome/test/worker/test_worker_main.cc
index e14d9a4..81b3aca 100644
--- a/chrome/test/worker/test_worker_main.cc
+++ b/chrome/test/worker/test_worker_main.cc
@@ -66,8 +66,8 @@ string16 GetLocalizedString(int message_id) {
return L"";
}
-std::string GetDataResource(int resource_id) {
- return "";
+StringPiece GetDataResource(int resource_id) {
+ return StringPiece();
}
void SetMediaPlayerAvailable(bool value) {
generated by cgit v1.1 at 2025-02-02 06:34:49 +0000