projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
xwalk
/
runtime
/
browser
/
ui
/
splash_screen_tizen.cc
diff --git
a/src/xwalk/runtime/browser/ui/splash_screen_tizen.cc
b/src/xwalk/runtime/browser/ui/splash_screen_tizen.cc
index
8ba6214
..
b8ebcb6
100644
(file)
--- a/
src/xwalk/runtime/browser/ui/splash_screen_tizen.cc
+++ b/
src/xwalk/runtime/browser/ui/splash_screen_tizen.cc
@@
-27,7
+27,7
@@
class SplashScreenTizen::SplashScreenLayerDelegate : public ui::LayerDelegate {
void set_image(const gfx::Image& image) { image_ = image; }
const gfx::Image& image() const { return image_; }
void set_image(const gfx::Image& image) { image_ = image; }
const gfx::Image& image() const { return image_; }
- v
irtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE
{
+ v
oid OnPaintLayer(gfx::Canvas* canvas) override
{
if (!image_.IsEmpty()) {
canvas->DrawImageInt(image_.AsImageSkia(), 0, 0);
} else {
if (!image_.IsEmpty()) {
canvas->DrawImageInt(image_.AsImageSkia(), 0, 0);
} else {
@@
-35,12
+35,12
@@
class SplashScreenTizen::SplashScreenLayerDelegate : public ui::LayerDelegate {
}
}
}
}
- v
irtual v
oid OnDelegatedFrameDamage(
- const gfx::Rect& damage_rect_in_dip)
OVERRIDE
{}
+ void OnDelegatedFrameDamage(
+ const gfx::Rect& damage_rect_in_dip)
override
{}
- v
irtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE
{}
+ v
oid OnDeviceScaleFactorChanged(float device_scale_factor) override
{}
-
virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE
{
+
base::Closure PrepareForLayerBoundsChange() override
{
return base::Closure();
}
return base::Closure();
}