diff options
| -rw-r--r-- | WebCore/WebCore.xcodeproj/project.pbxproj | 2 | ||||
| -rwxr-xr-x | WebCore/platform/MockGeolocationService.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/PatternAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/plugins/android_npapi.h | 8 |
4 files changed, 11 insertions, 3 deletions
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj index 96c4fc7..a56a10c 100644 --- a/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/WebCore/WebCore.xcodeproj/project.pbxproj @@ -4539,7 +4539,7 @@ FE80D7C80E9C1F25000D6F75 /* Geoposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7BA0E9C1F25000D6F75 /* Geoposition.cpp */; }; FE80D7C90E9C1F25000D6F75 /* Geoposition.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */; }; FE80D7CB0E9C1F25000D6F75 /* PositionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */; settings = {ATTRIBUTES = (Private, ); }; }; - FE80D7CD0E9C1F25000D6F75 /* PositionError.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BF0E9C1F25000D6F75 /* PositionError.h */; }; + FE80D7CD0E9C1F25000D6F75 /* PositionError.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BF0E9C1F25000D6F75 /* PositionError.h */; settings = {ATTRIBUTES = (Private, ); }; }; FE80D7CF0E9C1F25000D6F75 /* PositionErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7C10E9C1F25000D6F75 /* PositionErrorCallback.h */; settings = {ATTRIBUTES = (Private, ); }; }; FE80D7D10E9C1F25000D6F75 /* PositionOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7C30E9C1F25000D6F75 /* PositionOptions.h */; settings = {ATTRIBUTES = (Private, ); }; }; FE80DA630E9C4703000D6F75 /* JSGeolocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80DA5F0E9C4703000D6F75 /* JSGeolocation.cpp */; }; diff --git a/WebCore/platform/MockGeolocationService.cpp b/WebCore/platform/MockGeolocationService.cpp index 45e7348..515bd97 100755 --- a/WebCore/platform/MockGeolocationService.cpp +++ b/WebCore/platform/MockGeolocationService.cpp @@ -81,7 +81,7 @@ bool MockGeolocationService::startUpdating(PositionOptions*) void MockGeolocationService::timerFired(Timer<MockGeolocationService>* timer) { - ASSERT(timer == &m_timer); + if (timer != &m_timer) ASSERT(0); makeGeolocationCallback(); } diff --git a/WebCore/platform/graphics/android/PatternAndroid.cpp b/WebCore/platform/graphics/android/PatternAndroid.cpp index ff2b522..a787113 100644 --- a/WebCore/platform/graphics/android/PatternAndroid.cpp +++ b/WebCore/platform/graphics/android/PatternAndroid.cpp @@ -43,6 +43,8 @@ static SkShader::TileMode toTileMode(bool doRepeat) { SkShader* Pattern::createPlatformPattern(const TransformationMatrix& ) const { SkBitmapRef* ref = tileImage()->nativeImageForCurrentFrame(); + if (!ref) + return 0; SkShader* s = SkShader::CreateBitmapShader(ref->bitmap(), toTileMode(m_repeatX), toTileMode(m_repeatY)); diff --git a/WebKit/android/plugins/android_npapi.h b/WebKit/android/plugins/android_npapi.h index 1c7655b..37c8ed3 100644 --- a/WebKit/android/plugins/android_npapi.h +++ b/WebKit/android/plugins/android_npapi.h @@ -429,6 +429,10 @@ struct ANPTypefaceInterfaceV0 : ANPInterface { requested name and style. Pass null as the name to return the default font for the requested style. Will never return null + The 5 generic font names "serif", "sans-serif", "monospace", "cursive", + "fantasy" are recognized, and will be mapped to their logical font + automatically by this call. + @param name May be NULL. The name of the font family. @param style The style (normal, bold, italic) of the typeface. @return reference to the closest-matching typeface. Caller must call @@ -497,7 +501,9 @@ struct ANPTypefaceInterfaceV0 : ANPInterface { int32_t (*getFontPath)(const ANPTypeface*, char path[], int32_t length, int32_t* index); - /** Return the path name for the font directory, or NULL if not supported + /** Return a UTF8 encoded path name for the font directory, or NULL if not + supported. If returned, this string address will be valid for the life + of the plugin instance. It will always end with a '/' character. */ const char* (*getFontDirectoryPath)(); }; |