summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-07-11 10:39:10 +0100
committerSteve Block <steveblock@google.com>2011-07-12 10:53:43 +0100
commita577c97987bfe6f96fee0081bcdf4d526a9f7d3f (patch)
treea05449ba341f5cb6d7dc5603e0df2045e501eee8 /Source/WebKit
parentad1bc825197d7f62d2a8d06d3b56fdc5f9c458b9 (diff)
downloadexternal_webkit-a577c97987bfe6f96fee0081bcdf4d526a9f7d3f.zip
external_webkit-a577c97987bfe6f96fee0081bcdf4d526a9f7d3f.tar.gz
external_webkit-a577c97987bfe6f96fee0081bcdf4d526a9f7d3f.tar.bz2
notImplemented() should always log to logcat
- Update Android's version of notImplemented() to match that on other platforms and only log once for each method. - Remove lowPriority_notImplemented(), as this was added way back in https://mondrian.corp.google.com/changelist/16159-p9 and I'm pretty sure the distinction between that and notImplemented() has long since been lost. - Move verifiedOk() to FrameLoaderClientAndroid.cpp as this is the only place it is used. Bug: 5008643 Change-Id: I6552a2a736873b4dfb0933e55af3ab862b60f87c
Diffstat (limited to 'Source/WebKit')
-rw-r--r--Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp24
1 files changed, 13 insertions, 11 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index 88ab4a3..b79b550 100644
--- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -82,6 +82,8 @@
#include <utils/AssetManager.h>
#include <wtf/text/CString.h>
+#define verifiedOk() // Verified that we don't need to implement this.
+
extern android::AssetManager* globalAssetManager();
namespace android {
@@ -154,12 +156,12 @@ void FrameLoaderClientAndroid::detachedFromParent3() {
// called for each subresource, so they should not be dispatched to the m_frame.
void FrameLoaderClientAndroid::assignIdentifierToInitialRequest(unsigned long id,
DocumentLoader*, const ResourceRequest&) {
- lowPriority_notImplemented();
+ notImplemented();
}
void FrameLoaderClientAndroid::dispatchWillSendRequest(DocumentLoader*, unsigned long id,
ResourceRequest&, const ResourceResponse&) {
- lowPriority_notImplemented();
+ notImplemented();
}
bool FrameLoaderClientAndroid::shouldUseCredentialStorage(DocumentLoader*, unsigned long identifier)
@@ -170,32 +172,32 @@ bool FrameLoaderClientAndroid::shouldUseCredentialStorage(DocumentLoader*, unsig
void FrameLoaderClientAndroid::dispatchDidReceiveAuthenticationChallenge(DocumentLoader*,
unsigned long id, const AuthenticationChallenge&) {
- lowPriority_notImplemented();
+ notImplemented();
}
void FrameLoaderClientAndroid::dispatchDidCancelAuthenticationChallenge(DocumentLoader*,
unsigned long id, const AuthenticationChallenge&) {
- lowPriority_notImplemented();
+ notImplemented();
}
void FrameLoaderClientAndroid::dispatchDidReceiveResponse(DocumentLoader*,
unsigned long id, const ResourceResponse&) {
- lowPriority_notImplemented();
+ notImplemented();
}
void FrameLoaderClientAndroid::dispatchDidReceiveContentLength(DocumentLoader*,
unsigned long id, int lengthReceived) {
- lowPriority_notImplemented();
+ notImplemented();
}
void FrameLoaderClientAndroid::dispatchDidFinishLoading(DocumentLoader*,
unsigned long id) {
- lowPriority_notImplemented();
+ notImplemented();
}
void FrameLoaderClientAndroid::dispatchDidFailLoading(DocumentLoader* docLoader,
unsigned long id, const ResourceError&) {
- lowPriority_notImplemented();
+ notImplemented();
}
bool FrameLoaderClientAndroid::dispatchDidLoadResourceFromMemoryCache(DocumentLoader*,
@@ -399,7 +401,7 @@ void FrameLoaderClientAndroid::dispatchDidFailLoad(const ResourceError&) {
void FrameLoaderClientAndroid::dispatchDidFinishDocumentLoad() {
// called when finishedParsing
- lowPriority_notImplemented();
+ notImplemented();
}
void FrameLoaderClientAndroid::dispatchDidFinishLoad() {
@@ -542,7 +544,7 @@ void FrameLoaderClientAndroid::dispatchDecidePolicyForNewWindowAction(FramePolic
}
void FrameLoaderClientAndroid::cancelPolicyCheck() {
- lowPriority_notImplemented();
+ notImplemented();
}
void FrameLoaderClientAndroid::dispatchUnableToImplementPolicy(const ResourceError&) {
@@ -1291,7 +1293,7 @@ ObjectContentType FrameLoaderClientAndroid::objectContentType(const KURL& url, c
// may use it to set the media style to 'print' when the user wants to print
// a particular web page.
String FrameLoaderClientAndroid::overrideMediaType() const {
- lowPriority_notImplemented();
+ notImplemented();
return String();
}