| OLD | NEW |
| 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 23 matching lines...) Expand all Loading... |
| 34 #include "core/loader/SubframeLoader.h" | 34 #include "core/loader/SubframeLoader.h" |
| 35 | 35 |
| 36 #include "HTMLNames.h" | 36 #include "HTMLNames.h" |
| 37 #include "bindings/v8/ScriptController.h" | 37 #include "bindings/v8/ScriptController.h" |
| 38 #include "core/html/HTMLAppletElement.h" | 38 #include "core/html/HTMLAppletElement.h" |
| 39 #include "core/html/HTMLFrameElementBase.h" | 39 #include "core/html/HTMLFrameElementBase.h" |
| 40 #include "core/html/HTMLPlugInImageElement.h" | 40 #include "core/html/HTMLPlugInImageElement.h" |
| 41 #include "core/html/PluginDocument.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" | |
| 45 #include "core/page/ChromeClient.h" | |
| 46 #include "core/page/ContentSecurityPolicy.h" | 44 #include "core/page/ContentSecurityPolicy.h" |
| 47 #include "core/page/DiagnosticLoggingKeys.h" | |
| 48 #include "core/page/Frame.h" | 45 #include "core/page/Frame.h" |
| 49 #include "core/page/Page.h" | 46 #include "core/page/Page.h" |
| 50 #include "core/page/Settings.h" | 47 #include "core/page/Settings.h" |
| 51 #include "core/platform/MIMETypeRegistry.h" | 48 #include "core/platform/MIMETypeRegistry.h" |
| 52 #include "core/plugins/PluginData.h" | 49 #include "core/plugins/PluginData.h" |
| 53 #include "core/rendering/RenderEmbeddedObject.h" | 50 #include "core/rendering/RenderEmbeddedObject.h" |
| 54 #include "core/rendering/RenderView.h" | 51 #include "core/rendering/RenderView.h" |
| 55 #include "weborigin/SecurityOrigin.h" | 52 #include "weborigin/SecurityOrigin.h" |
| 56 #include "weborigin/SecurityPolicy.h" | 53 #include "weborigin/SecurityPolicy.h" |
| 57 | 54 |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 return true; | 351 return true; |
| 355 } | 352 } |
| 356 | 353 |
| 357 KURL SubframeLoader::completeURL(const String& url) const | 354 KURL SubframeLoader::completeURL(const String& url) const |
| 358 { | 355 { |
| 359 ASSERT(m_frame->document()); | 356 ASSERT(m_frame->document()); |
| 360 return m_frame->document()->completeURL(url); | 357 return m_frame->document()->completeURL(url); |
| 361 } | 358 } |
| 362 | 359 |
| 363 } // namespace WebCore | 360 } // namespace WebCore |
| OLD | NEW |