From ca70a69f4b5ac05eb7e054cfa014d219b915f632 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 5 Oct 2015 16:44:41 -0700 Subject: Merge to XFA: Remove JavaScript.h Small manaul merge in JS_Object.cpp (cherry picked from commit 5e8b7356d68e35d7d631a2a917e651a4e7c73b65) Original Review URL: https://codereview.chromium.org/1385983002 . TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1381233005 . --- fpdfsdk/src/javascript/color.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/src/javascript/color.cpp') diff --git a/fpdfsdk/src/javascript/color.cpp b/fpdfsdk/src/javascript/color.cpp index c6d13fc284..cac390791f 100644 --- a/fpdfsdk/src/javascript/color.cpp +++ b/fpdfsdk/src/javascript/color.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/javascript/JavaScript.h" +#include "../../include/javascript/color.h" + #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_Define.h" #include "../../include/javascript/JS_Object.h" #include "../../include/javascript/JS_Value.h" -#include "../../include/javascript/color.h" #include "../../include/javascript/JS_EventHandler.h" #include "../../include/javascript/JS_Context.h" #include "../../include/javascript/JS_Runtime.h" -- cgit v1.2.3