| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 3 * Copyright (C) 2006 Apple Computer, 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 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 #include "FormState.h" | 87 #include "FormState.h" |
| 88 #include "Frame.h" | 88 #include "Frame.h" |
| 89 #include "FrameChromium.h" | 89 #include "FrameChromium.h" |
| 90 #include "FrameLoader.h" | 90 #include "FrameLoader.h" |
| 91 #include "FrameLoadRequest.h" | 91 #include "FrameLoadRequest.h" |
| 92 #include "FrameTree.h" | 92 #include "FrameTree.h" |
| 93 #include "FrameView.h" | 93 #include "FrameView.h" |
| 94 #include "GraphicsContext.h" | 94 #include "GraphicsContext.h" |
| 95 #include "HTMLCollection.h" | 95 #include "HTMLCollection.h" |
| 96 #include "HTMLHeadElement.h" | 96 #include "HTMLHeadElement.h" |
| 97 #include "HTMLInputElement.h" |
| 97 #include "HTMLFrameOwnerElement.h" | 98 #include "HTMLFrameOwnerElement.h" |
| 98 #include "HTMLLinkElement.h" | 99 #include "HTMLLinkElement.h" |
| 99 #include "HTMLNames.h" | 100 #include "HTMLNames.h" |
| 100 #include "HistoryItem.h" | 101 #include "HistoryItem.h" |
| 101 #include "InspectorController.h" | 102 #include "InspectorController.h" |
| 102 #if defined(OS_MACOSX) | 103 #if defined(OS_MACOSX) |
| 103 #include "LocalCurrentGraphicsContext.h" | 104 #include "LocalCurrentGraphicsContext.h" |
| 104 #endif | 105 #endif |
| 105 #include "markup.h" | 106 #include "markup.h" |
| 106 #include "Page.h" | 107 #include "Page.h" |
| (...skipping 1722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1829 | 1830 |
| 1830 SecurityOrigin* security_origin = frame_->document()->securityOrigin(); | 1831 SecurityOrigin* security_origin = frame_->document()->securityOrigin(); |
| 1831 | 1832 |
| 1832 if (!frame_->loader()->isScheduledLocationChangePending()) { | 1833 if (!frame_->loader()->isScheduledLocationChangePending()) { |
| 1833 frame_->loader()->stopAllLoaders(); | 1834 frame_->loader()->stopAllLoaders(); |
| 1834 frame_->loader()->begin(frame_->loader()->url(), true, security_origin); | 1835 frame_->loader()->begin(frame_->loader()->url(), true, security_origin); |
| 1835 frame_->loader()->write(script_result); | 1836 frame_->loader()->write(script_result); |
| 1836 frame_->loader()->end(); | 1837 frame_->loader()->end(); |
| 1837 } | 1838 } |
| 1838 } | 1839 } |
| OLD | NEW |