summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ppapi/c/private/ppb_pdf.h11
-rw-r--r--webkit/glue/resources/pdf_progress_0.pngbin0 -> 2940 bytes
-rw-r--r--webkit/glue/resources/pdf_progress_1.pngbin0 -> 3098 bytes
-rw-r--r--webkit/glue/resources/pdf_progress_2.pngbin0 -> 3041 bytes
-rw-r--r--webkit/glue/resources/pdf_progress_3.pngbin0 -> 3206 bytes
-rw-r--r--webkit/glue/resources/pdf_progress_4.pngbin0 -> 3126 bytes
-rw-r--r--webkit/glue/resources/pdf_progress_5.pngbin0 -> 3181 bytes
-rw-r--r--webkit/glue/resources/pdf_progress_6.pngbin0 -> 3152 bytes
-rw-r--r--webkit/glue/resources/pdf_progress_7.pngbin0 -> 3271 bytes
-rw-r--r--webkit/glue/resources/pdf_progress_8.pngbin0 -> 3169 bytes
-rw-r--r--webkit/glue/resources/pdf_progress_background.pngbin0 -> 704 bytes
-rw-r--r--webkit/glue/webkit_resources.grd10
-rw-r--r--webkit/glue/webkit_strings.grd4
-rw-r--r--webkit/plugins/ppapi/ppb_pdf_impl.cc13
14 files changed, 38 insertions, 0 deletions
diff --git a/ppapi/c/private/ppb_pdf.h b/ppapi/c/private/ppb_pdf.h
index 286a782..a84a763f 100644
--- a/ppapi/c/private/ppb_pdf.h
+++ b/ppapi/c/private/ppb_pdf.h
@@ -19,6 +19,7 @@ typedef enum {
PP_RESOURCESTRING_PDFGETPASSWORD = 0,
PP_RESOURCESTRING_PDFLOADING = 1,
PP_RESOURCESTRING_PDFLOAD_FAILED = 2,
+ PP_RESOURCESTRING_PDFPROGRESSLOADING = 3,
} PP_ResourceString;
typedef enum {
@@ -45,6 +46,16 @@ typedef enum {
PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_8 = 20,
PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_9 = 21,
PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_NUM_BACKGROUND = 22,
+ PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_0 = 23,
+ PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_1 = 24,
+ PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_2 = 25,
+ PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_3 = 26,
+ PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_4 = 27,
+ PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_5 = 28,
+ PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_6 = 29,
+ PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_7 = 30,
+ PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_8 = 31,
+ PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_BACKGROUND = 32,
} PP_ResourceImage;
typedef enum {
diff --git a/webkit/glue/resources/pdf_progress_0.png b/webkit/glue/resources/pdf_progress_0.png
new file mode 100644
index 0000000..2491af2
--- /dev/null
+++ b/webkit/glue/resources/pdf_progress_0.png
Binary files differ
diff --git a/webkit/glue/resources/pdf_progress_1.png b/webkit/glue/resources/pdf_progress_1.png
new file mode 100644
index 0000000..bf08864
--- /dev/null
+++ b/webkit/glue/resources/pdf_progress_1.png
Binary files differ
diff --git a/webkit/glue/resources/pdf_progress_2.png b/webkit/glue/resources/pdf_progress_2.png
new file mode 100644
index 0000000..10c03f7
--- /dev/null
+++ b/webkit/glue/resources/pdf_progress_2.png
Binary files differ
diff --git a/webkit/glue/resources/pdf_progress_3.png b/webkit/glue/resources/pdf_progress_3.png
new file mode 100644
index 0000000..deff53f
--- /dev/null
+++ b/webkit/glue/resources/pdf_progress_3.png
Binary files differ
diff --git a/webkit/glue/resources/pdf_progress_4.png b/webkit/glue/resources/pdf_progress_4.png
new file mode 100644
index 0000000..82d9a2f
--- /dev/null
+++ b/webkit/glue/resources/pdf_progress_4.png
Binary files differ
diff --git a/webkit/glue/resources/pdf_progress_5.png b/webkit/glue/resources/pdf_progress_5.png
new file mode 100644
index 0000000..9b57a69
--- /dev/null
+++ b/webkit/glue/resources/pdf_progress_5.png
Binary files differ
diff --git a/webkit/glue/resources/pdf_progress_6.png b/webkit/glue/resources/pdf_progress_6.png
new file mode 100644
index 0000000..9674132
--- /dev/null
+++ b/webkit/glue/resources/pdf_progress_6.png
Binary files differ
diff --git a/webkit/glue/resources/pdf_progress_7.png b/webkit/glue/resources/pdf_progress_7.png
new file mode 100644
index 0000000..d5e2464
--- /dev/null
+++ b/webkit/glue/resources/pdf_progress_7.png
Binary files differ
diff --git a/webkit/glue/resources/pdf_progress_8.png b/webkit/glue/resources/pdf_progress_8.png
new file mode 100644
index 0000000..c12d91f
--- /dev/null
+++ b/webkit/glue/resources/pdf_progress_8.png
Binary files differ
diff --git a/webkit/glue/resources/pdf_progress_background.png b/webkit/glue/resources/pdf_progress_background.png
new file mode 100644
index 0000000..216dd63
--- /dev/null
+++ b/webkit/glue/resources/pdf_progress_background.png
Binary files differ
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index a11dae9..a838193 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -76,6 +76,16 @@
<include name="IDR_PDF_THUMBNAIL_8" file="resources\pdf_thumbnail_8.png" type="BINDATA" />
<include name="IDR_PDF_THUMBNAIL_9" file="resources\pdf_thumbnail_9.png" type="BINDATA" />
<include name="IDR_PDF_THUMBNAIL_NUM_BACKGROUND" file="resources\pdf_thumbnail_num_background.png" type="BINDATA" />
+ <include name="IDR_PDF_PROGRESS_BAR_0" file="resources\pdf_progress_0.png" type="BINDATA" />
+ <include name="IDR_PDF_PROGRESS_BAR_1" file="resources\pdf_progress_1.png" type="BINDATA" />
+ <include name="IDR_PDF_PROGRESS_BAR_2" file="resources\pdf_progress_2.png" type="BINDATA" />
+ <include name="IDR_PDF_PROGRESS_BAR_3" file="resources\pdf_progress_3.png" type="BINDATA" />
+ <include name="IDR_PDF_PROGRESS_BAR_4" file="resources\pdf_progress_4.png" type="BINDATA" />
+ <include name="IDR_PDF_PROGRESS_BAR_5" file="resources\pdf_progress_5.png" type="BINDATA" />
+ <include name="IDR_PDF_PROGRESS_BAR_6" file="resources\pdf_progress_6.png" type="BINDATA" />
+ <include name="IDR_PDF_PROGRESS_BAR_7" file="resources\pdf_progress_7.png" type="BINDATA" />
+ <include name="IDR_PDF_PROGRESS_BAR_8" file="resources\pdf_progress_8.png" type="BINDATA" />
+ <include name="IDR_PDF_PROGRESS_BAR_BACKGROUND" file="resources\pdf_progress_background.png" type="BINDATA" />
</includes>
</release>
</grit>
diff --git a/webkit/glue/webkit_strings.grd b/webkit/glue/webkit_strings.grd
index 7611062..6e26557 100644
--- a/webkit/glue/webkit_strings.grd
+++ b/webkit/glue/webkit_strings.grd
@@ -489,6 +489,10 @@ below:
Failed to load PDF document
</message>
+ <message name="IDS_PDF_PROGRESS_LOADING" desc="A message displayed on the progress control over PDF page during document loading.">
+ Loading
+ </message>
+
</messages>
</release>
</grit>
diff --git a/webkit/plugins/ppapi/ppb_pdf_impl.cc b/webkit/plugins/ppapi/ppb_pdf_impl.cc
index 2019945..d902060 100644
--- a/webkit/plugins/ppapi/ppb_pdf_impl.cc
+++ b/webkit/plugins/ppapi/ppb_pdf_impl.cc
@@ -80,6 +80,17 @@ static const ResourceImageInfo kResourceImageMap[] = {
{ PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_9, IDR_PDF_THUMBNAIL_9 },
{ PP_RESOURCEIMAGE_PDF_BUTTON_THUMBNAIL_NUM_BACKGROUND,
IDR_PDF_THUMBNAIL_NUM_BACKGROUND },
+ { PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_0, IDR_PDF_PROGRESS_BAR_0 },
+ { PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_1, IDR_PDF_PROGRESS_BAR_1 },
+ { PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_2, IDR_PDF_PROGRESS_BAR_2 },
+ { PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_3, IDR_PDF_PROGRESS_BAR_3 },
+ { PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_4, IDR_PDF_PROGRESS_BAR_4 },
+ { PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_5, IDR_PDF_PROGRESS_BAR_5 },
+ { PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_6, IDR_PDF_PROGRESS_BAR_6 },
+ { PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_7, IDR_PDF_PROGRESS_BAR_7 },
+ { PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_8, IDR_PDF_PROGRESS_BAR_8 },
+ { PP_RESOURCEIMAGE_PDF_PROGRESS_BAR_BACKGROUND,
+ IDR_PDF_PROGRESS_BAR_BACKGROUND },
};
PP_Var GetLocalizedString(PP_Instance instance_id,
@@ -95,6 +106,8 @@ PP_Var GetLocalizedString(PP_Instance instance_id,
rv = UTF16ToUTF8(webkit_glue::GetLocalizedString(IDS_PDF_PAGE_LOADING));
} else if (string_id == PP_RESOURCESTRING_PDFLOAD_FAILED) {
rv = UTF16ToUTF8(webkit_glue::GetLocalizedString(IDS_PDF_PAGE_LOAD_FAILED));
+ } else if (string_id == PP_RESOURCESTRING_PDFPROGRESSLOADING) {
+ rv = UTF16ToUTF8(webkit_glue::GetLocalizedString(IDS_PDF_PROGRESS_LOADING));
} else {
NOTREACHED();
}
generated by cgit v1.1 at 2025-02-12 21:01:28 +0000