summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-08-10 01:07:19 -0700
committerLei Zhang <thestig@chromium.org>2015-08-10 01:07:19 -0700
commit335e11825fcb8520f68ac668f8dacd9b48f05804 (patch)
tree5ee84a54b99ecbc2ebd3205ca5fe5b6e6ee09891 /core/src
parent68869fd52909b3d5a66dd891b0637fb2718bed35 (diff)
downloadpdfium-335e11825fcb8520f68ac668f8dacd9b48f05804.tar.xz
Merge to XFA: Cleanup: Mark methods with the override keyword.
- Delete unneeded CFFL_ComboBox::CanCopy() and friends. - Delete unneeded CFFL_FormFiller::CanCopy() and friends. - Delete unneeded CFFL_TextField::CanCopy() and friends. - Delete unneeded FormFiller::DoCopy() and friends. - Rename CFFL_FormFiller::On{Set,Kill}Focus to avoid conflicts. BUG=pdfium:185 TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/1283493004 . (cherry picked from commit 3a3849176aa6e2db8baf2f9367b2d96c71815319) Review URL: https://codereview.chromium.org/1279123006 .
Diffstat (limited to 'core/src')
-rw-r--r--core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp
index c07806c994..cc6c9e9d56 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp
@@ -512,7 +512,7 @@ class CPDF_LabCS : public CPDF_ColorSpace {
int pixels,
int image_width,
int image_height,
- FX_BOOL bTransMask = FALSE) const;
+ FX_BOOL bTransMask = FALSE) const override;
FX_FLOAT m_WhitePoint[3];
FX_FLOAT m_BlackPoint[3];