Revert 221930 "[OSX] Turn on canvas_skia for OSX"
commit262816200be72a1ac7df34fe03b780ee42b7702d
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Sat, 7 Sep 2013 23:50:54 +0000 (7 23:50 +0000)
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Sat, 7 Sep 2013 23:50:54 +0000 (7 23:50 +0000)
tree8930aeefd9be91743f3c94377eee2fdc7fa43477
parentdd3918f7e7fd7caa39fb82491682eb37729cd1e9
Revert 221930 "[OSX] Turn on canvas_skia for OSX"

> [OSX] Turn on canvas_skia for OSX
>
> BUG=151935
>
> Review URL: https://chromiumcodereview.appspot.com/23456020

This broke mac compile:

FAILED: clang++ -MMD -MF obj/ui/gfx/ui_unittests.canvas_unittest_mac.o.d -DANGLE_DX11 -DWTF_VECTOR_INITIAL_SIZE=4 -DCHROMIUM_BUILD -DCOMPONENT_BUILD -DUSE_LIBJPEG_TURBO=1 -DENABLE_ONE_CLICK_SIGNIN -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1 -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DENABLE_GPU=1 -DENABLE_EGLIMAGE=1 -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_AUTOMATION=1 -DENABLE_GOOGLE_NOW=1 -DENABLE_FULL_PRINTING=1 -DENABLE_PRINTING=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_MANAGED_USERS=1 -DSKIA_DLL -DSK_ENABLE_INST_COUNT=0 -DSK_SUPPORT_GPU=1 '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' -DSK_USE_POSIX_THREADS -DSK_DEFERRED_CANVAS_USES_FACTORIES=1 -DUNIT_TEST -DGTEST_HAS_RTTI=0 -DU_USING_ICU_NAMESPACE=0 -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -I../.. -I../.. -I../../third_party/skia/src/core -I../../skia/config -I../../third_party/skia/include/config -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/pdf -I../../third_party/skia/include/gpu -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../skia/ext -I../../third_party/skia/include/utils/mac -I../../testing/gmock/include -I../../testing/gtest/include -I../../third_party/icu/source/i18n -I../../third_party/icu/source/common -I../../third_party/libpng -I../../third_party/zlib -Igen/ui/app_locale_settings -Igen/ui/ui_strings -Igen/ui/ui_resources -isysroot /Developer/SDKs/MacOSX10.6.sdk -O0 -gdwarf-2 -fvisibility=hidden -Werror -Wnewline-eof -mmacosx-version-min=10.6 -arch i386 -Wall -Wendif-labels -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wheader-hygiene -Wno-c++11-narrowing -Wno-char-subscripts -Wno-unused-function -Wno-covered-switch-default -Wstring-conversion -Wno-deprecated-register -std=gnu++11 -fno-rtti -fno-exceptions -fvisibility-inlines-hidden -fno-threadsafe-statics -Xclang -load -Xclang /Volumes/data/b/build/slave/Mac_Builder__dbg_/build/src/tools/clang/scripts/../../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -fcolor-diagnostics -fno-strict-aliasing -fstack-protector-all -fobjc-call-cxx-cdtors  -c ../../ui/gfx/canvas_unittest_mac.mm -o obj/ui/gfx/ui_unittests.canvas_unittest_mac.o
../../ui/gfx/canvas_unittest_mac.mm:12:10: fatal error: 'ui/base/range/range.h' file not found
#include "ui/base/range/range.h"
         ^
1 error generated.
ninja: build stopped: subcommand failed.

TBR=groby@chromium.org

Review URL: https://codereview.chromium.org/23622022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221934 0039d316-1c4b-4281-b951-d872f2087c98
build/common.gypi
ui/gfx/canvas_mac.mm [new file with mode: 0644]
ui/gfx/canvas_unittest_mac.mm [deleted file]
ui/ui.gyp
ui/ui_unittests.gypi