src/core/SkPaintOptionsAndroid.cpp - Issue 15720006: Android specific changes that are upstreamed from the android framework.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/core/SkPaintOptionsAndroid.cpp

Issue 15720006: Android specific changes that are upstreamed from the android framework. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: missing declaration Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/core/SkPaintOptionsAndroid.cpp

diff --git a/src/core/SkPaintOptionsAndroid.cpp b/src/core/SkPaintOptionsAndroid.cpp

index 46e8060073d3e517662bc530173658cf4f04813d..31f489cb728434e7f2519bd4bb9f03c02ececb79 100644

--- a/src/core/SkPaintOptionsAndroid.cpp

+++ b/src/core/SkPaintOptionsAndroid.cpp

@@ -6,14 +6,14 @@

* found in the LICENSE file.

-#ifdef SK_BUILD_FOR_ANDROID

#include "SkPaintOptionsAndroid.h"

#include "SkFlattenableBuffers.h"

#include "SkTDict.h"

#include "SkThread.h"

#include <cstring>

+#ifdef SK_BUILD_FOR_ANDROID

SkLanguage SkLanguage::getParent() const {

SkASSERT(!fTag.isEmpty());

const char* tag = fTag.c_str();

« no previous file with comments | « src/core/SkPaint.cpp ('k') | src/ports/SkFontConfigInterface_android.cpp » ('j') | no next file with comments »