Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Side by Side Diff: webkit/plugins/npapi/webplugin_delegate_impl_mac.mm

Issue 10826036: mac: Let Carbon plugin stuff buid with the 10.7 SDK (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« webkit/glue/webcursor_mac.mm ('K') | « webkit/glue/webcursor_mac.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 #import <QuartzCore/QuartzCore.h> 6 #import <QuartzCore/QuartzCore.h>
7 7
8 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" 8 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
9 9
10 #include <string> 10 #include <string>
(...skipping 25 matching lines...) Expand all
36 #if defined(USE_SKIA) 36 #if defined(USE_SKIA)
37 #include "skia/ext/skia_utils_mac.h" 37 #include "skia/ext/skia_utils_mac.h"
38 #endif 38 #endif
39 39
40 using WebKit::WebCursorInfo; 40 using WebKit::WebCursorInfo;
41 using WebKit::WebKeyboardEvent; 41 using WebKit::WebKeyboardEvent;
42 using WebKit::WebInputEvent; 42 using WebKit::WebInputEvent;
43 using WebKit::WebMouseEvent; 43 using WebKit::WebMouseEvent;
44 using WebKit::WebMouseWheelEvent; 44 using WebKit::WebMouseWheelEvent;
45 45
46 #if defined(MAC_OS_X_VERSION_10_7)
47 #ifndef NP_NO_CARBON
48 // QuickdrawAPI.h is no longer included in the 10.7 SDK, but the symbols are
49 // still exported by QD.framework (a subframework of ApplicationServices).
50 // http://developer.apple.com/legacy/mac/library/documentation/Carbon/reference/ QuickDraw_Ref/QuickDraw_Ref.pdf
51 extern "C" void SetRect(
52 Rect* r, short left, short top, short right, short bottom);
53 extern "C" void OffsetRect(Rect* r, short dh, short dv);
Nico 2012/07/26 22:45:47 Oops, forgot the extern "C" reshuffle in this file
54 #endif // NP_NO_CARBON
55 #endif // defined(MAC_OS_X_VERSION_10_7)
56
46 // Important implementation notes: The Mac definition of NPAPI, particularly 57 // Important implementation notes: The Mac definition of NPAPI, particularly
47 // the distinction between windowed and windowless modes, differs from the 58 // the distinction between windowed and windowless modes, differs from the
48 // Windows and Linux definitions. Most of those differences are 59 // Windows and Linux definitions. Most of those differences are
49 // accomodated by the WebPluginDelegate class. 60 // accomodated by the WebPluginDelegate class.
50 61
51 namespace webkit { 62 namespace webkit {
52 namespace npapi { 63 namespace npapi {
53 64
54 namespace { 65 namespace {
55 66
(...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after
1068 HIPoint mouse_location; 1079 HIPoint mouse_location;
1069 HIGetMousePosition(kHICoordSpaceScreenPixel, NULL, &mouse_location); 1080 HIGetMousePosition(kHICoordSpaceScreenPixel, NULL, &mouse_location);
1070 np_event.where.h = mouse_location.x; 1081 np_event.where.h = mouse_location.x;
1071 np_event.where.v = mouse_location.y; 1082 np_event.where.v = mouse_location.y;
1072 instance()->NPP_HandleEvent(&np_event); 1083 instance()->NPP_HandleEvent(&np_event);
1073 } 1084 }
1074 #endif // !NP_NO_CARBON 1085 #endif // !NP_NO_CARBON
1075 1086
1076 } // namespace npapi 1087 } // namespace npapi
1077 } // namespace webkit 1088 } // namespace webkit
OLDNEW
« webkit/glue/webcursor_mac.mm ('K') | « webkit/glue/webcursor_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698