Export symbols from content.dll that are depended upon by chrome.dll.

content/renderer/renderer_glue.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file provides the embedder's side of random webkit glue functions.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 74 matching lines @@
   }
 
   RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_WriteObjectsAsync(objects_));
 }
 
 namespace webkit_glue {
 
 // Clipboard glue
 
-ui::Clipboard* ClipboardGetClipboard() {
+CONTENT_EXPORT ui::Clipboard* ClipboardGetClipboard() {

[Jói, 2011/11/11 13:09:36]

Should these be in the header file (webkit/glue/webkit_glue.h) instead, or would
that ruin it for others implementing that header?

[tommi (sloooow) - chröme, 2011/11/11 13:23:29]

Yes, they should only be in the header. Fixing.

   return NULL;
 }
 
-uint64 ClipboardGetSequenceNumber(ui::Clipboard::Buffer buffer) {
+CONTENT_EXPORT uint64 ClipboardGetSequenceNumber(ui::Clipboard::Buffer buffer) {
   uint64 sequence_number = 0;
   RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_GetSequenceNumber(buffer,
                                              &sequence_number));
   return sequence_number;
 }
 
-bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format,
-                                ui::Clipboard::Buffer buffer) {
+CONTENT_EXPORT bool ClipboardIsFormatAvailable(
+    const ui::Clipboard::FormatType& format,
+    ui::Clipboard::Buffer buffer) {
   bool result;
   RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_IsFormatAvailable(format, buffer, &result));
   return result;
 }
 
-void ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
-                                 std::vector<string16>* types,
-                                 bool* contains_filenames) {
+CONTENT_EXPORT void ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
+                                                std::vector<string16>* types,
+                                                bool* contains_filenames) {
   RenderThreadImpl::current()->Send(new ClipboardHostMsg_ReadAvailableTypes(
       buffer, types, contains_filenames));
 }
 
-void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result) {
+CONTENT_EXPORT void ClipboardReadText(ui::Clipboard::Buffer buffer,
+                                      string16* result) {
   RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_ReadText(buffer, result));
 }
 
-void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result) {
+CONTENT_EXPORT void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer,
+                                           std::string* result) {
   RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_ReadAsciiText(buffer, result));
 }
 
-void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
-                       GURL* url, uint32* fragment_start,
-                       uint32* fragment_end) {
+CONTENT_EXPORT void ClipboardReadHTML(ui::Clipboard::Buffer buffer,
+                                      string16* markup,
+                                      GURL* url, uint32* fragment_start,
+                                      uint32* fragment_end) {
   RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_ReadHTML(buffer, markup, url, fragment_start,
                                     fragment_end));
 }
 
-void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data) {
+CONTENT_EXPORT void ClipboardReadImage(ui::Clipboard::Buffer buffer,
+                                       std::string* data) {
   base::SharedMemoryHandle image_handle;
   uint32 image_size;
   RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_ReadImage(buffer, &image_handle, &image_size));
   if (base::SharedMemory::IsHandleValid(image_handle)) {
     base::SharedMemory buffer(image_handle, true);
     buffer.Map(image_size);
     data->append(static_cast<char*>(buffer.memory()), image_size);
   }
 }
 
-void GetPlugins(bool refresh,
-                std::vector<webkit::WebPluginInfo>* plugins) {
+CONTENT_EXPORT void GetPlugins(bool refresh,
+                               std::vector<webkit::WebPluginInfo>* plugins) {
   if (!RenderThreadImpl::current()->plugin_refresh_allowed())
     refresh = false;
   RenderThreadImpl::current()->Send(
       new ViewHostMsg_GetPlugins(refresh, plugins));
 }
 
-bool IsProtocolSupportedForMedia(const GURL& url) {
+CONTENT_EXPORT bool IsProtocolSupportedForMedia(const GURL& url) {
   // If new protocol is to be added here, we need to make sure the response is
   // validated accordingly in the media engine.
   if (url.SchemeIsFile() || url.SchemeIs(chrome::kHttpScheme) ||
       url.SchemeIs(chrome::kHttpsScheme) ||
       url.SchemeIs(chrome::kDataScheme) ||
       url.SchemeIs(chrome::kFileSystemScheme) ||
       url.SchemeIs(chrome::kBlobScheme))
     return true;
   return
       content::GetContentClient()->renderer()->IsProtocolSupportedForMedia(url);
 }
 
 // static factory function
-ResourceLoaderBridge* ResourceLoaderBridge::Create(
+CONTENT_EXPORT ResourceLoaderBridge* ResourceLoaderBridge::Create(
     const ResourceLoaderBridge::RequestInfo& request_info) {
   return ChildThread::current()->CreateBridge(request_info);
 }
 
 // static factory function
-WebSocketStreamHandleBridge* WebSocketStreamHandleBridge::Create(
+CONTENT_EXPORT WebSocketStreamHandleBridge* WebSocketStreamHandleBridge::Create(
     WebKit::WebSocketStreamHandle* handle,
     WebSocketStreamHandleDelegate* delegate) {
   SocketStreamDispatcher* dispatcher =
       ChildThread::current()->socket_stream_dispatcher();
   return dispatcher->CreateBridge(handle, delegate);
 }
 
-string16 GetLocalizedString(int message_id) {
+CONTENT_EXPORT string16 GetLocalizedString(int message_id) {
   return content::GetContentClient()->GetLocalizedString(message_id);
 }
 
-base::StringPiece GetDataResource(int resource_id) {
+CONTENT_EXPORT base::StringPiece GetDataResource(int resource_id) {
   return content::GetContentClient()->GetDataResource(resource_id);
 }
 
 }  // namespace webkit_glue