bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Linux/OS-X compile errors (issue #751). 

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1271@896 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-11-05 20:14:50 +00:00
parent 67fdcd0920
commit 737ad31704
7 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cef1/cef.gyp
View File

@ -14,7 +14,7 @@
'<!(python ../chrome/tools/build/version.py -f ../chrome/VERSION -t "1<(revision).@BUILD_HI@.@BUILD_LO@" -e "BUILD_HI=int(BUILD)/256" -e "BUILD_LO=int(BUILD)%256")', '<!(python ../chrome/tools/build/version.py -f ../chrome/VERSION -t "1<(revision).@BUILD_HI@.@BUILD_LO@" -e "BUILD_HI=int(BUILD)/256" -e "BUILD_LO=int(BUILD)%256")',
}, },
'conditions': [ 'conditions': [
[ 'os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', { [ 'os_posix==1 and OS!="mac" and OS!="android" and gcc_version>=46', {
'target_defaults': { 'target_defaults': {
# Disable warnings about c++0x compatibility, as some names (such # Disable warnings about c++0x compatibility, as some names (such
# as nullptr) conflict with upcoming c++0x types. # as nullptr) conflict with upcoming c++0x types.

4
cef1/include/internal/cef_types_wrappers.h
View File

@ -507,8 +507,8 @@ class CefTime : public CefStructBase<CefTimeTraits> {
} }
// Return the delta between this object and |other| in milliseconds. // Return the delta between this object and |other| in milliseconds.
int64 Delta(const CefTime& other) { long long Delta(const CefTime& other) {
int64 delta = 0; long long delta = 0;
cef_time_delta(this, &other, &delta); cef_time_delta(this, &other, &delta);
return delta; return delta;
} }

2
cef3/cef.gyp
View File

@ -999,7 +999,7 @@
}, },
], ],
'conditions': [ 'conditions': [
['os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', { ['os_posix==1 and OS!="mac" and OS!="android" and gcc_version>=46', {
'target_defaults': { 'target_defaults': {
# Disable warnings about c++0x compatibility, as some names (such # Disable warnings about c++0x compatibility, as some names (such
# as nullptr) conflict with upcoming c++0x types. # as nullptr) conflict with upcoming c++0x types.

2
cef3/include/cef_trace_event.h
View File

@ -184,7 +184,7 @@ CEF_EXPORT void cef_trace_event_end(const char* category,
const char* arg2_name, const char* arg2_name,
uint64 arg2_val, uint64 arg2_val,
int copy); int copy);
CEF_EXPORT void cef_trace_event_if_longer_than(long long threshold_us, CEF_EXPORT void cef_trace_event_if_longer_than(int64 threshold_us,
const char* category, const char* category,
const char* name, const char* name,
const char* arg1_name, const char* arg1_name,

4
cef3/include/internal/cef_types_wrappers.h
View File

@ -503,8 +503,8 @@ class CefTime : public CefStructBase<CefTimeTraits> {
} }
// Return the delta between this object and |other| in milliseconds. // Return the delta between this object and |other| in milliseconds.
int64 Delta(const CefTime& other) { long long Delta(const CefTime& other) {
int64 delta = 0; long long delta = 0;
cef_time_delta(this, &other, &delta); cef_time_delta(this, &other, &delta);
return delta; return delta;
} }

3
cef3/tests/unittests/urlrequest_unittest.cc
View File

@ -842,6 +842,9 @@ class RequestRendererTest : public ClientApp::RenderDelegate,
class RequestTestHandler : public TestHandler, class RequestTestHandler : public TestHandler,
public RequestTestRunner::Delegate { public RequestTestRunner::Delegate {
public: public:
// Don't hide the DestroyTest method.
using TestHandler::DestroyTest;
RequestTestHandler(RequestTestMode test_mode, RequestTestHandler(RequestTestMode test_mode,
bool test_in_browser, bool test_in_browser,
const char* test_url) const char* test_url)

5
cef3/tests/unittests/v8_unittest.cc
View File

@ -1955,8 +1955,9 @@ class V8TestHandler : public TestHandler {
int httpStatusCode) OVERRIDE { int httpStatusCode) OVERRIDE {
if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) { if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) {
if (browser->IsPopup()) { if (browser->IsPopup()) {
EXPECT_STREQ(GetBrowser()->GetHost()->GetDevToolsURL(true).c_str(), EXPECT_STREQ(
frame->GetURL().c_str()); GetBrowser()->GetHost()->GetDevToolsURL(true).ToString().c_str(),
frame->GetURL().ToString().c_str());
CefRefPtr<CefProcessMessage> return_msg = CefRefPtr<CefProcessMessage> return_msg =
CefProcessMessage::Create(kV8DevToolsLoadHookMsg); CefProcessMessage::Create(kV8DevToolsLoadHookMsg);
EXPECT_TRUE(browser->SendProcessMessage(PID_RENDERER, return_msg)); EXPECT_TRUE(browser->SendProcessMessage(PID_RENDERER, return_msg));