summaryrefslogtreecommitdiff
path: root/fpdfsdk/include
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-10-05 16:44:41 -0700
committerTom Sepez <tsepez@chromium.org>2015-10-05 16:44:41 -0700
commitca70a69f4b5ac05eb7e054cfa014d219b915f632 (patch)
treea68c24ad9ae15740a9997fafc8b231aef078a56d /fpdfsdk/include
parent563f7f8fbc445021fe37397eadf10847bddc004a (diff)
downloadpdfium-ca70a69f4b5ac05eb7e054cfa014d219b915f632.tar.xz
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 .
Diffstat (limited to 'fpdfsdk/include')
-rw-r--r--fpdfsdk/include/javascript/Field.h2
-rw-r--r--fpdfsdk/include/javascript/JavaScript.h25
-rw-r--r--fpdfsdk/include/javascript/color.h2
3 files changed, 2 insertions, 27 deletions
diff --git a/fpdfsdk/include/javascript/Field.h b/fpdfsdk/include/javascript/Field.h
index 4a6f524f72..851bc4fc16 100644
--- a/fpdfsdk/include/javascript/Field.h
+++ b/fpdfsdk/include/javascript/Field.h
@@ -9,7 +9,7 @@
#include <string> // For std::wstring.
-// TODO(tsepez): include PWL_Wnd.h for PWL_Color after fixing its IWYU.
+#include "../pdfwindow/PWL_Wnd.h" // For CPWL_Color.
#include "JS_Define.h"
class Document;
diff --git a/fpdfsdk/include/javascript/JavaScript.h b/fpdfsdk/include/javascript/JavaScript.h
deleted file mode 100644
index 28239efc6a..0000000000
--- a/fpdfsdk/include/javascript/JavaScript.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JAVASCRIPT_H_
-#define FPDFSDK_INCLUDE_JAVASCRIPT_JAVASCRIPT_H_
-
-#include <string>
-#include <vector>
-
-#include "../../../core/include/fpdfapi/fpdf_module.h"
-#include "../../../core/include/fpdfapi/fpdf_pageobj.h"
-#include "../../../core/include/fpdfapi/fpdf_serial.h"
-#include "../../../core/include/fpdfdoc/fpdf_doc.h"
-#include "../../../core/include/fpdfdoc/fpdf_vt.h"
-#include "../fsdk_mgr.h"
-#include "../fx_systemhandler.h"
-#include "../fxedit/fx_edit.h"
-#include "../jsapi/fxjs_v8.h"
-#include "../pdfwindow/IPDFWindow.h"
-#include "../fpdfxfa/fpdfxfa_app.h"
-
-#endif // FPDFSDK_INCLUDE_JAVASCRIPT_JAVASCRIPT_H_
diff --git a/fpdfsdk/include/javascript/color.h b/fpdfsdk/include/javascript/color.h
index 322c4c26fa..8008575a70 100644
--- a/fpdfsdk/include/javascript/color.h
+++ b/fpdfsdk/include/javascript/color.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
#define FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
+#include "../pdfwindow/PWL_Wnd.h" // For CPWL_Color.
#include "JS_Define.h"
-// TODO(tsepez): include CPWL_Color.h once its own IWYU is fixed.
class color : public CJS_EmbedObj {
public: