From b8f3655d492fc602c252f6fcc9aba3d37d8d59f4 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Mon, 22 Jul 2013 14:39:45 +0000 Subject: Update obvious deps. This is a step toward targets declaring their deps in a sane fashion. This change resolves cycles by forcing core to the root, then everything in skia_lib pointing toward core as best possible, then everything outside skia_lib depending on skia_lib for things in skia_lib. This prevents double definitions where a symbol is provided by both the skia_lib shared object and and a statically linked component of skia_lib. R=djsollen@google.com Review URL: https://codereview.chromium.org/19823003 git-svn-id: http://skia.googlecode.com/svn/trunk@10231 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/animator/SkDisplayEvent.cpp | 74 ----------------------------------------- 1 file changed, 74 deletions(-) (limited to 'src/animator') diff --git a/src/animator/SkDisplayEvent.cpp b/src/animator/SkDisplayEvent.cpp index 48529aa0be..a0cfcb1073 100644 --- a/src/animator/SkDisplayEvent.cpp +++ b/src/animator/SkDisplayEvent.cpp @@ -250,77 +250,3 @@ bool SkDisplayEvent::setProperty(int index, SkScriptValue& value) { } return true; } - -#ifdef SK_BUILD_FOR_ANDROID - -#include "SkMetaData.h" -#include "SkParse.h" -#include "SkTextBox.h" -#include "SkXMLWriter.h" - -void SkMetaData::setPtr(char const*, void*, PtrProc ) {} -void SkMetaData::setS32(char const*, int ) {} -bool SkEventSink::doEvent(SkEvent const& ) { return false; } -bool SkXMLParser::parse(SkStream& ) { return false; } -SkXMLParserError::SkXMLParserError( ) {} -void SkEvent::setType(char const*, size_t ) {} -void SkEvent::postTime(SkMSec) {} -SkEvent::SkEvent(char const*, SkEventSinkID) {} -SkEvent::SkEvent(SkEvent const&) {} -SkEvent::SkEvent( ) {} -SkEvent::~SkEvent( ) {} -bool SkEventSink::onQuery(SkEvent* ) { return false; } -SkEventSink::SkEventSink( ) {} -SkEventSink::~SkEventSink( ) {} -bool SkXMLParser::parse(char const*, size_t ) { return false; } -bool SkXMLParser::parse(SkDOM const&, SkDOMNode const* ) { return false; } -//void SkParse::UnitTest( ) {} -const char* SkMetaData::findString(char const* ) const {return 0;} -bool SkMetaData::findPtr(char const*, void**, PtrProc* ) const {return false;} -bool SkMetaData::findS32(char const*, int* ) const {return false;} -bool SkEvent::isType(char const*, size_t ) const { return false; } -void SkMetaData::setString(char const*, char const* ) {} -const char* SkParse::FindNamedColor(char const*, size_t, SkColor* ) {return NULL; } -const char* SkMetaData::Iter::next(SkMetaData::Type*, int* ) { return NULL; } -SkMetaData::Iter::Iter(SkMetaData const& ) {} -bool SkMetaData::findScalar(char const*, SkScalar* ) const {return false;} -void SkMetaData::reset( ) {} -void SkEvent::setType(SkString const& ) {} -bool SkMetaData::findBool(char const*, bool* ) const {return false;} -void SkEvent::getType(SkString*) const {} -bool SkXMLParser::endElement(char const* ) { return false; } -bool SkXMLParser::addAttribute(char const*, char const* ) { return false;} -bool SkXMLParser::startElement(char const* ) { return false;} -bool SkXMLParser::text(char const*, int ) { return false;} -bool SkXMLParser::onText(char const*, int ) { return false;} -SkXMLParser::SkXMLParser(SkXMLParserError* ) {} -SkXMLParser::~SkXMLParser( ) {} -SkXMLParserError::~SkXMLParserError( ) {} -void SkXMLParserError::getErrorString(SkString*) const {} -void SkTextBox::setSpacing(SkScalar, SkScalar ) {} -void SkTextBox::setSpacingAlign(SkTextBox::SpacingAlign ) {} -void SkTextBox::draw(SkCanvas*, char const*, size_t, SkPaint const& ) {} -void SkTextBox::setBox(SkRect const& ) {} -void SkTextBox::setMode(SkTextBox::Mode ) {} -SkTextBox::SkTextBox( ) {} -void SkMetaData::setScalar(char const*, SkScalar ) {} -const char* SkParse::FindScalar(char const*, SkScalar* ) {return 0; } -const char* SkParse::FindScalars(char const*, SkScalar*, int ) {return 0; } -const char* SkParse::FindHex(char const*, unsigned int* ) {return 0; } -const char* SkParse::FindS32(char const*, int* ) {return 0; } -void SkXMLWriter::addAttribute(char const*, char const* ) {} -void SkXMLWriter::startElement(char const* ) {} -void SkXMLWriter::doEnd(SkXMLWriter::Elem* ) {} -SkXMLWriter::Elem* SkXMLWriter::getEnd( ) { return 0; } -bool SkXMLWriter::doStart(char const*, size_t ) { return false; } -SkXMLWriter::SkXMLWriter(bool ) {} -SkXMLWriter::~SkXMLWriter( ) {} -SkMetaData::SkMetaData() {} -SkMetaData::~SkMetaData() {} -bool SkEventSink::onEvent(SkEvent const&) {return false;} -bool SkXMLParser::onEndElement(char const*) {return false;} -bool SkXMLParser::onAddAttribute(char const*, char const*) {return false;} -bool SkXMLParser::onStartElement(char const*) {return false;} -void SkXMLWriter::writeHeader() {} - -#endif -- cgit v1.2.3