OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_view.h" | 5 #include "content/renderer/render_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1658 | 1658 |
1659 void RenderView::setToolTipText(const WebString& text, WebTextDirection hint) { | 1659 void RenderView::setToolTipText(const WebString& text, WebTextDirection hint) { |
1660 Send(new ViewHostMsg_SetTooltipText(routing_id_, UTF16ToWideHack(text), | 1660 Send(new ViewHostMsg_SetTooltipText(routing_id_, UTF16ToWideHack(text), |
1661 hint)); | 1661 hint)); |
1662 } | 1662 } |
1663 | 1663 |
1664 void RenderView::startDragging(const WebDragData& data, | 1664 void RenderView::startDragging(const WebDragData& data, |
1665 WebDragOperationsMask mask, | 1665 WebDragOperationsMask mask, |
1666 const WebImage& image, | 1666 const WebImage& image, |
1667 const WebPoint& imageOffset) { | 1667 const WebPoint& imageOffset) { |
1668 // We want to hide popups but don't want to clear filled filed. | |
1669 if (webview()) { | |
1670 webview()->hidePopups(); | |
1671 webview()->acceptCurrectAutoFilled(); | |
Ilya Sherman
2011/05/07 09:07:10
You probably want to swap the order of these two l
honten.org
2011/05/09 02:30:32
Hmmm...
Even if I change the order of the calling
Ilya Sherman
2011/05/09 07:40:05
As I mentioned on the WebKit bug, I don't fully un
| |
1672 } | |
1673 | |
1668 #if WEBKIT_USING_SKIA | 1674 #if WEBKIT_USING_SKIA |
1669 SkBitmap bitmap(image.getSkBitmap()); | 1675 SkBitmap bitmap(image.getSkBitmap()); |
1670 #elif WEBKIT_USING_CG | 1676 #elif WEBKIT_USING_CG |
1671 SkBitmap bitmap = gfx::CGImageToSkBitmap(image.getCGImageRef()); | 1677 SkBitmap bitmap = gfx::CGImageToSkBitmap(image.getCGImageRef()); |
1672 #endif | 1678 #endif |
1673 | 1679 |
1674 Send(new DragHostMsg_StartDragging(routing_id_, | 1680 Send(new DragHostMsg_StartDragging(routing_id_, |
1675 WebDropData(data), | 1681 WebDropData(data), |
1676 mask, | 1682 mask, |
1677 bitmap, | 1683 bitmap, |
(...skipping 2425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4103 const webkit_glue::CustomContextMenuContext& custom_context) { | 4109 const webkit_glue::CustomContextMenuContext& custom_context) { |
4104 if (custom_context.is_pepper_menu) | 4110 if (custom_context.is_pepper_menu) |
4105 pepper_delegate_.OnContextMenuClosed(custom_context); | 4111 pepper_delegate_.OnContextMenuClosed(custom_context); |
4106 else | 4112 else |
4107 context_menu_node_.reset(); | 4113 context_menu_node_.reset(); |
4108 } | 4114 } |
4109 | 4115 |
4110 void RenderView::OnNetworkStateChanged(bool online) { | 4116 void RenderView::OnNetworkStateChanged(bool online) { |
4111 WebNetworkStateNotifier::setOnLine(online); | 4117 WebNetworkStateNotifier::setOnLine(online); |
4112 } | 4118 } |
OLD | NEW |