| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #include "HTMLAppletElement.h" | 43 #include "HTMLAppletElement.h" |
| 44 #include "HTMLFrameElementBase.h" | 44 #include "HTMLFrameElementBase.h" |
| 45 #include "HTMLNames.h" | 45 #include "HTMLNames.h" |
| 46 #include "HTMLPlugInImageElement.h" | 46 #include "HTMLPlugInImageElement.h" |
| 47 #include "MIMETypeRegistry.h" | 47 #include "MIMETypeRegistry.h" |
| 48 #include "Page.h" | 48 #include "Page.h" |
| 49 #include "PluginData.h" | 49 #include "PluginData.h" |
| 50 #include "PluginDocument.h" | 50 #include "PluginDocument.h" |
| 51 #include "RenderEmbeddedObject.h" | 51 #include "RenderEmbeddedObject.h" |
| 52 #include "RenderView.h" | 52 #include "RenderView.h" |
| 53 #include "ScriptController.h" |
| 53 #include "SecurityOrigin.h" | 54 #include "SecurityOrigin.h" |
| 54 #include "SecurityPolicy.h" | 55 #include "SecurityPolicy.h" |
| 55 #include "Settings.h" | 56 #include "Settings.h" |
| 56 | 57 |
| 57 namespace WebCore { | 58 namespace WebCore { |
| 58 | 59 |
| 59 using namespace HTMLNames; | 60 using namespace HTMLNames; |
| 60 | 61 |
| 61 SubframeLoader::SubframeLoader(Frame* frame) | 62 SubframeLoader::SubframeLoader(Frame* frame) |
| 62 : m_containsPlugins(false) | 63 : m_containsPlugins(false) |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 return true; | 359 return true; |
| 359 } | 360 } |
| 360 | 361 |
| 361 KURL SubframeLoader::completeURL(const String& url) const | 362 KURL SubframeLoader::completeURL(const String& url) const |
| 362 { | 363 { |
| 363 ASSERT(m_frame->document()); | 364 ASSERT(m_frame->document()); |
| 364 return m_frame->document()->completeURL(url); | 365 return m_frame->document()->completeURL(url); |
| 365 } | 366 } |
| 366 | 367 |
| 367 } // namespace WebCore | 368 } // namespace WebCore |
| OLD | NEW |