From 5e8b7356d68e35d7d631a2a917e651a4e7c73b65 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 5 Oct 2015 16:18:28 -0700 Subject: Remove JavaScript.h It merely includes a bunch of other .h files which are handled better since we fixed IWYU. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1385983002 . --- BUILD.gn | 1 - fpdfsdk/include/javascript/Field.h | 2 +- fpdfsdk/include/javascript/JavaScript.h | 24 ------------------------ fpdfsdk/include/javascript/color.h | 2 +- fpdfsdk/src/javascript/Consts.cpp | 1 - fpdfsdk/src/javascript/Document.cpp | 1 - fpdfsdk/src/javascript/Field.cpp | 1 - fpdfsdk/src/javascript/Icon.cpp | 1 - fpdfsdk/src/javascript/JS_Context.cpp | 1 - fpdfsdk/src/javascript/JS_EventHandler.cpp | 1 - fpdfsdk/src/javascript/JS_GlobalData.cpp | 1 - fpdfsdk/src/javascript/JS_Object.cpp | 1 - fpdfsdk/src/javascript/JS_Runtime.cpp | 1 - fpdfsdk/src/javascript/JS_Value.cpp | 1 - fpdfsdk/src/javascript/PublicMethods.cpp | 1 - fpdfsdk/src/javascript/app.cpp | 1 - fpdfsdk/src/javascript/color.cpp | 4 ++-- fpdfsdk/src/javascript/console.cpp | 1 - fpdfsdk/src/javascript/event.cpp | 2 -- fpdfsdk/src/javascript/global.cpp | 1 - fpdfsdk/src/javascript/report.cpp | 1 - fpdfsdk/src/javascript/util.cpp | 1 - pdfium.gyp | 1 - 23 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 fpdfsdk/include/javascript/JavaScript.h diff --git a/BUILD.gn b/BUILD.gn index c603c7111d..84f2fbb19d 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -642,7 +642,6 @@ static_library("javascript") { "fpdfsdk/include/javascript/JS_Object.h", "fpdfsdk/include/javascript/JS_Runtime.h", "fpdfsdk/include/javascript/JS_Value.h", - "fpdfsdk/include/javascript/JavaScript.h", "fpdfsdk/include/javascript/PublicMethods.h", "fpdfsdk/include/javascript/app.h", "fpdfsdk/include/javascript/color.h", 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 // 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 655aca07d6..0000000000 --- a/fpdfsdk/include/javascript/JavaScript.h +++ /dev/null @@ -1,24 +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 -#include - -#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" - -#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: diff --git a/fpdfsdk/src/javascript/Consts.cpp b/fpdfsdk/src/javascript/Consts.cpp index acb49662b0..fcdc5eabe2 100644 --- a/fpdfsdk/src/javascript/Consts.cpp +++ b/fpdfsdk/src/javascript/Consts.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_Define.h" #include "../../include/javascript/JS_Object.h" diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp index 796fddb5ed..98ac88a9b1 100644 --- a/fpdfsdk/src/javascript/Document.cpp +++ b/fpdfsdk/src/javascript/Document.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_Define.h" #include "../../include/javascript/JS_Object.h" diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp index 140bb422fe..27015268ce 100644 --- a/fpdfsdk/src/javascript/Field.cpp +++ b/fpdfsdk/src/javascript/Field.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_Define.h" #include "../../include/javascript/JS_Object.h" diff --git a/fpdfsdk/src/javascript/Icon.cpp b/fpdfsdk/src/javascript/Icon.cpp index 0e96a05e5e..4468fac90e 100644 --- a/fpdfsdk/src/javascript/Icon.cpp +++ b/fpdfsdk/src/javascript/Icon.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_Define.h" #include "../../include/javascript/JS_Object.h" diff --git a/fpdfsdk/src/javascript/JS_Context.cpp b/fpdfsdk/src/javascript/JS_Context.cpp index 342616d301..fc7d974395 100644 --- a/fpdfsdk/src/javascript/JS_Context.cpp +++ b/fpdfsdk/src/javascript/JS_Context.cpp @@ -8,7 +8,6 @@ #include "../../include/javascript/JS_Context.h" #include "../../include/javascript/JS_EventHandler.h" #include "../../include/javascript/JS_Runtime.h" -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/resource.h" /* -------------------------- CJS_Context -------------------------- */ diff --git a/fpdfsdk/src/javascript/JS_EventHandler.cpp b/fpdfsdk/src/javascript/JS_EventHandler.cpp index 553fc95631..64a6168e83 100644 --- a/fpdfsdk/src/javascript/JS_EventHandler.cpp +++ b/fpdfsdk/src/javascript/JS_EventHandler.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_EventHandler.h" #include "../../include/javascript/JS_Context.h" diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp index 807491854a..7f2c9ecf55 100644 --- a/fpdfsdk/src/javascript/JS_GlobalData.cpp +++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp @@ -5,7 +5,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../../core/include/fdrm/fx_crypt.h" -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_GlobalData.h" diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp index 952f4b582b..7898f48516 100644 --- a/fpdfsdk/src/javascript/JS_Object.cpp +++ b/fpdfsdk/src/javascript/JS_Object.cpp @@ -8,7 +8,6 @@ #include "../../include/javascript/JS_Context.h" #include "../../include/javascript/JS_Define.h" #include "../../include/javascript/JS_Object.h" -#include "../../include/javascript/JavaScript.h" namespace { diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index 707551adbe..fe197c5517 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_EventHandler.h" #include "../../include/javascript/JS_Runtime.h" diff --git a/fpdfsdk/src/javascript/JS_Value.cpp b/fpdfsdk/src/javascript/JS_Value.cpp index a07c61f108..f4aecba94e 100644 --- a/fpdfsdk/src/javascript/JS_Value.cpp +++ b/fpdfsdk/src/javascript/JS_Value.cpp @@ -8,7 +8,6 @@ #include #include -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/JS_Define.h" #include "../../include/javascript/JS_Object.h" #include "../../include/javascript/JS_Value.h" diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp index ef745b73ee..5b923ca4fc 100644 --- a/fpdfsdk/src/javascript/PublicMethods.cpp +++ b/fpdfsdk/src/javascript/PublicMethods.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_Define.h" #include "../../include/javascript/JS_Object.h" diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp index 12f164edf1..bac87ea657 100644 --- a/fpdfsdk/src/javascript/app.cpp +++ b/fpdfsdk/src/javascript/app.cpp @@ -5,7 +5,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../../third_party/base/nonstd_unique_ptr.h" -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_Define.h" #include "../../include/javascript/JS_Object.h" 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" diff --git a/fpdfsdk/src/javascript/console.cpp b/fpdfsdk/src/javascript/console.cpp index cc64e1091b..519cecc5b4 100644 --- a/fpdfsdk/src/javascript/console.cpp +++ b/fpdfsdk/src/javascript/console.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_Define.h" #include "../../include/javascript/JS_Object.h" diff --git a/fpdfsdk/src/javascript/event.cpp b/fpdfsdk/src/javascript/event.cpp index 751705aed1..7031be8c38 100644 --- a/fpdfsdk/src/javascript/event.cpp +++ b/fpdfsdk/src/javascript/event.cpp @@ -4,13 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/javascript/JavaScript.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/JS_EventHandler.h" -//#include "../include/JS_ResMgr.h" #include "../../include/javascript/JS_Context.h" #include "../../include/javascript/event.h" #include "../../include/javascript/Field.h" diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp index 20276c359d..5182ae6701 100644 --- a/fpdfsdk/src/javascript/global.cpp +++ b/fpdfsdk/src/javascript/global.cpp @@ -12,7 +12,6 @@ #include "../../include/javascript/JS_GlobalData.h" #include "../../include/javascript/JS_Object.h" #include "../../include/javascript/JS_Value.h" -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/global.h" #include "../../include/javascript/resource.h" diff --git a/fpdfsdk/src/javascript/report.cpp b/fpdfsdk/src/javascript/report.cpp index 732ae6d20e..d3877924c3 100644 --- a/fpdfsdk/src/javascript/report.cpp +++ b/fpdfsdk/src/javascript/report.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_Define.h" #include "../../include/javascript/JS_Object.h" diff --git a/fpdfsdk/src/javascript/util.cpp b/fpdfsdk/src/javascript/util.cpp index c1b7b4e06a..6afddf74b5 100644 --- a/fpdfsdk/src/javascript/util.cpp +++ b/fpdfsdk/src/javascript/util.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/javascript/JavaScript.h" #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_Define.h" #include "../../include/javascript/JS_Object.h" diff --git a/pdfium.gyp b/pdfium.gyp index 8920968955..5acc62e9ee 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -633,7 +633,6 @@ 'fpdfsdk/include/javascript/global.h', 'fpdfsdk/include/javascript/Icon.h', 'fpdfsdk/include/javascript/IJavaScript.h', - 'fpdfsdk/include/javascript/JavaScript.h', 'fpdfsdk/include/javascript/JS_Context.h', 'fpdfsdk/include/javascript/JS_Define.h', 'fpdfsdk/include/javascript/JS_EventHandler.h', -- cgit v1.2.3