mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix compilation

Browse source
This commit is contained in:
Aleksei Kuzmin 2017-06-17 01:13:30 +03:00
parent d09cab2e21
commit 48821a6d2a
5 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/frame_subscriber.cc
View file

@ -45,7 +45,7 @@ bool FrameSubscriber::ShouldCaptureFrame(
gfx::Size view_size = rect.size(); gfx::Size view_size = rect.size();
gfx::Size bitmap_size = view_size; gfx::Size bitmap_size = view_size;
const gfx::NativeView native_view = view_->GetNativeView(); gfx::NativeView native_view = view_->GetNativeView();
const float scale = const float scale =
display::Screen::GetScreen()->GetDisplayNearestView(native_view) display::Screen::GetScreen()->GetDisplayNearestView(native_view)
.device_scale_factor(); .device_scale_factor();

2
atom/browser/lib/bluetooth_chooser.h
View file

@ -33,7 +33,7 @@ class BluetoothChooser : public content::BluetoothChooser {
bool is_gatt_connected, bool is_gatt_connected,
bool is_paired, bool is_paired,
int signal_strength_level) override; int signal_strength_level) override;
void RemoveDevice(const std::string& device_id) override; void RemoveDevice(const std::string& device_id);
private: private:
std::vector<DeviceInfo> device_list_; std::vector<DeviceInfo> device_list_;

2
atom/browser/osr/osr_render_widget_host_view.h
View file

@ -113,8 +113,6 @@ class OffScreenRenderWidgetHostView
#endif // defined(OS_MACOSX) #endif // defined(OS_MACOSX)
// content::RenderWidgetHostViewBase: // content::RenderWidgetHostViewBase:
void OnSwapCompositorFrame(uint32_t, cc::CompositorFrame)
override;
void ClearCompositorFrame(void) override; void ClearCompositorFrame(void) override;
void InitAsPopup(content::RenderWidgetHostView *rwhv, const gfx::Rect& rect) void InitAsPopup(content::RenderWidgetHostView *rwhv, const gfx::Rect& rect)
override; override;

3
atom/renderer/api/atom_api_spell_check_client.h
View file

@ -11,6 +11,7 @@
#include "base/callback.h" #include "base/callback.h"
#include "chrome/renderer/spellchecker/spellcheck_worditerator.h" #include "chrome/renderer/spellchecker/spellcheck_worditerator.h"
#include "native_mate/scoped_persistent.h" #include "native_mate/scoped_persistent.h"
#include "third_party/WebKit/public/platform/WebVector.h"
#include "third_party/WebKit/public/web/WebSpellCheckClient.h" #include "third_party/WebKit/public/web/WebSpellCheckClient.h"
namespace blink { namespace blink {
@ -38,7 +39,7 @@ class SpellCheckClient : public blink::WebSpellCheckClient {
blink::WebVector<blink::WebString>* optionalSuggestions) override; blink::WebVector<blink::WebString>* optionalSuggestions) override;
void RequestCheckingOfText( void RequestCheckingOfText(
const blink::WebString& textToCheck, const blink::WebString& textToCheck,
blink::WebTextCheckingCompletion* completionCallback) override; blink::WebTextCheckingResult completionCallback) override;
void ShowSpellingUI(bool show) override; void ShowSpellingUI(bool show) override;
bool IsShowingSpellingUI() override; bool IsShowingSpellingUI() override;
void UpdateSpellingUIWithMisspelledWord( void UpdateSpellingUIWithMisspelledWord(

2
brightray/browser/devtools_embedder_message_dispatcher.cc
View file

@ -69,7 +69,7 @@ template <typename T, typename... Ts>
struct ParamTuple<T, Ts...> { struct ParamTuple<T, Ts...> {
bool Parse(const base::ListValue& list, bool Parse(const base::ListValue& list,
const base::ListValue::const_iterator& it) { const base::ListValue::const_iterator& it) {
return it != list.end() && GetValue(**it, &head) && return it != list.end() && GetValue(*it, &head) &&
tail.Parse(list, it + 1); tail.Parse(list, it + 1);
} }