bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mac: Fix 10.10 SDK compile and test errors (issue #1414)

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-08-26 16:38:43 -04:00
parent 9af98fab45
commit c2086cf7c7
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cefclient/browser/browser_window_osr_mac.mm
View File

@@ -648,6 +648,8 @@ BrowserOpenGLView* GLView(NSView* view) {
case NSOtherMouseUp:
modifiers |= EVENTFLAG_MIDDLE_MOUSE_BUTTON;
break;
default:
break;
}
return modifiers;

4
tests/cefsimple/cefsimple_mac.mm
View File

@@ -11,7 +11,7 @@
#include "include/wrapper/cef_helpers.h"
// Receives notifications from the application.
@interface SimpleAppDelegate : NSObject
@interface SimpleAppDelegate : NSObject<NSApplicationDelegate>
- (void)createApplication:(id)object;
- (void)tryToTerminateApplication:(NSApplication*)app;
@end
@@ -90,7 +90,7 @@
[NSBundle loadNibNamed:@"MainMenu" owner:NSApp];
// Set the delegate for application events.
[NSApp setDelegate:self];
[[NSApplication sharedApplication] setDelegate:self];
}
- (void)tryToTerminateApplication:(NSApplication*)app {

4
tests/unittests/os_rendering_unittest.cc
View File

@@ -85,7 +85,7 @@ const int kVerticalScrollbarWidth = GetSystemMetrics(SM_CXVSCROLL);
const CefRect kEditBoxRect(442, 251, 46, 16);
const CefRect kNavigateButtonRect(375, 275, 130, 20);
const CefRect kSelectRect(461, 21, 87, 26);
const CefRect kExpandedSelectRect(466, 42, 81, 286);
const CefRect kExpandedSelectRect(466, 42, 79, 286);
const CefRect kDropDivRect(9, 330, 52, 52);
const CefRect kDragDivRect(60, 330, 52, 52);
const int kVerticalScrollbarWidth = 15;
@@ -691,7 +691,7 @@ class OSRTestHandler : public RoutingTestHandler,
expanded_select_rect.height));
// first pixel of border
#if defined(OS_MACOSX)
EXPECT_EQ(0xff719bc1, *(reinterpret_cast<const uint32*>(buffer)));
EXPECT_EQ(0xff5d99d6, *(reinterpret_cast<const uint32*>(buffer)));
#else
if (scale_factor_ == 1.0f)
EXPECT_EQ(0xffd69c2b, *(reinterpret_cast<const uint32*>(buffer)));