← Back to branch summary

~abreu-alexandre/oxide/add-ua-to-downloadrequested

« back to all changes in this revision

Viewing changes to patches/support-native-popup-menus.patch

  • Committer: Chris Coulson
  • Date: 2014-08-19 09:43:28 UTC
  • mfrom: (640.1.51 canary)
  • Revision ID: chris.coulson@canonical.com-20140819094328-rglm6lnnoikpgs3r
Bump Chromium rev to 38.0.2125.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/support-native-popup-menus.patch
5
5
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
6
6
--- a/content/browser/renderer_host/render_view_host_impl.cc
7
7
+++ b/content/browser/renderer_host/render_view_host_impl.cc
8
 
@@ -961,20 +961,18 @@ bool RenderViewHostImpl::OnMessageReceiv
 
8
@@ -930,20 +930,18 @@ bool RenderViewHostImpl::OnMessageReceiv
9
9
     IPC_MESSAGE_HANDLER(ViewHostMsg_RouteMessageEvent, OnRouteMessageEvent)
10
10
     IPC_MESSAGE_HANDLER(DragHostMsg_StartDragging, OnStartDragging)
11
11
     IPC_MESSAGE_HANDLER(DragHostMsg_UpdateDragCursor, OnUpdateDragCursor)
26
26
   IPC_END_MESSAGE_MAP()
27
27
 
28
28
   return handled;
29
 
@@ -1367,28 +1365,26 @@ void RenderViewHostImpl::ForwardKeyboard
 
29
@@ -1338,28 +1336,26 @@ void RenderViewHostImpl::ForwardKeyboard
30
30
   if (ignore_input_events()) {
31
31
     if (key_event.type == WebInputEvent::RawKeyDown)
32
32
       delegate_->OnIgnoredUIEvent();
55
55
 
56
56
 void RenderViewHostImpl::DidCancelPopupMenu() {
57
57
   Send(new ViewMsg_SelectPopupMenuItem(GetRoutingID(), -1));
58
 
@@ -1522,17 +1518,16 @@ void RenderViewHostImpl::OnFocusedNodeTo
 
58
@@ -1502,17 +1498,16 @@ void RenderViewHostImpl::OnFocusedNodeTo
59
59
     virtual_keyboard_requested_ = base::win::DisplayVirtualKeyboard();
60
60
   } else {
61
61
     virtual_keyboard_requested_ = false;
73
73
                         params.item_height,
74
74
                         params.item_font_size,
75
75
                         params.selected_item,
76
 
@@ -1542,17 +1537,16 @@ void RenderViewHostImpl::OnShowPopup(
 
76
@@ -1522,17 +1517,16 @@ void RenderViewHostImpl::OnShowPopup(
77
77
   }
78
78
 }
79
79
 
94
94
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
95
95
--- a/content/browser/renderer_host/render_view_host_impl.h
96
96
+++ b/content/browser/renderer_host/render_view_host_impl.h
97
 
@@ -389,20 +389,18 @@ class CONTENT_EXPORT RenderViewHostImpl
 
97
@@ -354,20 +354,18 @@ class CONTENT_EXPORT RenderViewHostImpl
98
98
 #endif
99
99
 
100
100
 #if defined(ENABLE_BROWSER_CDMS)
115
115
   // Set the opener to null in the renderer process.
116
116
   void DisownOpener();
117
117
 
118
 
@@ -485,20 +483,18 @@ class CONTENT_EXPORT RenderViewHostImpl
 
118
@@ -450,20 +448,18 @@ class CONTENT_EXPORT RenderViewHostImpl
119
119
   void OnFocusedNodeChanged(bool is_editable_node);
120
120
   void OnUpdateInspectorSetting(const std::string& key,
121
121
                                 const std::string& value);
139
139
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
140
140
--- a/content/common/view_messages.h
141
141
+++ b/content/common/view_messages.h
142
 
@@ -904,22 +904,24 @@ IPC_MESSAGE_CONTROL1(ViewMsg_SetWebKitSh
 
142
@@ -912,22 +912,24 @@ IPC_MESSAGE_CONTROL1(ViewMsg_SetWebKitSh
143
143
 // they came in, so the renderer can tell if it needs to send updated rects.
144
144
 // Otherwise just pass -1 to always receive the list of rects.
145
145
 //
164
164
                     bool /* animate */)
165
165
 
166
166
 IPC_MESSAGE_ROUTED0(ViewMsg_ShowImeIfNeeded)
167
 
@@ -931,18 +933,19 @@ IPC_MESSAGE_ROUTED1(ViewMsg_BeginFrame,
 
167
@@ -939,18 +941,19 @@ IPC_MESSAGE_ROUTED1(ViewMsg_BeginFrame,
168
168
 // Sent by the browser when an IME update that requires acknowledgement has been
169
169
 // processed on the browser side.
170
170
 IPC_MESSAGE_ROUTED0(ViewMsg_ImeEventAck)
185
185
 IPC_MESSAGE_ROUTED2(ViewMsg_WindowFrameChanged,
186
186
                     gfx::Rect /* window frame */,
187
187
                     gfx::Rect /* content view frame */)
188
 
@@ -1074,22 +1077,20 @@ IPC_MESSAGE_ROUTED0(ViewHostMsg_Close)
 
188
@@ -1084,22 +1087,20 @@ IPC_MESSAGE_ROUTED0(ViewHostMsg_Close)
189
189
 IPC_MESSAGE_ROUTED0(ViewHostMsg_UpdateScreenRects_ACK)
190
190
 
191
191
 // Sent by the renderer process to request that the browser move the view.
211
211
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
212
212
--- a/content/content_renderer.gypi
213
213
+++ b/content/content_renderer.gypi
214
 
@@ -186,16 +186,18 @@
 
214
@@ -183,16 +183,18 @@
215
215
       'renderer/dom_storage/webstoragearea_impl.cc',
216
216
       'renderer/dom_storage/webstoragearea_impl.h',
217
217
       'renderer/dom_storage/webstoragenamespace_impl.cc',
282
282
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
283
283
--- a/content/renderer/render_thread_impl.cc
284
284
+++ b/content/renderer/render_thread_impl.cc
285
 
@@ -374,20 +374,18 @@ RenderThreadImpl::RenderThreadImpl(const
 
285
@@ -399,20 +399,18 @@ RenderThreadImpl::RenderThreadImpl(const
286
286
 
287
287
 void RenderThreadImpl::Init() {
288
288
   TRACE_EVENT_BEGIN_ETW("RenderThreadImpl::Init", 0, "");
306
306
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
307
307
--- a/content/renderer/render_view_impl.cc
308
308
+++ b/content/renderer/render_view_impl.cc
309
 
@@ -1409,21 +1409,24 @@ bool RenderViewImpl::OnMessageReceived(c
 
309
@@ -1421,21 +1421,24 @@ bool RenderViewImpl::OnMessageReceived(c
310
310
     IPC_MESSAGE_HANDLER(ViewMsg_WindowSnapshotCompleted,
311
311
                         OnWindowSnapshotCompleted)
312
312
     IPC_MESSAGE_HANDLER(ViewMsg_ForceRedraw, OnForceRedraw)
324
324
-#elif defined(OS_MACOSX)
325
325
+#endif
326
326
+#if defined(OS_MACOSX)
 
327
     IPC_MESSAGE_HANDLER(ViewMsg_GetRenderedText,
 
328
                         OnGetRenderedText)
327
329
     IPC_MESSAGE_HANDLER(ViewMsg_PluginImeCompositionCompleted,
328
330
                         OnPluginImeCompositionCompleted)
329
331
     IPC_MESSAGE_HANDLER(ViewMsg_SelectPopupMenuItem, OnSelectPopupMenuItem)
330
332
     IPC_MESSAGE_HANDLER(ViewMsg_SetInLiveResize, OnSetInLiveResize)
331
333
     IPC_MESSAGE_HANDLER(ViewMsg_SetWindowVisibility, OnSetWindowVisibility)
332
334
     IPC_MESSAGE_HANDLER(ViewMsg_WindowFrameChanged, OnWindowFrameChanged)
333
 
 #endif
334
 
     // Adding a new message? Add platform independent ones first, then put the
335
 
@@ -1763,17 +1766,17 @@ WebWidget* RenderViewImpl::createPopupMe
 
335
@@ -1779,17 +1782,17 @@ WebWidget* RenderViewImpl::createPopupMe
336
336
         screen_metrics_emulator_.get());
337
337
   }
338
338
   return widget->webwidget();
351
351
   // will have to close the first one before another one can be shown.
352
352
   if (external_popup_menu_)
353
353
     return NULL;
354
 
@@ -4055,39 +4058,35 @@ void RenderViewImpl::DismissDateTimeDial
 
354
@@ -4111,39 +4114,35 @@ void RenderViewImpl::DismissDateTimeDial
355
355
 void RenderViewImpl::OnSelectPopupMenuItem(int selected_index) {
356
356
   if (external_popup_menu_ == NULL)
357
357
     return;
415
415
 
416
416
   // Plugin-related functions --------------------------------------------------
417
417
 
418
 
@@ -731,24 +729,27 @@ class CONTENT_EXPORT RenderViewImpl
 
418
@@ -733,24 +731,27 @@ class CONTENT_EXPORT RenderViewImpl
419
419
   void OnDisownOpener();
420
420
   void OnWindowSnapshotCompleted(const int snapshot_id,
421
421
       const gfx::Size& size, const std::vector<unsigned char>& png);
436
436
-#elif defined(OS_MACOSX)
437
437
+#endif
438
438
+#if defined(OS_MACOSX)
 
439
   void OnGetRenderedText();
439
440
   void OnPluginImeCompositionCompleted(const base::string16& text,
440
441
                                        int plugin_id);
441
442
   void OnSelectPopupMenuItem(int selected_index);
443
444
   void OnSetWindowVisibility(bool visible);
444
445
   void OnWindowFrameChanged(const gfx::Rect& window_frame,
445
446
                             const gfx::Rect& view_frame);
446
 
 #endif
447
 
@@ -1100,20 +1101,18 @@ class CONTENT_EXPORT RenderViewImpl
 
447
@@ -1105,20 +1106,18 @@ class CONTENT_EXPORT RenderViewImpl
448
448
   // is passed to us upon creation.  WebKit asks for this ID upon first use and
449
449
   // uses it whenever asking the browser process to allocate new storage areas.
450
450
   int64 session_storage_namespace_id_;