mac: Let Carbon plugin stuff buid with the 10.7 SDK

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

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=148647

[Mark Mentovai, 2012-07-26 22:41:10]

You should test this with the 10.6 SDK too.

Where you have a couple of “extern "C"” things backed up against each other, I
think it’s preferable to write

#if LOGIC_TO_DECIDE_IF_YOU_NEED_THIS
extern "C" {
// declare stuff
}  // extern "C"
#endif

https://chromiumcodereview.appspot.com/10826036/diff/1/content/plugin/plugin_...
File content/plugin/plugin_carbon_interpose_mac.cc (right):

https://chromiumcodereview.appspot.com/10826036/diff/1/content/plugin/plugin_...
content/plugin/plugin_carbon_interpose_mac.cc:18: extern "C" Boolean
PtInRect(Point pt, const Rect* r);
Wanna wrap this in an SDK macro-checking #if?

https://chromiumcodereview.appspot.com/10826036/diff/1/webkit/glue/webcursor.h
File webkit/glue/webcursor.h (right):

https://chromiumcodereview.appspot.com/10826036/diff/1/webkit/glue/webcursor....
webkit/glue/webcursor.h:29: typedef struct Cursor Cursor;
Weird, is someone using this header in a .c (not .cc) file?

https://chromiumcodereview.appspot.com/10826036/diff/1/webkit/glue/webcursor_...
File webkit/glue/webcursor_mac.mm (right):

https://chromiumcodereview.appspot.com/10826036/diff/1/webkit/glue/webcursor_...
webkit/glue/webcursor_mac.mm:25: struct Cursor {
SDK version check for sure, or you’ll have conflicting declarations of Cursor.

[Nico, 2012-07-26 22:45:12]

Thanks!

https://chromiumcodereview.appspot.com/10826036/diff/1/content/plugin/plugin_...
File content/plugin/plugin_carbon_interpose_mac.cc (right):

https://chromiumcodereview.appspot.com/10826036/diff/1/content/plugin/plugin_...
content/plugin/plugin_carbon_interpose_mac.cc:18: extern "C" Boolean
PtInRect(Point pt, const Rect* r);
On 2012/07/26 22:41:10, Mark Mentovai wrote:
> Wanna wrap this in an SDK macro-checking #if?

Done.

https://chromiumcodereview.appspot.com/10826036/diff/1/webkit/glue/webcursor.h
File webkit/glue/webcursor.h (right):

https://chromiumcodereview.appspot.com/10826036/diff/1/webkit/glue/webcursor....
webkit/glue/webcursor.h:29: typedef struct Cursor Cursor;
On 2012/07/26 22:41:10, Mark Mentovai wrote:
> Weird, is someone using this header in a .c (not .cc) file?

No. This change isn't really necessary, I just thought it's neater to match the
definition in the header.

https://chromiumcodereview.appspot.com/10826036/diff/1/webkit/glue/webcursor_...
File webkit/glue/webcursor_mac.mm (right):

https://chromiumcodereview.appspot.com/10826036/diff/1/webkit/glue/webcursor_...
webkit/glue/webcursor_mac.mm:25: struct Cursor {
On 2012/07/26 22:41:10, Mark Mentovai wrote:
> SDK version check for sure, or you’ll have conflicting declarations of Cursor.

Done.

[Nico, 2012-07-26 22:45:47]

https://chromiumcodereview.appspot.com/10826036/diff/5002/webkit/plugins/npap...
File webkit/plugins/npapi/webplugin_delegate_impl_mac.mm (right):

https://chromiumcodereview.appspot.com/10826036/diff/5002/webkit/plugins/npap...
webkit/plugins/npapi/webplugin_delegate_impl_mac.mm:53: extern "C" void
OffsetRect(Rect* r, short dh, short dv);
Oops, forgot the extern "C" reshuffle in this file. Will do in a sec.

[Mark Mentovai, 2012-07-26 22:49:00]

https://chromiumcodereview.appspot.com/10826036/diff/5002/content/plugin/plug...
File content/plugin/plugin_carbon_interpose_mac.cc (right):

https://chromiumcodereview.appspot.com/10826036/diff/5002/content/plugin/plug...
content/plugin/plugin_carbon_interpose_mac.cc:15: #if
defined(MAC_OS_X_VERSION_10_7)
Since we can’t be sure there aren’t “fixed” versions of older SDKs that include
this macro, we should write:

#if defined(MAC_OS_X_VERSION_10_7) && \
    MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7

as is done elsewhere in Chrome.

Specifically, writing MAC_OS_X_VERSION_MAX_ALLOWED is the canonical “key” to
clue a reader in that this is an SDK check.

https://chromiumcodereview.appspot.com/10826036/diff/5002/webkit/glue/webcurs...
File webkit/glue/webcursor_mac.mm (right):

https://chromiumcodereview.appspot.com/10826036/diff/5002/webkit/glue/webcurs...
webkit/glue/webcursor_mac.mm:22: #if defined(MAC_OS_X_VERSION_10_7)
Same.

https://chromiumcodereview.appspot.com/10826036/diff/5002/webkit/glue/webcurs...
webkit/glue/webcursor_mac.mm:38: #if !defined(MAC_OS_X_VERSION_10_7) || \
Kinda like what’s done here.

[Nico, 2012-07-26 22:53:46]

all done, thanks

https://chromiumcodereview.appspot.com/10826036/diff/5002/content/plugin/plug...
File content/plugin/plugin_carbon_interpose_mac.cc (right):

https://chromiumcodereview.appspot.com/10826036/diff/5002/content/plugin/plug...
content/plugin/plugin_carbon_interpose_mac.cc:15: #if
defined(MAC_OS_X_VERSION_10_7)
On 2012/07/26 22:49:00, Mark Mentovai wrote:
> Since we can’t be sure there aren’t “fixed” versions of older SDKs that
include
> this macro, we should write:
> 
> #if defined(MAC_OS_X_VERSION_10_7) && \
>     MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
> 
> as is done elsewhere in Chrome.
> 
> Specifically, writing MAC_OS_X_VERSION_MAX_ALLOWED is the canonical “key” to
> clue a reader in that this is an SDK check.

Done.

[Mark Mentovai, 2012-07-26 22:55:44]

LGTM

[Nico, 2012-07-26 22:57:40]

Thanks!

On Thu, Jul 26, 2012 at 3:55 PM,  <mark@chromium.org> wrote:
> LGTM
>
> https://chromiumcodereview.appspot.com/10826036/

[Nico, 2012-07-26 23:17:51]

tony, stuart: OWNERS

[tony, 2012-07-26 23:19:24]

LGTM