am b12a0167: Adds ability to configure mock Geolocation service from DumpRenderTree on Android.
Merge commit 'b12a01676d083061bfcdc9efe98ac9d03dd59802' into eclair-plus-aosp
* commit 'b12a01676d083061bfcdc9efe98ac9d03dd59802':
Adds ability to configure mock Geolocation service from DumpRenderTree on Android.
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index 7fa3a6d..5421eaa 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -190,7 +190,6 @@
makeSuccessCallbacks();
} else {
WTF::RefPtr<WebCore::PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage);
- error->setIsFatal(true);
handleError(error.get());
}
}
@@ -292,9 +291,6 @@
sendErrorToWatchers(error);
m_oneShots.clear();
-
- if (error->isFatal())
- m_watchers.clear();
}
void Geolocation::requestPermission()
diff --git a/WebCore/page/PositionError.h b/WebCore/page/PositionError.h
index c309061..1d31f3b 100644
--- a/WebCore/page/PositionError.h
+++ b/WebCore/page/PositionError.h
@@ -45,22 +45,16 @@
ErrorCode code() const { return m_code; }
const String& message() const { return m_message; }
- void setIsFatal(bool isFatal) { m_isFatal = isFatal; }
- bool isFatal() { return m_isFatal; }
private:
PositionError(ErrorCode code, const String& message)
: m_code(code)
, m_message(message)
- , m_isFatal(false)
{
}
ErrorCode m_code;
String m_message;
- // Whether the error is fatal, such that no request can ever obtain a good
- // position fix in the future.
- bool m_isFatal;
};
} // namespace WebCore
