← Back to branch summary

~osomon/oxide/pa-context-app-name

« back to all changes in this revision

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

  • Committer: Chris Coulson
  • Date: 2015-08-21 15:16:19 UTC
  • mfrom: (640.1.348 canary)
  • Revision ID: chris.coulson@canonical.com-20150821151619-s1nzodx4pb6ai2bx
Bump Chromium rev to 46.0.2486.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/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
6
6
--- a/content/browser/frame_host/render_frame_host_impl.cc
7
7
+++ b/content/browser/frame_host/render_frame_host_impl.cc
8
 
@@ -455,20 +455,18 @@ bool RenderFrameHostImpl::OnMessageRecei
 
8
@@ -473,20 +473,18 @@ bool RenderFrameHostImpl::OnMessageRecei
9
9
     IPC_MESSAGE_HANDLER(FrameHostMsg_ToggleFullscreen, OnToggleFullscreen)
10
10
     // The following message is synthetic and doesn't come from RenderFrame, but
11
11
     // from RenderProcessHost.
26
26
 
27
27
 void RenderFrameHostImpl::AccessibilitySetFocus(int object_id) {
28
28
   Send(new AccessibilityMsg_SetFocus(routing_id_, object_id));
29
 
@@ -1584,17 +1582,16 @@ void RenderFrameHostImpl::OnDidStopLoadi
 
29
@@ -1546,17 +1544,16 @@ void RenderFrameHostImpl::OnDidStopLoadi
30
30
   frame_tree_node_->DidStopLoading();
31
31
   navigation_handle_.reset();
32
32
 }
44
44
     view->ShowPopupMenu(this,
45
45
                         params.bounds,
46
46
                         params.item_height,
47
 
@@ -1607,17 +1604,16 @@ void RenderFrameHostImpl::OnShowPopup(
 
47
@@ -1569,17 +1566,16 @@ void RenderFrameHostImpl::OnShowPopup(
48
48
 }
49
49
 
50
50
 void RenderFrameHostImpl::OnHidePopup() {
62
62
     // TODO(creis): Bind process ID here so that GeolocationServiceImpl
63
63
     // can perform permissions checks once site isolation is complete.
64
64
     // crbug.com/426384
65
 
@@ -2103,30 +2099,28 @@ RenderFrameHostImpl::GetParentNativeView
 
65
@@ -2034,30 +2030,28 @@ RenderFrameHostImpl::GetParentNativeView
66
66
 void RenderFrameHostImpl::DidSelectPopupMenuItem(int selected_index) {
67
67
   Send(new FrameMsg_SelectPopupMenuItem(routing_id_, selected_index));
68
68
 }
97
97
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
98
98
--- a/content/browser/frame_host/render_frame_host_impl.h
99
99
+++ b/content/browser/frame_host/render_frame_host_impl.h
100
 
@@ -37,19 +37,17 @@
 
100
@@ -38,19 +38,17 @@
101
101
 
102
102
 class GURL;
103
103
 struct AccessibilityHostMsg_EventParams;
117
117
 
118
118
 namespace content {
119
119
 
120
 
@@ -432,20 +430,19 @@ class CONTENT_EXPORT RenderFrameHostImpl
 
120
@@ -431,20 +429,19 @@ class CONTENT_EXPORT RenderFrameHostImpl
121
121
 #if defined(OS_WIN)
122
122
   void SetParentNativeViewAccessible(
123
123
       gfx::NativeViewAccessible accessible_parent);
140
140
                         const RequestNavigationParams& request_params);
141
141
 
142
142
@@ -559,20 +556,18 @@ class CONTENT_EXPORT RenderFrameHostImpl
143
 
       const AccessibilityHostMsg_FindInPageResultParams& params);
144
 
   void OnAccessibilitySnapshotResponse(int callback_id,
145
 
                                        const ui::AXTreeUpdate& snapshot);
 
143
   void OnAccessibilitySnapshotResponse(
 
144
       int callback_id,
 
145
       const ui::AXTreeUpdate<AXContentNodeData>& snapshot);
146
146
   void OnToggleFullscreen(bool enter_fullscreen);
147
147
   void OnDidStartLoading(bool to_different_document);
148
148
   void OnDidStopLoading();
199
199
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
200
200
--- a/content/common/frame_messages.h
201
201
+++ b/content/common/frame_messages.h
202
 
@@ -379,17 +379,16 @@ IPC_STRUCT_BEGIN(FrameMsg_TextTrackSetti
 
202
@@ -382,17 +382,16 @@ IPC_STRUCT_BEGIN(FrameMsg_TextTrackSetti
203
203
 
204
204
   // Text shadow (edge style) of the text track text.
205
205
   IPC_STRUCT_MEMBER(std::string, text_track_text_shadow)
217
217
 
218
218
   // The height of each item in the menu.
219
219
   IPC_STRUCT_MEMBER(int, item_height)
220
 
@@ -404,17 +403,16 @@ IPC_STRUCT_BEGIN(FrameHostMsg_ShowPopup_
 
220
@@ -407,17 +406,16 @@ IPC_STRUCT_BEGIN(FrameHostMsg_ShowPopup_
221
221
   IPC_STRUCT_MEMBER(std::vector<content::MenuItem>, popup_items)
222
222
 
223
223
   // Whether items should be right-aligned.
235
235
 // presented. When the frame finishes presenting, a matching
236
236
 // FrameHostMsg_CompositorFrameSwappedACK should be sent back to the
237
237
 // RenderViewHost that was produced the CompositorFrame.
238
 
@@ -605,24 +603,22 @@ IPC_MESSAGE_ROUTED1(FrameMsg_DidUpdateOr
 
238
@@ -608,24 +606,22 @@ IPC_MESSAGE_ROUTED1(FrameMsg_DidUpdateOr
239
239
 // Send to the RenderFrame to set text tracks state and style settings.
240
240
 // Sent for top-level frames.
241
241
 IPC_MESSAGE_ROUTED1(FrameMsg_SetTextTrackSettings,
261
261
 #endif
262
262
 
263
263
 // PlzNavigate
264
 
@@ -1012,16 +1008,12 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_ToggleF
 
264
@@ -1015,16 +1011,12 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_ToggleF
265
265
 // out-of-process parent frame.
266
266
 IPC_MESSAGE_ROUTED0(FrameHostMsg_DispatchLoad)
267
267
 
278
278
 IPC_MESSAGE_ROUTED0(FrameHostMsg_HidePopup)
279
279
-
280
280
-#endif
281
 
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
282
 
--- a/content/common/view_messages.h
283
 
+++ b/content/common/view_messages.h
284
 
@@ -936,18 +936,19 @@ IPC_MESSAGE_ROUTED0(ViewMsg_ShowImeIfNee
285
 
 // Sent by the browser when an IME update that requires acknowledgement has been
286
 
 // processed on the browser side.
287
 
 IPC_MESSAGE_ROUTED0(ViewMsg_ImeEventAck)
288
 
 
289
 
 // Extracts the data at the given rect, returning it through the
290
 
 // ViewHostMsg_SmartClipDataExtracted IPC.
291
 
 IPC_MESSAGE_ROUTED1(ViewMsg_ExtractSmartClipData,
292
 
                     gfx::Rect /* rect */)
293
 
+#endif
294
 
 
295
 
-#elif defined(OS_MACOSX)
296
 
+#if defined(OS_MACOSX)
297
 
 // Let the RenderView know its window has changed visibility.
298
 
 IPC_MESSAGE_ROUTED1(ViewMsg_SetWindowVisibility,
299
 
                     bool /* visibile */)
300
 
 
301
 
 // Let the RenderView know its window's frame has changed.
302
 
 IPC_MESSAGE_ROUTED2(ViewMsg_WindowFrameChanged,
303
 
                     gfx::Rect /* window frame */,
304
 
                     gfx::Rect /* content view frame */)
305
281
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
306
282
--- a/content/content_renderer.gypi
307
283
+++ b/content/content_renderer.gypi
308
 
@@ -161,16 +161,18 @@
 
284
@@ -162,16 +162,18 @@
309
285
       'renderer/dom_storage/dom_storage_dispatcher.h',
310
286
       'renderer/dom_storage/dom_storage_proxy.h',
311
287
       'renderer/dom_storage/webstoragearea_impl.cc',
376
352
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
377
353
--- a/content/renderer/render_frame_impl.cc
378
354
+++ b/content/renderer/render_frame_impl.cc
379
 
@@ -976,23 +976,21 @@ bool RenderFrameImpl::Send(IPC::Message*
 
355
@@ -977,23 +977,21 @@ bool RenderFrameImpl::Send(IPC::Message*
380
356
       delete message;
381
357
       return false;
382
358
     }
400
376
     return false;
401
377
 
402
378
   // TODO(kenrb): document() should not be null, but as a transitional step
403
 
@@ -1062,19 +1060,18 @@ bool RenderFrameImpl::OnMessageReceived(
 
379
@@ -1063,19 +1061,18 @@ bool RenderFrameImpl::OnMessageReceived(
404
380
                         OnSnapshotAccessibilityTree)
405
381
     IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener)
406
382
     IPC_MESSAGE_HANDLER(FrameMsg_CommitNavigation, OnCommitNavigation)
421
397
   return handled;
422
398
 }
423
399
 
424
 
@@ -1710,31 +1707,29 @@ void RenderFrameImpl::OnPostMessageEvent
 
400
@@ -1711,31 +1708,29 @@ void RenderFrameImpl::OnPostMessageEvent
425
401
   WebSecurityOrigin target_origin;
426
402
   if (!params.target_origin.empty()) {
427
403
     target_origin =
453
429
   external_popup_menu_->DidSelectItem(selected_index);
454
430
   external_popup_menu_.reset();
455
431
 }
456
 
@@ -2087,17 +2082,17 @@ RenderFrameImpl::createWorkerContentSett
 
432
@@ -2088,17 +2083,17 @@ RenderFrameImpl::createWorkerContentSett
457
433
   DCHECK(!frame_ || frame_ == frame);
458
434
   return GetContentClient()->renderer()->CreateWorkerContentSettingsClientProxy(
459
435
       this, frame);
541
517
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
542
518
--- a/content/renderer/render_thread_impl.cc
543
519
+++ b/content/renderer/render_thread_impl.cc
544
 
@@ -648,20 +648,18 @@ RenderThreadImpl::RenderThreadImpl(
 
520
@@ -545,20 +545,18 @@ RenderThreadImpl::RenderThreadImpl(
545
521
 
546
522
 void RenderThreadImpl::Init() {
547
523
   TRACE_EVENT_BEGIN_ETW("RenderThreadImpl::Init", 0, "");
565
541
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
566
542
--- a/content/renderer/render_widget.cc
567
543
+++ b/content/renderer/render_widget.cc
568
 
@@ -687,23 +687,21 @@ gfx::Rect RenderWidget::AdjustValidation
 
544
@@ -696,23 +696,21 @@ gfx::Rect RenderWidget::AdjustValidation
569
545
 
570
546
 void RenderWidget::SetScreenMetricsEmulationParameters(
571
547
     bool enabled,