Cleanup the XML directory in public includes.

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

13 files changed, 19 insertions, 764 deletions

diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi
index 53cadf5024..906bea814d 100644
--- a/gyp/apptype_console.gypi
+++ b/gyp/apptype_console.gypi
@@ -39,7 +39,6 @@
             'include_dirs' : [
               '../experimental/iOSSampleApp/Shared',
               '../include/views',
-              '../include/xml',
               '../include/utils/mac',
               '../src/views/mac',
             ],
@@ -55,7 +54,6 @@
         ],
         'dependencies': [
           'views.gyp:views',
-          'xml.gyp:xml',
         ],
         'link_settings': {
           'libraries': [
diff --git a/gyp/core.gyp b/gyp/core.gyp
index 91545ee0c3..e65baffc12 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -20,7 +20,6 @@
         '../include/pipe',
         '../include/ports',
         '../include/utils',
-        '../include/xml',
         '../include/images',
         '../src/core',
         '../src/sfnt',
diff --git a/gyp/experimental.gyp b/gyp/experimental.gyp
index c3789fad57..96f9c5d67c 100644
--- a/gyp/experimental.gyp
+++ b/gyp/experimental.gyp
@@ -32,7 +32,6 @@
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
         'views.gyp:views',
-        'xml.gyp:xml',
       ],
       'conditions' : [
         [ 'skia_gpu == 1', {
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 78d59dfe03..6d2a96882b 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -15,7 +15,6 @@
         '../include/ports',
         '../include/utils',
         '../include/utils/win',
-        '../include/xml',
         '../src/core',
         '../src/lazy',
         '../src/ports',
@@ -55,7 +54,6 @@
         '../src/ports/SkTime_win.cpp',
         '../src/ports/SkTLS_pthread.cpp',
         '../src/ports/SkTLS_win.cpp',
-        '../src/ports/SkXMLParser_empty.cpp',
 
         '../include/ports/SkFontConfigInterface.h',
         '../include/ports/SkFontMgr.h',
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 93ad0df389..bb8be20049 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -666,7 +666,6 @@
           '<(skia_include_path)/views/SkOSWindow_Unix.h',
           '<(skia_include_path)/views/SkOSWindow_Win.h',
           '<(skia_include_path)/views/SkWindow.h',
-          '<(skia_include_path)/xml/SkJS.h',
         ],
       },
       'include_dirs': [
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index e12c87a135..19816f88e4 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -22,7 +22,6 @@
         '../include/utils/mac',
         '../include/utils/unix',
         '../include/utils/win',
-        '../include/xml',
         '../src/core',
         '../src/opts',
         '../src/utils',
diff --git a/gyp/views.gyp b/gyp/views.gyp
index f61c11a16e..55fb6dad22 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -13,7 +13,7 @@
       'standalone_static_library': 1,
       'dependencies': [
         'skia_lib.gyp:skia_lib',
-        'xml.gyp:*',
+        'xml.gyp:xml',
       ],
       'include_dirs': [
         '../include/views',
@@ -134,6 +134,9 @@
           '../include/views',
         ],
       },
+      'export_dependent_settings': [
+        'xml.gyp:xml',
+      ],
     },
   ],
 }
diff --git a/gyp/xml.gyp b/gyp/xml.gyp
index 286a45c073..aaceef2e66 100644
--- a/gyp/xml.gyp
+++ b/gyp/xml.gyp
@@ -15,15 +15,12 @@
         '../include/xml/SkBML_WXMLParser.h',
         '../include/xml/SkBML_XMLParser.h',
         '../include/xml/SkDOM.h',
-        '../include/xml/SkJS.h',
         '../include/xml/SkXMLParser.h',
         '../include/xml/SkXMLWriter.h',
 
         '../src/xml/SkBML_Verbs.h',
         '../src/xml/SkBML_XMLParser.cpp',
         '../src/xml/SkDOM.cpp',
-        '../src/xml/SkJS.cpp',
-        '../src/xml/SkJSDisplayable.cpp',
         '../src/xml/SkXMLParser.cpp',
         '../src/xml/SkXMLPullParser.cpp',
         '../src/xml/SkXMLWriter.cpp',
@@ -31,16 +28,6 @@
       'sources!': [
           '../src/xml/SkXMLPullParser.cpp', #if 0 around class decl in header
       ],
-      'conditions': [
-        [ 'skia_os in ["win", "mac", "linux", "freebsd", "openbsd", "solaris", "android", "ios", "nacl", "chromeos"]', {
-          'sources!': [
-            # no jsapi.h by default on system
-            '../include/xml/SkJS.h',
-            '../src/xml/SkJS.cpp',
-            '../src/xml/SkJSDisplayable.cpp',
-          ],
-        }],
-      ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/xml',
diff --git a/include/xml/SkJS.h b/include/xml/SkJS.h
deleted file mode 100644
index 8a11097962..0000000000
--- a/include/xml/SkJS.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkTypes.h"
-#include "SkWindow.h"
-
-extern "C" {
-    typedef long JSWord;
-    typedef JSWord jsword;
-    typedef jsword  jsval;
-    typedef struct JSRuntime JSRuntime;
-    typedef struct JSContext JSContext;
-    typedef struct JSObject JSObject;
-}
-
-class SkString;
-
-class SkJS : public SkOSWindow {
-public:
-    SkJS(void* hwnd);
-    ~SkJS();
-    SkBool EvaluateScript(const char* script, jsval* rVal);
-    SkBool ValueToString(jsval value, SkString* string);
-#ifdef SK_DEBUG
-    static void Test(void* hwnd);
-#endif
-protected:
-    void InitializeDisplayables(const SkBitmap& , JSContext *, JSObject *, JSObject *);
-    void DisposeDisplayables();
-    JSRuntime *fRuntime;
-    JSContext *fContext;
-    JSObject *fGlobal;
-};
diff --git a/src/ports/SkXMLParser_empty.cpp b/src/ports/SkXMLParser_empty.cpp
deleted file mode 100644
index 09b222e899..0000000000
--- a/src/ports/SkXMLParser_empty.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkXMLParser.h"
-
-bool SkXMLParser::parse(SkStream& docStream)
-{
-    return false;
-}
-
-bool SkXMLParser::parse(const char doc[], size_t len)
-{
-    return false;
-}
-
-void SkXMLParser::GetNativeErrorString(int error, SkString* str)
-{
-
-}
diff --git a/src/xml/SkJS.cpp b/src/xml/SkJS.cpp
deleted file mode 100644
index 8167c9c1ea..0000000000
--- a/src/xml/SkJS.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include <jsapi.h>
-
-#include "SkJS.h"
-#include "SkString.h"
-
-#ifdef _WIN32_WCE
-extern "C" {
-    void abort() {
-        SkASSERT(0);
-    }
-
-    unsigned int _control87(unsigned int _new, unsigned int mask ) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    time_t mktime(struct tm *timeptr ) {
-        SkASSERT(0);
-        return 0;
-    }
-
-//  int errno;
-
-    char *strdup(const char *) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    char *strerror(int errnum) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    int isatty(void* fd) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    int putenv(const char *envstring) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    char *getenv(const char *varname) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    void GetSystemTimeAsFileTime(LPFILETIME lpSystemTimeAsFileTime) {
-        SkASSERT(0);
-    }
-
-    struct tm * localtime(const time_t *timer) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    size_t strftime(char *strDest, size_t maxsize, const char *format,
-        const struct tm *timeptr ) {
-        SkASSERT(0);
-        return 0;
-    }
-
-}
-#endif
-
-static JSBool
-global_enumerate(JSContext *cx, JSObject *obj)
-{
-#ifdef LAZY_STANDARD_CLASSES
-    return JS_EnumerateStandardClasses(cx, obj);
-#else
-    return JS_TRUE;
-#endif
-}
-
-static JSBool
-global_resolve(JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp)
-{
-#ifdef LAZY_STANDARD_CLASSES
-    if ((flags & JSRESOLVE_ASSIGNING) == 0) {
-        JSBool resolved;
-
-        if (!JS_ResolveStandardClass(cx, obj, id, &resolved))
-            return JS_FALSE;
-        if (resolved) {
-            *objp = obj;
-            return JS_TRUE;
-        }
-    }
-#endif
-
-#if defined(SHELL_HACK) && defined(DEBUG) && defined(XP_UNIX)
-    if ((flags & (JSRESOLVE_QUALIFIED | JSRESOLVE_ASSIGNING)) == 0) {
-        /*
-         * Do this expensive hack only for unoptimized Unix builds, which are
-         * not used for benchmarking.
-         */
-        char *path, *comp, *full;
-        const char *name;
-        JSBool ok, found;
-        JSFunction *fun;
-
-        if (!JSVAL_IS_STRING(id))
-            return JS_TRUE;
-        path = getenv("PATH");
-        if (!path)
-            return JS_TRUE;
-        path = JS_strdup(cx, path);
-        if (!path)
-            return JS_FALSE;
-        name = JS_GetStringBytes(JSVAL_TO_STRING(id));
-        ok = JS_TRUE;
-        for (comp = strtok(path, ":"); comp; comp = strtok(NULL, ":")) {
-            if (*comp != '\0') {
-                full = JS_smprintf("%s/%s", comp, name);
-                if (!full) {
-                    JS_ReportOutOfMemory(cx);
-                    ok = JS_FALSE;
-                    break;
-                }
-            } else {
-                full = (char *)name;
-            }
-            found = (access(full, X_OK) == 0);
-            if (*comp != '\0')
-                free(full);
-            if (found) {
-                fun = JS_DefineFunction(cx, obj, name, Exec, 0, JSPROP_ENUMERATE);
-                ok = (fun != NULL);
-                if (ok)
-                    *objp = obj;
-                break;
-            }
-        }
-        JS_free(cx, path);
-        return ok;
-    }
-#else
-    return JS_TRUE;
-#endif
-}
-
-JSClass global_class = {
-    "global", JSCLASS_NEW_RESOLVE,
-    JS_PropertyStub,  JS_PropertyStub,
-    JS_PropertyStub,  JS_PropertyStub,
-    global_enumerate, (JSResolveOp) global_resolve,
-    JS_ConvertStub,   JS_FinalizeStub
-};
-
-SkJS::SkJS(void* hwnd) : SkOSWindow(hwnd) {
-    if ((fRuntime = JS_NewRuntime(0x100000)) == NULL) {
-        SkASSERT(0);
-        return;
-    }
-    if ((fContext = JS_NewContext(fRuntime, 0x1000)) == NULL) {
-        SkASSERT(0);
-        return;
-    }
-    ;
-    if ((fGlobal = JS_NewObject(fContext, &global_class, NULL, NULL)) == NULL) {
-        SkASSERT(0);
-        return;
-    }
-    if (JS_InitStandardClasses(fContext, fGlobal) == NULL) {
-        SkASSERT(0);
-        return;
-    }
-    setConfig(SkBitmap::kARGB32_Config);
-    updateSize();
-    setVisibleP(true);
-    InitializeDisplayables(getBitmap(), fContext, fGlobal, NULL);
-}
-
-SkJS::~SkJS() {
-    DisposeDisplayables();
-    JS_DestroyContext(fContext);
-    JS_DestroyRuntime(fRuntime);
-    JS_ShutDown();
-}
-
-SkBool SkJS::EvaluateScript(const char* script, jsval* rVal) {
-    return JS_EvaluateScript(fContext, fGlobal, script, strlen(script),
-        "memory" /* no file name */, 0 /* no line number */, rVal);
-}
-
-SkBool SkJS::ValueToString(jsval value, SkString* string) {
-     JSString* str = JS_ValueToString(fContext, value);
-     if (str == NULL)
-         return false;
-     string->set(JS_GetStringBytes(str));
-     return true;
-}
-
-#ifdef SK_DEBUG
-void SkJS::Test(void* hwnd) {
-    SkJS js(hwnd);
-    jsval val;
-    SkBool success = js.EvaluateScript("22/7", &val);
-    SkASSERT(success);
-    SkString string;
-    success = js.ValueToString(val, &string);
-    SkASSERT(success);
-    SkASSERT(strcmp(string.c_str(), "3.142857142857143") == 0);
-    success = js.EvaluateScript(
-        "var rect = new rectangle();"
-        "rect.left = 4;"
-        "rect.top = 10;"
-        "rect.right = 20;"
-        "rect.bottom = 30;"
-        "rect.width = rect.height + 20;"
-        "rect.draw();"
-        , &val);
-    SkASSERT(success);
-    success = js.ValueToString(val, &string);
-    SkASSERT(success);
-}
-#endifASSERT(success);
diff --git a/src/xml/SkJSDisplayable.cpp b/src/xml/SkJSDisplayable.cpp
deleted file mode 100644
index 02a0501672..0000000000
--- a/src/xml/SkJSDisplayable.cpp
+++ /dev/null
@@ -1,452 +0,0 @@
-
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include <jsapi.h>
-#include "SkJS.h"
-#include "SkDisplayType.h"
-//#include "SkAnimateColor.h"
-#include "SkAnimateMaker.h"
-#include "SkAnimateSet.h"
-//#include "SkAnimateTransform.h"
-#include "SkCanvas.h"
-//#include "SkDimensions.h"
-#include "SkDisplayAdd.h"
-#include "SkDisplayApply.h"
-//#include "SkDisplayBefore.h"
-#include "SkDisplayEvent.h"
-//#include "SkDisplayFocus.h"
-#include "SkDisplayInclude.h"
-#include "SkDisplayPost.h"
-#include "SkDisplayRandom.h"
-#include "SkDraw3D.h"
-#include "SkDrawBitmap.h"
-#include "SkDrawClip.h"
-#include "SkDrawDash.h"
-#include "SkDrawDiscrete.h"
-#include "SkDrawEmboss.h"
-//#include "SkDrawFont.h"
-#include "SkDrawFull.h"
-#include "SkDrawGradient.h"
-#include "SkDrawLine.h"
-//#include "SkDrawMaskFilter.h"
-#include "SkDrawMatrix.h"
-#include "SkDrawOval.h"
-#include "SkDrawPaint.h"
-#include "SkDrawPath.h"
-#include "SkDrawPoint.h"
-// #include "SkDrawStroke.h"
-#include "SkDrawText.h"
-#include "SkDrawTo.h"
-//#include "SkDrawTransferMode.h"
-#include "SkDrawTransparentShader.h"
-//#include "SkDrawUse.h"
-#include "SkMatrixParts.h"
-#include "SkPathParts.h"
-#include "SkPostParts.h"
-#include "SkScript.h"
-#include "SkSnapshot.h"
-#include "SkTextOnPath.h"
-#include "SkTextToPath.h"
-
-
-class SkJSDisplayable {
-public:
-    SkJSDisplayable() : fDisplayable(NULL) {}
-    ~SkJSDisplayable() { delete fDisplayable; }
-    static void Destructor(JSContext *cx, JSObject *obj);
-    static JSBool GetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-    static JSBool SetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-    static SkCanvas* gCanvas;
-    static SkPaint* gPaint;
-    static JSBool Draw(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-    SkDisplayable* fDisplayable;
-};
-
-SkCanvas* SkJSDisplayable::gCanvas;
-SkPaint* SkJSDisplayable::gPaint;
-
-JSBool SkJSDisplayable::Draw(JSContext *cx, JSObject *obj, uintN argc,
-                                    jsval *argv, jsval *rval)
-{
-    SkJSDisplayable *p = (SkJSDisplayable*) JS_GetPrivate(cx, obj);
-    SkASSERT(p->fDisplayable->isDrawable());
-    SkDrawable* drawable = (SkDrawable*) p->fDisplayable;
-    SkAnimateMaker maker(NULL, gCanvas, gPaint);
-    drawable->draw(maker);
-    return JS_TRUE;
-}
-
-
-JSFunctionSpec SkJSDisplayable_methods[] =
-{
-    { "draw", SkJSDisplayable::Draw, 1, 0, 0 },
-    { 0 }
-};
-
-static JSPropertySpec* gDisplayableProperties[kNumberOfTypes];
-static JSClass gDisplayableClasses[kNumberOfTypes];
-
-#define JS_INIT(_prefix, _class) \
-static JSBool _class##Constructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { \
-    SkJSDisplayable* jsDisplayable = new SkJSDisplayable(); \
-    jsDisplayable->fDisplayable = new _prefix##_class(); \
-    JS_SetPrivate(cx, obj, (void*) jsDisplayable); \
-    return JS_TRUE; \
-} \
-    \
-static JSObject* _class##Init(JSContext *cx, JSObject *obj, JSObject *proto) { \
-    JSObject *newProtoObj = JS_InitClass(cx, obj, proto, &gDisplayableClasses[SkType_##_class], \
-        _class##Constructor, 0, \
-        NULL, SkJSDisplayable_methods , \
-        NULL, NULL); \
-    JS_DefineProperties(cx, newProtoObj, gDisplayableProperties[SkType_##_class]); \
-    return newProtoObj; \
-}
-
-JS_INIT(Sk, Add)
-JS_INIT(Sk, AddCircle)
-JS_INIT(Sk, AddOval)
-JS_INIT(Sk, AddPath)
-JS_INIT(Sk, AddRectangle)
-JS_INIT(Sk, AddRoundRect)
-//JS_INIT(Sk, After)
-JS_INIT(Sk, Apply)
-// JS_INIT(Sk, Animate)
-//JS_INIT(Sk, AnimateColor)
-JS_INIT(Sk, AnimateField)
-//JS_INIT(Sk, AnimateRotate)
-//JS_INIT(Sk, AnimateScale)
-//JS_INIT(Sk, AnimateTranslate)
-JS_INIT(SkDraw, Bitmap)
-JS_INIT(Sk, BaseBitmap)
-//JS_INIT(Sk, Before)
-JS_INIT(SkDraw, BitmapShader)
-JS_INIT(SkDraw, Blur)
-JS_INIT(SkDraw, Clip)
-JS_INIT(SkDraw, Color)
-JS_INIT(Sk, CubicTo)
-JS_INIT(Sk, Dash)
-JS_INIT(Sk, Data)
-//JS_INIT(Sk, Dimensions)
-JS_INIT(Sk, Discrete)
-JS_INIT(Sk, DrawTo)
-JS_INIT(SkDraw, Emboss)
-JS_INIT(SkDisplay, Event)
-// JS_INIT(SkDraw, Font)
-// JS_INIT(Sk, Focus)
-JS_INIT(Sk, Image)
-JS_INIT(Sk, Include)
-// JS_INIT(Sk, Input)
-JS_INIT(Sk, Line)
-JS_INIT(Sk, LinearGradient)
-JS_INIT(Sk, LineTo)
-JS_INIT(SkDraw, Matrix)
-JS_INIT(Sk, Move)
-JS_INIT(Sk, MoveTo)
-JS_INIT(Sk, Oval)
-JS_INIT(SkDraw, Path)
-JS_INIT(SkDraw, Paint)
-JS_INIT(Sk, DrawPoint)
-JS_INIT(Sk, PolyToPoly)
-JS_INIT(Sk, Polygon)
-JS_INIT(Sk, Polyline)
-JS_INIT(Sk, Post)
-JS_INIT(Sk, QuadTo)
-JS_INIT(Sk, RadialGradient)
-JS_INIT(SkDisplay, Random)
-JS_INIT(Sk, RectToRect)
-JS_INIT(Sk, Rectangle)
-JS_INIT(Sk, Remove)
-JS_INIT(Sk, Replace)
-JS_INIT(Sk, Rotate)
-JS_INIT(Sk, RoundRect)
-JS_INIT(Sk, Scale)
-JS_INIT(Sk, Set)
-JS_INIT(Sk, Skew)
-// JS_INIT(Sk, 3D_Camera)
-// JS_INIT(Sk, 3D_Patch)
-JS_INIT(Sk, Snapshot)
-// JS_INIT(SkDraw, Stroke)
-JS_INIT(Sk, Text)
-JS_INIT(Sk, TextOnPath)
-JS_INIT(Sk, TextToPath)
-JS_INIT(Sk, Translate)
-//JS_INIT(Sk, Use)
-
-#if SK_USE_CONDENSED_INFO == 0
-static void GenerateTables() {
-    for (int index = 0; index < kTypeNamesSize; index++) {
-        int infoCount;
-        SkDisplayTypes type = gTypeNames[index].fType;
-        const SkMemberInfo* info = SkDisplayType::GetMembers(NULL /* fMaker */, type, &infoCount);
-        if (info == NULL)
-            continue;
-        gDisplayableProperties[type] = new JSPropertySpec[infoCount + 1];
-        JSPropertySpec* propertySpec = gDisplayableProperties[type];
-        memset(propertySpec, 0, sizeof (JSPropertySpec) * (infoCount + 1));
-        for (int inner = 0; inner < infoCount; inner++) {
-            if (info[inner].fType == SkType_BaseClassInfo)
-                continue;
-            propertySpec[inner].name = info[inner].fName;
-            propertySpec[inner].tinyid = inner;
-            propertySpec[inner].flags = JSPROP_ENUMERATE;
-        }
-        gDisplayableClasses[type].name = gTypeNames[index].fName;
-        gDisplayableClasses[type].flags = JSCLASS_HAS_PRIVATE;
-        gDisplayableClasses[type].addProperty = JS_PropertyStub;
-        gDisplayableClasses[type].delProperty = JS_PropertyStub;
-        gDisplayableClasses[type].getProperty = SkJSDisplayable::GetProperty;
-        gDisplayableClasses[type].setProperty = SkJSDisplayable::SetProperty;
-        gDisplayableClasses[type].enumerate = JS_EnumerateStub;
-        gDisplayableClasses[type].resolve = JS_ResolveStub;
-        gDisplayableClasses[type].convert = JS_ConvertStub;
-        gDisplayableClasses[type].finalize = SkJSDisplayable::Destructor;
-    }
-}
-#endif
-
-void SkJSDisplayable::Destructor(JSContext *cx, JSObject *obj) {
-    delete (SkJSDisplayable*) JS_GetPrivate(cx, obj);
-}
-
-JSBool SkJSDisplayable::GetProperty(JSContext *cx, JSObject *obj, jsval id,
-                                 jsval *vp)
-{
-    if (JSVAL_IS_INT(id) == 0)
-        return JS_TRUE;
-    SkJSDisplayable *p = (SkJSDisplayable *) JS_GetPrivate(cx, obj);
-    SkDisplayable* displayable = p->fDisplayable;
-    SkDisplayTypes displayableType = displayable->getType();
-    int members;
-    const SkMemberInfo* info = SkDisplayType::GetMembers(NULL /* fMaker */, displayableType, &members);
-    int idIndex = JSVAL_TO_INT(id);
-    SkASSERT(idIndex >= 0 && idIndex < members);
-    info = &info[idIndex];
-    SkDisplayTypes infoType = (SkDisplayTypes) info->fType;
-    SkScalar scalar = 0;
-    S32 s32 = 0;
-    SkString* string= NULL;
-    JSString *str;
-    if (infoType == SkType_MemberProperty) {
-        infoType = info->propertyType();
-        switch (infoType) {
-            case SkType_Scalar: {
-                SkScriptValue scriptValue;
-                bool success = displayable->getProperty(info->propertyIndex(), &scriptValue);
-                SkASSERT(scriptValue.fType == SkType_Scalar);
-                scalar = scriptValue.fOperand.fScalar;
-                } break;
-            default:
-                SkASSERT(0); // !!! unimplemented
-        }
-    } else {
-        SkASSERT(info->fCount == 1);
-        switch (infoType) {
-            case SkType_Boolean:
-            case SkType_Color:
-            case SkType_S32:
-                s32 = *(S32*) info->memberData(displayable);
-                break;
-            case SkType_String:
-                info->getString(displayable, &string);
-                break;
-            case SkType_Scalar:
-                SkOperand operand;
-                info->getValue(displayable, &operand, 1);
-                scalar = operand.fScalar;
-                break;
-            default:
-                SkASSERT(0); // !!! unimplemented
-        }
-    }
-    switch (infoType) {
-        case SkType_Boolean:
-            *vp = BOOLEAN_TO_JSVAL(s32);
-            break;
-        case SkType_Color:
-        case SkType_S32:
-            *vp = INT_TO_JSVAL(s32);
-            break;
-        case SkType_Scalar:
-            if (SkScalarFraction(scalar) == 0)
-                *vp = INT_TO_JSVAL(SkScalarFloor(scalar));
-            else
-            *vp = DOUBLE_TO_JSVAL(scalar);
-            break;
-        case SkType_String:
-            str = JS_NewStringCopyN(cx, string->c_str(), string->size());
-            *vp = STRING_TO_JSVAL(str);
-            break;
-        default:
-            SkASSERT(0); // !!! unimplemented
-    }
-    return JS_TRUE;
-}
-
-JSBool SkJSDisplayable::SetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) {
-    if (JSVAL_IS_INT(id) == 0)
-        return JS_TRUE;
-    SkJSDisplayable *p = (SkJSDisplayable *) JS_GetPrivate(cx, obj);
-    SkDisplayable* displayable = p->fDisplayable;
-    SkDisplayTypes displayableType = displayable->getType();
-    int members;
-    const SkMemberInfo* info = SkDisplayType::GetMembers(NULL /* fMaker */, displayableType, &members);
-    int idIndex = JSVAL_TO_INT(id);
-    SkASSERT(idIndex >= 0 && idIndex < members);
-    info = &info[idIndex];
-    SkDisplayTypes infoType = info->getType();
-    SkScalar scalar = 0;
-    S32 s32 = 0;
-    SkString string;
-    JSString* str;
-    jsval value = *vp;
-    switch (infoType) {
-        case SkType_Boolean:
-            s32 = JSVAL_TO_BOOLEAN(value);
-            break;
-        case SkType_Color:
-        case SkType_S32:
-            s32 = JSVAL_TO_INT(value);
-            break;
-        case SkType_Scalar:
-            if (JSVAL_IS_INT(value))
-                scalar = SkIntToScalar(JSVAL_TO_INT(value));
-            else {
-                SkASSERT(JSVAL_IS_DOUBLE(value));
-                scalar = (float) *(double*) JSVAL_TO_DOUBLE(value);
-            }
-            break;
-        case SkType_String:
-            str = JS_ValueToString(cx, value);
-            string.set(JS_GetStringBytes(str));
-            break;
-        default:
-            SkASSERT(0); // !!! unimplemented
-    }
-    if (info->fType == SkType_MemberProperty) {
-        switch (infoType) {
-            case SkType_Scalar: {
-                SkScriptValue scriptValue;
-                scriptValue.fType = SkType_Scalar;
-                scriptValue.fOperand.fScalar = scalar;
-                displayable->setProperty(-1 - (int) info->fOffset, scriptValue);
-                } break;
-            default:
-                SkASSERT(0); // !!! unimplemented
-        }
-    } else {
-        SkASSERT(info->fCount == 1);
-        switch (infoType) {
-            case SkType_Boolean:
-            case SkType_Color:
-            case SkType_S32:
-                s32 = *(S32*) ((const char*) displayable + info->fOffset);
-                break;
-            case SkType_String:
-                info->setString(displayable, &string);
-                break;
-            case SkType_Scalar:
-                SkOperand operand;
-                operand.fScalar = scalar;
-                info->setValue(displayable, &operand, 1);
-                break;
-            default:
-                SkASSERT(0); // !!! unimplemented
-        }
-    }
-    return JS_TRUE;
-}
-
-void SkJS::InitializeDisplayables(const SkBitmap& bitmap, JSContext *cx, JSObject *obj, JSObject *proto) {
-    SkJSDisplayable::gCanvas = new SkCanvas(bitmap);
-    SkJSDisplayable::gPaint = new SkPaint();
-#if SK_USE_CONDENSED_INFO == 0
-    GenerateTables();
-#else
-    SkASSERT(0); // !!! compressed version hasn't been implemented
-#endif
-    AddInit(cx, obj, proto);
-    AddCircleInit(cx, obj, proto);
-    AddOvalInit(cx, obj, proto);
-    AddPathInit(cx, obj, proto);
-    AddRectangleInit(cx, obj, proto);
-    AddRoundRectInit(cx, obj, proto);
-//  AfterInit(cx, obj, proto);
-    ApplyInit(cx, obj, proto);
-    // AnimateInit(cx, obj, proto);
-//  AnimateColorInit(cx, obj, proto);
-    AnimateFieldInit(cx, obj, proto);
-//  AnimateRotateInit(cx, obj, proto);
-//  AnimateScaleInit(cx, obj, proto);
-//  AnimateTranslateInit(cx, obj, proto);
-    BitmapInit(cx, obj, proto);
-//  BaseBitmapInit(cx, obj, proto);
-//  BeforeInit(cx, obj, proto);
-    BitmapShaderInit(cx, obj, proto);
-    BlurInit(cx, obj, proto);
-    ClipInit(cx, obj, proto);
-    ColorInit(cx, obj, proto);
-    CubicToInit(cx, obj, proto);
-    DashInit(cx, obj, proto);
-    DataInit(cx, obj, proto);
-//  DimensionsInit(cx, obj, proto);
-    DiscreteInit(cx, obj, proto);
-    DrawToInit(cx, obj, proto);
-    EmbossInit(cx, obj, proto);
-    EventInit(cx, obj, proto);
-//  FontInit(cx, obj, proto);
-//  FocusInit(cx, obj, proto);
-    ImageInit(cx, obj, proto);
-    IncludeInit(cx, obj, proto);
-//  InputInit(cx, obj, proto);
-    LineInit(cx, obj, proto);
-    LinearGradientInit(cx, obj, proto);
-    LineToInit(cx, obj, proto);
-    MatrixInit(cx, obj, proto);
-    MoveInit(cx, obj, proto);
-    MoveToInit(cx, obj, proto);
-    OvalInit(cx, obj, proto);
-    PathInit(cx, obj, proto);
-    PaintInit(cx, obj, proto);
-    DrawPointInit(cx, obj, proto);
-    PolyToPolyInit(cx, obj, proto);
-    PolygonInit(cx, obj, proto);
-    PolylineInit(cx, obj, proto);
-    PostInit(cx, obj, proto);
-    QuadToInit(cx, obj, proto);
-    RadialGradientInit(cx, obj, proto);
-    RandomInit(cx, obj, proto);
-    RectToRectInit(cx, obj, proto);
-    RectangleInit(cx, obj, proto);
-    RemoveInit(cx, obj, proto);
-    ReplaceInit(cx, obj, proto);
-    RotateInit(cx, obj, proto);
-    RoundRectInit(cx, obj, proto);
-    ScaleInit(cx, obj, proto);
-    SetInit(cx, obj, proto);
-    SkewInit(cx, obj, proto);
-    // 3D_CameraInit(cx, obj, proto);
-    // 3D_PatchInit(cx, obj, proto);
-    SnapshotInit(cx, obj, proto);
-//  StrokeInit(cx, obj, proto);
-    TextInit(cx, obj, proto);
-    TextOnPathInit(cx, obj, proto);
-    TextToPathInit(cx, obj, proto);
-    TranslateInit(cx, obj, proto);
-//  UseInit(cx, obj, proto);
-}
-
-void SkJS::DisposeDisplayables() {
-    delete SkJSDisplayable::gPaint;
-    delete SkJSDisplayable::gCanvas;
-    for (int index = 0; index < kTypeNamesSize; index++) {
-        SkDisplayTypes type = gTypeNames[index].fType;
-        delete[] gDisplayableProperties[type];
-    }
-}
diff --git a/src/xml/SkXMLParser.cpp b/src/xml/SkXMLParser.cpp
index 63929a94e2..ccc7aa4b02 100644
--- a/src/xml/SkXMLParser.cpp
+++ b/src/xml/SkXMLParser.cpp
@@ -59,6 +59,21 @@ SkXMLParser::~SkXMLParser()
 {
 }
 
+bool SkXMLParser::parse(SkStream& docStream)
+{
+    return false;
+}
+
+bool SkXMLParser::parse(const char doc[], size_t len)
+{
+    return false;
+}
+
+void SkXMLParser::GetNativeErrorString(int error, SkString* str)
+{
+
+}
+
 bool SkXMLParser::startElement(const char elem[])
 {
     return this->onStartElement(elem);