From 5ef50304352203ac2189bc3c346f0df7214c4604 Mon Sep 17 00:00:00 2001
From: Lu Wang <coolwanglu@gmail.com>
Date: Sat, 28 Sep 2013 11:35:54 +0800
Subject: [PATCH] remove deprecated prefixes

---
 ChangeLog                |  2 ++
 share/base.css.in        | 22 ++++++++++++++++------
 share/fancy.css.in       |  6 ------
 share/manifest           | 10 ++++++++++
 src/HTMLRenderer/draw.cc |  2 +-
 src/StateManager.h       |  3 +--
 6 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aba111c..341ad48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Developing v0.10
 
+* Add a logo
+* Remove Opera prefix (-o-)
 * Background image optimization
 * Support output background image in JPEG (--bg-format jpg)
 * [Experimental] Support output background image in SVG (--bg-format svg)
diff --git a/share/base.css.in b/share/base.css.in
index 871a028..4f9065b 100644
--- a/share/base.css.in
+++ b/share/base.css.in
@@ -31,6 +31,22 @@
     right:0;
     overflow:auto;
   }
+  #loading-indicator {
+    position:absolute;
+    width:64px;
+    height:64px;
+    top:50%;
+    left:50%;
+    margin-top:-32px;
+    margin-left:-32px;
+  }
+  #loading-indicator img {
+    position:absolute;
+    top:0;
+    left:0;
+    bottom:0;
+    right:0;
+  }
 }
 @media print { 
   @page { margin:0; }
@@ -82,9 +98,7 @@
   /* set transform-origin for scaling */
   transform-origin:0% 0%;
   -ms-transform-origin:0% 0%;
-  -moz-transform-origin:0% 0%;
   -webkit-transform-origin:0% 0%;
-  -o-transform-origin:0% 0%;
 }
 .@CSS_PAGE_CONTENT_BOX_CN@.opened { /* used by pdf2htmlEX.js, to show/hide pages */
   display:block;
@@ -142,9 +156,7 @@
   font-size:1px;
   transform-origin:0% 100%;
   -ms-transform-origin:0% 100%;
-  -moz-transform-origin:0% 100%;
   -webkit-transform-origin:0% 100%;
-  -o-transform-origin:0% 100%;
   unicode-bidi:bidi-override;/* For rtl lanauges, e.g. Hebrew, we don't want the default Unicode behaviour */
   -moz-font-feature-settings:"liga" 0;/* We don't want Firefox to recognize ligatures */
 }
@@ -176,8 +188,6 @@ span { /* text blocks within a line */
   position:absolute;
   transform-origin:0% 100%;
   -ms-transform-origin:0% 100%;
-  -moz-transform-origin:0% 100%;
   -webkit-transform-origin:0% 100%;
-  -o-transform-origin:0% 100%;
 }
 /* Base CSS END */
diff --git a/share/fancy.css.in b/share/fancy.css.in
index 6d1be24..bb1b3d5 100644
--- a/share/fancy.css.in
+++ b/share/fancy.css.in
@@ -42,9 +42,7 @@
     background-color:#9e9e9e;
     /* http://philbit.com/svgpatterns/#thinstripes */
     background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1IiBoZWlnaHQ9IjUiPgo8cmVjdCB3aWR0aD0iNSIgaGVpZ2h0PSI1IiBmaWxsPSIjOWU5ZTllIj48L3JlY3Q+CjxwYXRoIGQ9Ik0wIDVMNSAwWk02IDRMNCA2Wk0tMSAxTDEgLTFaIiBzdHJva2U9IiM4ODgiIHN0cm9rZS13aWR0aD0iMSI+PC9wYXRoPgo8L3N2Zz4=");
-    -moz-transition:left 500ms;
     -webkit-transition:left 500ms;
-    -o-transition:left 500ms;
     transition:left 500ms;
   }
   .@CSS_PAGE_DECORATION_CN@ {
@@ -52,13 +50,9 @@
     box-shadow: 1px 1px 3px 1px #333;
   }
   @keyframes fadein { from { opacity:0;} to { opacity:1;} }
-  @-moz-keyframes fadein { from { opacity:0;} to { opacity:1;} }
   @-webkit-keyframes fadein { from { opacity:0;} to { opacity:1;} }
-  @-o-keyframes fadein { from { opacity:0;} to { opacity: 1;} }
   .@CSS_PAGE_CONTENT_BOX_CN@.opened { /* used by pdf2htmlEX.js, to show/hide pages */
-    -moz-animation: fadein 100ms; 
     -webkit-animation: fadein 100ms;
-    -o-animation: fadein 100ms; 
     animation: fadein 100ms; 
   }
 }
diff --git a/share/manifest b/share/manifest
index 2cd3dbe..2a917b1 100644
--- a/share/manifest
+++ b/share/manifest
@@ -39,6 +39,7 @@ pdf2htmlEX.defaultViewer = new pdf2htmlEX.Viewer({
     container_id : 'page-container', 
     sidebar_id : 'sidebar',
     outline_id : 'outline',
+    indicator_id : 'loading-indicator',
 });
 </script>
 """
@@ -77,6 +78,15 @@ $pages
 </div>
 """
 
+# shown when loading a page via ajax
+"""
+<div id="loading-indicator">
+"""
+@pdf2htmlEX-64x64.png
+"""
+</div>
+"""
+
 """
 </body>
 </html>
diff --git a/src/HTMLRenderer/draw.cc b/src/HTMLRenderer/draw.cc
index 9bc0ead..7a84b1a 100644
--- a/src/HTMLRenderer/draw.cc
+++ b/src/HTMLRenderer/draw.cc
@@ -206,7 +206,7 @@ LinearGradient::LinearGradient (GfxAxialShading * shading,
 
 void LinearGradient::dumpto (ostream & out)
 {
-    auto prefixes = {"", "-ms-", "-moz-", "-webkit-", "-o-"};
+    auto prefixes = {"", "-ms-", "-webkit-"};
     for(auto iter = prefixes.begin(); iter != prefixes.end(); ++iter)
     {
         out << "background-image:" << (*iter) << "linear-gradient(" << round(angle) << "rad";
diff --git a/src/StateManager.h b/src/StateManager.h
index 8057091..2cd446c 100644
--- a/src/StateManager.h
+++ b/src/StateManager.h
@@ -304,15 +304,14 @@ public:
         // we have already shifted the origin
         // TODO: recognize common matices
         const auto & m = matrix.m;
+        auto prefixes = {"", "-ms-", "-webkit-"};
         if(tm_equal(m, ID_MATRIX, 4))
         {
-            auto prefixes = {"", "-ms-", "-moz-", "-webkit-", "-o-"};
             for(auto iter = prefixes.begin(); iter != prefixes.end(); ++iter)
                 out << *iter << "transform:none;";
         }
         else
         {
-            auto prefixes = {"", "-ms-", "-moz-", "-webkit-", "-o-"};
             for(auto iter = prefixes.begin(); iter != prefixes.end(); ++iter)
             {
                 // PDF use a different coordinate system from Web