Rename PPB_Font to PPB_BrowserFont_Trusted.

ppapi/example/example.cc

 // 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.
 
 #include <math.h>
 #include <stdio.h>  // FIXME(brettw) erase me.
 #ifndef _WIN32
 #include <sys/time.h>
 #else
 #include <windows.h>
@@ skipping 13 matching lines @@
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/input_event.h"
 #include "ppapi/cpp/private/instance_private.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/private/var_private.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/cpp/url_loader.h"
 #include "ppapi/cpp/url_request_info.h"
 #include "ppapi/cpp/var.h"
-#include "ppapi/cpp/view.h"
-#include "ppapi/utility/completion_callback_factory.h"
 
 static const int kStepsPerCircle = 800;
 
 void FlushCallback(void* data, int32_t result);
 
 void FillRect(pp::ImageData* image, int left, int top, int width, int height,
               uint32_t color) {
   for (int y = std::max(0, top);
        y < std::min(image->size().height() - 1, top + height);
        y++) {
@@ skipping 46 matching lines @@
  public:
   virtual void DidFetch(bool success, const std::string& data) = 0;
 };
 
 class MyFetcher {
  public:
   MyFetcher() : client_(NULL) {
     callback_factory_.Initialize(this);
   }
 
-  void Start(pp::InstancePrivate& instance,
+  void Start(const pp::InstancePrivate& instance,
              const pp::Var& url,
              MyFetcherClient* client) {
-    pp::URLRequestInfo request(&instance);
+    pp::URLRequestInfo request;
     request.SetURL(url);
     request.SetMethod("GET");
 
     loader_ = pp::URLLoader(instance);
     client_ = client;
 
     pp::CompletionCallback callback =
         callback_factory_.NewOptionalCallback(&MyFetcher::DidOpen);
     int rv = loader_.Open(request, callback);
     if (rv != PP_OK_COMPLETIONPENDING)
@@ skipping 45 matching lines @@
   char buf_[4096];
   std::string data_;
 };
 
 class MyInstance : public pp::InstancePrivate, public MyFetcherClient {
  public:
   MyInstance(PP_Instance instance)
       : pp::InstancePrivate(instance),
         time_at_last_check_(0.0),
         fetcher_(NULL),
+        width_(0),
+        height_(0),
         animation_counter_(0),
         print_settings_valid_(false),
-        showing_custom_cursor_(false),
-        cursor_dimension_(50),
-        expanding_cursor_(false) {
+        showing_custom_cursor_(false) {
     RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE);
   }
 
   virtual ~MyInstance() {
     if (fetcher_) {
       delete fetcher_;
       fetcher_ = NULL;
     }
   }
 
@@ skipping 27 matching lines @@
         return true;
       default:
         return false;
     }
   }
 
   virtual pp::Var GetInstanceObject() {
     return pp::VarPrivate(this, new MyScriptableObject(this));
   }
 
-  pp::ImageData PaintImage(const pp::Size& size) {
-    pp::ImageData image(this, PP_IMAGEDATAFORMAT_BGRA_PREMUL, size, false);
+  pp::ImageData PaintImage(int width, int height) {
+    pp::ImageData image(this, PP_IMAGEDATAFORMAT_BGRA_PREMUL,
+                        pp::Size(width, height), false);
     if (image.is_null()) {
-      printf("Couldn't allocate the image data.");
+      printf("Couldn't allocate the image data: %d, %d\n", width, height);
       return image;
     }
 
     // Fill with semitransparent gradient.
     for (int y = 0; y < image.size().height(); y++) {
       char* row = &static_cast<char*>(image.data())[y * image.stride()];
       for (int x = 0; x < image.size().width(); x++) {
         row[x * 4 + 0] = y;
         row[x * 4 + 1] = y;
         row[x * 4 + 2] = 0;
         row[x * 4 + 3] = y;
       }
     }
 
     // Draw the orbiting box.
     float radians = static_cast<float>(animation_counter_) / kStepsPerCircle *
         2 * 3.14159265358979F;
 
-    float radius =
-        static_cast<float>(std::min(size.width(), size.height())) / 2.0f - 3.0f;
+    float radius = static_cast<float>(std::min(width, height)) / 2.0f - 3.0f;
     int x = static_cast<int>(cos(radians) * radius + radius + 2);
     int y = static_cast<int>(sin(radians) * radius + radius + 2);
 
     const uint32_t box_bgra = 0x80000000;  // Alpha 50%.
     FillRect(&image, x - 3, y - 3, 7, 7, box_bgra);
     return image;
   }
 
   void Paint() {
-    pp::ImageData image = PaintImage(device_context_.size());
+    pp::ImageData image = PaintImage(width_, height_);
     if (!image.is_null()) {
       device_context_.ReplaceContents(&image);
       device_context_.Flush(pp::CompletionCallback(&FlushCallback, this));
     } else {
-      printf("NullImage\n");
+      printf("NullImage: %d, %d\n", width_, height_);
     }
   }
 
-  virtual void DidChangeView(const pp::View& view) {
+  virtual void DidChangeView(const pp::Rect& position, const pp::Rect& clip) {
     Log(PP_LOGLEVEL_LOG, "DidChangeView");
-    if (view.GetRect().size() == current_view_.GetRect().size())
+    if (position.size().width() == width_ &&
+        position.size().height() == height_)
       return;  // We don't care about the position, only the size.
-    current_view_ = view;
 
+    width_ = position.size().width();
+    height_ = position.size().height();
     printf("DidChangeView relevant change: width=%d height:%d\n",
-           view.GetRect().width(), view.GetRect().height());
+           width_, height_);
 
-    device_context_ = pp::Graphics2D(this, view.GetRect().size(), false);
+    device_context_ = pp::Graphics2D(this, pp::Size(width_, height_), false);
     if (!BindGraphics(device_context_)) {
       printf("Couldn't bind the device context\n");
       return;
     }
 
     Paint();
   }
 
 #if defined(_WIN32)
 struct timeval {
@@ skipping 36 matching lines @@
       char fps_text[64];
       sprintf(fps_text, "%g fps",
               kStepsPerCircle / (time_now - time_at_last_check_));
       fps.SetProperty("innerHTML", fps_text);
     }
 
     time_at_last_check_ = time_now;
   }
 
   // Print interfaces.
-  virtual uint32_t QuerySupportedPrintOutputFormats() {
-    return PP_PRINTOUTPUTFORMAT_RASTER;
+  // TODO(mball,dmichael) Replace this with the PPP_PRINTING_DEV_USE_0_4 version
+  virtual PP_PrintOutputFormat_Dev* QuerySupportedPrintOutputFormats(
+      uint32_t* format_count) {
+    pp::Memory_Dev memory;
+    PP_PrintOutputFormat_Dev* format =
+        static_cast<PP_PrintOutputFormat_Dev*>(
+            memory.MemAlloc(sizeof(PP_PrintOutputFormat_Dev)));
+    *format = PP_PRINTOUTPUTFORMAT_RASTER;
+    *format_count = 1;
+    return format;
   }
 
   virtual int32_t PrintBegin(const PP_PrintSettings_Dev& print_settings) {
     if (print_settings_.format != PP_PRINTOUTPUTFORMAT_RASTER)
       return 0;
 
     print_settings_ = print_settings;
     print_settings_valid_ = true;
     return 1;
   }
 
   virtual pp::Resource PrintPages(
       const PP_PrintPageNumberRange_Dev* page_ranges,
       uint32_t page_range_count) {
     if (!print_settings_valid_)
       return pp::Resource();
 
     if (page_range_count != 1)
       return pp::Resource();
 
     // Check if the page numbers are valid. We returned 1 in PrintBegin so we
     // only have 1 page to print.
     if (page_ranges[0].first_page_number || page_ranges[0].last_page_number) {
       return pp::Resource();
     }
 
-    pp::Size size(static_cast<int>(
-            (print_settings_.printable_area.size.width / 72.0) *
-             print_settings_.dpi),
-        static_cast<int>(
-            (print_settings_.printable_area.size.height / 72.0) *
-             print_settings_.dpi));
-    return PaintImage(size);
+    int width = static_cast<int>(
+        (print_settings_.printable_area.size.width / 72.0) *
+         print_settings_.dpi);
+    int height = static_cast<int>(
+        (print_settings_.printable_area.size.height / 72.0) *
+         print_settings_.dpi);
+
+    return PaintImage(width, height);
   }
 
   virtual void PrintEnd() {
     print_settings_valid_ = false;
   }
 
-  virtual bool IsScalingDisabled() {
-    return false;
-  }
-
   void OnFlush() {
     if (animation_counter_ % kStepsPerCircle == 0)
       UpdateFps();
     animation_counter_++;
     Paint();
-    if (showing_custom_cursor_)
-      SetCursor();
   }
 
  private:
   void SayHello() {
     pp::VarPrivate window = GetWindowObject();
     pp::VarPrivate doc = window.GetProperty("document");
     pp::VarPrivate body = doc.GetProperty("body");
 
     pp::VarPrivate obj(this, new MyScriptableObject(this));
 
@@ skipping 27 matching lines @@
     if (success) {
       Log(PP_LOGLEVEL_LOG, data);
     } else {
       Log(PP_LOGLEVEL_ERROR, "Failed to download.");
     }
     delete fetcher_;
     fetcher_ = NULL;
   }
 
   void ToggleCursor() {
-    showing_custom_cursor_ = !showing_custom_cursor_;
-    SetCursor();
-  }
-
-  void SetCursor() {
     const PPB_CursorControl_Dev* cursor_control =
         reinterpret_cast<const PPB_CursorControl_Dev*>(
             pp::Module::Get()->GetBrowserInterface(
                 PPB_CURSOR_CONTROL_DEV_INTERFACE));
     if (!cursor_control)
       return;
 
-    if (!showing_custom_cursor_) {
+    if (showing_custom_cursor_) {
       cursor_control->SetCursor(pp_instance(), PP_CURSORTYPE_POINTER, 0, NULL);
     } else {
       pp::ImageData image_data(this, pp::ImageData::GetNativeImageDataFormat(),
-                               pp::Size(cursor_dimension_, cursor_dimension_),
-                               false);
-      FillRect(&image_data, 0, 0, cursor_dimension_, cursor_dimension_,
+                               pp::Size(50, 50), false);
+      FillRect(&image_data, 0, 0, 50, 50,
                image_data.format() == PP_IMAGEDATAFORMAT_BGRA_PREMUL ?
                    0x80800000 : 0x80000080);
-      pp::Point hot_spot(cursor_dimension_ / 2, cursor_dimension_ / 2);
+      pp::Point hot_spot(0, 0);
       cursor_control->SetCursor(pp_instance(), PP_CURSORTYPE_CUSTOM,
                                 image_data.pp_resource(), &hot_spot.pp_point());
-      if (expanding_cursor_) {
-        if (++cursor_dimension_ >= 50)
-          expanding_cursor_ = false;
-      } else {
-        if (--cursor_dimension_ <= 5)
-          expanding_cursor_ = true;
-      }
     }
+
+    showing_custom_cursor_ = !showing_custom_cursor_;
   }
 
   pp::Var console_;
   pp::Graphics2D device_context_;
 
   double time_at_last_check_;
 
-  pp::View current_view_;
+  MyFetcher* fetcher_;
 
-  MyFetcher* fetcher_;
+  int width_;
+  int height_;
 
   // Incremented for each flush we get.
   int animation_counter_;
   bool print_settings_valid_;
   PP_PrintSettings_Dev print_settings_;
 
   bool showing_custom_cursor_;
-  int cursor_dimension_;
-  bool expanding_cursor_;
 };
 
 void FlushCallback(void* data, int32_t result) {
   static_cast<MyInstance*>(data)->OnFlush();
 }
 
 class MyModule : public pp::Module {
  public:
   MyModule() : pp::Module() {}
   virtual ~MyModule() {}
 
   virtual pp::Instance* CreateInstance(PP_Instance instance) {
     return new MyInstance(instance);
   }
 };
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new MyModule();
 }
 
 }  // namespace pp