Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 117 #include "core/frame/LocalDOMWindow.h" | 117 #include "core/frame/LocalDOMWindow.h" |
| 118 #include "core/frame/FrameHost.h" | 118 #include "core/frame/FrameHost.h" |
| 119 #include "core/frame/FrameView.h" | 119 #include "core/frame/FrameView.h" |
| 120 #include "core/frame/Settings.h" | 120 #include "core/frame/Settings.h" |
| 121 #include "core/html/HTMLAnchorElement.h" | 121 #include "core/html/HTMLAnchorElement.h" |
| 122 #include "core/html/HTMLCollection.h" | 122 #include "core/html/HTMLCollection.h" |
| 123 #include "core/html/HTMLFormElement.h" | 123 #include "core/html/HTMLFormElement.h" |
| 124 #include "core/html/HTMLFrameElementBase.h" | 124 #include "core/html/HTMLFrameElementBase.h" |
| 125 #include "core/html/HTMLFrameOwnerElement.h" | 125 #include "core/html/HTMLFrameOwnerElement.h" |
| 126 #include "core/html/HTMLHeadElement.h" | 126 #include "core/html/HTMLHeadElement.h" |
| 127 #include "core/html/HTMLImageElement.h" | |
| 127 #include "core/html/HTMLInputElement.h" | 128 #include "core/html/HTMLInputElement.h" |
| 128 #include "core/html/HTMLLinkElement.h" | 129 #include "core/html/HTMLLinkElement.h" |
| 129 #include "core/html/PluginDocument.h" | 130 #include "core/html/PluginDocument.h" |
| 130 #include "core/inspector/ConsoleMessage.h" | 131 #include "core/inspector/ConsoleMessage.h" |
| 131 #include "core/inspector/ScriptCallStack.h" | 132 #include "core/inspector/ScriptCallStack.h" |
| 132 #include "core/layout/HitTestResult.h" | 133 #include "core/layout/HitTestResult.h" |
| 133 #include "core/layout/LayoutBox.h" | 134 #include "core/layout/LayoutBox.h" |
| 134 #include "core/layout/LayoutObject.h" | 135 #include "core/layout/LayoutObject.h" |
| 135 #include "core/layout/LayoutPart.h" | 136 #include "core/layout/LayoutPart.h" |
| 136 #include "core/layout/LayoutTreeAsText.h" | 137 #include "core/layout/LayoutTreeAsText.h" |
| (...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 916 ASSERT(frame()); | 917 ASSERT(frame()); |
| 917 frame()->loader().reload(ignoreCache ? EndToEndReload : NormalReload); | 918 frame()->loader().reload(ignoreCache ? EndToEndReload : NormalReload); |
| 918 } | 919 } |
| 919 | 920 |
| 920 void WebLocalFrameImpl::reloadWithOverrideURL(const WebURL& overrideUrl, bool ig noreCache) | 921 void WebLocalFrameImpl::reloadWithOverrideURL(const WebURL& overrideUrl, bool ig noreCache) |
| 921 { | 922 { |
| 922 ASSERT(frame()); | 923 ASSERT(frame()); |
| 923 frame()->loader().reload(ignoreCache ? EndToEndReload : NormalReload, overri deUrl); | 924 frame()->loader().reload(ignoreCache ? EndToEndReload : NormalReload, overri deUrl); |
| 924 } | 925 } |
| 925 | 926 |
| 927 void WebLocalFrameImpl::reloadImage(const WebNode& webNode) | |
|
esprehn
2015/07/15 20:53:57
This should be a method on WebElement, not WebLoca
| |
| 928 { | |
| 929 const Node* node = webNode.constUnwrap<Node>(); | |
| 930 if (isHTMLImageElement(*node)) { | |
| 931 const HTMLImageElement& imageElement = toHTMLImageElement(*node); | |
| 932 imageElement.forceReload(); | |
| 933 } | |
| 934 } | |
| 935 | |
| 926 void WebLocalFrameImpl::loadRequest(const WebURLRequest& request) | 936 void WebLocalFrameImpl::loadRequest(const WebURLRequest& request) |
| 927 { | 937 { |
| 928 ASSERT(frame()); | 938 ASSERT(frame()); |
| 929 ASSERT(!request.isNull()); | 939 ASSERT(!request.isNull()); |
| 930 const ResourceRequest& resourceRequest = request.toResourceRequest(); | 940 const ResourceRequest& resourceRequest = request.toResourceRequest(); |
| 931 | 941 |
| 932 if (resourceRequest.url().protocolIs("javascript")) { | 942 if (resourceRequest.url().protocolIs("javascript")) { |
| 933 loadJavaScriptURL(resourceRequest.url()); | 943 loadJavaScriptURL(resourceRequest.url()); |
| 934 return; | 944 return; |
| 935 } | 945 } |
| (...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2090 { | 2100 { |
| 2091 m_frameWidget = frameWidget; | 2101 m_frameWidget = frameWidget; |
| 2092 } | 2102 } |
| 2093 | 2103 |
| 2094 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const | 2104 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const |
| 2095 { | 2105 { |
| 2096 return m_frameWidget; | 2106 return m_frameWidget; |
| 2097 } | 2107 } |
| 2098 | 2108 |
| 2099 } // namespace blink | 2109 } // namespace blink |
| OLD | NEW |