bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-02 20:26:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix clang compile errors.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1485 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-10-24 21:40:32 +00:00
parent c7d7b9fbbf
commit 4fa7a4d806
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cef.gypi
View File

@ -6,6 +6,8 @@
'variables': { 'variables': {
'use_ash': 0, 'use_ash': 0,
'use_aura': 0, 'use_aura': 0,
# Don't use the chrome style plugin with CEF.
'clang_use_chrome_plugins': 0,
'conditions': [ 'conditions': [
# Directory for CEF source files. # Directory for CEF source files.
[ 'OS=="win"', { [ 'OS=="win"', {
@ -17,10 +19,6 @@
}, { # OS!="win" }, { # OS!="win"
'cef_directory' : '<!(echo $CEF_DIRECTORY)', 'cef_directory' : '<!(echo $CEF_DIRECTORY)',
}], }],
[ 'OS=="mac"', {
# Don't use the chrome style plugin with CEF.
'clang_use_chrome_plugins': 0,
}],
] ]
}, 'conditions': [ }, 'conditions': [
['os_posix==1 and OS!="mac" and OS!="android"', { ['os_posix==1 and OS!="mac" and OS!="android"', {

2
libcef/browser/render_widget_host_view_osr.cc
View File

@ -213,10 +213,12 @@ void CefRenderWidgetHostViewOSR::TextInputTypeChanged(
void CefRenderWidgetHostViewOSR::ImeCancelComposition() { void CefRenderWidgetHostViewOSR::ImeCancelComposition() {
} }
#if defined(OS_WIN) || defined(USE_AURA)
void CefRenderWidgetHostViewOSR::ImeCompositionRangeChanged( void CefRenderWidgetHostViewOSR::ImeCompositionRangeChanged(
const gfx::Range& range, const gfx::Range& range,
const std::vector<gfx::Rect>& character_bounds) { const std::vector<gfx::Rect>& character_bounds) {
} }
#endif
#endif // !defined(OS_MACOSX) #endif // !defined(OS_MACOSX)
void CefRenderWidgetHostViewOSR::DidUpdateBackingStore( void CefRenderWidgetHostViewOSR::DidUpdateBackingStore(

2
libcef/browser/render_widget_host_view_osr.h
View File

@ -122,9 +122,11 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase {
ui::TextInputMode mode, ui::TextInputMode mode,
bool can_compose_inline) OVERRIDE; bool can_compose_inline) OVERRIDE;
virtual void ImeCancelComposition() OVERRIDE; virtual void ImeCancelComposition() OVERRIDE;
#if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA)
virtual void ImeCompositionRangeChanged( virtual void ImeCompositionRangeChanged(
const gfx::Range& range, const gfx::Range& range,
const std::vector<gfx::Rect>& character_bounds) OVERRIDE; const std::vector<gfx::Rect>& character_bounds) OVERRIDE;
#endif
virtual void DidUpdateBackingStore( virtual void DidUpdateBackingStore(
const gfx::Rect& scroll_rect, const gfx::Rect& scroll_rect,
const gfx::Vector2d& scroll_delta, const gfx::Vector2d& scroll_delta,