Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d1dee80

Browse files
GnorTechGnorTech
committed
rebase fix for nw11
1 parent cc27ae2 commit d1dee80

83 files changed

Lines changed: 1317 additions & 875 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎nw.gypi‎

Lines changed: 50 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
'<(DEPTH)/content/content.gyp:content_ppapi_plugin',
4545
'<(DEPTH)/content/content.gyp:content_renderer',
4646
'<(DEPTH)/content/content.gyp:content_utility',
47-
'<(DEPTH)/content/content.gyp:content_worker',
47+
# '<(DEPTH)/content/content.gyp:content_worker',
4848
'<(DEPTH)/content/content_resources.gyp:content_resources',
4949
'<(DEPTH)/ipc/ipc.gyp:ipc',
5050
'<(DEPTH)/media/media.gyp:media',
@@ -68,7 +68,7 @@
6868
'<(DEPTH)/third_party/WebKit/public/web',
6969
'<(DEPTH)/breakpad/src',
7070
'<(SHARED_INTERMEDIATE_DIR)/blink',
71-
'<(SHARED_INTERMEDIATE_DIR)/blink/bindings',
71+
'<(SHARED_INTERMEDIATE_DIR)/blink/bindings/core/v8/',
7272
'<(SHARED_INTERMEDIATE_DIR)/chrome',
7373
],
7474
'cflags_cc': [
@@ -85,12 +85,12 @@
8585
'<(DEPTH)/chrome/common/env_vars.cc',
8686
'<(DEPTH)/chrome/browser/crash_upload_list.cc',
8787
'<(DEPTH)/chrome/browser/upload_list.cc',
88-
'<(DEPTH)/chrome/browser/platform_util_common_linux.cc',
8988
'<(DEPTH)/chrome/browser/platform_util_linux.cc',
89+
'<(DEPTH)/chrome/browser/platform_util_aura.cc',
9090
'<(DEPTH)/chrome/browser/platform_util_mac.mm',
9191
'<(DEPTH)/chrome/browser/platform_util_win.cc',
9292
'<(DEPTH)/chrome/browser/platform_util.h',
93-
'<(DEPTH)/chrome/browser/process_singleton_linux.cc',
93+
'<(DEPTH)/chrome/browser/process_singleton_posix.cc',
9494
'<(DEPTH)/chrome/browser/process_singleton_mac.cc',
9595
'<(DEPTH)/chrome/browser/process_singleton_win.cc',
9696
'<(DEPTH)/chrome/browser/process_singleton.h',
@@ -102,10 +102,6 @@
102102
'<(DEPTH)/chrome/browser/ui/cocoa/custom_frame_view.h',
103103
'<(DEPTH)/chrome/browser/ui/cocoa/custom_frame_view.mm',
104104
'<(DEPTH)/chrome/browser/ui/base_window.h',
105-
'<(DEPTH)/chrome/browser/ui/gtk/gtk_window_util.cc',
106-
'<(DEPTH)/chrome/browser/ui/gtk/gtk_window_util.h',
107-
'<(DEPTH)/chrome/browser/ui/gtk/unity_service.cc',
108-
'<(DEPTH)/chrome/browser/ui/gtk/unity_service.h',
109105
'<(DEPTH)/chrome/browser/ui/views/status_icons/status_icon_win.cc',
110106
'<(DEPTH)/chrome/browser/ui/views/status_icons/status_icon_win.h',
111107
'<(DEPTH)/chrome/browser/ui/views/status_icons/status_tray_win.cc',
@@ -116,17 +112,14 @@
116112
'<(DEPTH)/chrome/common/chrome_switches.h',
117113
'<(DEPTH)/extensions/common/draggable_region.cc',
118114
'<(DEPTH)/extensions/common/draggable_region.h',
115+
'<(DEPTH)/extensions/renderer/static_v8_external_ascii_string_resource.cc',
116+
'<(DEPTH)/extensions/renderer/static_v8_external_ascii_string_resource.h',
119117
'<(DEPTH)/third_party/zlib/google/zip.cc',
120118
'<(DEPTH)/third_party/zlib/google/zip.h',
121119
'<(DEPTH)/third_party/zlib/google/zip_reader.cc',
122120
'<(DEPTH)/third_party/zlib/google/zip_reader.h',
123121
'<(DEPTH)/third_party/zlib/google/zip_internal.cc',
124122
'<(DEPTH)/third_party/zlib/google/zip_internal.h',
125-
'<(DEPTH)/components/autofill/content/renderer/page_click_listener.h',
126-
'<(DEPTH)/components/autofill/content/renderer/page_click_tracker.cc',
127-
'<(DEPTH)/components/autofill/content/renderer/page_click_tracker.h',
128-
'<(DEPTH)/chrome/renderer/static_v8_external_string_resource.cc',
129-
'<(DEPTH)/chrome/renderer/static_v8_external_string_resource.h',
130123
'src/api/api_messages.cc',
131124
'src/api/api_messages.h',
132125
'src/api/app/app.cc',
@@ -144,24 +137,22 @@
144137
'src/api/dispatcher_bindings_mac.mm',
145138
'src/api/dispatcher_host.cc',
146139
'src/api/dispatcher_host.h',
147-
'src/api/event/event.h',
148-
'src/api/event/event.cc',
149-
'src/api/screen/screen.h',
150-
'src/api/screen/screen.cc',
140+
# 'src/api/event/event.h',
141+
# 'src/api/event/event.cc',
142+
# 'src/api/screen/screen.h',
143+
# 'src/api/screen/screen.cc',
151144
'src/api/window_bindings.cc',
152145
'src/api/window_bindings.h',
153146
'src/api/menu/menu.cc',
154147
'src/api/menu/menu.h',
155-
'src/api/menu/menu_delegate_win.cc',
156-
'src/api/menu/menu_delegate_win.h',
157-
'src/api/menu/menu_gtk.cc',
148+
'src/api/menu/menu_delegate.cc',
149+
'src/api/menu/menu_delegate.h',
158150
'src/api/menu/menu_mac.mm',
159-
'src/api/menu/menu_win.cc',
151+
'src/api/menu/menu_views.cc',
160152
'src/api/menuitem/menuitem.cc',
161153
'src/api/menuitem/menuitem.h',
162-
'src/api/menuitem/menuitem_gtk.cc',
163154
'src/api/menuitem/menuitem_mac.mm',
164-
'src/api/menuitem/menuitem_win.cc',
155+
'src/api/menuitem/menuitem_views.cc',
165156
'src/api/menuitem/menuitem_delegate_mac.h',
166157
'src/api/menuitem/menuitem_delegate_mac.mm',
167158
'src/api/shell/shell.cc',
@@ -187,19 +178,17 @@
187178
'src/api/window/window.h',
188179
'src/browser/app_controller_mac.h',
189180
'src/browser/app_controller_mac.mm',
190-
'src/browser/autofill_popup_view_gtk.cc',
191-
'src/browser/autofill_popup_view_gtk.h',
192181
'src/browser/autofill_popup_view_cocoa.h',
193182
'src/browser/autofill_popup_view_cocoa.mm',
194183
'src/browser/autofill_popup_view_bridge.h',
195184
'src/browser/autofill_popup_view_bridge.mm',
196185
'src/browser/autofill_popup_controller_impl.cc',
197186
'src/browser/autofill_popup_controller_impl.h',
198-
'src/browser/tab_autofill_manager_delegate.cc',
199-
'src/browser/tab_autofill_manager_delegate.h',
187+
# 'src/browser/tab_autofill_manager_delegate.cc',
188+
# 'src/browser/tab_autofill_manager_delegate.h',
200189
'src/browser/capture_page_helper.h',
201190
'src/browser/capture_page_helper.cc',
202-
'src/browser/color_chooser_gtk.cc',
191+
# 'src/browser/color_chooser_gtk.cc',
203192
'src/browser/color_chooser_win.cc',
204193
'src/browser/color_chooser_mac.mm',
205194
'src/browser/chrome_event_processing_window.mm',
@@ -208,23 +197,19 @@
208197
'src/browser/file_select_helper.h',
209198
'src/browser/native_window.cc',
210199
'src/browser/native_window.h',
211-
'src/browser/native_window_gtk.cc',
212-
'src/browser/native_window_gtk.h',
213200
'src/browser/native_window_helper_mac.h',
214201
'src/browser/native_window_mac.h',
215202
'src/browser/native_window_mac.mm',
216-
'src/browser/native_window_toolbar_win.cc',
217-
'src/browser/native_window_toolbar_win.h',
218-
'src/browser/native_window_win.cc',
219-
'src/browser/native_window_win.h',
203+
'src/browser/native_window_toolbar_aura.cc',
204+
'src/browser/native_window_toolbar_aura.h',
205+
'src/browser/native_window_aura.cc',
206+
'src/browser/native_window_aura.h',
220207
'src/browser/net_disk_cache_remover.cc',
221208
'src/browser/net_disk_cache_remover.h',
222209
'src/browser/nw_form_database_service.cc',
223210
'src/browser/nw_form_database_service.h',
224211
'src/browser/popup_controller_common.cc',
225212
'src/browser/popup_controller_common.h',
226-
'src/browser/printing/print_dialog_gtk.cc',
227-
'src/browser/printing/print_dialog_gtk.h',
228213
'src/browser/printing/print_job.cc',
229214
'src/browser/printing/print_job.h',
230215
'src/browser/printing/print_job_manager.cc',
@@ -251,11 +236,11 @@
251236
'src/browser/shell_download_manager_delegate_mac.mm',
252237
'src/browser/shell_javascript_dialog_creator.cc',
253238
'src/browser/shell_javascript_dialog_creator.h',
254-
'src/browser/shell_javascript_dialog_gtk.cc',
239+
# 'src/browser/shell_javascript_dialog_gtk.cc',
255240
'src/browser/shell_javascript_dialog_mac.mm',
256241
'src/browser/shell_javascript_dialog_win.cc',
257242
'src/browser/shell_javascript_dialog.h',
258-
'src/browser/shell_login_dialog_gtk.cc',
243+
# 'src/browser/shell_login_dialog_gtk.cc',
259244
'src/browser/shell_login_dialog_mac.mm',
260245
'src/browser/shell_login_dialog_win.cc',
261246
'src/browser/shell_login_dialog.cc',
@@ -328,8 +313,8 @@
328313
'src/nw_notification_manager_win.cc',
329314
'src/nw_notification_manager_mac.h',
330315
'src/nw_notification_manager_mac.mm',
331-
'src/nw_notification_manager_linux.h',
332-
'src/nw_notification_manager_linux.cc',
316+
# 'src/nw_notification_manager_linux.h',
317+
# 'src/nw_notification_manager_linux.cc',
333318
'src/shell_browser_context.cc',
334319
'src/shell_browser_context.h',
335320
'src/shell_browser_main.cc',
@@ -364,14 +349,21 @@
364349
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
365350
],
366351
}],
352+
['os_posix == 1 and OS != "mac" and android_webview_build != 1', {
353+
'dependencies': [
354+
'../components/components.gyp:breakpad_host',
355+
],
356+
}],
367357
['use_aura==1', {
368358
'dependencies': [
359+
'<(DEPTH)/components/components.gyp:web_modal',
360+
'<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
369361
'<(DEPTH)/ui/views/views.gyp:views',
370362
'<(DEPTH)/ui/views/views.gyp:views_test_support',
371363
'<(DEPTH)/ui/views/controls/webview/webview.gyp:webview',
372364
],
373365
}],
374-
['(os_posix==1 and OS != "mac" and linux_use_tcmalloc==1 and asan==0)', {
366+
['(os_posix==1 and OS != "mac" and use_allocator!="none")', {
375367
'dependencies': [
376368
# This is needed by content/app/content_main_runner.cc
377369
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
@@ -400,21 +392,21 @@
400392
'<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler',
401393
'<(DEPTH)/breakpad/breakpad.gyp:breakpad_sender',
402394
'<(DEPTH)/components/components.gyp:breakpad_component',
403-
'<(DEPTH)/components/components.gyp:web_modal',
404395
],
405396
}],
406397
['os_posix==1 and OS != "mac" and OS != "ios"', {
407-
'sources': [
408-
'src/breakpad_linux.cc',
409-
'src/breakpad_linux.h',
410-
'src/crash_handler_host_linux.cc',
411-
'src/crash_handler_host_linux.h',
412-
],
413398
'dependencies': [
414399
'<(DEPTH)/breakpad/breakpad.gyp:breakpad_client',
415400
'<(DEPTH)/components/components.gyp:breakpad_component',
416401
],
417402
}],
403+
['OS=="linux"', {
404+
'dependencies': [
405+
'<(DEPTH)/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui',
406+
'<(DEPTH)/build/linux/system.gyp:gio',
407+
'<(DEPTH)/build/linux/system.gyp:gtk',
408+
],
409+
}],
418410
['OS == "mac"', {
419411
'sources!': [
420412
'<(DEPTH)/chrome/common/child_process_logging_posix.cc',
@@ -433,14 +425,6 @@
433425
],
434426
},
435427
}],
436-
['toolkit_uses_gtk == 1', {
437-
'dependencies': [
438-
# For FT_Init_FreeType and friends.
439-
'../build/linux/system.gyp:freetype2',
440-
'../build/linux/system.gyp:gtk',
441-
'../build/linux/system.gyp:gtkprint',
442-
],
443-
}],
444428
['OS=="win"', {
445429
'sources': [
446430
'src/browser/color_chooser_dialog.cc',
@@ -450,7 +434,6 @@
450434
'<(SHARED_INTERMEDIATE_DIR)/webkit',
451435
],
452436
'dependencies': [
453-
'<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
454437
'<(DEPTH)/ui/views/controls/webview/webview.gyp:webview',
455438
'<(DEPTH)/ui/views/views.gyp:views',
456439
'<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
@@ -605,6 +588,10 @@
605588
'dependencies': [
606589
'<(DEPTH)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
607590
'<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
591+
'<(DEPTH)/net/net.gyp:net_resources',
592+
'<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
593+
'<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
594+
'<(DEPTH)/webkit/glue/resources/webkit_resources.gyp:webkit_resources',
608595
'nw_resources',
609596
],
610597
'variables': {
@@ -619,11 +606,11 @@
619606
'<(SHARED_INTERMEDIATE_DIR)/content/nw_resources.pak',
620607
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
621608
'<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
622-
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
623-
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
624-
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
609+
'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
610+
'<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
611+
'<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
625612
'<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
626-
'<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
613+
'<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
627614
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
628615
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
629616
],
@@ -744,7 +731,7 @@
744731
},
745732
],
746733
'dependencies': [
747-
'<(DEPTH)/v8/tools/gyp/v8.gyp:nwsnapshot',
734+
# '<(DEPTH)/v8/tools/gyp/v8.gyp:nwsnapshot',
748735
'<(DEPTH)/chrome/chrome.gyp:chromedriver',
749736
],
750737
}],
@@ -847,16 +834,11 @@
847834
'ldflags': [
848835
'-Wl,--whole-archive', 'obj/third_party/node/libnode.a', '-Wl,--no-whole-archive' ],
849836
}],
850-
['OS == "win" or toolkit_uses_gtk == 1', {
837+
['OS == "win"', {
851838
'dependencies': [
852839
'<(DEPTH)/sandbox/sandbox.gyp:sandbox',
853840
],
854841
}], # OS=="win" or (toolkit_uses_gtk == 1 and selinux == 0)
855-
['toolkit_uses_gtk == 1', {
856-
'dependencies': [
857-
'<(DEPTH)/build/linux/system.gyp:gtk',
858-
],
859-
}], # toolkit_uses_gtk
860842
['OS=="linux"', {
861843
'dependencies': [
862844
'<(DEPTH)/build/linux/system.gyp:notify',

‎src/api/api_messages.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "extensions/common/draggable_region.h"
2626
#include "content/public/common/common_param_traits.h"
2727
#include "ipc/ipc_message_macros.h"
28+
#include "ui/gfx/ipc/gfx_param_traits.h"
2829

2930
#define IPC_MESSAGE_START ShellMsgStart
3031

‎src/api/app/app.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void App::Call(Shell* shell,
126126
} else if (method == "SetCrashDumpDir") {
127127
std::string path;
128128
arguments.GetString(0, &path);
129-
result->AppendBoolean(SetCrashDumpPath(path.c_str()));
129+
//FIXME: result->AppendBoolean(SetCrashDumpPath(path.c_str()));
130130
return;
131131
} else if (method == "RegisterGlobalHotKey") {
132132
int object_id = -1;

‎src/api/bindings_common.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@
2727
#include "content/public/renderer/render_thread.h"
2828
#include "content/public/renderer/v8_value_converter.h"
2929
#include "third_party/WebKit/public/web/WebView.h"
30-
#include "third_party/WebKit/public/web/WebFrame.h"
30+
#include "third_party/WebKit/public/web/WebLocalFrame.h"
3131
#include "ui/base/resource/resource_bundle.h"
3232

3333
using content::RenderView;
3434
using content::RenderThread;
3535
using content::V8ValueConverter;
3636
using blink::WebFrame;
37+
using blink::WebLocalFrame;
3738
using blink::WebView;
3839

3940
namespace {
4041
RenderView* GetRenderView(v8::Handle<v8::Context> ctx) {
41-
WebFrame* frame = WebFrame::frameForContext(ctx);
42+
WebLocalFrame* frame = WebLocalFrame::frameForContext(ctx);
4243
if (!frame)
4344
return NULL;
4445

0 commit comments

Comments
 (0)