• commit-bot@chromium.org's avatar
    Fix compilation with SK_ENABLE_INST_COUNT=1 · ab1c1386
    commit-bot@chromium.org authored
    Add INHERITED declarations to class declarations that prevent
    compilation with the flag.
    
    Remove SK_DEFINE_INST_COUNT from all class implementations.  Instead,
    use function-local static variables in the reference count helper
    classes to create the global instances to store the needed info. The
    accessor functions are defined inline in the helper classes, so
    definitions are not needed. The initialization point of the variables
    should be as well defined as previously.
    
    Remove SK_DECLARE_INST_COUNT_TEMPLATE and use SK_DECLARE_INST_COUNT
    instead. This avoids possible future compilation errors further.
    
    For SK_ENABLE_INST_COUNT=0 compilation, add an empty static member
    function to all classes that use SK_DECLARE_INST_COUNT and
    SK_DECLARE_INST_COUNT_ROOT macros. The function ensures that classes
    contain public INHERITED typedef. This member function seems to be
    compiled away. This shouĺd ensure that part of the compilation errors
    are caught earlier.
    
    Also adds DSK_DECLARE_INST_COUNT to few SkPDFDict subclasses.
    
    R=robertphillips@google.com, richardlin@chromium.org, bsalomon@google.com
    
    Author: kkinnunen@nvidia.com
    
    Review URL: https://codereview.chromium.org/98703002
    
    git-svn-id: http://skia.googlecode.com/svn/trunk@12501 2bbb7eff-a529-9590-31e7-b0007b416f81
    ab1c1386
SkBenchmark.cpp 1.43 KB