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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 #include "core/editing/SpellChecker.h" | 125 #include "core/editing/SpellChecker.h" |
126 #include "core/editing/TextAffinity.h" | 126 #include "core/editing/TextAffinity.h" |
127 #include "core/editing/TextIterator.h" | 127 #include "core/editing/TextIterator.h" |
128 #include "core/editing/htmlediting.h" | 128 #include "core/editing/htmlediting.h" |
129 #include "core/editing/markup.h" | 129 #include "core/editing/markup.h" |
130 #include "core/frame/Console.h" | 130 #include "core/frame/Console.h" |
131 #include "core/frame/DOMWindow.h" | 131 #include "core/frame/DOMWindow.h" |
132 #include "core/frame/FrameView.h" | 132 #include "core/frame/FrameView.h" |
133 #include "core/html/HTMLCollection.h" | 133 #include "core/html/HTMLCollection.h" |
134 #include "core/html/HTMLFormElement.h" | 134 #include "core/html/HTMLFormElement.h" |
| 135 #include "core/html/HTMLFrameElementBase.h" |
135 #include "core/html/HTMLFrameOwnerElement.h" | 136 #include "core/html/HTMLFrameOwnerElement.h" |
136 #include "core/html/HTMLHeadElement.h" | 137 #include "core/html/HTMLHeadElement.h" |
137 #include "core/html/HTMLInputElement.h" | 138 #include "core/html/HTMLInputElement.h" |
138 #include "core/html/HTMLLinkElement.h" | 139 #include "core/html/HTMLLinkElement.h" |
139 #include "core/html/PluginDocument.h" | 140 #include "core/html/PluginDocument.h" |
140 #include "core/inspector/InspectorController.h" | 141 #include "core/inspector/InspectorController.h" |
141 #include "core/inspector/ScriptCallStack.h" | 142 #include "core/inspector/ScriptCallStack.h" |
142 #include "core/loader/DocumentLoader.h" | 143 #include "core/loader/DocumentLoader.h" |
143 #include "core/loader/FrameLoadRequest.h" | 144 #include "core/loader/FrameLoadRequest.h" |
144 #include "core/loader/FrameLoader.h" | 145 #include "core/loader/FrameLoader.h" |
(...skipping 2074 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2219 return 0; | 2220 return 0; |
2220 FrameLoaderClient* client = frame->loader().client(); | 2221 FrameLoaderClient* client = frame->loader().client(); |
2221 if (!client || !client->isFrameLoaderClientImpl()) | 2222 if (!client || !client->isFrameLoaderClientImpl()) |
2222 return 0; | 2223 return 0; |
2223 return toFrameLoaderClientImpl(client)->webFrame(); | 2224 return toFrameLoaderClientImpl(client)->webFrame(); |
2224 } | 2225 } |
2225 | 2226 |
2226 WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(Element* element) | 2227 WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(Element* element) |
2227 { | 2228 { |
2228 // FIXME: Why do we check specifically for <iframe> and <frame> here? Why ca
n't we get the WebFrameImpl from an <object> element, for example. | 2229 // FIXME: Why do we check specifically for <iframe> and <frame> here? Why ca
n't we get the WebFrameImpl from an <object> element, for example. |
2229 if (!element || !element->isFrameOwnerElement() || (!isHTMLIFrameElement(*el
ement) && !isHTMLFrameElement(*element))) | 2230 if (!isHTMLFrameElementBase(element)) |
2230 return 0; | 2231 return 0; |
2231 return fromFrame(toHTMLFrameOwnerElement(element)->contentFrame()); | 2232 return fromFrame(toHTMLFrameElementBase(element)->contentFrame()); |
2232 } | 2233 } |
2233 | 2234 |
2234 WebViewImpl* WebFrameImpl::viewImpl() const | 2235 WebViewImpl* WebFrameImpl::viewImpl() const |
2235 { | 2236 { |
2236 if (!frame()) | 2237 if (!frame()) |
2237 return 0; | 2238 return 0; |
2238 return WebViewImpl::fromPage(frame()->page()); | 2239 return WebViewImpl::fromPage(frame()->page()); |
2239 } | 2240 } |
2240 | 2241 |
2241 WebDataSourceImpl* WebFrameImpl::dataSourceImpl() const | 2242 WebDataSourceImpl* WebFrameImpl::dataSourceImpl() const |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2485 | 2486 |
2486 // There is a possibility that the frame being detached was the only | 2487 // There is a possibility that the frame being detached was the only |
2487 // pending one. We need to make sure final replies can be sent. | 2488 // pending one. We need to make sure final replies can be sent. |
2488 flushCurrentScopingEffort(m_findRequestIdentifier); | 2489 flushCurrentScopingEffort(m_findRequestIdentifier); |
2489 | 2490 |
2490 cancelPendingScopingEffort(); | 2491 cancelPendingScopingEffort(); |
2491 } | 2492 } |
2492 } | 2493 } |
2493 | 2494 |
2494 } // namespace blink | 2495 } // namespace blink |
OLD | NEW |