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 2237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2248 frame()->view()->setInputEventsScaleFactorForEmulation(m_inputEventsScaleFac
torForEmulation); | 2248 frame()->view()->setInputEventsScaleFactorForEmulation(m_inputEventsScaleFac
torForEmulation); |
2249 | 2249 |
2250 if (isMainFrame) | 2250 if (isMainFrame) |
2251 webView->suppressInvalidations(false); | 2251 webView->suppressInvalidations(false); |
2252 } | 2252 } |
2253 | 2253 |
2254 WebFrameImpl* WebFrameImpl::fromFrame(Frame* frame) | 2254 WebFrameImpl* WebFrameImpl::fromFrame(Frame* frame) |
2255 { | 2255 { |
2256 if (!frame) | 2256 if (!frame) |
2257 return 0; | 2257 return 0; |
2258 return static_cast<FrameLoaderClientImpl*>(frame->loader()->client())->webFr
ame(); | 2258 return toFrameLoaderClientImpl(frame->loader()->client())->webFrame(); |
2259 } | 2259 } |
2260 | 2260 |
2261 WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(Element* element) | 2261 WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(Element* element) |
2262 { | 2262 { |
2263 // 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. | 2263 // 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. |
2264 if (!element || !element->isFrameOwnerElement() || (!element->hasTagName(HTM
LNames::iframeTag) && !element->hasTagName(HTMLNames::frameTag))) | 2264 if (!element || !element->isFrameOwnerElement() || (!element->hasTagName(HTM
LNames::iframeTag) && !element->hasTagName(HTMLNames::frameTag))) |
2265 return 0; | 2265 return 0; |
2266 return fromFrame(toHTMLFrameOwnerElement(element)->contentFrame()); | 2266 return fromFrame(toHTMLFrameOwnerElement(element)->contentFrame()); |
2267 } | 2267 } |
2268 | 2268 |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2521 | 2521 |
2522 // There is a possibility that the frame being detached was the only | 2522 // There is a possibility that the frame being detached was the only |
2523 // pending one. We need to make sure final replies can be sent. | 2523 // pending one. We need to make sure final replies can be sent. |
2524 flushCurrentScopingEffort(m_findRequestIdentifier); | 2524 flushCurrentScopingEffort(m_findRequestIdentifier); |
2525 | 2525 |
2526 cancelPendingScopingEffort(); | 2526 cancelPendingScopingEffort(); |
2527 } | 2527 } |
2528 } | 2528 } |
2529 | 2529 |
2530 } // namespace WebKit | 2530 } // namespace WebKit |
OLD | NEW |