From cc1229c9d5e57b45305ba8f99ae33e92db0032bc Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 12 Aug 2015 18:58:52 -0700 Subject: [PATCH] Revert "Revert[4] "move some public headers into private"" This reverts commit 33e00db73d5f1836481cf4053c64e4ed20537662. BUG=skia: TBR= NOTREECHECKS=True FAILED: /b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/components/user_manager/user_manager_test_support.fake_user_manager.o.d -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_FILE_OFFSET_BITS=64 -DCHROMIUM_BUILD -DCR_CLANG_REVISION=242792-1 -DCOMPONENT_BUILD -DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_AURA=1 -DUSE_ASH=1 -DUSE_PANGO=1 -DUSE_CAIRO=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 -DUSE_X11=1 -DIMAGE_LOADER_EXTENSION=1 -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 -DUSE_PROPRIETARY_CODECS -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DENABLE_TOPCHROME_MD=1 -DUSE_UDEV -DDONT_EMBED_BUILD_METADATA -DDCHECK_ALWAYS_ON=1 -DFIELDTRIAL_TESTING_ENABLED -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_GOOGLE_NOW=1 -DENABLE_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DSAFE_BROWSING_SERVICE -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DUNIT_TEST -DGTEST_HAS_RTTI=0 -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DOS_CHROMEOS=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_DEBUG -D_GLIBCXX_DEBUG=1 -Igen -I../.. -I../../skia/config -I../../testing/gmock/include -I../../testing/gtest/include -Werror -pthread -fno-strict-aliasing -Wall -Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe -fPIC -Wno-reserved-user-defined-literal -Xclang -load -Xclang /b/build/slave/linux_chromeos/build/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-templates -fcolor-diagnostics -B/b/build/slave/linux_chromeos/build/src/third_party/binutils/Linux_x64/Release/bin -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-deprecated-register -Wno-inconsistent-missing-override -Wno-shift-negative-value -pthread -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -m64 -march=x86-64 -O0 -g -funwind-tables -gsplit-dwarf -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -g0 -fno-exceptions -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -Wsign-compare -std=gnu++11 -c ../../components/user_manager/fake_user_manager.cc -o obj/components/user_manager/user_manager_test_support.fake_user_manager.o In file included from ../../components/user_manager/fake_user_manager.cc:5: In file included from ../../components/user_manager/fake_user_manager.h:12: In file included from ../../components/user_manager/user.h:14: In file included from ../../components/user_manager/user_image/user_image.h:12: In file included from ../../ui/gfx/image/image_skia.h:15: In file included from ../../ui/gfx/image/image_skia_rep.h:8: In file included from ../../third_party/skia/include/core/SkBitmap.h:11: In file included from ../../third_party/skia/include/core/SkColor.h:11: In file included from ../../third_party/skia/include/core/SkScalar.h:12: ../../third_party/skia/include/core/../private/SkFloatingPoint.h:13:10: fatal error: 'SkTypes.h' file not found #include "SkTypes.h" ninja -w dupbuild=err -C /b/build/slave/linux_chromeos/build/src/out/Debug accessibility_unittests accessibility_unittests_run app_list_unittests app_list_unittests_run app_shell_unittests app_shell_unittests_run ash_unittests ash_unittests_run aura_builder aura_unittests aura_unittests_run base_unittests base_unittests_run browser_tests browser_tests_run cacheinvalidation_unittests cacheinvalidation_unittests_run chromeos_unittests chromeos_unittests_run components_unittests components_unittests_run compositor_unittests compositor_unittests_run content_browsertests content_browsertests_run content_unittests content_unittests_run crypto_unittests crypto_unittests_run dbus_unittests device_unittests device_unittests_run display_unittests display_unittests_run events_unittests events_unittests_run extensions_browsertests extensions_browsertests_run extensions_unittests extensions_unittests_run gcm_unit_tests gcm_unit_tests_run gfx_unittests gfx_unittests_run google_apis_unittests google_apis_unittests_run gpu_unittests gpu_unittests_run interactive_ui_tests interactive_ui_tests_run ipc_tests ipc_tests_run jingle_unittests jingle_unittests_run media_unittests media_unittests_run message_center_unittests message_center_unittests_run midi_unittests midi_unittests_run nacl_helper_nonsfi_unittests nacl_loader_unittests nacl_loader_unittests_run net_unittests net_unittests_run ppapi_unittests printing_unittests printing_unittests_run remoting_unittests remoting_unittests_run sandbox_linux_unittests sandbox_linux_unittests_run skia_unittests skia_unittests_run sql_unittests sql_unittests_run sync_unit_tests sync_unit_tests_run ui_base_unittests ui_base_unittests_run ui_chromeos_unittests ui_touch_selection_unittests ui_touch_selection_unittests_run unit_tests unit_tests_run url_unittests url_unittests_run views_unittests wm_unittests wm_unittests_run -j50 ninja: Entering directory `/b/build/slave/linux_chromeos/build/src/out/Debug' Review URL: https://codereview.chromium.org/1288863002 --- gyp/animator.gyp | 1 - gyp/core.gypi | 4 ++++ gyp/sfnt.gyp | 1 - {src => include}/core/SkEndian.h | 0 include/{private => core}/SkFloatBits.h | 0 include/{private => core}/SkFloatingPoint.h | 0 include/core/SkPicture.h | 1 + include/core/SkScalar.h | 2 +- include/core/SkTypeface.h | 2 +- include/{private => core}/SkWeakRefCnt.h | 0 include/svg/parser/SkSVGParser.h | 1 + 11 files changed, 8 insertions(+), 4 deletions(-) rename {src => include}/core/SkEndian.h (100%) rename include/{private => core}/SkFloatBits.h (100%) rename include/{private => core}/SkFloatingPoint.h (100%) rename include/{private => core}/SkWeakRefCnt.h (100%) diff --git a/gyp/animator.gyp b/gyp/animator.gyp index 9eb076b164..e267756724 100644 --- a/gyp/animator.gyp +++ b/gyp/animator.gyp @@ -20,7 +20,6 @@ ], 'include_dirs': [ '../include/animator', - '../include/private', '../src/utils', ], 'sources': [ diff --git a/gyp/core.gypi b/gyp/core.gypi index fd9644eeec..d1ac89547f 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -273,10 +273,13 @@ '<(skia_include_path)/core/SkDrawable.h', '<(skia_include_path)/core/SkDrawFilter.h', '<(skia_include_path)/core/SkDrawLooper.h', + '<(skia_include_path)/core/SkEndian.h', '<(skia_include_path)/core/SkError.h', '<(skia_include_path)/core/SkFixed.h', '<(skia_include_path)/core/SkFlattenable.h', '<(skia_include_path)/core/SkFlattenableSerialization.h', + '<(skia_include_path)/core/SkFloatBits.h', + '<(skia_include_path)/core/SkFloatingPoint.h', '<(skia_include_path)/core/SkFontHost.h', '<(skia_include_path)/core/SkFontStyle.h', '<(skia_include_path)/core/SkGraphics.h', @@ -331,6 +334,7 @@ '<(skia_include_path)/core/SkTypes.h', '<(skia_include_path)/core/SkUnPreMultiply.h', '<(skia_include_path)/core/SkUtils.h', + '<(skia_include_path)/core/SkWeakRefCnt.h', '<(skia_include_path)/core/SkWriter32.h', '<(skia_include_path)/core/SkXfermode.h', diff --git a/gyp/sfnt.gyp b/gyp/sfnt.gyp index c129570e6b..944857f5f0 100644 --- a/gyp/sfnt.gyp +++ b/gyp/sfnt.gyp @@ -13,7 +13,6 @@ 'core.gyp:*', ], 'include_dirs': [ - '../src/core', '../src/sfnt', ], 'sources': [ diff --git a/src/core/SkEndian.h b/include/core/SkEndian.h similarity index 100% rename from src/core/SkEndian.h rename to include/core/SkEndian.h diff --git a/include/private/SkFloatBits.h b/include/core/SkFloatBits.h similarity index 100% rename from include/private/SkFloatBits.h rename to include/core/SkFloatBits.h diff --git a/include/private/SkFloatingPoint.h b/include/core/SkFloatingPoint.h similarity index 100% rename from include/private/SkFloatingPoint.h rename to include/core/SkFloatingPoint.h diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index baef45ded0..358faf9524 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -9,6 +9,7 @@ #define SkPicture_DEFINED #include "SkImageDecoder.h" +#include "SkLazyPtr.h" #include "SkRefCnt.h" #include "SkTypes.h" diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h index 71575a4920..25d1c611cd 100644 --- a/include/core/SkScalar.h +++ b/include/core/SkScalar.h @@ -9,7 +9,7 @@ #define SkScalar_DEFINED #include "SkFixed.h" -#include "../private/SkFloatingPoint.h" +#include "SkFloatingPoint.h" // TODO: move this sort of check into SkPostConfig.h #define SK_SCALAR_IS_DOUBLE 0 diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index 863b8abac5..a9204a6df9 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -14,7 +14,7 @@ #include "SkLazyPtr.h" #include "SkRect.h" #include "SkString.h" -#include "../private/SkWeakRefCnt.h" +#include "SkWeakRefCnt.h" class SkDescriptor; class SkFontData; diff --git a/include/private/SkWeakRefCnt.h b/include/core/SkWeakRefCnt.h similarity index 100% rename from include/private/SkWeakRefCnt.h rename to include/core/SkWeakRefCnt.h diff --git a/include/svg/parser/SkSVGParser.h b/include/svg/parser/SkSVGParser.h index bb3ab90517..c2f9112e64 100644 --- a/include/svg/parser/SkSVGParser.h +++ b/include/svg/parser/SkSVGParser.h @@ -12,6 +12,7 @@ #include "SkMatrix.h" #include "SkTDict.h" +#include "SkTDStack.h" #include "SkSVGPaintState.h" #include "SkSVGTypes.h" #include "SkStream.h"