Remove CFWL_Note.

Remove CFWL_Note.

This CL removes the CFWL_Note class. The two subclasses, CFWL_Event and
CFWL_Message are distinct types and should not be related by the subclass. The
code has been updated to pass the correct types as needed.

The various FWL_EVTHASH and FWL_MSGHASH defines have all been removed and turned
into an FWL_EventType and FWL_MessageType enum classes.

BUG=pdfium:474
Committed: https://pdfium.googlesource.com/pdfium/+/5d9da0c1255a75dd9b7b2005f8b7d6ae4948feaf

[dsinclair, 2016-04-19 18:10:15]

dsinclair@chromium.org changed reviewers:
+ thestig@chromium.org, tsepez@chromium.org

[dsinclair, 2016-04-19 18:10:16]

PTAL.

[Tom Sepez, 2016-04-19 18:46:11]

Probably want to tackle the nits as a followup. LGTM

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_checkboximp.cpp (right):

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_checkboximp.cpp:424: case CFWL_MessageType::SetFocus:
nit: If we split these out into separate calls with a hard-coded parameter, we
can combine lines 417 and 420.  I think it reads better without the
recomparison.

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_comboboximp.cpp (right):

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_comboboximp.cpp:152: case CFWL_MessageType::SetFocus:
nit: same thing here.

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_comboboximp.cpp:1382: OnFocusChanged(pMessage, dwMsgCode
== CFWL_MessageType::SetFocus);
and here.

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_comboboximp.cpp:1784: if (dwMsgCode ==
CFWL_MessageType::KillFocus ||
nit: else if, also maybe handle as two separate ifs rather than recompare.

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_datetimepickerimp.cpp (right):

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_datetimepickerimp.cpp:1035: case
CFWL_MessageType::SetFocus:
and here.

[dsinclair, 2016-04-19 19:11:25]

Changes weren't too bad, did them in this CL. PTAL.

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_checkboximp.cpp (right):

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_checkboximp.cpp:424: case CFWL_MessageType::SetFocus:
On 2016/04/19 18:46:11, Tom Sepez wrote:
> nit: If we split these out into separate calls with a hard-coded parameter, we
> can combine lines 417 and 420.  I think it reads better without the
> recomparison.

Done.

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_comboboximp.cpp (right):

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_comboboximp.cpp:152: case CFWL_MessageType::SetFocus:
On 2016/04/19 18:46:11, Tom Sepez wrote:
> nit: same thing here.

Done.

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_comboboximp.cpp:1382: OnFocusChanged(pMessage, dwMsgCode
== CFWL_MessageType::SetFocus);
On 2016/04/19 18:46:11, Tom Sepez wrote:
> and here.

Done.

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_comboboximp.cpp:1784: if (dwMsgCode ==
CFWL_MessageType::KillFocus ||
On 2016/04/19 18:46:11, Tom Sepez wrote:
> nit: else if, also maybe handle as two separate ifs rather than recompare.

Done.

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_datetimepickerimp.cpp (right):

https://codereview.chromium.org/1901183002/diff/40001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_datetimepickerimp.cpp:1035: case
CFWL_MessageType::SetFocus:
On 2016/04/19 18:46:11, Tom Sepez wrote:
> and here.

Done. dwMsgCode was also used on 1068, but I moved that into a case statement.

[dsinclair, 2016-04-21 13:10:34]

ping.

[Tom Sepez, 2016-04-21 19:22:33]

Much better.  Just a few more things.

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_listboximp.cpp (right):

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_listboximp.cpp:998: case CFWL_MessageType::SetFocus:
missed one.

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_monthcalendarimp.cpp (right):

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_monthcalendarimp.cpp:1031: OnFocusChanged(pMessage,
dwMsgCode == CFWL_MessageType::SetFocus);
missed another

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_pushbuttonimp.cpp (right):

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_pushbuttonimp.cpp:417: OnFocusChanged(pMessage, dwMsgCode
== CFWL_MessageType::SetFocus);
missed a third.

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_spinbuttonimp.cpp (right):

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_spinbuttonimp.cpp:218: OnFocusChanged(pMessage, dwMsgCode
== CFWL_MessageType::SetFocus);
missed fourth

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/core/fwl_noteim...
File xfa/fwl/core/fwl_noteimp.cpp (right):

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/core/fwl_noteim...
xfa/fwl/core/fwl_noteimp.cpp:108: void* key = NULL;
nit: nullptr;

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/core/fwl_noteim...
xfa/fwl/core/fwl_noteimp.cpp:109: CFWL_EventTarget* pEventTarget;
nit: would prefer void* value = nullptr;

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/core/fwl_noteim...
xfa/fwl/core/fwl_noteimp.cpp:110: m_eventTargets.GetNextAssoc(pos, key,
(void*&)pEventTarget);
Then m_eventTargets.GetNextAssoc(pos, key, value);

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/core/fwl_noteim...
xfa/fwl/core/fwl_noteimp.cpp:112: pEventTarget->ProcessEvent(pNote);
then CFWL_EventTarget* pEventTarget = static_cast<>(value);

https://codereview.chromium.org/1901183002/diff/80001/xfa/fxfa/app/xfa_ffchec...
File xfa/fxfa/app/xfa_ffcheckbutton.cpp (right):

https://codereview.chromium.org/1901183002/diff/80001/xfa/fxfa/app/xfa_ffchec...
xfa/fxfa/app/xfa_ffcheckbutton.cpp:304: CFWL_EventType dwEventID =
pEvent->GetClassID();
nit: local not needed

[dsinclair, 2016-04-21 19:35:49]

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_listboximp.cpp (right):

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_listboximp.cpp:998: case CFWL_MessageType::SetFocus:
On 2016/04/21 19:22:33, Tom Sepez wrote:
> missed one.

Done.

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_monthcalendarimp.cpp (right):

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_monthcalendarimp.cpp:1031: OnFocusChanged(pMessage,
dwMsgCode == CFWL_MessageType::SetFocus);
On 2016/04/21 19:22:33, Tom Sepez wrote:
> missed another

Done.

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_pushbuttonimp.cpp (right):

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_pushbuttonimp.cpp:417: OnFocusChanged(pMessage, dwMsgCode
== CFWL_MessageType::SetFocus);
On 2016/04/21 19:22:33, Tom Sepez wrote:
> missed a third.

Done.

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_spinbuttonimp.cpp (right):

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_spinbuttonimp.cpp:218: OnFocusChanged(pMessage, dwMsgCode
== CFWL_MessageType::SetFocus);
On 2016/04/21 19:22:33, Tom Sepez wrote:
> missed fourth

Done.

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/core/fwl_noteim...
File xfa/fwl/core/fwl_noteimp.cpp (right):

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/core/fwl_noteim...
xfa/fwl/core/fwl_noteimp.cpp:108: void* key = NULL;
On 2016/04/21 19:22:33, Tom Sepez wrote:
> nit: nullptr;

Done.

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/core/fwl_noteim...
xfa/fwl/core/fwl_noteimp.cpp:109: CFWL_EventTarget* pEventTarget;
On 2016/04/21 19:22:33, Tom Sepez wrote:
> nit: would prefer void* value = nullptr;

Done.

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/core/fwl_noteim...
xfa/fwl/core/fwl_noteimp.cpp:110: m_eventTargets.GetNextAssoc(pos, key,
(void*&)pEventTarget);
On 2016/04/21 19:22:33, Tom Sepez wrote:
> Then m_eventTargets.GetNextAssoc(pos, key, value);

Done.

https://codereview.chromium.org/1901183002/diff/80001/xfa/fwl/core/fwl_noteim...
xfa/fwl/core/fwl_noteimp.cpp:112: pEventTarget->ProcessEvent(pNote);
On 2016/04/21 19:22:33, Tom Sepez wrote:
> then CFWL_EventTarget* pEventTarget = static_cast<>(value);

Done.

https://codereview.chromium.org/1901183002/diff/80001/xfa/fxfa/app/xfa_ffchec...
File xfa/fxfa/app/xfa_ffcheckbutton.cpp (right):

https://codereview.chromium.org/1901183002/diff/80001/xfa/fxfa/app/xfa_ffchec...
xfa/fxfa/app/xfa_ffcheckbutton.cpp:304: CFWL_EventType dwEventID =
pEvent->GetClassID();
On 2016/04/21 19:22:33, Tom Sepez wrote:
> nit: local not needed

Done.

[Tom Sepez, 2016-04-21 20:06:27]

lgtm

[dsinclair, 2016-04-21 20:11:38]

The CQ bit was checked by dsinclair@chromium.org

[commit-bot: I haz the power, 2016-04-21 20:11:47]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1901183002/120001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1901183002/120001

[commit-bot: I haz the power, 2016-04-21 20:12:09]

Description was changed from

==========
Remove CFWL_Note.

This CL removes the CFWL_Note class. The two subclasses, CFWL_Event and
CFWL_Message are distinct types and should not be related by the subclass. The
code has been updated to pass the correct types as needed.

The various FWL_EVTHASH and FWL_MSGHASH defines have all been removed and turned
into an FWL_EventType and FWL_MessageType enum classes.

BUG=pdfium:474
==========

to

==========
Remove CFWL_Note.

This CL removes the CFWL_Note class. The two subclasses, CFWL_Event and
CFWL_Message are distinct types and should not be related by the subclass. The
code has been updated to pass the correct types as needed.

The various FWL_EVTHASH and FWL_MSGHASH defines have all been removed and turned
into an FWL_EventType and FWL_MessageType enum classes.

BUG=pdfium:474

Committed:
https://pdfium.googlesource.com/pdfium/+/5d9da0c1255a75dd9b7b2005f8b7d6ae4948...
==========

[commit-bot: I haz the power, 2016-04-21 20:12:11]

Committed patchset #7 (id:120001) as
https://pdfium.googlesource.com/pdfium/+/5d9da0c1255a75dd9b7b2005f8b7d6ae4948...