diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 23:18:45 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 23:18:45 +0000 |
| commit | b9e86a733401dce38488331973ec0ec918e502a5 (patch) | |
| tree | acf169300323b15f0781e1655fbed83f3dfbd3fe /content | |
| parent | bc99d22866cff7a21e81451d22b352ec6ffe9e82 (diff) | |
| download | chromium_src-b9e86a733401dce38488331973ec0ec918e502a5.zip chromium_src-b9e86a733401dce38488331973ec0ec918e502a5.tar.gz chromium_src-b9e86a733401dce38488331973ec0ec918e502a5.tar.bz2 | |
mac: Let Carbon plugin stuff buid with the 10.7 SDK
QuickDraw.h is gone, but the frameworks still exports the symbols
on 10.8. So just declare the functions for now, so that we can
build with the 10.7 SDK.
We can remove Carbon plugin support later.
BUG=136844
TEST=none
TBR=stuartmorgan,tony
Review URL: https://chromiumcodereview.appspot.com/10826036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148647 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/plugin/plugin_carbon_interpose_mac.cc | 13 | ||||
| -rw-r--r-- | content/plugin/plugin_interpose_util_mac.h | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/content/plugin/plugin_carbon_interpose_mac.cc b/content/plugin/plugin_carbon_interpose_mac.cc index 20a7d54..6b71916 100644 --- a/content/plugin/plugin_carbon_interpose_mac.cc +++ b/content/plugin/plugin_carbon_interpose_mac.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 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. @@ -12,6 +12,17 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#if defined(MAC_OS_X_VERSION_10_7) && \ + MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 +// QuickdrawAPI.h is no longer included in the 10.7 SDK, but the symbols are +// still exported by QD.framework (a subframework of ApplicationServices). +// http://developer.apple.com/legacy/mac/library/documentation/Carbon/reference/QuickDraw_Ref/QuickDraw_Ref.pdf +extern "C" { +Boolean PtInRect(Point pt, const Rect* r); +void SetCursor(const Cursor* crsr); +} +#endif // 10.7+ SDK + // Returns true if the given window is modal. static bool IsModalWindow(WindowRef window) { WindowModality modality = kWindowModalityNone; diff --git a/content/plugin/plugin_interpose_util_mac.h b/content/plugin/plugin_interpose_util_mac.h index b98ed5c..3f9912c 100644 --- a/content/plugin/plugin_interpose_util_mac.h +++ b/content/plugin/plugin_interpose_util_mac.h @@ -9,6 +9,8 @@ #import "base/basictypes.h" +typedef struct Cursor Cursor; + // This is really a WebPluginDelegateImpl, but that class is private to the // framework, and these functions are called from a dylib. typedef void* OpaquePluginRef; |