}
void GeolocationServiceAndroid::timerFired(Timer<GeolocationServiceAndroid>* timer) {
- ASSERT(m_timer == timer);
+ ASSERT(&m_timer == timer);
ASSERT(m_lastPosition || m_lastError);
if (m_lastPosition)
positionChanged();
#ifndef FontPlatformData_H
#define FontPlatformData_H
-#include "StringImpl.h"
+#ifndef NDEBUG
+#include "PlatformString.h"
+#endif
class SkPaint;
class SkTypeface;
float size() const { return mTextSize; }
unsigned hash() const;
+#ifndef NDEBUG
+ String description() const { return ""; }
+#endif
+
private:
SkTypeface* mTypeface;
float mTextSize;
if (index != WTF::notFound) {
// Get the permission from the permanent list.
PermissionsMap::const_iterator iter = s_permanentPermissions.find(origin);
- ASSERT(iter != (PermissionsMap::const_iterator end = s_permanentPermissions.end()));
+#ifndef NDEBUG
+ PermissionsMap::const_iterator end = s_permanentPermissions.end();
+ ASSERT(iter != end);
+#endif
bool allow = iter->second;
maybeCallbackFrames(origin, allow);
if (!mUserInitiatedClick && !request.getUserGesture() &&
(requestUrl.protocolIs("http") || requestUrl.protocolIs("https") ||
requestUrl.protocolIs("file") || requestUrl.protocolIs("about") ||
- requestUrl.protocolIs("javascript")))
+ WebCore::protocolIsJavaScript(requestUrl.string())))
return true;
WebCore::String url(request.url().string());
// Empty urls should not be sent to java
str = (jstring)env->GetObjectField(obj, gFieldIds->mAppCachePath);
if (str) {
WebCore::String path = to_string(env, str);
- if (path.length()) {
+ if (path.length() && WebCore::cacheStorage().cacheDirectory().isNull()) {
WebCore::cacheStorage().setCacheDirectory(path);
}
}
hasMouseOver = NodeHasEventListeners(node, &eventNames().mouseoverEvent, 1);
isAnchor = true;
KURL href = anchorNode->href();
- if (!href.isEmpty() && !href.protocolIs("javascript"))
+ if (!href.isEmpty() && !WebCore::protocolIsJavaScript(href.string()))
// Set the exported string for all non-javascript anchors.
exported = href.string().copy();
}