diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/ppapi/examples | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/ppapi/examples')
| -rw-r--r-- | chromium/ppapi/examples/ime/ime.cc | 5 | ||||
| -rw-r--r-- | chromium/ppapi/examples/video_decode/video_decode.cc | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chromium/ppapi/examples/ime/ime.cc b/chromium/ppapi/examples/ime/ime.cc index e7307868476..0f3e41edcf2 100644 --- a/chromium/ppapi/examples/ime/ime.cc +++ b/chromium/ppapi/examples/ime/ime.cc @@ -21,7 +21,7 @@ namespace { -// Extracted from: ui/base/keycodes/keyboard_codes.h +// Extracted from: ui/events/keycodes/keyboard_codes.h enum { VKEY_BACK = 0x08, VKEY_SHIFT = 0x10, @@ -128,7 +128,8 @@ class MyTextField { area_(x, y, width, height), font_size_(height - 2), caret_pos_(std::string::npos), - anchor_pos_(std::string::npos) { + anchor_pos_(std::string::npos), + target_segment_(0) { pp::FontDescription_Dev desc; desc.set_family(PP_FONTFAMILY_SANSSERIF); desc.set_size(font_size_); diff --git a/chromium/ppapi/examples/video_decode/video_decode.cc b/chromium/ppapi/examples/video_decode/video_decode.cc index e6bcff82f19..d1f7181dedf 100644 --- a/chromium/ppapi/examples/video_decode/video_decode.cc +++ b/chromium/ppapi/examples/video_decode/video_decode.cc @@ -221,6 +221,7 @@ VideoDecodeDemoInstance::VideoDecodeDemoInstance(PP_Instance instance, pp::Module* module) : pp::Instance(instance), pp::Graphics3DClient(this), pp::VideoDecoderClient_Dev(this), + is_painting_(false), num_frames_rendered_(0), first_frame_delivered_ticks_(-1), swap_ticks_(0), |