Skip to content

Commit e0484ca

Browse files
rogerwangrogerwang
committed
Printing support
1 parent 312a02d commit e0484ca

35 files changed

Lines changed: 7201 additions & 25 deletions

‎nw.gypi‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
'<(DEPTH)/media/media.gyp:media',
3333
'<(DEPTH)/net/net.gyp:net_with_v8',
3434
'<(DEPTH)/net/net.gyp:net_resources',
35+
'<(DEPTH)/printing/printing.gyp:printing',
3536
'<(DEPTH)/skia/skia.gyp:skia',
3637
'<(DEPTH)/third_party/node/node.gyp:node',
3738
'<(DEPTH)/ui/ui.gyp:ui',
@@ -144,6 +145,21 @@
144145
'src/browser/native_window_toolbar_win.h',
145146
'src/browser/native_window_win.cc',
146147
'src/browser/native_window_win.h',
148+
'src/browser/printing/print_dialog_gtk.cc',
149+
'src/browser/printing/print_dialog_gtk.h',
150+
'src/browser/printing/print_job.cc',
151+
'src/browser/printing/print_job.h',
152+
'src/browser/printing/print_job_manager.cc',
153+
'src/browser/printing/print_job_manager.h',
154+
'src/browser/printing/print_job_worker.cc',
155+
'src/browser/printing/print_job_worker.h',
156+
'src/browser/printing/print_job_worker_owner.h',
157+
'src/browser/printing/printing_message_filter.cc',
158+
'src/browser/printing/printing_message_filter.h',
159+
'src/browser/printing/printer_query.cc',
160+
'src/browser/printing/printer_query.h',
161+
'src/browser/printing/print_view_manager.cc',
162+
'src/browser/printing/print_view_manager.h',
147163
'src/browser/shell_application_mac.h',
148164
'src/browser/shell_application_mac.mm',
149165
'src/browser/shell_devtools_delegate.cc',
@@ -170,6 +186,8 @@
170186
'src/browser/shell_toolbar_delegate_mac.mm',
171187
'src/browser/standard_menus_mac.h',
172188
'src/browser/standard_menus_mac.mm',
189+
'src/common/print_messages.cc',
190+
'src/common/print_messages.h',
173191
'src/common/shell_switches.cc',
174192
'src/common/shell_switches.h',
175193
'src/geolocation/shell_access_token_store.cc',
@@ -203,6 +221,11 @@
203221
'src/renderer/common/render_messages.h',
204222
'src/renderer/prerenderer/prerenderer_client.cc',
205223
'src/renderer/prerenderer/prerenderer_client.h',
224+
'src/renderer/printing/print_web_view_helper.cc',
225+
'src/renderer/printing/print_web_view_helper.h',
226+
'src/renderer/printing/print_web_view_helper_linux.cc',
227+
'src/renderer/printing/print_web_view_helper_mac.mm',
228+
'src/renderer/printing/print_web_view_helper_win.cc',
206229
'src/renderer/nw_render_view_observer.cc',
207230
'src/renderer/nw_render_view_observer.h',
208231
'src/renderer/shell_content_renderer_client.cc',
@@ -236,6 +259,14 @@
236259
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
237260
],
238261
}],
262+
['toolkit_uses_gtk == 1', {
263+
'dependencies': [
264+
# For FT_Init_FreeType and friends.
265+
'../build/linux/system.gyp:freetype2',
266+
'../build/linux/system.gyp:gtk',
267+
'../build/linux/system.gyp:gtkprint',
268+
],
269+
}],
239270
['OS=="win"', {
240271
'resource_include_dirs': [
241272
'<(SHARED_INTERMEDIATE_DIR)/webkit',

‎src/api/api_messages.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@
44

55
// Get basic type definitions.
66
#define IPC_MESSAGE_IMPL
7-
#include "content/nw/src/api/api_messages.h"
7+
#include "content/nw/src/common/common_message_generator.h"
88

99
// Generate constructors.
1010
#include "ipc/struct_constructor_macros.h"
11-
#include "content/nw/src/api/api_messages.h"
11+
#include "content/nw/src/common/common_message_generator.h"
1212

1313
// Generate destructors.
1414
#include "ipc/struct_destructor_macros.h"
15-
#include "content/nw/src/api/api_messages.h"
15+
#include "content/nw/src/common/common_message_generator.h"
1616

1717
// Generate param traits write methods.
1818
#include "ipc/param_traits_write_macros.h"
1919
namespace IPC {
20-
#include "content/nw/src/api/api_messages.h"
20+
#include "content/nw/src/common/common_message_generator.h"
2121
} // namespace IPC
2222

2323
// Generate param traits read methods.
2424
#include "ipc/param_traits_read_macros.h"
2525
namespace IPC {
26-
#include "content/nw/src/api/api_messages.h"
26+
#include "content/nw/src/common/common_message_generator.h"
2727
} // namespace IPC
2828

2929
// Generate param traits log methods.
3030
#include "ipc/param_traits_log_macros.h"
3131
namespace IPC {
32-
#include "content/nw/src/api/api_messages.h"
32+
#include "content/nw/src/common/common_message_generator.h"
3333
} // namespace IPC

0 commit comments

Comments
 (0)