Merge to XFA: Fix behaviour of app.alert() with a single object argument.

samples/pdfium_test.cc

 // 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 <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <list>
@@ skipping 177 matching lines @@
   // If a PS_NULL pen is used, the dimensions of the rectangle are 1 pixel less.
   Rectangle(dc, 0, 0, width + 1, height + 1);
 
   FPDF_RenderPage(dc, page, 0, 0, width, height, 0,
                   FPDF_ANNOT | FPDF_PRINTING | FPDF_NO_CATCH);
 
   DeleteEnhMetaFile(CloseEnhMetaFile(dc));
 }
 #endif
 
-int ExampleAppAlert(IPDF_JSPLATFORM*, FPDF_WIDESTRING msg, FPDF_WIDESTRING,
-                    int, int) {
-  std::wstring platform_string = GetPlatformWString(msg);
-  printf("Alert: %ls\n", platform_string.c_str());
+int ExampleAppAlert(IPDF_JSPLATFORM*,
+                    FPDF_WIDESTRING msg,
+                    FPDF_WIDESTRING title,
+                    int nType,
+                    int nIcon) {
+  printf("%ls", GetPlatformWString(title).c_str());
+  if (nIcon || nType)
+    printf("[icon=%d,type=%d]", nIcon, nType);
+  printf(": %ls\n", GetPlatformWString(msg).c_str());
   return 0;
 }
 
 void ExampleDocGotoPage(IPDF_JSPLATFORM*, int pageNumber) {
   printf("Goto Page: %d\n", pageNumber);
 }
 
 void ExampleUnsupportedHandler(UNSUPPORT_INFO*, int type) {
   std::string feature = "Unknown";
   switch (type) {
@@ skipping 439 matching lines @@
   }
 
   FPDF_DestroyLibrary();
 #ifdef PDF_ENABLE_V8
   v8::V8::ShutdownPlatform();
   delete platform;
 #endif  // PDF_ENABLE_V8
 
   return 0;
 }