diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 23:32:33 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 23:32:33 +0000 |
| commit | f7e6ca877859bc53f63ab969ebeebc62ed864fdf (patch) | |
| tree | 0646e086f2ca56d036657f9f423780337deeb3b2 /webkit/glue | |
| parent | 08d64181e3dace8d2992e61e0bc4508553244059 (diff) | |
| download | chromium_src-f7e6ca877859bc53f63ab969ebeebc62ed864fdf.zip chromium_src-f7e6ca877859bc53f63ab969ebeebc62ed864fdf.tar.gz chromium_src-f7e6ca877859bc53f63ab969ebeebc62ed864fdf.tar.bz2 | |
enable component build of webkit_glue.
Also fixes a few straggling missing dependencies.
R=darin@chromium.org
BUG=98755
TEST=waterfall stays green
Review URL: http://codereview.chromium.org/8819004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/context_menu.h | 2 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 2 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue_export.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/context_menu.h b/webkit/glue/context_menu.h index cbbec387..895d689 100644 --- a/webkit/glue/context_menu.h +++ b/webkit/glue/context_menu.h @@ -25,7 +25,7 @@ struct CustomContextMenuContext { // It could also be |kCurrentRenderWidget|, which means the render widget that // the corresponding ViewHostMsg_ContextMenu is sent to. int32 render_widget_id; - static const int32 kCurrentRenderWidget; + WEBKIT_GLUE_EXPORT static const int32 kCurrentRenderWidget; WEBKIT_GLUE_EXPORT CustomContextMenuContext(); }; diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 2f3a882..d2a97e0 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -106,7 +106,7 @@ }, { 'target_name': 'glue', - 'type': 'static_library', + 'type': '<(component)', 'variables': { 'enable_wexit_time_destructors': 1, }, 'defines': [ 'WEBKIT_EXTENSIONS_IMPLEMENTATION', diff --git a/webkit/glue/webkit_glue_export.h b/webkit/glue/webkit_glue_export.h index 8dfccad..1a72fc2 100644 --- a/webkit/glue/webkit_glue_export.h +++ b/webkit/glue/webkit_glue_export.h @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_WEBKIT_GLUE_EXPORT_H_ #pragma once -#if 0 // defined(COMPONENT_BUILD) +#if defined(COMPONENT_BUILD) #if defined(WIN32) #if defined(WEBKIT_GLUE_IMPLEMENTATION) |