Moves shared/function.js to core/

mozilla · May 23, 2014 · fcc4dfd · fcc4dfd
1 parent 7a19085
commit fcc4dfd
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 23 deletions.
diff --git a/examples/acroforms/index.html b/examples/acroforms/index.html
@@ -5,7 +5,6 @@
   <!-- In production, only one script (pdf.js) is necessary -->
   <!-- In production, change the content of PDFJS.workerSrc below -->
   <script src="../../src/shared/util.js"></script>
-  <script src="../../src/shared/function.js"></script>
   <script src="../../src/shared/annotation.js"></script>
   <script src="../../src/display/api.js"></script>
   <script src="../../src/display/metadata.js"></script>

diff --git a/examples/helloworld/index.html b/examples/helloworld/index.html
@@ -5,7 +5,6 @@
   <!-- In production, only one script (pdf.js) is necessary -->
   <!-- In production, change the content of PDFJS.workerSrc below -->
   <script src="../../src/shared/util.js"></script>
-  <script src="../../src/shared/function.js"></script>
   <script src="../../src/shared/annotation.js"></script>
   <script src="../../src/display/api.js"></script>
   <script src="../../src/display/metadata.js"></script>

diff --git a/make.js b/make.js
@@ -370,7 +370,6 @@ target.bundle = function(args) {
 
   var SHARED_SRC_FILES = [
     'shared/util.js',
-    'shared/function.js',
     'shared/annotation.js',
   ];
 

diff --git a/src/shared/function.js → src/core/function.js b/src/shared/function.js → src/core/function.js
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* globals PostScriptLexer, PostScriptParser, error, info, isArray, isBool */
+/* globals PostScriptLexer, PostScriptParser, error, info, isArray, isBool,
+           isDict, isStream */
 
 'use strict';
 
@@ -436,6 +437,20 @@ var PDFFunction = (function PDFFunctionClosure() {
   };
 })();
 
+function isPDFFunction(v) {
+  var fnDict;
+  if (typeof v != 'object') {
+    return false;
+  } else if (isDict(v)) {
+    fnDict = v;
+  } else if (isStream(v)) {
+    fnDict = v.dict;
+  } else {
+    return false;
+  }
+  return fnDict.has('FunctionType');
+}
+
 var PostScriptStack = (function PostScriptStackClosure() {
   var MAX_STACK_SIZE = 100;
   function PostScriptStack(initialStack) {

diff --git a/src/shared/util.js b/src/shared/util.js
@@ -963,20 +963,6 @@ function isRef(v) {
   return v instanceof Ref;
 }
 
-function isPDFFunction(v) {
-  var fnDict;
-  if (typeof v != 'object') {
-    return false;
-  } else if (isDict(v)) {
-    fnDict = v;
-  } else if (isStream(v)) {
-    fnDict = v.dict;
-  } else {
-    return false;
-  }
-  return fnDict.has('FunctionType');
-}
-
 /**
  * Promise Capability object.
  *

diff --git a/src/worker_loader.js b/src/worker_loader.js
@@ -21,7 +21,6 @@
 // List of shared files to include;
 var sharedFiles = [
   'shared/util.js',
-  'shared/function.js',
   'shared/annotation.js'
 ];
 
@@ -34,6 +33,7 @@ var otherFiles = [
   'core/obj.js',
   'core/charsets.js',
   'core/cidmaps.js',
+  'core/function.js',
   'core/colorspace.js',
   'core/crypto.js',
   'core/pattern.js',

diff --git a/test/font/font_test.html b/test/font/font_test.html
@@ -22,7 +22,7 @@
   <script src="../../src/display/webgl.js"></script>
   <script src="../../src/core/obj.js"></script>
   <script src="../../src/shared/annotation.js"></script>
-  <script src="../../src/shared/function.js"></script>
+  <script src="../../src/core/function.js"></script>
   <script src="../../src/core/charsets.js"></script>
   <script src="../../src/core/cidmaps.js"></script>
   <script src="../../src/core/colorspace.js"></script>

diff --git a/test/test_slave.html b/test/test_slave.html
@@ -20,7 +20,6 @@
     <title>pdf.js test slave</title>
     <style type="text/css"></style>
     <script src="/src/shared/util.js"></script>
-    <script src="/src/shared/function.js"></script>
     <script src="/src/shared/annotation.js"></script>
     <script src="/src/display/api.js"></script>
     <script src="/src/display/metadata.js"></script>

diff --git a/test/unit/unit_test.html b/test/unit/unit_test.html
@@ -21,7 +21,7 @@
   <script src="../../src/display/webgl.js"></script>
   <script src="../../src/core/obj.js"></script>
   <script src="../../src/shared/annotation.js"></script>
-  <script src="../../src/shared/function.js"></script>
+  <script src="../../src/core/function.js"></script>
   <script src="../../src/core/charsets.js"></script>
   <script src="../../src/core/cidmaps.js"></script>
   <script src="../../src/core/colorspace.js"></script>

diff --git a/web/viewer.html b/web/viewer.html
@@ -48,7 +48,6 @@
 
 <!--#if !PRODUCTION-->
     <script src="../src/shared/util.js"></script>
-    <script src="../src/shared/function.js"></script>
     <script src="../src/shared/annotation.js"></script>
     <script src="../src/display/api.js"></script>
     <script src="../src/display/metadata.js"></script>