diff options
| author | Steve Block <steveblock@google.com> | 2009-10-09 13:27:03 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:59 +0100 |
| commit | 3f252f84468859d129a8c6a9302412d2e6e5a3fa (patch) | |
| tree | 109b326a088d13e83fd53b4bace151f800647c1a /WebCore/loader | |
| parent | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (diff) | |
| download | external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.zip external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.gz external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.bz2 | |
Merge webkit.org at R49305 : Fix merge conflicts.
Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
Diffstat (limited to 'WebCore/loader')
| -rw-r--r-- | WebCore/loader/DocumentLoader.h | 4 | ||||
| -rw-r--r-- | WebCore/loader/FrameLoader.cpp | 5 | ||||
| -rw-r--r-- | WebCore/loader/FrameLoaderClient.h | 4 | ||||
| -rw-r--r-- | WebCore/loader/appcache/DOMApplicationCache.cpp | 3 |
4 files changed, 2 insertions, 14 deletions
diff --git a/WebCore/loader/DocumentLoader.h b/WebCore/loader/DocumentLoader.h index 1220a0e..1fa2b65 100644 --- a/WebCore/loader/DocumentLoader.h +++ b/WebCore/loader/DocumentLoader.h @@ -43,11 +43,7 @@ namespace WebCore { class Archive; class ArchiveResource; class ArchiveResourceCollection; -<<<<<<< HEAD:WebCore/loader/DocumentLoader.h #endif - class CachedPage; -======= ->>>>>>> webkit.org at 49305:WebCore/loader/DocumentLoader.h class Frame; class FrameLoader; class MainResourceLoader; diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index 9dfefcd..fffd6ee 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -114,7 +114,6 @@ #include "SVGViewSpec.h" #endif -<<<<<<< HEAD:WebCore/loader/FrameLoader.cpp #ifdef ANDROID_INSTRUMENT #include "TimeCounter.h" #include "RenderArena.h" @@ -122,10 +121,10 @@ #if PLATFORM(ANDROID) #include "WebCoreFrameBridge.h" -======= +#endif + #if PLATFORM(MAC) || PLATFORM(WIN) #define PAGE_CACHE_ACCEPTS_UNLOAD_HANDLERS ->>>>>>> webkit.org at 49305:WebCore/loader/FrameLoader.cpp #endif namespace WebCore { diff --git a/WebCore/loader/FrameLoaderClient.h b/WebCore/loader/FrameLoaderClient.h index 7973ca5..a20bd43 100644 --- a/WebCore/loader/FrameLoaderClient.h +++ b/WebCore/loader/FrameLoaderClient.h @@ -73,15 +73,11 @@ namespace WebCore { class String; class Widget; -<<<<<<< HEAD:WebCore/loader/FrameLoaderClient.h #ifdef ANDROID_HISTORY_CLIENT class BackForwardList; #endif - typedef void (FrameLoader::*FramePolicyFunction)(PolicyAction); -======= typedef void (PolicyChecker::*FramePolicyFunction)(PolicyAction); ->>>>>>> webkit.org at 49305:WebCore/loader/FrameLoaderClient.h class FrameLoaderClient { public: diff --git a/WebCore/loader/appcache/DOMApplicationCache.cpp b/WebCore/loader/appcache/DOMApplicationCache.cpp index 1496b8a..29c1bd5 100644 --- a/WebCore/loader/appcache/DOMApplicationCache.cpp +++ b/WebCore/loader/appcache/DOMApplicationCache.cpp @@ -120,14 +120,11 @@ EventTargetData* DOMApplicationCache::eventTargetData() return &m_eventTargetData; } -<<<<<<< HEAD:WebCore/loader/appcache/DOMApplicationCache.cpp -======= EventTargetData* DOMApplicationCache::ensureEventTargetData() { return &m_eventTargetData; } ->>>>>>> webkit.org at 49305:WebCore/loader/appcache/DOMApplicationCache.cpp } // namespace WebCore #endif // ENABLE(OFFLINE_WEB_APPLICATIONS) |