Merge remote-tracking branch 'mozilla/master' into textsearch

Conflicts:
	l10n/en-US/viewer.properties
	web/viewer.html

diff --cc l10n/en-US/viewer.properties
index 1cc46eedfa3e936c80497fcd6049fe4ad2b1dc65,d0ba6ffacfa10084e6b430c1a0ad6ec88fd96c54..c8b061d494696c940fe86b8b3d28267d0d79c220
--- 1/l10n/en-US/viewer.properties
--- 2/l10n/en-US/viewer.properties
+++ b/l10n/en-US/viewer.properties
@@@ -42,5 -42,4 +42,7 @@@ zoom_in_label=Zoom I
  zoom.title=Zoom
  thumb_page_title=Page {{page}}
  thumb_page_canvas=Thumbnail of Page {{page}}
+ request_password=PDF is protected by a password:
 +search.title=Search Document
 +search_label=Search
++

diff --cc src/api.js
Simple merge

diff --cc src/core.js
Simple merge

diff --cc src/worker.js
Simple merge

diff --cc web/viewer.css
Simple merge

diff --cc web/viewer.html
index 17688ef0ca7411074793a2bf3004a407a0b0f72b,45fb9f0401e2405678f5ca9bf9870297e94804c0..b2d1a924387b03f9ecef1684f41e2196b6b05ac6
--- 1/web/viewer.html
--- 2/web/viewer.html
+++ b/web/viewer.html
@@@ -89,8 -81,8 +89,8 @@@
                      <span data-l10n-id="next_label">Next</span>
                    </button>
                  </div>
-                 <label class="toolbarLabel" for="pageNumber" data-l10n-id="page_label">Page: </label>
+                 <label id="pageNumberLabel" class="toolbarLabel" for="pageNumber" data-l10n-id="page_label">Page: </label>
 -                <input type="number" id="pageNumber" class="toolbarField pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" tabindex="6">
 +                <input type="number" id="pageNumber" class="toolbarField pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" tabindex="7">
                  </input>
                  <span id="numPages" class="toolbarLabel"></span>
                </div>
@@@ -127,8 -119,8 +127,8 @@@
                        <span data-l10n-id="zoom_in_label">Zoom In</span>
                       </button>
                    </div>
-                   <span class="dropdownToolbarButton">
+                   <span id="scaleSelectContainer" class="dropdownToolbarButton">
 -                     <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" title="Zoom" oncontextmenu="return false;" tabindex="9" data-l10n-id="zoom">
 +                     <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" title="Zoom" oncontextmenu="return false;" tabindex="10" data-l10n-id="zoom">
                        <option id="pageAutoOption" value="auto" selected="selected" data-l10n-id="page_scale_auto">Automatic Zoom</option>
                        <option id="pageActualOption" value="page-actual" data-l10n-id="page_scale_actual">Actual Size</option>
                        <option id="pageFitOption" value="page-fit" data-l10n-id="page_scale_fit">Fit Page</option>

diff --cc web/viewer.js
Simple merge