Merge to XFA: Kill CFX_Object.

xfa/include/fwl/core/fwl_grid.h

 // 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 _FWL_GRID_H
 #define _FWL_GRID_H
 class IFWL_Widget;
 class IFWL_Content;
 class IFWL_Grid;
 #define FWL_CLASS_Grid                  L"FWL_GRID"
 #define FWL_CLASSHASH_Grid              3150298670
 #define FWL_GRIDSTYLEEXT_ShowGridLines (1L << 0)
-struct FWL_LAYOUTDATA : public CFX_Object {
+struct FWL_LAYOUTDATA {
     FX_FLOAT fWidth;
     FX_FLOAT fHeight;
 };
 enum FWL_GRIDUNIT {
     FWL_GRIDUNIT_Auto = 0,
     FWL_GRIDUNIT_Fixed,
     FWL_GRIDUNIT_Scaled,
     FWL_GRIDUNIT_Infinity,
 };
 enum FWL_GRIDMARGIN {
@@ skipping 41 matching lines @@
     FX_BOOL                             GetWidgetMargin(IFWL_Widget *pWidget, FWL_GRIDMARGIN eMargin, FX_FLOAT &fMargin);
     FWL_ERR                             SetWidgetMargin(IFWL_Widget *pWidget, FWL_GRIDMARGIN eMargin, FX_FLOAT fMargin);
     FWL_ERR                             RemoveWidgetMargin(IFWL_Widget *pWidget, FWL_GRIDMARGIN eMargin);
     FX_FLOAT                    GetGridSize(FWL_GRIDSIZE eSize, FWL_GRIDUNIT &eUnit);
     FWL_ERR                             SetGridSize(FWL_GRIDSIZE eSize, FX_FLOAT fSize, FWL_GRIDUNIT eUit);
 protected:
     IFWL_Grid();
     virtual ~IFWL_Grid();
 };
 #endif