diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 21:05:56 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 21:05:56 +0000 |
commit | c5d463ec9cf8eda310e0992b7bb30e9041dfa2b0 (patch) | |
tree | bd6bf910534a45c772585754061ae531e6ed81ae /content/common | |
parent | afbdd164e2cc5babc0fc8b8574c5b95d4a818b78 (diff) | |
download | chromium_src-c5d463ec9cf8eda310e0992b7bb30e9041dfa2b0.zip chromium_src-c5d463ec9cf8eda310e0992b7bb30e9041dfa2b0.tar.gz chromium_src-c5d463ec9cf8eda310e0992b7bb30e9041dfa2b0.tar.bz2 |
content: Add CONTENT_EXPORT in most places required to link tests on mac.
BUG=90078
TEST=none
Review URL: http://codereview.chromium.org/9703071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
-rw-r--r-- | content/common/mac/attributed_string_coder.h | 3 | ||||
-rw-r--r-- | content/common/mac/font_descriptor.h | 5 | ||||
-rw-r--r-- | content/common/mac/font_loader.h | 5 | ||||
-rw-r--r-- | content/common/sandbox_mac.h | 5 |
4 files changed, 12 insertions, 6 deletions
diff --git a/content/common/mac/attributed_string_coder.h b/content/common/mac/attributed_string_coder.h index 0da8a9b..40eab17c 100644 --- a/content/common/mac/attributed_string_coder.h +++ b/content/common/mac/attributed_string_coder.h @@ -10,6 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string16.h" +#include "content/common/content_export.h" #include "content/common/mac/font_descriptor.h" #include "ipc/ipc_message_utils.h" #include "ui/base/range/range.h" @@ -30,7 +31,7 @@ namespace mac { // friends to send objects from the renderer to the browser could lead to // deserialization of arbitrary objects. This class restricts serialization to // a specific object class and specific attributes of that object. -class AttributedStringCoder { +class CONTENT_EXPORT AttributedStringCoder { public: // A C++ IPC-friendly representation of the NSFontAttributeName attribute // set. diff --git a/content/common/mac/font_descriptor.h b/content/common/mac/font_descriptor.h index 750976f..c9588aa 100644 --- a/content/common/mac/font_descriptor.h +++ b/content/common/mac/font_descriptor.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,6 +7,7 @@ #pragma once #include "base/string16.h" +#include "content/common/content_export.h" #ifdef __OBJC__ @class NSFont; @@ -15,7 +16,7 @@ class NSFont; #endif // Container to allow serializing an NSFont over IPC. -struct FontDescriptor { +struct CONTENT_EXPORT FontDescriptor { explicit FontDescriptor(NSFont* font); FontDescriptor(string16 name, float size); diff --git a/content/common/mac/font_loader.h b/content/common/mac/font_loader.h index 17f63e1..0b64417 100644 --- a/content/common/mac/font_loader.h +++ b/content/common/mac/font_loader.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -9,6 +9,7 @@ #include <ApplicationServices/ApplicationServices.h> #include "base/shared_memory.h" +#include "content/common/content_export.h" #ifdef __OBJC__ @class NSFont; @@ -33,6 +34,7 @@ class FontLoader { // file. // |font_data_size| - size of data contained in |font_data|. // |font_id| - unique identifier for the on-disk file we load for the font. + CONTENT_EXPORT static bool LoadFontIntoBuffer(NSFont* font_to_encode, base::SharedMemory* font_data, uint32* font_data_size, @@ -49,6 +51,7 @@ class FontLoader { // |out| - A CGFontRef corresponding to the designated font. // The caller is responsible for releasing this value via CGFontRelease() // when done. + CONTENT_EXPORT static bool CGFontRefFromBuffer(base::SharedMemoryHandle font_data, uint32 font_data_size, CGFontRef* out); diff --git a/content/common/sandbox_mac.h b/content/common/sandbox_mac.h index 5fc96d9..399790f 100644 --- a/content/common/sandbox_mac.h +++ b/content/common/sandbox_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -11,6 +11,7 @@ #include "base/basictypes.h" #include "base/hash_tables.h" #include "base/gtest_prod_util.h" +#include "content/common/content_export.h" #include "content/public/common/sandbox_type_mac.h" class FilePath; @@ -52,7 +53,7 @@ class SandboxSubstring { SandboxSubstringType type_; }; -class Sandbox { +class CONTENT_EXPORT Sandbox { public: // A map of variable name -> string to substitute in its place. typedef base::hash_map<std::string, SandboxSubstring> |