diff options
| author | Leon Scroggins <scroggo@google.com> | 2009-12-16 10:23:52 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2009-12-16 10:23:52 -0500 |
| commit | 244d10fe2a0de787a558ea3a8bf02eb4c641bb50 (patch) | |
| tree | 80a888723bcb2a424b194b25f22d2fe0d241d732 /WebKit/android/WebCoreSupport | |
| parent | 40a90188cf739cbcc2a44669c05ca526aaf0b0d8 (diff) | |
| parent | 33cbb13803ce37ab3306b7ba46d2cc4a86cb9193 (diff) | |
| download | external_webkit-244d10fe2a0de787a558ea3a8bf02eb4c641bb50.zip external_webkit-244d10fe2a0de787a558ea3a8bf02eb4c641bb50.tar.gz external_webkit-244d10fe2a0de787a558ea3a8bf02eb4c641bb50.tar.bz2 | |
resolved conflicts for merge of 33cbb138 to master
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index ae3d582..44c942d 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -44,6 +44,7 @@ #include "MIMETypeRegistry.h" #include "NotImplemented.h" #include "Page.h" +#include "PlatformBridge.h" #include "PlatformGraphicsContext.h" #include "PlatformString.h" #include "PluginDatabase.h" @@ -300,11 +301,11 @@ void FrameLoaderClientAndroid::dispatchDidFailProvisionalLoad(const ResourceErro AssetManager* am = globalAssetManager(); // Check to see if the error code was not generated internally - WebFrame::RAW_RES_ID id = WebFrame::NODOMAIN; + WebCore::PlatformBridge::rawResId id = WebCore::PlatformBridge::NoDomain; if ((error.errorCode() == ErrorFile || error.errorCode() == ErrorFileNotFound) && (!error.localizedDescription().isEmpty())) { - id = WebFrame::LOADERROR; + id = WebCore::PlatformBridge::LoadError; } String filename = m_webFrame->getRawResourceFilename(id); if (filename.isEmpty()) |