Inflict PDF_ENABLE_XFA ifdefs on XFA fpdfsdk/

Inflict PDF_ENABLE_XFA ifdefs on XFA fpdfsdk/

R=thestig@chromium.org

Committed: https://pdfium.googlesource.com/pdfium/+/51da093564cdfd32a6ac02ad75e981787a0f1b35

[Tom Sepez, 2015-11-24 22:06:19]

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

[Tom Sepez, 2015-11-24 22:06:20]

Lei, I think this is as good as it gets.

[Lei Zhang, 2015-11-25 00:12:02]

2/3 of the done reading. The core/ comments regarding formatting applies here
too.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/include/fsdk_basefo...
File fpdfsdk/include/fsdk_baseform.h (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/include/fsdk_basefo...
fpdfsdk/include/fsdk_baseform.h:213: private:
I wonder how much work this is to fix.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/include/fsdk_basefo...
fpdfsdk/include/fsdk_baseform.h:272: #ifdef PDF_ENABLE_XFA
Combine with set below.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/include/fsdk_basefo...
fpdfsdk/include/fsdk_baseform.h:356: #ifdef PDF_ENABLE_XFA
Ditto, combine.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/include/jsapi/fxjs_...
File fpdfsdk/include/jsapi/fxjs_v8.h (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/include/jsapi/fxjs_...
fpdfsdk/include/jsapi/fxjs_v8.h:147: 
another silly diff

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/formfiller/FFL_...
File fpdfsdk/src/formfiller/FFL_FormFiller.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:247: CPDF_Page* pPage =
pWidget->GetPDFPage();
GetUnderlyingPage?

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:469: CPDF_Page* pPage =
m_pAnnot->GetPDFPage();
GetUnderlyingPage?

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:630: CPDF_Page* pPage =
m_pWidget->GetPDFPage();
GetUnderlyingPage?

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/formfiller/FFL_...
File fpdfsdk/src/formfiller/FFL_TextField.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_TextField.cpp:123:
m_pApp->FFI_Invalidate(pAnnot->GetPDFPage(), rcAnnot.left, rcAnnot.top,
GetUnderlyingPage?

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfformfill.cpp
File fpdfsdk/src/fpdfformfill.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfformfill.cp...
fpdfsdk/src/fpdfformfill.cpp:312: if (!hHandle || !page)
Needs more merging here.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfppo.cpp
File fpdfsdk/src/fpdfppo.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfppo.cpp#new...
fpdfsdk/src/fpdfppo.cpp:307: 
If this is the only difference, then the #include is probably not needed above.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfsave.cpp
File fpdfsdk/src/fpdfsave.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfsave.cpp#ne...
fpdfsdk/src/fpdfsave.cpp:297: CPDFXFA_Document* pDoc =
(CPDFXFA_Document*)document;
Maybe more UnderlyingDocumentType here?

[Lei Zhang, 2015-11-25 00:34:31]

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdftext.cpp
File fpdfsdk/src/fpdftext.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdftext.cpp#ne...
fpdfsdk/src/fpdftext.cpp:24: #ifndef PDF_ENABLE_XFA
Use UnderlyingPageType here?

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview.cpp
File fpdfsdk/src/fpdfview.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview.cpp#ne...
fpdfsdk/src/fpdfview.cpp:64: return page ?
UnderlyingFromFPDFPage(page)->GetPDFPage() : nullptr;
#endif here, and another #if PDF_ENABLE_XFA for CFPDF_FileStream's ctor.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview.cpp#ne...
fpdfsdk/src/fpdfview.cpp:240: if (pModuleMgr) {
Always true, given the lines above.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview.cpp#ne...
fpdfsdk/src/fpdfview.cpp:452: return 0;
This is a weird discrepancy.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview.cpp#ne...
fpdfsdk/src/fpdfview.cpp:481: 
blank

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview.cpp#ne...
fpdfsdk/src/fpdfview.cpp:992: CPDF_Dictionary* pDict =
pDoc->GetPage(page_index);
More readable to combine all the XFA path into one #ifdef

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview_c_api_...
File fpdfsdk/src/fpdfview_c_api_test.c (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview_c_api_...
fpdfsdk/src/fpdfview_c_api_test.c:108: CHK(FORM_OnRButtonDown);
I think this is dead code. Removal CL never got merged.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_baseform.cpp
File fpdfsdk/src/fsdk_baseform.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_baseform.c...
fpdfsdk/src/fsdk_baseform.cpp:639: #else
#else // PDF_ENABLE_XFA
...
#ifdef PDF_ENABLE_XFA

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_baseform.c...
fpdfsdk/src/fsdk_baseform.cpp:682: #ifdef PDF_ENABLE_XFA
Another double #ifdef

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_baseform.c...
fpdfsdk/src/fsdk_baseform.cpp:707: #ifdef PDF_ENABLE_XFA
And another

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_mgr.cpp
File fpdfsdk/src/fsdk_mgr.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_mgr.cpp#ne...
fpdfsdk/src/fsdk_mgr.cpp:681: CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
Dup of line 673.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_mgr.cpp#ne...
fpdfsdk/src/fsdk_mgr.cpp:761: if (pSDKAnnot->GetType() == "Widget") {
Maybe:

bool bHitTest = pSDKAnnot->GetType() == "Widget";
#ifdef PDF_ENABLE_XFA
bHitTest | = pSDKAnnot->GetType() == FSDK_XFAWIDGET_TYPENAME
#endif
if (bHitTest) {
...

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_mgr.cpp#ne...
fpdfsdk/src/fsdk_mgr.cpp:869: #endif
Weird automatic change.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_mgr.cpp#ne...
fpdfsdk/src/fsdk_mgr.cpp:1103: #ifndef PDF_ENABLE_XFA
The body of this function probably should be properly separated.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/javascript/JS_R...
File fpdfsdk/src/javascript/JS_Runtime.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/javascript/JS_R...
fpdfsdk/src/javascript/JS_Runtime.cpp:56: #ifndef PDF_ENABLE_XFA
Needs some manual merging here.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/jsapi/fxjs_v8_e...
File fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/jsapi/fxjs_v8_e...
fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp:34: v8::Locker locker(m_pIsolate);
Do you know if these are needed on master too? Ditto in other JS files.

[Tom Sepez, 2015-11-25 21:45:30]

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/include/fsdk_basefo...
File fpdfsdk/include/fsdk_baseform.h (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/include/fsdk_basefo...
fpdfsdk/include/fsdk_baseform.h:213: private:
On 2015/11/25 00:12:02, Lei Zhang wrote:
> I wonder how much work this is to fix.
Makes a good follow-up

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/include/fsdk_basefo...
fpdfsdk/include/fsdk_baseform.h:272: #ifdef PDF_ENABLE_XFA
On 2015/11/25 00:12:02, Lei Zhang wrote:
> Combine with set below.
Will do in next CL.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/include/fsdk_basefo...
fpdfsdk/include/fsdk_baseform.h:356: #ifdef PDF_ENABLE_XFA
On 2015/11/25 00:12:02, Lei Zhang wrote:
> Ditto, combine.

Ditto

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/include/jsapi/fxjs_...
File fpdfsdk/include/jsapi/fxjs_v8.h (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/include/jsapi/fxjs_...
fpdfsdk/include/jsapi/fxjs_v8.h:147: 
On 2015/11/25 00:12:02, Lei Zhang wrote:
> another silly diff
Will handle in new CL and regenerate afterwards.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/formfiller/FFL_...
File fpdfsdk/src/formfiller/FFL_FormFiller.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:247: CPDF_Page* pPage =
pWidget->GetPDFPage();
On 2015/11/25 00:12:02, Lei Zhang wrote:
> GetUnderlyingPage?
I'm going to cobble up a pair of CLs to fix this now.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:469: CPDF_Page* pPage =
m_pAnnot->GetPDFPage();
On 2015/11/25 00:12:02, Lei Zhang wrote:
> GetUnderlyingPage?
Ditto

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:630: CPDF_Page* pPage =
m_pWidget->GetPDFPage();
On 2015/11/25 00:12:02, Lei Zhang wrote:
> GetUnderlyingPage?

Ditto

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfppo.cpp
File fpdfsdk/src/fpdfppo.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfppo.cpp#new...
fpdfsdk/src/fpdfppo.cpp:307: 
On 2015/11/25 00:12:02, Lei Zhang wrote:
> If this is the only difference, then the #include is probably not needed
above.

Sadly, it is needed since it breaks IWYU elsewhere !!!  I took a stab at fixing
it, but it was involved.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdftext.cpp
File fpdfsdk/src/fpdftext.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdftext.cpp#ne...
fpdfsdk/src/fpdftext.cpp:24: #ifndef PDF_ENABLE_XFA
On 2015/11/25 00:34:30, Lei Zhang wrote:
> Use UnderlyingPageType here?

Unified a bit.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview.cpp
File fpdfsdk/src/fpdfview.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview.cpp#ne...
fpdfsdk/src/fpdfview.cpp:64: return page ?
UnderlyingFromFPDFPage(page)->GetPDFPage() : nullptr;
On 2015/11/25 00:34:30, Lei Zhang wrote:
> #endif here, and another #if PDF_ENABLE_XFA for CFPDF_FileStream's ctor.
Yup, manual cleanup to follow.  diff is too good at saving space.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview.cpp#ne...
fpdfsdk/src/fpdfview.cpp:240: if (pModuleMgr) {
On 2015/11/25 00:34:30, Lei Zhang wrote:
> Always true, given the lines above.

Done.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview.cpp#ne...
fpdfsdk/src/fpdfview.cpp:452: return 0;
On 2015/11/25 00:34:30, Lei Zhang wrote:
> This is a weird discrepancy.

Sure is.  It looks like its been this way since before the beginning.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview.cpp#ne...
fpdfsdk/src/fpdfview.cpp:481: 
On 2015/11/25 00:34:30, Lei Zhang wrote:
> blank

Done.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview.cpp#ne...
fpdfsdk/src/fpdfview.cpp:992: CPDF_Dictionary* pDict =
pDoc->GetPage(page_index);
On 2015/11/25 00:34:30, Lei Zhang wrote:
> More readable to combine all the XFA path into one #ifdef

Manual task for later.  diff is too smart here.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview_c_api_...
File fpdfsdk/src/fpdfview_c_api_test.c (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfview_c_api_...
fpdfsdk/src/fpdfview_c_api_test.c:108: CHK(FORM_OnRButtonDown);
On 2015/11/25 00:34:31, Lei Zhang wrote:
> I think this is dead code. Removal CL never got merged.
I think this calls into xfa code now and is needed.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_baseform.cpp
File fpdfsdk/src/fsdk_baseform.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_baseform.c...
fpdfsdk/src/fsdk_baseform.cpp:639: #else
On 2015/11/25 00:34:31, Lei Zhang wrote:
> #else // PDF_ENABLE_XFA
> ...
> #ifdef PDF_ENABLE_XFA
Yeah, these are all conflicts with the pre-existing stubb I hacked up a few
weeks ago. Should be resolved by manual process after landing generated CL.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_mgr.cpp
File fpdfsdk/src/fsdk_mgr.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_mgr.cpp#ne...
fpdfsdk/src/fsdk_mgr.cpp:681: CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
On 2015/11/25 00:34:31, Lei Zhang wrote:
> Dup of line 673.

Strange.  Wonder if there was some whitespace diff that prevented matching?
Removed blank line.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_mgr.cpp#ne...
fpdfsdk/src/fsdk_mgr.cpp:761: if (pSDKAnnot->GetType() == "Widget") {

Done.  Will use 

bHitTest = bHitTest || pSDKAnnot->GetType() == FSDK_XFAWIDGET_TYPENAME;

because bitwise ops on bools feels wrong to me.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_mgr.cpp#ne...
fpdfsdk/src/fsdk_mgr.cpp:869: #endif
On 2015/11/25 00:34:31, Lei Zhang wrote:
> Weird automatic change.

Removed whitespace on xfa side.  Maybe it gets smarter.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fsdk_mgr.cpp#ne...
fpdfsdk/src/fsdk_mgr.cpp:1103: #ifndef PDF_ENABLE_XFA
On 2015/11/25 00:34:31, Lei Zhang wrote:
> The body of this function probably should be properly separated.

Ok manual.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/javascript/JS_R...
File fpdfsdk/src/javascript/JS_Runtime.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/javascript/JS_R...
fpdfsdk/src/javascript/JS_Runtime.cpp:56: #ifndef PDF_ENABLE_XFA
On 2015/11/25 00:34:31, Lei Zhang wrote:
> Needs some manual merging here.

Yah, I've not jumped off this bridge yet.

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/jsapi/fxjs_v8_e...
File fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/jsapi/fxjs_v8_e...
fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp:34: v8::Locker locker(m_pIsolate);
On 2015/11/25 00:34:31, Lei Zhang wrote:
> Do you know if these are needed on master too? Ditto in other JS files.

They are probably not needed anywhere.  If you look, XFA has a threads package
API (that does nothing).  So maybe some other variant of XFA had threads.  We
don't.  I was going to let them be until the threads pacakge code was removed.

[Lei Zhang, 2015-11-25 21:51:34]

Is there a new patch set waiting to be uploaded?

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfppo.cpp
File fpdfsdk/src/fpdfppo.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfppo.cpp#new...
fpdfsdk/src/fpdfppo.cpp:307: 
On 2015/11/25 21:45:29, Tom Sepez wrote:
> On 2015/11/25 00:12:02, Lei Zhang wrote:
> > If this is the only difference, then the #include is probably not needed
> above.
> 
> Sadly, it is needed since it breaks IWYU elsewhere !!!  I took a stab at
fixing
> it, but it was involved.

Ouch. Add a TODO?

[Tom Sepez, 2015-11-25 22:58:30]

On 2015/11/25 21:51:34, Lei Zhang wrote:
> Is there a new patch set waiting to be uploaded?
Need to land the two follow-on CLs and regenerate.  Blocked on 
https://codereview.chromium.org/1472363003/

[Tom Sepez, 2015-11-25 23:08:22]

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfppo.cpp
File fpdfsdk/src/fpdfppo.cpp (right):

https://codereview.chromium.org/1477583002/diff/1/fpdfsdk/src/fpdfppo.cpp#new...
fpdfsdk/src/fpdfppo.cpp:307: 
On 2015/11/25 21:51:34, Lei Zhang wrote:
> On 2015/11/25 21:45:29, Tom Sepez wrote:
> > On 2015/11/25 00:12:02, Lei Zhang wrote:
> > > If this is the only difference, then the #include is probably not needed
> > above.
> > 
> > Sadly, it is needed since it breaks IWYU elsewhere !!!  I took a stab at
> fixing
> > it, but it was involved.
> 
> Ouch. Add a TODO?
Actually, I'm lying.  It works today.  The last time I tried it, fsdk_define had
problems.

[Tom Sepez, 2015-11-25 23:48:42]

And we've got a new one for review.

[Tom Sepez, 2015-11-25 23:53:10]

https://codereview.chromium.org/1477583002/diff/20001/fpdfsdk/src/fsdk_action...
File fpdfsdk/src/fsdk_actionhandler.cpp (right):

https://codereview.chromium.org/1477583002/diff/20001/fpdfsdk/src/fsdk_action...
fpdfsdk/src/fsdk_actionhandler.cpp:8: #include
"../include/fpdfxfa/fpdfxfa_doc.h"
Argh, maybe this was the IWYU bug I was thinking of ...

[Tom Sepez, 2015-11-25 23:55:29]

https://codereview.chromium.org/1477583002/diff/20001/fpdfsdk/src/fsdk_action...
File fpdfsdk/src/fsdk_actionhandler.cpp (right):

https://codereview.chromium.org/1477583002/diff/20001/fpdfsdk/src/fsdk_action...
fpdfsdk/src/fsdk_actionhandler.cpp:8: #include
"../include/fpdfxfa/fpdfxfa_doc.h"
On 2015/11/25 23:53:10, Tom Sepez wrote:
> Argh, maybe this was the IWYU bug I was thinking of ...

Nope.  Builds today, will fix in a separate CL.

[Tom Sepez, 2015-11-25 23:58:32]

On 2015/11/25 23:55:29, Tom Sepez wrote:
>
https://codereview.chromium.org/1477583002/diff/20001/fpdfsdk/src/fsdk_action...
> File fpdfsdk/src/fsdk_actionhandler.cpp (right):
> 
>
https://codereview.chromium.org/1477583002/diff/20001/fpdfsdk/src/fsdk_action...
> fpdfsdk/src/fsdk_actionhandler.cpp:8: #include
> "../include/fpdfxfa/fpdfxfa_doc.h"
> On 2015/11/25 23:53:10, Tom Sepez wrote:
> > Argh, maybe this was the IWYU bug I was thinking of ...
> 
> Nope.  Builds today, will fix in a separate CL.

And it gone from PS3.  I think this is ready.

[Lei Zhang, 2015-11-25 23:59:16]

lgtm

[Tom Sepez, 2015-11-26 00:05:52]

Description was changed from

==========
Inflict PDF_ENABLE_XFA ifdefs on XFA fpdfsdk/
==========

to

==========
Inflict PDF_ENABLE_XFA ifdefs on XFA fpdfsdk/

R=thestig@chromium.org

Committed:
https://pdfium.googlesource.com/pdfium/+/51da093564cdfd32a6ac02ad75e981787a0f...
==========

[Tom Sepez, 2015-11-26 00:05:53]

Committed patchset #3 (id:40001) manually as
51da093564cdfd32a6ac02ad75e981787a0f1b35 (presubmit successful).