BASELINE: Update Chromium to 49.0.2623.23

Also adds missing printing sources.

Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

73 files changed, 169 insertions, 408 deletions

diff --git a/chromium/ppapi/cpp/BUILD.gn b/chromium/ppapi/cpp/BUILD.gn
index 63b3f60c091..06ec9d1f238 100644
--- a/chromium/ppapi/cpp/BUILD.gn
+++ b/chromium/ppapi/cpp/BUILD.gn
@@ -12,7 +12,7 @@ source_set("cpp") {
     "ppp_entrypoints.cc",
   ]
 
-  deps = [
+  public_deps = [
     ":objects",
     "//ppapi/c",
   ]
diff --git a/chromium/ppapi/cpp/array_output.h b/chromium/ppapi/cpp/array_output.h
index fe0bbc335bc..4af175fd7d0 100644
--- a/chromium/ppapi/cpp/array_output.h
+++ b/chromium/ppapi/cpp/array_output.h
@@ -5,6 +5,9 @@
 #ifndef PPAPI_CPP_ARRAY_OUTPUT_H_
 #define PPAPI_CPP_ARRAY_OUTPUT_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
 #include "ppapi/c/pp_array_output.h"
diff --git a/chromium/ppapi/cpp/audio_buffer.h b/chromium/ppapi/cpp/audio_buffer.h
index ecaa439d1cb..0080f8c0760 100644
--- a/chromium/ppapi/cpp/audio_buffer.h
+++ b/chromium/ppapi/cpp/audio_buffer.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_AUDIO_BUFFER_H_
 #define PPAPI_CPP_AUDIO_BUFFER_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_audio_buffer.h"
 #include "ppapi/cpp/resource.h"
 
diff --git a/chromium/ppapi/cpp/audio_encoder.h b/chromium/ppapi/cpp/audio_encoder.h
index 620d507153c..9e5f3ea1d62 100644
--- a/chromium/ppapi/cpp/audio_encoder.h
+++ b/chromium/ppapi/cpp/audio_encoder.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_AUDIO_ENCODER_H_
 #define PPAPI_CPP_AUDIO_ENCODER_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/pp_codecs.h"
 #include "ppapi/c/ppb_audio_buffer.h"
 #include "ppapi/cpp/audio_buffer.h"
diff --git a/chromium/ppapi/cpp/completion_callback.h b/chromium/ppapi/cpp/completion_callback.h
index 2062180a52a..2edbe6222fb 100644
--- a/chromium/ppapi/cpp/completion_callback.h
+++ b/chromium/ppapi/cpp/completion_callback.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_COMPLETION_CALLBACK_H_
 #define PPAPI_CPP_COMPLETION_CALLBACK_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/logging.h"
diff --git a/chromium/ppapi/cpp/compositor.h b/chromium/ppapi/cpp/compositor.h
index c89e26244d9..940acdf02cf 100644
--- a/chromium/ppapi/cpp/compositor.h
+++ b/chromium/ppapi/cpp/compositor.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_COMPOSITOR_H_
 #define PPAPI_CPP_COMPOSITOR_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_compositor.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/compositor_layer.h"
diff --git a/chromium/ppapi/cpp/compositor_layer.h b/chromium/ppapi/cpp/compositor_layer.h
index 9e65e87964d..b4c46dcf9d9 100644
--- a/chromium/ppapi/cpp/compositor_layer.h
+++ b/chromium/ppapi/cpp/compositor_layer.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_COMPOSITOR_LAYER_H_
 #define PPAPI_CPP_COMPOSITOR_LAYER_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_compositor_layer.h"
 #include "ppapi/cpp/graphics_3d.h"
 #include "ppapi/cpp/image_data.h"
diff --git a/chromium/ppapi/cpp/core.h b/chromium/ppapi/cpp/core.h
index 35b8655f604..e4cb4e92304 100644
--- a/chromium/ppapi/cpp/core.h
+++ b/chromium/ppapi/cpp/core.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_CORE_H_
 #define PPAPI_CPP_CORE_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_core.h"
 
 /// @file
diff --git a/chromium/ppapi/cpp/dev/audio_input_dev.h b/chromium/ppapi/cpp/dev/audio_input_dev.h
index a6e5a544ca5..aacfa083377 100644
--- a/chromium/ppapi/cpp/dev/audio_input_dev.h
+++ b/chromium/ppapi/cpp/dev/audio_input_dev.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_DEV_AUDIO_INPUT_DEV_H_
 #define PPAPI_CPP_DEV_AUDIO_INPUT_DEV_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "ppapi/c/dev/ppb_audio_input_dev.h"
diff --git a/chromium/ppapi/cpp/dev/buffer_dev.h b/chromium/ppapi/cpp/dev/buffer_dev.h
index d82f92d5cc8..35f18daeddf 100644
--- a/chromium/ppapi/cpp/dev/buffer_dev.h
+++ b/chromium/ppapi/cpp/dev/buffer_dev.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_DEV_BUFFER_DEV_H_
 #define PPAPI_CPP_DEV_BUFFER_DEV_H_
 
+#include <stdint.h>
+
 #include "ppapi/cpp/resource.h"
 
 namespace pp {
diff --git a/chromium/ppapi/cpp/dev/file_chooser_dev.cc b/chromium/ppapi/cpp/dev/file_chooser_dev.cc
index 2efb346dbee..333eb6f812f 100644
--- a/chromium/ppapi/cpp/dev/file_chooser_dev.cc
+++ b/chromium/ppapi/cpp/dev/file_chooser_dev.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/cpp/dev/file_chooser_dev.h"
 
+#include <stddef.h>
 #include <string.h>
 
 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
diff --git a/chromium/ppapi/cpp/dev/file_chooser_dev.h b/chromium/ppapi/cpp/dev/file_chooser_dev.h
index 3d5ee00c136..4cd4b28c245 100644
--- a/chromium/ppapi/cpp/dev/file_chooser_dev.h
+++ b/chromium/ppapi/cpp/dev/file_chooser_dev.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_DEV_FILE_CHOOSER_DEV_H_
 #define PPAPI_CPP_DEV_FILE_CHOOSER_DEV_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
diff --git a/chromium/ppapi/cpp/dev/font_dev.cc b/chromium/ppapi/cpp/dev/font_dev.cc
deleted file mode 100644
index 4c74d472903..00000000000
--- a/chromium/ppapi/cpp/dev/font_dev.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ppapi/cpp/dev/font_dev.h"
-
-#include <algorithm>
-
-#include "ppapi/cpp/image_data.h"
-#include "ppapi/cpp/instance_handle.h"
-#include "ppapi/cpp/point.h"
-#include "ppapi/cpp/rect.h"
-#include "ppapi/cpp/module_impl.h"
-
-namespace pp {
-
-namespace {
-
-template <> const char* interface_name<PPB_Font_Dev>() {
-  return PPB_FONT_DEV_INTERFACE;
-}
-
-}  // namespace
-
-// FontDescription_Dev ---------------------------------------------------------
-
-FontDescription_Dev::FontDescription_Dev() {
-  pp_font_description_.face = face_.pp_var();
-  set_family(PP_FONTFAMILY_DEFAULT);
-  set_size(0);
-  set_weight(PP_FONTWEIGHT_NORMAL);
-  set_italic(false);
-  set_small_caps(false);
-  set_letter_spacing(0);
-  set_word_spacing(0);
-}
-
-FontDescription_Dev::FontDescription_Dev(const FontDescription_Dev& other) {
-  set_face(other.face());
-  set_family(other.family());
-  set_size(other.size());
-  set_weight(other.weight());
-  set_italic(other.italic());
-  set_small_caps(other.small_caps());
-  set_letter_spacing(other.letter_spacing());
-  set_word_spacing(other.word_spacing());
-}
-
-FontDescription_Dev::~FontDescription_Dev() {
-}
-
-FontDescription_Dev& FontDescription_Dev::operator=(
-    const FontDescription_Dev& other) {
-  pp_font_description_ = other.pp_font_description_;
-
-  // Be careful about the refcount of the string, the copy that operator= made
-  // above didn't copy a ref.
-  pp_font_description_.face = PP_MakeUndefined();
-  set_face(other.face());
-
-  return *this;
-}
-
-// TextRun_Dev -----------------------------------------------------------------
-
-TextRun_Dev::TextRun_Dev() {
-  pp_text_run_.text = text_.pp_var();
-  pp_text_run_.rtl = PP_FALSE;
-  pp_text_run_.override_direction = PP_FALSE;
-}
-
-TextRun_Dev::TextRun_Dev(const std::string& text,
-                         bool rtl,
-                         bool override_direction)
-    : text_(text) {
-  pp_text_run_.text = text_.pp_var();
-  pp_text_run_.rtl = PP_FromBool(rtl);
-  pp_text_run_.override_direction = PP_FromBool(override_direction);
-}
-
-TextRun_Dev::TextRun_Dev(const TextRun_Dev& other) : text_(other.text_) {
-  pp_text_run_.text = text_.pp_var();
-  pp_text_run_.rtl = other.pp_text_run_.rtl;
-  pp_text_run_.override_direction = other.pp_text_run_.override_direction;
-}
-
-TextRun_Dev::~TextRun_Dev() {
-}
-
-TextRun_Dev& TextRun_Dev::operator=(const TextRun_Dev& other) {
-  pp_text_run_ = other.pp_text_run_;
-  text_ = other.text_;
-  pp_text_run_.text = text_.pp_var();
-  return *this;
-}
-
-// Font ------------------------------------------------------------------------
-
-Font_Dev::Font_Dev() : Resource() {
-}
-
-Font_Dev::Font_Dev(PP_Resource resource) : Resource(resource) {
-}
-
-Font_Dev::Font_Dev(const InstanceHandle& instance,
-                   const FontDescription_Dev& description) {
-  if (!has_interface<PPB_Font_Dev>())
-    return;
-  PassRefFromConstructor(get_interface<PPB_Font_Dev>()->Create(
-      instance.pp_instance(), &description.pp_font_description()));
-}
-
-Font_Dev::Font_Dev(const Font_Dev& other) : Resource(other) {
-}
-
-Font_Dev& Font_Dev::operator=(const Font_Dev& other) {
-  Resource::operator=(other);
-  return *this;
-}
-
-// static
-Var Font_Dev::GetFontFamilies(const InstanceHandle& instance) {
-  if (!has_interface<PPB_Font_Dev>())
-    return Var();
-  return Var(PASS_REF, get_interface<PPB_Font_Dev>()->GetFontFamilies(
-                 instance.pp_instance()));
-}
-
-bool Font_Dev::Describe(FontDescription_Dev* description,
-                        PP_FontMetrics_Dev* metrics) const {
-  if (!has_interface<PPB_Font_Dev>())
-    return false;
-
-  // Be careful with ownership of the |face| string. It will come back with
-  // a ref of 1, which we want to assign to the |face_| member of the C++ class.
-  if (!get_interface<PPB_Font_Dev>()->Describe(
-      pp_resource(), &description->pp_font_description_, metrics))
-    return false;
-  description->face_ = Var(PASS_REF,
-                           description->pp_font_description_.face);
-
-  return true;
-}
-
-bool Font_Dev::DrawTextAt(ImageData* dest,
-                          const TextRun_Dev& text,
-                          const Point& position,
-                          uint32_t color,
-                          const Rect& clip,
-                          bool image_data_is_opaque) const {
-  if (!has_interface<PPB_Font_Dev>())
-    return false;
-  return PP_ToBool(get_interface<PPB_Font_Dev>()->DrawTextAt(
-      pp_resource(),
-      dest->pp_resource(),
-      &text.pp_text_run(),
-      &position.pp_point(),
-      color,
-      &clip.pp_rect(),
-      PP_FromBool(image_data_is_opaque)));
-}
-
-int32_t Font_Dev::MeasureText(const TextRun_Dev& text) const {
-  if (!has_interface<PPB_Font_Dev>())
-    return -1;
-  return get_interface<PPB_Font_Dev>()->MeasureText(pp_resource(),
-                                                    &text.pp_text_run());
-}
-
-uint32_t Font_Dev::CharacterOffsetForPixel(const TextRun_Dev& text,
-                                           int32_t pixel_position) const {
-  if (!has_interface<PPB_Font_Dev>())
-    return 0;
-  return get_interface<PPB_Font_Dev>()->CharacterOffsetForPixel(
-      pp_resource(), &text.pp_text_run(), pixel_position);
-
-}
-
-int32_t Font_Dev::PixelOffsetForCharacter(const TextRun_Dev& text,
-                                          uint32_t char_offset) const {
-  if (!has_interface<PPB_Font_Dev>())
-    return 0;
-  return get_interface<PPB_Font_Dev>()->PixelOffsetForCharacter(
-      pp_resource(), &text.pp_text_run(), char_offset);
-}
-
-bool Font_Dev::DrawSimpleText(ImageData* dest,
-                              const std::string& text,
-                              const Point& position,
-                              uint32_t color,
-                              bool image_data_is_opaque) const {
-  return DrawTextAt(dest, TextRun_Dev(text), position, color,
-                    Rect(dest->size()), image_data_is_opaque);
-}
-
-int32_t Font_Dev::MeasureSimpleText(const std::string& text) const {
-  return MeasureText(TextRun_Dev(text));
-}
-
-}  // namespace pp
diff --git a/chromium/ppapi/cpp/dev/font_dev.h b/chromium/ppapi/cpp/dev/font_dev.h
deleted file mode 100644
index d0875a50cc3..00000000000
--- a/chromium/ppapi/cpp/dev/font_dev.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef PPAPI_CPP_DEV_FONT_DEV_H_
-#define PPAPI_CPP_DEV_FONT_DEV_H_
-
-#include <string>
-
-#include "ppapi/c/dev/ppb_font_dev.h"
-#include "ppapi/cpp/resource.h"
-#include "ppapi/cpp/var.h"
-
-struct PP_FontDescription_Dev;
-
-namespace pp {
-
-class ImageData;
-class InstanceHandle;
-class Point;
-class Rect;
-
-// FontDescription_Dev ---------------------------------------------------------
-
-class FontDescription_Dev {
- public:
-  FontDescription_Dev();
-  FontDescription_Dev(const FontDescription_Dev& other);
-  ~FontDescription_Dev();
-
-  FontDescription_Dev& operator=(const FontDescription_Dev& other);
-
-  const PP_FontDescription_Dev& pp_font_description() const {
-    return pp_font_description_;
-  }
-
-  Var face() const { return face_; }
-  void set_face(const Var& face) {
-    face_ = face;
-    pp_font_description_.face = face_.pp_var();
-  }
-
-  PP_FontFamily_Dev family() const { return pp_font_description_.family; }
-  void set_family(PP_FontFamily_Dev f) { pp_font_description_.family = f; }
-
-  uint32_t size() const { return pp_font_description_.size; }
-  void set_size(uint32_t s) { pp_font_description_.size = s; }
-
-  PP_FontWeight_Dev weight() const { return pp_font_description_.weight; }
-  void set_weight(PP_FontWeight_Dev w) { pp_font_description_.weight = w; }
-
-  bool italic() const { return PP_ToBool(pp_font_description_.italic); }
-  void set_italic(bool i) { pp_font_description_.italic = PP_FromBool(i); }
-
-  bool small_caps() const {
-    return PP_ToBool(pp_font_description_.small_caps);
-  }
-  void set_small_caps(bool s) {
-    pp_font_description_.small_caps = PP_FromBool(s);
-  }
-
-  int letter_spacing() const { return pp_font_description_.letter_spacing; }
-  void set_letter_spacing(int s) { pp_font_description_.letter_spacing = s; }
-
-  int word_spacing() const { return pp_font_description_.word_spacing; }
-  void set_word_spacing(int w) { pp_font_description_.word_spacing = w; }
-
- private:
-  friend class Font_Dev;
-
-  Var face_;  // Manages memory for pp_font_description_.face
-  PP_FontDescription_Dev pp_font_description_;
-};
-
-// TextRun_Dev -----------------------------------------------------------------
-
-class TextRun_Dev {
- public:
-  TextRun_Dev();
-  TextRun_Dev(const std::string& text,
-              bool rtl = false,
-              bool override_direction = false);
-  TextRun_Dev(const TextRun_Dev& other);
-  ~TextRun_Dev();
-
-  TextRun_Dev& operator=(const TextRun_Dev& other);
-
-  const PP_TextRun_Dev& pp_text_run() const {
-    return pp_text_run_;
-  }
-
- private:
-  Var text_;  // Manages memory for the reference in pp_text_run_.
-  PP_TextRun_Dev pp_text_run_;
-};
-
-// Font ------------------------------------------------------------------------
-
-// Provides access to system fonts.
-class Font_Dev : public Resource {
- public:
-  // Creates an is_null() Font object.
-  Font_Dev();
-
-  explicit Font_Dev(PP_Resource resource);
-  Font_Dev(const InstanceHandle& instance,
-           const FontDescription_Dev& description);
-  Font_Dev(const Font_Dev& other);
-
-  Font_Dev& operator=(const Font_Dev& other);
-
-  // PPB_Font methods:
-  static Var GetFontFamilies(const InstanceHandle& instance);
-  bool Describe(FontDescription_Dev* description,
-                PP_FontMetrics_Dev* metrics) const;
-  bool DrawTextAt(ImageData* dest,
-                  const TextRun_Dev& text,
-                  const Point& position,
-                  uint32_t color,
-                  const Rect& clip,
-                  bool image_data_is_opaque) const;
-  int32_t MeasureText(const TextRun_Dev& text) const;
-  uint32_t CharacterOffsetForPixel(const TextRun_Dev& text,
-                                   int32_t pixel_position) const;
-  int32_t PixelOffsetForCharacter(const TextRun_Dev& text,
-                                  uint32_t char_offset) const;
-
-  // Convenience function that assumes a left-to-right string with no clipping.
-  bool DrawSimpleText(ImageData* dest,
-                      const std::string& text,
-                      const Point& position,
-                      uint32_t color,
-                      bool image_data_is_opaque = false) const;
-
-  // Convenience function that assumes a left-to-right string.
-  int32_t MeasureSimpleText(const std::string& text) const;
-};
-
-}  // namespace pp
-
-#endif  // PPAPI_CPP_DEV_FONT_DEV_H_
diff --git a/chromium/ppapi/cpp/dev/ime_input_event_dev.h b/chromium/ppapi/cpp/dev/ime_input_event_dev.h
index f9126aa4a1b..525954dc3e6 100644
--- a/chromium/ppapi/cpp/dev/ime_input_event_dev.h
+++ b/chromium/ppapi/cpp/dev/ime_input_event_dev.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_DEV_IME_INPUT_EVENT_DEV_H_
 #define PPAPI_CPP_DEV_IME_INPUT_EVENT_DEV_H_
 
+#include <stdint.h>
+
 #include <utility>
 #include <vector>
 
diff --git a/chromium/ppapi/cpp/dev/printing_dev.h b/chromium/ppapi/cpp/dev/printing_dev.h
index 869dbacc5b2..d419bc81027 100644
--- a/chromium/ppapi/cpp/dev/printing_dev.h
+++ b/chromium/ppapi/cpp/dev/printing_dev.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_DEV_PRINTING_DEV_H_
 #define PPAPI_CPP_DEV_PRINTING_DEV_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/dev/ppp_printing_dev.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/instance_handle.h"
diff --git a/chromium/ppapi/cpp/dev/scriptable_object_deprecated.cc b/chromium/ppapi/cpp/dev/scriptable_object_deprecated.cc
index 19c4738c007..69f26ea4684 100644
--- a/chromium/ppapi/cpp/dev/scriptable_object_deprecated.cc
+++ b/chromium/ppapi/cpp/dev/scriptable_object_deprecated.cc
@@ -3,6 +3,10 @@
 // found in the LICENSE file.
 
 #include "ppapi/cpp/dev/scriptable_object_deprecated.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
 #include "ppapi/c/dev/ppb_memory_dev.h"
 #include "ppapi/c/dev/ppp_class_deprecated.h"
 #include "ppapi/cpp/module.h"
diff --git a/chromium/ppapi/cpp/dev/text_input_dev.h b/chromium/ppapi/cpp/dev/text_input_dev.h
index fca87280467..87f43b64dfc 100644
--- a/chromium/ppapi/cpp/dev/text_input_dev.h
+++ b/chromium/ppapi/cpp/dev/text_input_dev.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_DEV_TEXT_INPUT_DEV_H_
 #define PPAPI_CPP_DEV_TEXT_INPUT_DEV_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/c/dev/ppb_text_input_dev.h"
diff --git a/chromium/ppapi/cpp/dev/truetype_font_dev.h b/chromium/ppapi/cpp/dev/truetype_font_dev.h
index bd554f7cfaa..f1fa0f07a7f 100644
--- a/chromium/ppapi/cpp/dev/truetype_font_dev.h
+++ b/chromium/ppapi/cpp/dev/truetype_font_dev.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_TRUETYPE_FONT_H_
 #define PPAPI_CPP_TRUETYPE_FONT_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/dev/ppb_truetype_font_dev.h"
 #include "ppapi/c/pp_time.h"
 #include "ppapi/cpp/completion_callback.h"
diff --git a/chromium/ppapi/cpp/dev/video_capture_client_dev.h b/chromium/ppapi/cpp/dev/video_capture_client_dev.h
index 85b766e1665..1658aa50f2c 100644
--- a/chromium/ppapi/cpp/dev/video_capture_client_dev.h
+++ b/chromium/ppapi/cpp/dev/video_capture_client_dev.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_DEV_VIDEO_CAPTURE_CLIENT_DEV_H_
 #define PPAPI_CPP_DEV_VIDEO_CAPTURE_CLIENT_DEV_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "ppapi/c/dev/pp_video_capture_dev.h"
diff --git a/chromium/ppapi/cpp/dev/video_capture_dev.h b/chromium/ppapi/cpp/dev/video_capture_dev.h
index 649254e5b6f..fc751af0009 100644
--- a/chromium/ppapi/cpp/dev/video_capture_dev.h
+++ b/chromium/ppapi/cpp/dev/video_capture_dev.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_DEV_VIDEO_CAPTURE_DEV_H_
 #define PPAPI_CPP_DEV_VIDEO_CAPTURE_DEV_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "ppapi/c/dev/pp_video_capture_dev.h"
diff --git a/chromium/ppapi/cpp/dev/video_decoder_dev.h b/chromium/ppapi/cpp/dev/video_decoder_dev.h
index fab4fb517d8..9d07ffd026e 100644
--- a/chromium/ppapi/cpp/dev/video_decoder_dev.h
+++ b/chromium/ppapi/cpp/dev/video_decoder_dev.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_DEV_VIDEO_DECODER_DEV_H_
 #define PPAPI_CPP_DEV_VIDEO_DECODER_DEV_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "ppapi/c/dev/pp_video_dev.h"
diff --git a/chromium/ppapi/cpp/file_io.h b/chromium/ppapi/cpp/file_io.h
index bbd6b57b9ec..3f3faaa7bf9 100644
--- a/chromium/ppapi/cpp/file_io.h
+++ b/chromium/ppapi/cpp/file_io.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_FILE_IO_H_
 #define PPAPI_CPP_FILE_IO_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/pp_time.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/resource.h"
diff --git a/chromium/ppapi/cpp/graphics_3d.h b/chromium/ppapi/cpp/graphics_3d.h
index 31af6877829..b42614794b6 100644
--- a/chromium/ppapi/cpp/graphics_3d.h
+++ b/chromium/ppapi/cpp/graphics_3d.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_GRAPHICS_3D_H_
 #define PPAPI_CPP_GRAPHICS_3D_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_graphics_3d.h"
 #include "ppapi/cpp/resource.h"
 
diff --git a/chromium/ppapi/cpp/image_data.h b/chromium/ppapi/cpp/image_data.h
index e9366ceb415..ee64ecb8b8c 100644
--- a/chromium/ppapi/cpp/image_data.h
+++ b/chromium/ppapi/cpp/image_data.h
@@ -5,10 +5,12 @@
 #ifndef PPAPI_CPP_IMAGE_DATA_H_
 #define PPAPI_CPP_IMAGE_DATA_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/cpp/point.h"
-#include "ppapi/cpp/size.h"
 #include "ppapi/cpp/resource.h"
+#include "ppapi/cpp/size.h"
 
 /// @file
 /// This file defines the APIs for determining how a browser
diff --git a/chromium/ppapi/cpp/input_event.h b/chromium/ppapi/cpp/input_event.h
index f9641efad61..239e9be53b1 100644
--- a/chromium/ppapi/cpp/input_event.h
+++ b/chromium/ppapi/cpp/input_event.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_INPUT_EVENT_H_
 #define PPAPI_CPP_INPUT_EVENT_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/chromium/ppapi/cpp/media_stream_audio_track.h b/chromium/ppapi/cpp/media_stream_audio_track.h
index 680e52b832e..869461a58af 100644
--- a/chromium/ppapi/cpp/media_stream_audio_track.h
+++ b/chromium/ppapi/cpp/media_stream_audio_track.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_MEDIA_STREAM_AUDIO_TRACK_H_
 #define PPAPI_CPP_MEDIA_STREAM_AUDIO_TRACK_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/c/ppb_media_stream_audio_track.h"
diff --git a/chromium/ppapi/cpp/media_stream_video_track.h b/chromium/ppapi/cpp/media_stream_video_track.h
index 5d03745f196..065d1d4f24a 100644
--- a/chromium/ppapi/cpp/media_stream_video_track.h
+++ b/chromium/ppapi/cpp/media_stream_video_track.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_MEDIA_STREAM_VIDEO_TRACK_H_
 #define PPAPI_CPP_MEDIA_STREAM_VIDEO_TRACK_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/c/ppb_media_stream_video_track.h"
diff --git a/chromium/ppapi/cpp/message_loop.h b/chromium/ppapi/cpp/message_loop.h
index 6ae374682ec..4df2dd72e36 100644
--- a/chromium/ppapi/cpp/message_loop.h
+++ b/chromium/ppapi/cpp/message_loop.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_MESSAGE_LOOP_H_
 #define PPAPI_CPP_MESSAGE_LOOP_H_
 
+#include <stdint.h>
+
 #include "ppapi/cpp/resource.h"
 
 /// @file
diff --git a/chromium/ppapi/cpp/network_list.h b/chromium/ppapi/cpp/network_list.h
index d479129442e..39043e964e9 100644
--- a/chromium/ppapi/cpp/network_list.h
+++ b/chromium/ppapi/cpp/network_list.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_NETWORK_LIST_H_
 #define PPAPI_CPP_NETWORK_LIST_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/chromium/ppapi/cpp/network_monitor.h b/chromium/ppapi/cpp/network_monitor.h
index bce731d90d2..c2dac4cdbee 100644
--- a/chromium/ppapi/cpp/network_monitor.h
+++ b/chromium/ppapi/cpp/network_monitor.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_NETWORK_MONITOR_H_
 #define PPAPI_CPP_NETWORK_MONITOR_H_
 
+#include <stdint.h>
+
 #include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/resource.h"
 
diff --git a/chromium/ppapi/cpp/network_proxy.h b/chromium/ppapi/cpp/network_proxy.h
index 25696de5a4b..26fd9e95d23 100644
--- a/chromium/ppapi/cpp/network_proxy.h
+++ b/chromium/ppapi/cpp/network_proxy.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_NETWORK_PROXY_H_
 #define PPAPI_CPP_NETWORK_PROXY_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/cpp/completion_callback.h"
diff --git a/chromium/ppapi/cpp/point.h b/chromium/ppapi/cpp/point.h
index c881bbd5506..028d050e7ad 100644
--- a/chromium/ppapi/cpp/point.h
+++ b/chromium/ppapi/cpp/point.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_POINT_H_
 #define PPAPI_CPP_POINT_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/pp_point.h"
 
 /// @file
diff --git a/chromium/ppapi/cpp/ppp_entrypoints.cc b/chromium/ppapi/cpp/ppp_entrypoints.cc
index e9e64573c1e..d345dabd5c5 100644
--- a/chromium/ppapi/cpp/ppp_entrypoints.cc
+++ b/chromium/ppapi/cpp/ppp_entrypoints.cc
@@ -7,9 +7,11 @@
 // plugin implementors can export their derivation of Module by just
 // linking to this implementation.
 
+#include <stdint.h>
+
+#include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb.h"
 #include "ppapi/c/ppp.h"
-#include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_embedder.h"
 
diff --git a/chromium/ppapi/cpp/private/camera_capabilities_private.cc b/chromium/ppapi/cpp/private/camera_capabilities_private.cc
index ad3d435e51e..d954027d48e 100644
--- a/chromium/ppapi/cpp/private/camera_capabilities_private.cc
+++ b/chromium/ppapi/cpp/private/camera_capabilities_private.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/cpp/private/camera_capabilities_private.h"
 
+#include <stdint.h>
+
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/cpp/instance_handle.h"
diff --git a/chromium/ppapi/cpp/private/camera_device_private.h b/chromium/ppapi/cpp/private/camera_device_private.h
index dce1e1b1747..d6c774eeb18 100644
--- a/chromium/ppapi/cpp/private/camera_device_private.h
+++ b/chromium/ppapi/cpp/private/camera_device_private.h
@@ -6,6 +6,8 @@
 #ifndef PPAPI_CPP_PRIVATE_CAMERA_DEVICE_PRIVATE_H_
 #define PPAPI_CPP_PRIVATE_CAMERA_DEVICE_PRIVATE_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/private/ppb_camera_device_private.h"
 #include "ppapi/cpp/resource.h"
 #include "ppapi/cpp/var.h"
diff --git a/chromium/ppapi/cpp/private/content_decryptor_private.h b/chromium/ppapi/cpp/private/content_decryptor_private.h
index 18d2367fc4b..765001d7c6c 100644
--- a/chromium/ppapi/cpp/private/content_decryptor_private.h
+++ b/chromium/ppapi/cpp/private/content_decryptor_private.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_
 #define PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/chromium/ppapi/cpp/private/ext_crx_file_system_private.h b/chromium/ppapi/cpp/private/ext_crx_file_system_private.h
index e307f91f0e8..2bd43f5c256 100644
--- a/chromium/ppapi/cpp/private/ext_crx_file_system_private.h
+++ b/chromium/ppapi/cpp/private/ext_crx_file_system_private.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_EXTENSION_CRX_FILE_SYSTEM_PRIVATE_H_
 #define PPAPI_CPP_PRIVATE_EXTENSION_CRX_FILE_SYSTEM_PRIVATE_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/file_system.h"
diff --git a/chromium/ppapi/cpp/private/find_private.h b/chromium/ppapi/cpp/private/find_private.h
index 268033b6218..897cd75eab8 100644
--- a/chromium/ppapi/cpp/private/find_private.h
+++ b/chromium/ppapi/cpp/private/find_private.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_FIND_PRIVATE_H_
 #define PPAPI_CPP_PRIVATE_FIND_PRIVATE_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/chromium/ppapi/cpp/private/flash_clipboard.h b/chromium/ppapi/cpp/private/flash_clipboard.h
index 0df6028cf5a..5b06e630b52 100644
--- a/chromium/ppapi/cpp/private/flash_clipboard.h
+++ b/chromium/ppapi/cpp/private/flash_clipboard.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_FLASH_CLIPBOARD_H_
 #define PPAPI_CPP_PRIVATE_FLASH_CLIPBOARD_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/chromium/ppapi/cpp/private/flash_device_id.h b/chromium/ppapi/cpp/private/flash_device_id.h
index 33c5e55652f..d285c47a3d6 100644
--- a/chromium/ppapi/cpp/private/flash_device_id.h
+++ b/chromium/ppapi/cpp/private/flash_device_id.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_FLASH_DEVICE_ID_H_
 #define PPAPI_CPP_PRIVATE_FLASH_DEVICE_ID_H_
 
+#include <stdint.h>
+
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/resource.h"
 
diff --git a/chromium/ppapi/cpp/private/flash_drm.h b/chromium/ppapi/cpp/private/flash_drm.h
index 2edddac1d52..5ac82bc89b4 100644
--- a/chromium/ppapi/cpp/private/flash_drm.h
+++ b/chromium/ppapi/cpp/private/flash_drm.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_FLASH_DRM_H_
 #define PPAPI_CPP_PRIVATE_FLASH_DRM_H_
 
+#include <stdint.h>
+
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/file_ref.h"
 #include "ppapi/cpp/resource.h"
diff --git a/chromium/ppapi/cpp/private/flash_file.h b/chromium/ppapi/cpp/private/flash_file.h
index 04ab195eeb3..1441c37db1c 100644
--- a/chromium/ppapi/cpp/private/flash_file.h
+++ b/chromium/ppapi/cpp/private/flash_file.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_FLASH_FILE_H_
 #define PPAPI_CPP_PRIVATE_FLASH_FILE_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/chromium/ppapi/cpp/private/flash_font_file.cc b/chromium/ppapi/cpp/private/flash_font_file.cc
index df11f57d741..30a5f666dfb 100644
--- a/chromium/ppapi/cpp/private/flash_font_file.cc
+++ b/chromium/ppapi/cpp/private/flash_font_file.cc
@@ -4,7 +4,6 @@
 
 #include "ppapi/cpp/private/flash_font_file.h"
 
-#include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/private/ppb_flash_font_file.h"
 #include "ppapi/c/trusted/ppb_browser_font_trusted.h"
 #include "ppapi/cpp/instance_handle.h"
@@ -18,6 +17,10 @@ template <> const char* interface_name<PPB_Flash_FontFile_0_1>() {
   return PPB_FLASH_FONTFILE_INTERFACE_0_1;
 }
 
+template <> const char* interface_name<PPB_Flash_FontFile_0_2>() {
+  return PPB_FLASH_FONTFILE_INTERFACE_0_2;
+}
+
 }  // namespace
 
 namespace flash {
@@ -28,7 +31,11 @@ FontFile::FontFile() {
 FontFile::FontFile(const InstanceHandle& instance,
                    const PP_BrowserFont_Trusted_Description* description,
                    PP_PrivateFontCharset charset) {
-  if (has_interface<PPB_Flash_FontFile_0_1>()) {
+  if (has_interface<PPB_Flash_FontFile_0_2>()) {
+    PassRefFromConstructor(get_interface<PPB_Flash_FontFile_0_2>()->Create(
+        instance.pp_instance(), description, charset));
+  }
+  else if (has_interface<PPB_Flash_FontFile_0_1>()) {
     PassRefFromConstructor(get_interface<PPB_Flash_FontFile_0_1>()->Create(
         instance.pp_instance(), description, charset));
   }
@@ -39,13 +46,24 @@ FontFile::~FontFile() {
 
 // static
 bool FontFile::IsAvailable() {
-  return has_interface<PPB_Flash_FontFile_0_1>();
+  return (has_interface<PPB_Flash_FontFile_0_2>() ||
+          has_interface<PPB_Flash_FontFile_0_1>());
+}
+
+bool FontFile::IsSupportedForWindows() {
+  if (has_interface<PPB_Flash_FontFile_0_2>())
+    return !!get_interface<PPB_Flash_FontFile_0_2>()->IsSupportedForWindows();
+  return false;
 }
 
 bool FontFile::GetFontTable(uint32_t table,
                             void* output,
                             uint32_t* output_length) {
-  if (has_interface<PPB_Flash_FontFile_0_1>()) {
+  if (has_interface<PPB_Flash_FontFile_0_2>()) {
+    return !!get_interface<PPB_Flash_FontFile_0_2>()->
+        GetFontTable(pp_resource(), table, output, output_length);
+  }
+  else if (has_interface<PPB_Flash_FontFile_0_1>()) {
     return !!get_interface<PPB_Flash_FontFile_0_1>()->
         GetFontTable(pp_resource(), table, output, output_length);
   }
diff --git a/chromium/ppapi/cpp/private/flash_font_file.h b/chromium/ppapi/cpp/private/flash_font_file.h
index 053fca25789..0c4aaa68680 100644
--- a/chromium/ppapi/cpp/private/flash_font_file.h
+++ b/chromium/ppapi/cpp/private/flash_font_file.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_FLASH_FONT_FILE_H_
 #define PPAPI_CPP_PRIVATE_FLASH_FONT_FILE_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/private/pp_private_font_charset.h"
 #include "ppapi/cpp/resource.h"
 
@@ -28,6 +30,9 @@ class FontFile : public Resource {
   // Returns true if the required interface is available.
   static bool IsAvailable();
 
+  // Returns true if this interface is supported for Windows.
+  bool IsSupportedForWindows();
+
   bool GetFontTable(uint32_t table, void* output, uint32_t* output_length);
 };
 
diff --git a/chromium/ppapi/cpp/private/flash_menu.h b/chromium/ppapi/cpp/private/flash_menu.h
index a0a7499a636..cadc97dcffa 100644
--- a/chromium/ppapi/cpp/private/flash_menu.h
+++ b/chromium/ppapi/cpp/private/flash_menu.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_FLASH_MENU_H_
 #define PPAPI_CPP_PRIVATE_FLASH_MENU_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/private/ppb_flash_menu.h"
 #include "ppapi/cpp/resource.h"
 
diff --git a/chromium/ppapi/cpp/private/isolated_file_system_private.h b/chromium/ppapi/cpp/private/isolated_file_system_private.h
index 88213d6cf16..2cbdc11e760 100644
--- a/chromium/ppapi/cpp/private/isolated_file_system_private.h
+++ b/chromium/ppapi/cpp/private/isolated_file_system_private.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_ISOLATED_FILE_SYSTEM_PRIVATE_H_
 #define PPAPI_CPP_PRIVATE_ISOLATED_FILE_SYSTEM_PRIVATE_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/private/ppb_isolated_file_system_private.h"
 #include "ppapi/cpp/completion_callback.h"
diff --git a/chromium/ppapi/cpp/private/output_protection_private.h b/chromium/ppapi/cpp/private/output_protection_private.h
index 6b543ea222f..2bcb2604ab1 100644
--- a/chromium/ppapi/cpp/private/output_protection_private.h
+++ b/chromium/ppapi/cpp/private/output_protection_private.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_OUTPUT_PROTECTION_PRIVATE_H_
 #define PPAPI_CPP_PRIVATE_OUTPUT_PROTECTION_PRIVATE_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/private/ppb_output_protection_private.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/resource.h"
diff --git a/chromium/ppapi/cpp/private/pdf.h b/chromium/ppapi/cpp/private/pdf.h
index 7e772709bef..755c9c32faa 100644
--- a/chromium/ppapi/cpp/private/pdf.h
+++ b/chromium/ppapi/cpp/private/pdf.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_PDF_H_
 #define PPAPI_CPP_PRIVATE_PDF_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/c/private/ppb_pdf.h"
diff --git a/chromium/ppapi/cpp/private/platform_verification.h b/chromium/ppapi/cpp/private/platform_verification.h
index 166077a8289..a9f73fa2472 100644
--- a/chromium/ppapi/cpp/private/platform_verification.h
+++ b/chromium/ppapi/cpp/private/platform_verification.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_PLATFORM_VERIFICATION_H_
 #define PPAPI_CPP_PRIVATE_PLATFORM_VERIFICATION_H_
 
+#include <stdint.h>
+
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/resource.h"
 
diff --git a/chromium/ppapi/cpp/private/uma_private.h b/chromium/ppapi/cpp/private/uma_private.h
index 78d526d82be..b9ba156695d 100644
--- a/chromium/ppapi/cpp/private/uma_private.h
+++ b/chromium/ppapi/cpp/private/uma_private.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_UMA_PRIVATE_H_
 #define PPAPI_CPP_PRIVATE_UMA_PRIVATE_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/c/pp_instance.h"
diff --git a/chromium/ppapi/cpp/private/var_private.cc b/chromium/ppapi/cpp/private/var_private.cc
index ff61226d582..0dbe2dc1794 100644
--- a/chromium/ppapi/cpp/private/var_private.cc
+++ b/chromium/ppapi/cpp/private/var_private.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/cpp/private/var_private.h"
 
+#include <stddef.h>
+
 #include "ppapi/c/dev/ppb_memory_dev.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/cpp/instance_handle.h"
diff --git a/chromium/ppapi/cpp/private/var_private.h b/chromium/ppapi/cpp/private/var_private.h
index 7cc0e31dccf..63522ca00d3 100644
--- a/chromium/ppapi/cpp/private/var_private.h
+++ b/chromium/ppapi/cpp/private/var_private.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_VAR_PRIVATE_H_
 #define PPAPI_CPP_PRIVATE_VAR_PRIVATE_H_
 
+#include <stdint.h>
+
 #include "ppapi/cpp/var.h"
 
 namespace pp {
diff --git a/chromium/ppapi/cpp/private/video_destination_private.h b/chromium/ppapi/cpp/private/video_destination_private.h
index a9364850901..7e2bd5b6179 100644
--- a/chromium/ppapi/cpp/private/video_destination_private.h
+++ b/chromium/ppapi/cpp/private/video_destination_private.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_VIDEO_DESTINATION_PRIVATE_H_
 #define PPAPI_CPP_PRIVATE_VIDEO_DESTINATION_PRIVATE_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/c/pp_time.h"
diff --git a/chromium/ppapi/cpp/private/video_source_private.h b/chromium/ppapi/cpp/private/video_source_private.h
index 487703ed103..b62e0305e11 100644
--- a/chromium/ppapi/cpp/private/video_source_private.h
+++ b/chromium/ppapi/cpp/private/video_source_private.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_PRIVATE_VIDEO_SOURCE_PRIVATE_H_
 #define PPAPI_CPP_PRIVATE_VIDEO_SOURCE_PRIVATE_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/c/pp_time.h"
diff --git a/chromium/ppapi/cpp/rect.h b/chromium/ppapi/cpp/rect.h
index 15bb1f5205c..7973a83d805 100644
--- a/chromium/ppapi/cpp/rect.h
+++ b/chromium/ppapi/cpp/rect.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_RECT_H_
 #define PPAPI_CPP_RECT_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/pp_rect.h"
 #include "ppapi/cpp/point.h"
 #include "ppapi/cpp/size.h"
diff --git a/chromium/ppapi/cpp/tcp_socket.h b/chromium/ppapi/cpp/tcp_socket.h
index 578e08fac22..84981e7d502 100644
--- a/chromium/ppapi/cpp/tcp_socket.h
+++ b/chromium/ppapi/cpp/tcp_socket.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_TCP_SOCKET_H_
 #define PPAPI_CPP_TCP_SOCKET_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_tcp_socket.h"
 #include "ppapi/cpp/net_address.h"
 #include "ppapi/cpp/pass_ref.h"
diff --git a/chromium/ppapi/cpp/text_input_controller.h b/chromium/ppapi/cpp/text_input_controller.h
index 8843bd362f2..69b11209c7b 100644
--- a/chromium/ppapi/cpp/text_input_controller.h
+++ b/chromium/ppapi/cpp/text_input_controller.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_TEXT_INPUT_CONTROLLER_H_
 #define PPAPI_CPP_TEXT_INPUT_CONTROLLER_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/c/ppb_text_input_controller.h"
diff --git a/chromium/ppapi/cpp/touch_point.h b/chromium/ppapi/cpp/touch_point.h
index 0868061d2e4..66c512ba7d5 100644
--- a/chromium/ppapi/cpp/touch_point.h
+++ b/chromium/ppapi/cpp/touch_point.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_TOUCH_POINT_H_
 #define PPAPI_CPP_TOUCH_POINT_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_input_event.h"
 #include "ppapi/cpp/input_event.h"
 #include "ppapi/cpp/point.h"
diff --git a/chromium/ppapi/cpp/trusted/browser_font_trusted.cc b/chromium/ppapi/cpp/trusted/browser_font_trusted.cc
index 5d474699825..869f8bb6faf 100644
--- a/chromium/ppapi/cpp/trusted/browser_font_trusted.cc
+++ b/chromium/ppapi/cpp/trusted/browser_font_trusted.cc
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/point.h"
@@ -20,29 +19,6 @@ namespace {
 template <> const char* interface_name<PPB_BrowserFont_Trusted_1_0>() {
   return PPB_BROWSERFONT_TRUSTED_INTERFACE_1_0;
 }
-template <> const char* interface_name<PPB_Font_Dev_0_6>() {
-  return PPB_FONT_DEV_INTERFACE_0_6;
-}
-
-// This class provides backwards compat for PPB_Font, which is binary
-// compatible with the BrowserFont interface.
-// TODO(brettw) remove PPB_Font altogether when Flash is updated.
-const PP_FontDescription_Dev* BrowserFontDescToFontDesc(
-    const PP_BrowserFont_Trusted_Description* desc) {
-  return reinterpret_cast<const PP_FontDescription_Dev*>(desc);
-}
-PP_FontDescription_Dev* BrowserFontDescToFontDesc(
-    PP_BrowserFont_Trusted_Description* desc) {
-  return reinterpret_cast<PP_FontDescription_Dev*>(desc);
-}
-PP_FontMetrics_Dev* BrowserFontMetricsToFontMetrics(
-    PP_BrowserFont_Trusted_Metrics* metrics) {
-  return reinterpret_cast<PP_FontMetrics_Dev*>(metrics);
-}
-const PP_TextRun_Dev* BrowserFontTextRunToFontTextRun(
-    const PP_BrowserFont_Trusted_TextRun* run) {
-  return reinterpret_cast<const PP_TextRun_Dev*>(run);
-}
 
 }  // namespace
 
@@ -137,10 +113,6 @@ BrowserFont_Trusted::BrowserFont_Trusted(
     PassRefFromConstructor(get_interface<PPB_BrowserFont_Trusted_1_0>()->Create(
         instance.pp_instance(),
         &description.pp_font_description()));
-  } else if (!has_interface<PPB_Font_Dev_0_6>()) {
-    PassRefFromConstructor(get_interface<PPB_Font_Dev_0_6>()->Create(
-        instance.pp_instance(),
-        BrowserFontDescToFontDesc(&description.pp_font_description())));
   }
 }
 
@@ -156,10 +128,11 @@ BrowserFont_Trusted& BrowserFont_Trusted::operator=(
 
 // static
 Var BrowserFont_Trusted::GetFontFamilies(const InstanceHandle& instance) {
-  if (!has_interface<PPB_Font_Dev_0_6>())
+  if (!has_interface<PPB_BrowserFont_Trusted_1_0>())
     return Var();
+
   return Var(PASS_REF,
-             get_interface<PPB_Font_Dev_0_6>()->GetFontFamilies(
+             get_interface<PPB_BrowserFont_Trusted_1_0>()->GetFontFamilies(
                  instance.pp_instance()));
 }
 
@@ -172,12 +145,6 @@ bool BrowserFont_Trusted::Describe(
     if (!get_interface<PPB_BrowserFont_Trusted_1_0>()->Describe(
         pp_resource(), &description->pp_font_description_, metrics))
       return false;
-  } else if (!has_interface<PPB_Font_Dev_0_6>()) {
-    if (!get_interface<PPB_Font_Dev_0_6>()->Describe(
-        pp_resource(),
-        BrowserFontDescToFontDesc(&description->pp_font_description_),
-        BrowserFontMetricsToFontMetrics(metrics)))
-      return false;
   }
   description->face_ = Var(PASS_REF,
                            description->pp_font_description_.face);
@@ -199,15 +166,6 @@ bool BrowserFont_Trusted::DrawTextAt(ImageData* dest,
         color,
         &clip.pp_rect(),
         PP_FromBool(image_data_is_opaque)));
-  } else if (!has_interface<PPB_Font_Dev_0_6>()) {
-    return PP_ToBool(get_interface<PPB_Font_Dev_0_6>()->DrawTextAt(
-        pp_resource(),
-        dest->pp_resource(),
-        BrowserFontTextRunToFontTextRun(&text.pp_text_run()),
-        &position.pp_point(),
-        color,
-        &clip.pp_rect(),
-        PP_FromBool(image_data_is_opaque)));
   }
   return false;
 }
@@ -217,10 +175,6 @@ int32_t BrowserFont_Trusted::MeasureText(const BrowserFontTextRun& text) const {
     return get_interface<PPB_BrowserFont_Trusted_1_0>()->MeasureText(
         pp_resource(),
         &text.pp_text_run());
-  } else if (!has_interface<PPB_Font_Dev_0_6>()) {
-    return get_interface<PPB_Font_Dev_0_6>()->MeasureText(
-        pp_resource(),
-        BrowserFontTextRunToFontTextRun(&text.pp_text_run()));
   }
   return -1;
 }
@@ -234,11 +188,6 @@ uint32_t BrowserFont_Trusted::CharacterOffsetForPixel(
             pp_resource(),
             &text.pp_text_run(),
             pixel_position);
-  } else if (!has_interface<PPB_Font_Dev_0_6>()) {
-    return get_interface<PPB_Font_Dev_0_6>()->CharacterOffsetForPixel(
-        pp_resource(),
-        BrowserFontTextRunToFontTextRun(&text.pp_text_run()),
-        pixel_position);
   }
   return 0;
 }
@@ -252,11 +201,6 @@ int32_t BrowserFont_Trusted::PixelOffsetForCharacter(
            pp_resource(),
            &text.pp_text_run(),
            char_offset);
-  } else if (!has_interface<PPB_Font_Dev_0_6>()) {
-    return get_interface<PPB_Font_Dev_0_6>()->PixelOffsetForCharacter(
-        pp_resource(),
-        BrowserFontTextRunToFontTextRun(&text.pp_text_run()),
-        char_offset);
   }
   return 0;
 }
diff --git a/chromium/ppapi/cpp/trusted/browser_font_trusted.h b/chromium/ppapi/cpp/trusted/browser_font_trusted.h
index 7225b269ee5..c3bef772099 100644
--- a/chromium/ppapi/cpp/trusted/browser_font_trusted.h
+++ b/chromium/ppapi/cpp/trusted/browser_font_trusted.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_TRUSTED_BROWSER_FONT_TRUSTED_H_
 #define PPAPI_CPP_TRUSTED_BROWSER_FONT_TRUSTED_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/c/trusted/ppb_browser_font_trusted.h"
diff --git a/chromium/ppapi/cpp/trusted/file_chooser_trusted.h b/chromium/ppapi/cpp/trusted/file_chooser_trusted.h
index cdb70b0be68..dfd7c58c7ae 100644
--- a/chromium/ppapi/cpp/trusted/file_chooser_trusted.h
+++ b/chromium/ppapi/cpp/trusted/file_chooser_trusted.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_TRUSTED_FILE_CHOOSER_TRUSTED_H_
 #define PPAPI_CPP_TRUSTED_FILE_CHOOSER_TRUSTED_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "ppapi/cpp/dev/file_chooser_dev.h"
diff --git a/chromium/ppapi/cpp/udp_socket.h b/chromium/ppapi/cpp/udp_socket.h
index 69e906ff209..2de376698d9 100644
--- a/chromium/ppapi/cpp/udp_socket.h
+++ b/chromium/ppapi/cpp/udp_socket.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_UDP_SOCKET_H_
 #define PPAPI_CPP_UDP_SOCKET_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_udp_socket.h"
 #include "ppapi/cpp/net_address.h"
 #include "ppapi/cpp/pass_ref.h"
diff --git a/chromium/ppapi/cpp/url_request_info.h b/chromium/ppapi/cpp/url_request_info.h
index c476be480ff..2710d876ddc 100644
--- a/chromium/ppapi/cpp/url_request_info.h
+++ b/chromium/ppapi/cpp/url_request_info.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_URL_REQUEST_INFO_H_
 #define PPAPI_CPP_URL_REQUEST_INFO_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_url_request_info.h"
 #include "ppapi/cpp/resource.h"
 #include "ppapi/cpp/var.h"
diff --git a/chromium/ppapi/cpp/url_response_info.h b/chromium/ppapi/cpp/url_response_info.h
index f9e60cfb828..727b72027d7 100644
--- a/chromium/ppapi/cpp/url_response_info.h
+++ b/chromium/ppapi/cpp/url_response_info.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_URL_RESPONSE_INFO_H_
 #define PPAPI_CPP_URL_RESPONSE_INFO_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_url_response_info.h"
 #include "ppapi/cpp/resource.h"
 #include "ppapi/cpp/var.h"
diff --git a/chromium/ppapi/cpp/var.cc b/chromium/ppapi/cpp/var.cc
index e16b0e40668..bd5844c5457 100644
--- a/chromium/ppapi/cpp/var.cc
+++ b/chromium/ppapi/cpp/var.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/cpp/var.h"
 
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/chromium/ppapi/cpp/var.h b/chromium/ppapi/cpp/var.h
index a79f3c4f3e2..1b2435606a2 100644
--- a/chromium/ppapi/cpp/var.h
+++ b/chromium/ppapi/cpp/var.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_VAR_H_
 #define PPAPI_CPP_VAR_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
@@ -164,7 +166,7 @@ class Var {
 
   /// This function determines if this <code>Var</code> is a number.
   ///
-  /// @return true if this <code>Var</code> is an int32 or double number,
+  /// @return true if this <code>Var</code> is an int32_t or double number,
   /// otherwise false.
   bool is_number() const {
     return var_.type == PP_VARTYPE_INT32 ||
diff --git a/chromium/ppapi/cpp/var_array_buffer.h b/chromium/ppapi/cpp/var_array_buffer.h
index 7d1f9ad48c4..54b9395744f 100644
--- a/chromium/ppapi/cpp/var_array_buffer.h
+++ b/chromium/ppapi/cpp/var_array_buffer.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_VAR_ARRAY_BUFFER_H_
 #define PPAPI_CPP_VAR_ARRAY_BUFFER_H_
 
+#include <stdint.h>
+
 #include "ppapi/cpp/var.h"
 
 /// @file
diff --git a/chromium/ppapi/cpp/video_decoder.h b/chromium/ppapi/cpp/video_decoder.h
index 50b0ea2596e..dda74c766b4 100644
--- a/chromium/ppapi/cpp/video_decoder.h
+++ b/chromium/ppapi/cpp/video_decoder.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_VIDEO_DECODER_H_
 #define PPAPI_CPP_VIDEO_DECODER_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/pp_codecs.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/cpp/completion_callback.h"
diff --git a/chromium/ppapi/cpp/video_encoder.cc b/chromium/ppapi/cpp/video_encoder.cc
index 969fc1ff951..eab719ffc96 100644
--- a/chromium/ppapi/cpp/video_encoder.cc
+++ b/chromium/ppapi/cpp/video_encoder.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/cpp/video_encoder.h"
 
+#include <stddef.h>
+
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_video_encoder.h"
 #include "ppapi/cpp/completion_callback.h"
diff --git a/chromium/ppapi/cpp/video_encoder.h b/chromium/ppapi/cpp/video_encoder.h
index e3b3d3e60a4..1a801850669 100644
--- a/chromium/ppapi/cpp/video_encoder.h
+++ b/chromium/ppapi/cpp/video_encoder.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_VIDEO_ENCODER_H_
 #define PPAPI_CPP_VIDEO_ENCODER_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/pp_codecs.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/cpp/completion_callback.h"
diff --git a/chromium/ppapi/cpp/video_frame.h b/chromium/ppapi/cpp/video_frame.h
index d456158f462..05cfcff0322 100644
--- a/chromium/ppapi/cpp/video_frame.h
+++ b/chromium/ppapi/cpp/video_frame.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_VIDEO_FRAME_H_
 #define PPAPI_CPP_VIDEO_FRAME_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_video_frame.h"
 #include "ppapi/cpp/resource.h"
 #include "ppapi/cpp/size.h"
diff --git a/chromium/ppapi/cpp/websocket.h b/chromium/ppapi/cpp/websocket.h
index 0c72dc0eda9..c1c78b0d267 100644
--- a/chromium/ppapi/cpp/websocket.h
+++ b/chromium/ppapi/cpp/websocket.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_CPP_WEBSOCKET_H_
 #define PPAPI_CPP_WEBSOCKET_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_websocket.h"
 #include "ppapi/cpp/resource.h"