diff options
17 files changed, 56 insertions, 26 deletions
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index c9d55b5..032f414 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -29,6 +29,7 @@ '../ui/surface/surface.gyp:surface', '../webkit/support/webkit_support.gyp:glue', '../webkit/support/webkit_support.gyp:glue_common', + '../webkit/support/webkit_support.gyp:glue_renderer', '../webkit/support/webkit_support.gyp:plugins', '../webkit/support/webkit_support.gyp:webkit_media', '../webkit/support/webkit_support.gyp:webkit_resources', diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS index a79563b..cdfd74b 100644 --- a/chrome/renderer/DEPS +++ b/chrome/renderer/DEPS @@ -19,6 +19,7 @@ include_rules = [ "+webkit/glue/plugins", "+webkit/media", "+webkit/plugins", + "+webkit/renderer", "+third_party/cld/encodings/compact_lang_det/win", "+third_party/npapi/bindings", diff --git a/chrome/renderer/external_host_bindings.h b/chrome/renderer/external_host_bindings.h index 5cd6b4c..170987f 100644 --- a/chrome/renderer/external_host_bindings.h +++ b/chrome/renderer/external_host_bindings.h @@ -6,7 +6,7 @@ #define CHROME_RENDERER_EXTERNAL_HOST_BINDINGS_H_ #include "ipc/ipc_sender.h" -#include "webkit/glue/cpp_bound_class.h" +#include "webkit/renderer/cpp_bound_class.h" // ExternalHostBindings is the class backing the "externalHost" object // accessible from Javascript diff --git a/chrome/renderer/plugins/plugin_placeholder.h b/chrome/renderer/plugins/plugin_placeholder.h index f438be3..812f8636 100644 --- a/chrome/renderer/plugins/plugin_placeholder.h +++ b/chrome/renderer/plugins/plugin_placeholder.h @@ -10,8 +10,8 @@ #include "content/public/renderer/render_process_observer.h" #include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" -#include "webkit/glue/cpp_bound_class.h" #include "webkit/plugins/webplugininfo.h" +#include "webkit/renderer/cpp_bound_class.h" struct ChromeViewHostMsg_GetPluginInfo_Status; diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 8d8b1c1..a5a9f76 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -21,6 +21,7 @@ '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', '../webkit/support/webkit_support.gyp:glue', '../webkit/support/webkit_support.gyp:glue_common', + '../webkit/support/webkit_support.gyp:glue_renderer', '../webkit/support/webkit_support.gyp:plugins', '../webkit/support/webkit_support.gyp:plugins_common', '../webkit/support/webkit_support.gyp:webkit_media', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 74d2549..925041c2 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -478,7 +478,6 @@ '../webkit/dom_storage/dom_storage_database_unittest.cc', '../webkit/dom_storage/dom_storage_map_unittest.cc', '../webkit/dom_storage/session_storage_database_unittest.cc', - '../webkit/glue/cpp_variant_unittest.cc', '../webkit/glue/glue_serialize_unittest.cc', '../webkit/glue/multipart_response_delegate_unittest.cc', '../webkit/glue/resource_request_body_unittest.cc', @@ -520,6 +519,7 @@ '../webkit/browser/quota/quota_manager_unittest.cc', '../webkit/browser/quota/quota_temporary_storage_evictor_unittest.cc', '../webkit/browser/quota/usage_tracker_unittest.cc', + '../webkit/renderer/cpp_variant_unittest.cc', '../webkit/renderer/fileapi/webfilewriter_base_unittest.cc', ], 'conditions': [ @@ -556,6 +556,7 @@ '../v8/tools/gyp/v8.gyp:v8', '../webkit/support/webkit_support.gyp:glue', '../webkit/support/webkit_support.gyp:glue_common', + '../webkit/support/webkit_support.gyp:glue_renderer', '../webkit/support/webkit_support.gyp:plugins', '../webkit/support/webkit_support.gyp:plugins_common', '../webkit/support/webkit_support.gyp:webkit_base', @@ -721,6 +722,7 @@ '../ui/ui.gyp:ui', '../webkit/support/webkit_support.gyp:clearkeycdmadapter', '../webkit/support/webkit_support.gyp:glue', + '../webkit/support/webkit_support.gyp:glue_renderer', ], 'include_dirs': [ '..', @@ -822,12 +824,12 @@ 'test/layout_browsertest.h', 'test/layout_test_http_server.cc', 'test/layout_test_http_server.h', - '../webkit/glue/cpp_binding_example.cc', - '../webkit/glue/cpp_binding_example.h', '../webkit/plugins/ppapi/mock_platform_image_2d.cc', '../webkit/plugins/ppapi/mock_platform_image_2d.h', '../webkit/plugins/ppapi/mock_plugin_delegate.cc', '../webkit/plugins/ppapi/mock_plugin_delegate.h', + '../webkit/renderer/cpp_binding_example.cc', + '../webkit/renderer/cpp_binding_example.h', ], 'conditions': [ ['chromeos==0', { diff --git a/content/renderer/cpp_bound_class_unittest.cc b/content/renderer/cpp_bound_class_unittest.cc index 240f7f4..62d4a29 100644 --- a/content/renderer/cpp_bound_class_unittest.cc +++ b/content/renderer/cpp_bound_class_unittest.cc @@ -12,7 +12,7 @@ #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "webkit/glue/cpp_binding_example.h" +#include "webkit/renderer/cpp_binding_example.h" using webkit_glue::CppArgumentList; using webkit_glue::CppBindingExample; diff --git a/content/renderer/dom_automation_controller.h b/content/renderer/dom_automation_controller.h index 1516eea..0f6a74a 100644 --- a/content/renderer/dom_automation_controller.h +++ b/content/renderer/dom_automation_controller.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_DOM_AUTOMATION_CONTROLLER_H_ #include "ipc/ipc_sender.h" -#include "webkit/glue/cpp_bound_class.h" +#include "webkit/renderer/cpp_bound_class.h" /* DomAutomationController class: Bound to Javascript window.domAutomationController object. diff --git a/content/renderer/stats_collection_controller.h b/content/renderer/stats_collection_controller.h index eb1ccb0..63175d8 100644 --- a/content/renderer/stats_collection_controller.h +++ b/content/renderer/stats_collection_controller.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_STATS_COLLECTION_CONTROLLER_H_ #include "ipc/ipc_sender.h" -#include "webkit/glue/cpp_bound_class.h" +#include "webkit/renderer/cpp_bound_class.h" namespace content { diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index ae6a0f6..d9e814a 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -147,6 +147,34 @@ }, { + 'target_name': 'glue_renderer', + 'type': '<(component)', + 'variables': { 'enable_wexit_time_destructors': 1, }, + 'defines': [ + 'WEBKIT_EXTENSIONS_IMPLEMENTATION', + 'WEBKIT_GLUE_IMPLEMENTATION', + ], + 'dependencies': [ + '<(DEPTH)/base/base.gyp:base_i18n', + '<(DEPTH)/base/base.gyp:base', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', + 'glue_common', + ], + + 'include_dirs': [ + '<(INTERMEDIATE_DIR)', + '<(SHARED_INTERMEDIATE_DIR)/webkit', + ], + + 'sources': [ + '../renderer/cpp_bound_class.cc', + '../renderer/cpp_bound_class.h', + '../renderer/cpp_variant.cc', + '../renderer/cpp_variant.h', + ], + }, + + { 'target_name': 'glue', 'type': '<(component)', 'variables': { 'enable_wexit_time_destructors': 1, }, @@ -190,10 +218,6 @@ '<(SHARED_INTERMEDIATE_DIR)/ui', ], 'sources': [ - 'cpp_bound_class.cc', - 'cpp_bound_class.h', - 'cpp_variant.cc', - 'cpp_variant.h', 'cursor_utils.cc', 'cursor_utils.h', 'fling_curve_configuration.cc', diff --git a/webkit/glue/cpp_binding_example.cc b/webkit/renderer/cpp_binding_example.cc index 43b4ede..43b4ede 100644 --- a/webkit/glue/cpp_binding_example.cc +++ b/webkit/renderer/cpp_binding_example.cc diff --git a/webkit/glue/cpp_binding_example.h b/webkit/renderer/cpp_binding_example.h index 82412ea..ee8568d 100644 --- a/webkit/glue/cpp_binding_example.h +++ b/webkit/renderer/cpp_binding_example.h @@ -33,7 +33,7 @@ #ifndef CPP_BINDING_EXAMPLE_H__ #define CPP_BINDING_EXAMPLE_H__ -#include "webkit/glue/cpp_bound_class.h" +#include "webkit/renderer/cpp_bound_class.h" namespace webkit_glue { diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/renderer/cpp_bound_class.cc index 8a4afe4..6e7e923 100644 --- a/webkit/glue/cpp_bound_class.cc +++ b/webkit/renderer/cpp_bound_class.cc @@ -12,15 +12,15 @@ // name in its internal map of methods, and then calls the appropriate // method. -#include "webkit/glue/cpp_bound_class.h" +#include "webkit/renderer/cpp_bound_class.h" #include "base/compiler_specific.h" #include "base/logging.h" #include "base/stl_util.h" #include "base/utf_string_conversions.h" -#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/public/platform/WebString.h" using WebKit::WebBindings; using WebKit::WebFrame; diff --git a/webkit/glue/cpp_bound_class.h b/webkit/renderer/cpp_bound_class.h index cdc80a6..2a75be5 100644 --- a/webkit/glue/cpp_bound_class.h +++ b/webkit/renderer/cpp_bound_class.h @@ -15,15 +15,15 @@ See cpp_binding_example.{h|cc} for an example. */ -#ifndef WEBKIT_GLUE_CPP_BOUND_CLASS_H_ -#define WEBKIT_GLUE_CPP_BOUND_CLASS_H_ +#ifndef WEBKIT_RENDERER_CPP_BOUND_CLASS_H_ +#define WEBKIT_RENDERER_CPP_BOUND_CLASS_H_ #include <map> #include <vector> #include "base/callback.h" -#include "webkit/glue/cpp_variant.h" #include "webkit/glue/webkit_glue_export.h" +#include "webkit/renderer/cpp_variant.h" namespace WebKit { class WebFrame; @@ -144,4 +144,4 @@ class WEBKIT_GLUE_EXPORT CppBoundClass { } // namespace webkit_glue -#endif // WEBKIT_GLUE_CPP_BOUND_CLASS_H_ +#endif // WEBKIT_RENDERER_CPP_BOUND_CLASS_H_ diff --git a/webkit/glue/cpp_variant.cc b/webkit/renderer/cpp_variant.cc index 4889774..bea0573 100644 --- a/webkit/glue/cpp_variant.cc +++ b/webkit/renderer/cpp_variant.cc @@ -5,12 +5,12 @@ // This file contains definitions for CppVariant. #include <limits> -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "webkit/glue/cpp_variant.h" #include "base/logging.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "webkit/renderer/cpp_variant.h" using WebKit::WebBindings; @@ -256,7 +256,8 @@ bool CppVariant::Invoke(const std::string& method, const CppVariant* args, NPObject* np_object = value.objectValue; if (WebBindings::hasMethod(NULL, np_object, method_name)) { NPVariant r; - bool status = WebBindings::invoke(NULL, np_object, method_name, args, arg_count, &r); + bool status = + WebBindings::invoke(NULL, np_object, method_name, args, arg_count, &r); result.Set(r); return status; } else { diff --git a/webkit/glue/cpp_variant.h b/webkit/renderer/cpp_variant.h index 8c13048..9dd8c83 100644 --- a/webkit/glue/cpp_variant.h +++ b/webkit/renderer/cpp_variant.h @@ -15,8 +15,8 @@ For a usage example, see cpp_binding_example.{h|cc}. */ -#ifndef WEBKIT_GLUE_CPP_VARIANT_H__ -#define WEBKIT_GLUE_CPP_VARIANT_H__ +#ifndef WEBKIT_RENDERER_CPP_VARIANT_H__ +#define WEBKIT_RENDERER_CPP_VARIANT_H__ #include <string> #include <vector> @@ -113,4 +113,4 @@ class WEBKIT_GLUE_EXPORT CppVariant : public NPVariant { } // namespace webkit_glue -#endif // WEBKIT_GLUE_CPP_VARIANT_H__ +#endif // WEBKIT_RENDERER_CPP_VARIANT_H__ diff --git a/webkit/glue/cpp_variant_unittest.cc b/webkit/renderer/cpp_variant_unittest.cc index 85cc140..3774171 100644 --- a/webkit/glue/cpp_variant_unittest.cc +++ b/webkit/renderer/cpp_variant_unittest.cc @@ -8,7 +8,7 @@ #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "webkit/glue/cpp_variant.h" +#include "webkit/renderer/cpp_variant.h" using WebKit::WebBindings; using webkit_glue::CppVariant; |