Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(405)

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

Issue 14022018: Absolutify paths to html/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 7 years, 7 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/loader/SinkDocument.h ('k') | Source/core/loader/cache/CachedResourceLoader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 15 matching lines...) Expand all
26 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 26 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
27 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 27 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
28 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 28 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */ 31 */
32 32
33 #include "config.h" 33 #include "config.h"
34 #include "core/loader/SubframeLoader.h" 34 #include "core/loader/SubframeLoader.h"
35 35
36 #include "HTMLAppletElement.h"
37 #include "HTMLFrameElementBase.h"
38 #include "HTMLNames.h" 36 #include "HTMLNames.h"
39 #include "HTMLPlugInImageElement.h"
40 #include "PluginDocument.h"
41 #include "bindings/v8/ScriptController.h" 37 #include "bindings/v8/ScriptController.h"
38 #include "core/html/HTMLAppletElement.h"
39 #include "core/html/HTMLFrameElementBase.h"
40 #include "core/html/HTMLPlugInImageElement.h"
41 #include "core/html/PluginDocument.h"
42 #include "core/loader/FrameLoader.h" 42 #include "core/loader/FrameLoader.h"
43 #include "core/loader/FrameLoaderClient.h" 43 #include "core/loader/FrameLoaderClient.h"
44 #include "core/page/Chrome.h" 44 #include "core/page/Chrome.h"
45 #include "core/page/ChromeClient.h" 45 #include "core/page/ChromeClient.h"
46 #include "core/page/ContentSecurityPolicy.h" 46 #include "core/page/ContentSecurityPolicy.h"
47 #include "core/page/DiagnosticLoggingKeys.h" 47 #include "core/page/DiagnosticLoggingKeys.h"
48 #include "core/page/Frame.h" 48 #include "core/page/Frame.h"
49 #include "core/page/Page.h" 49 #include "core/page/Page.h"
50 #include "core/page/SecurityOrigin.h" 50 #include "core/page/SecurityOrigin.h"
51 #include "core/page/SecurityPolicy.h" 51 #include "core/page/SecurityPolicy.h"
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 return true; 358 return true;
359 } 359 }
360 360
361 KURL SubframeLoader::completeURL(const String& url) const 361 KURL SubframeLoader::completeURL(const String& url) const
362 { 362 {
363 ASSERT(m_frame->document()); 363 ASSERT(m_frame->document());
364 return m_frame->document()->completeURL(url); 364 return m_frame->document()->completeURL(url);
365 } 365 }
366 366
367 } // namespace WebCore 367 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/SinkDocument.h ('k') | Source/core/loader/cache/CachedResourceLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698