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

Update to Chromium revision 2b3ae3b8 (#394939)

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-05-24 19:35:43 -04:00
parent 582ce074aa
commit ab2636b012
125 changed files with 619 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cefclient/browser/main_message_loop_external_pump.h
View File

@@ -23,7 +23,7 @@ class MainMessageLoopExternalPump : public MainMessageLoopStd {
public:
// Creates the singleton instance of this object. Must be called on the main
// application thread.
static scoped_ptr<MainMessageLoopExternalPump> Create();
static SCOPED_PTR(MainMessageLoopExternalPump) Create();
// Returns the singleton instance of this object. Safe to call from any
// thread.

6
tests/cefclient/browser/main_message_loop_external_pump_linux.cc
View File

@@ -98,7 +98,7 @@ class MainMessageLoopExternalPumpLinux : public MainMessageLoopExternalPump {
int wakeup_pipe_write_;
// Use a scoped_ptr to avoid needing the definition of GPollFD in the header.
scoped_ptr<GPollFD> wakeup_gpollfd_;
SCOPED_PTR(GPollFD) wakeup_gpollfd_;
};
// Return a timeout suitable for the glib loop, -1 to block forever,
@@ -295,9 +295,9 @@ bool MainMessageLoopExternalPumpLinux::IsTimerPending() {
} // namespace
// static
scoped_ptr<MainMessageLoopExternalPump>
SCOPED_PTR(MainMessageLoopExternalPump)
MainMessageLoopExternalPump::Create() {
return make_scoped_ptr<MainMessageLoopExternalPump>(
return SCOPED_PTR(MainMessageLoopExternalPump)(
new MainMessageLoopExternalPumpLinux());
}

4
tests/cefclient/browser/main_message_loop_external_pump_mac.mm
View File

@@ -162,9 +162,9 @@ void MainMessageLoopExternalPumpMac::KillTimer() {
}
// static
scoped_ptr<MainMessageLoopExternalPump>
SCOPED_PTR(MainMessageLoopExternalPump)
MainMessageLoopExternalPump::Create() {
return make_scoped_ptr<MainMessageLoopExternalPump>(
return SCOPED_PTR(MainMessageLoopExternalPump)(
new MainMessageLoopExternalPumpMac());
}

4
tests/cefclient/browser/main_message_loop_external_pump_win.cc
View File

@@ -140,9 +140,9 @@ LRESULT CALLBACK MainMessageLoopExternalPumpWin::WndProc(
} // namespace
// static
scoped_ptr<MainMessageLoopExternalPump>
SCOPED_PTR(MainMessageLoopExternalPump)
MainMessageLoopExternalPump::Create() {
return make_scoped_ptr<MainMessageLoopExternalPump>(
return SCOPED_PTR(MainMessageLoopExternalPump)(
new MainMessageLoopExternalPumpWin());
}