Source/core/loader/DocumentLoader.cpp - Issue 23623012: Move TextResourceDecoder from loader/ to fetch/

Side by Side Diff: Source/core/loader/DocumentLoader.cpp

Issue 23623012: Move TextResourceDecoder from loader/ to fetch/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « Source/core/inspector/NetworkResourcesData.cpp ('k') | Source/core/loader/DocumentWriter.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.	2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.

3 * Copyright (C) 2011 Google Inc. All rights reserved.	3 * Copyright (C) 2011 Google Inc. All rights reserved.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions	6 * modification, are permitted provided that the following conditions

7 * are met:	7 * are met:

8 *	8 *

9 * 1. Redistributions of source code must retain the above copyright	9 * 1. Redistributions of source code must retain the above copyright

10 * notice, this list of conditions and the following disclaimer.	10 * notice, this list of conditions and the following disclaimer.

(...skipping 21 matching lines...) Expand all Loading...
32	32

33 #include "FetchInitiatorTypeNames.h"	33 #include "FetchInitiatorTypeNames.h"

34 #include "bindings/v8/ScriptController.h"	34 #include "bindings/v8/ScriptController.h"

35 #include "core/dom/DOMImplementation.h"	35 #include "core/dom/DOMImplementation.h"

36 #include "core/dom/Document.h"	36 #include "core/dom/Document.h"

37 #include "core/dom/DocumentParser.h"	37 #include "core/dom/DocumentParser.h"

38 #include "core/dom/Event.h"	38 #include "core/dom/Event.h"

39 #include "core/fetch/MemoryCache.h"	39 #include "core/fetch/MemoryCache.h"

40 #include "core/fetch/ResourceFetcher.h"	40 #include "core/fetch/ResourceFetcher.h"

41 #include "core/fetch/ResourceLoader.h"	41 #include "core/fetch/ResourceLoader.h"

	42 #include "core/fetch/TextResourceDecoder.h"

42 #include "core/html/HTMLFrameOwnerElement.h"	43 #include "core/html/HTMLFrameOwnerElement.h"

43 #include "core/inspector/InspectorInstrumentation.h"	44 #include "core/inspector/InspectorInstrumentation.h"

44 #include "core/loader/DocumentWriter.h"	45 #include "core/loader/DocumentWriter.h"

45 #include "core/loader/FrameLoader.h"	46 #include "core/loader/FrameLoader.h"

46 #include "core/loader/FrameLoaderClient.h"	47 #include "core/loader/FrameLoaderClient.h"

47 #include "core/loader/SinkDocument.h"	48 #include "core/loader/SinkDocument.h"

48 #include "core/loader/TextResourceDecoder.h"

49 #include "core/loader/UniqueIdentifier.h"	49 #include "core/loader/UniqueIdentifier.h"

50 #include "core/loader/appcache/ApplicationCacheHost.h"	50 #include "core/loader/appcache/ApplicationCacheHost.h"

51 #include "core/loader/archive/ArchiveResourceCollection.h"	51 #include "core/loader/archive/ArchiveResourceCollection.h"

52 #include "core/loader/archive/MHTMLArchive.h"	52 #include "core/loader/archive/MHTMLArchive.h"

53 #include "core/page/DOMWindow.h"	53 #include "core/page/DOMWindow.h"

54 #include "core/page/Frame.h"	54 #include "core/page/Frame.h"

55 #include "core/page/FrameTree.h"	55 #include "core/page/FrameTree.h"

56 #include "core/page/Page.h"	56 #include "core/page/Page.h"

57 #include "core/page/Settings.h"	57 #include "core/page/Settings.h"

58 #include "core/platform/Logging.h"	58 #include "core/platform/Logging.h"

(...skipping 950 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1009 void DocumentLoader::replaceDocument(const String& source, Document* ownerDocume nt)	1009 void DocumentLoader::replaceDocument(const String& source, Document* ownerDocume nt)

1010 {	1010 {

1011 m_frame->loader()->stopAllLoaders();	1011 m_frame->loader()->stopAllLoaders();

1012 m_writer = createWriterFor(m_frame, ownerDocument, m_frame->document()->url( ), mimeType(), m_writer ? m_writer->encoding() : "", m_writer ? m_writer->encod ingWasChosenByUser() : false, true);	1012 m_writer = createWriterFor(m_frame, ownerDocument, m_frame->document()->url( ), mimeType(), m_writer ? m_writer->encoding() : "", m_writer ? m_writer->encod ingWasChosenByUser() : false, true);

1013 if (!source.isNull())	1013 if (!source.isNull())

1014 m_writer->appendReplacingData(source);	1014 m_writer->appendReplacingData(source);

1015 endWriting(m_writer.get());	1015 endWriting(m_writer.get());

1016 }	1016 }

1017	1017

1018 } // namespace WebCore	1018 } // namespace WebCore

OLD	NEW