diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-03 19:12:16 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-03 19:12:16 +0000 |
commit | bfb92b339c6a65a445176f3fcd630dcb747aee13 (patch) | |
tree | f03abde287b914aa7247f5b14b1638ecc5f55f87 /third_party/mozilla | |
parent | 72ed0b850d453af806341557ce61c41281ebe142 (diff) | |
download | chromium_src-bfb92b339c6a65a445176f3fcd630dcb747aee13.zip chromium_src-bfb92b339c6a65a445176f3fcd630dcb747aee13.tar.gz chromium_src-bfb92b339c6a65a445176f3fcd630dcb747aee13.tar.bz2 |
Fix the Mac 64 component build.
BUG=none
TEST=none
R=mark@chromium.org
Review URL: https://codereview.chromium.org/122453004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mozilla')
-rw-r--r-- | third_party/mozilla/ComplexTextInputPanel.h | 4 | ||||
-rw-r--r-- | third_party/mozilla/README.chromium | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/third_party/mozilla/ComplexTextInputPanel.h b/third_party/mozilla/ComplexTextInputPanel.h index be1d92a..314a4b9 100644 --- a/third_party/mozilla/ComplexTextInputPanel.h +++ b/third_party/mozilla/ComplexTextInputPanel.h @@ -30,11 +30,13 @@ #import <Cocoa/Cocoa.h> +#include "MozillaExport.h" + #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5 @class NSTextInputContext; #endif -@interface ComplexTextInputPanel : NSPanel { +MOZILLA_EXPORT @interface ComplexTextInputPanel : NSPanel { NSTextView *mInputTextView; } diff --git a/third_party/mozilla/README.chromium b/third_party/mozilla/README.chromium index 408e634..9c2dd71 100644 --- a/third_party/mozilla/README.chromium +++ b/third_party/mozilla/README.chromium @@ -16,14 +16,15 @@ Description: Local modifications: - NSURL+Utils.m was modified to use non-deprecated Cocoa APIs to allow - compilation on future versions of Mac OS X. + compilation on modern versions of Mac OS X. - NSString+Utils.m was renamed to NSString+Utils.mm and modified to use GURL for validation in -[NSString isValidURI]. - NSPasteboard+Utils.mm was modified to add an argument to -[NSPasteboard getURLs:andTitles:] to determine whether or not filenames in the drag should be converted to file URLs. - -[NSPasteboard htmlFromRtf] added to do rtf->html conversion. +- -[NSPasteboard htmlFromRtf] was added to do rtf->html conversion. - NSWorkspace+Utils.m was modified to compile on the x86_64 architecture. +- MOZILLA_EXPORT was added to some constants in NSPasteboard+Utils.h. ----------------------------------------------------------------- @@ -31,6 +32,6 @@ Also includes IME panel from Gecko, which is based on WebKit's implementation. Although it comes from Mozilla (http://mxr.mozilla.org), it uses the original WebKit license. -Local modifitations: -- Add #ifdef'd definifitions of a few symbols to support 10.5 SDK. -- Added MOZILLA_EXPORT to some constants in NSPasteboard+Utils.h. +Local modifications: +- #ifdef'd definitions of a few symbols were added to support the 10.5 SDK. +- MOZILLA_EXPORT was added to the IME panel class in ComplexTextInputPanel.h. |