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

macOS: Fix compile errors

Browse Source
This commit is contained in:
Marshall Greenblatt
2019-05-18 15:23:17 +03:00
parent 2ea173a254
commit 9a30f05f80
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1283,6 +1283,7 @@ class BrowserWindowOsrMacImpl {
void CreateBrowser(ClientWindowHandle parent_handle, void CreateBrowser(ClientWindowHandle parent_handle,
const CefRect& rect, const CefRect& rect,
const CefBrowserSettings& settings, const CefBrowserSettings& settings,
CefRefPtr<CefDictionaryValue> extra_info,
CefRefPtr<CefRequestContext> request_context); CefRefPtr<CefRequestContext> request_context);
void GetPopupConfig(CefWindowHandle temp_handle, void GetPopupConfig(CefWindowHandle temp_handle,
CefWindowInfo& windowInfo, CefWindowInfo& windowInfo,
@@ -1774,8 +1775,10 @@ void BrowserWindowOsrMac::CreateBrowser(
ClientWindowHandle parent_handle, ClientWindowHandle parent_handle,
const CefRect& rect, const CefRect& rect,
const CefBrowserSettings& settings, const CefBrowserSettings& settings,
CefRefPtr<CefDictionaryValue> extra_info,
CefRefPtr<CefRequestContext> request_context) { CefRefPtr<CefRequestContext> request_context) {
impl_->CreateBrowser(parent_handle, rect, settings, request_context); impl_->CreateBrowser(parent_handle, rect, settings, extra_info,
request_context);
} }
void BrowserWindowOsrMac::GetPopupConfig(CefWindowHandle temp_handle, void BrowserWindowOsrMac::GetPopupConfig(CefWindowHandle temp_handle,

4
tests/ceftests/urlrequest_unittest.cc
View File

@@ -1818,7 +1818,7 @@ class RequestTestRunner : public base::RefCountedThreadSafe<RequestTestRunner> {
std::string upload_data; std::string upload_data;
GetUploadData(expected_request, upload_data); GetUploadData(expected_request, upload_data);
EXPECT_EQ(upload_data.size(), client->upload_total_); EXPECT_EQ((int64)upload_data.size(), client->upload_total_);
} else { } else {
EXPECT_EQ(0, client->upload_progress_ct_); EXPECT_EQ(0, client->upload_progress_ct_);
EXPECT_EQ(0, client->upload_total_); EXPECT_EQ(0, client->upload_total_);
@@ -1826,7 +1826,7 @@ class RequestTestRunner : public base::RefCountedThreadSafe<RequestTestRunner> {
if (settings_.expect_download_progress) { if (settings_.expect_download_progress) {
EXPECT_LE(1, client->download_progress_ct_); EXPECT_LE(1, client->download_progress_ct_);
EXPECT_EQ(settings_.response_data.size(), client->download_total_); EXPECT_EQ((int64)settings_.response_data.size(), client->download_total_);
} else { } else {
EXPECT_EQ(0, client->download_progress_ct_); EXPECT_EQ(0, client->download_progress_ct_);
EXPECT_EQ(0, client->download_total_); EXPECT_EQ(0, client->download_total_);