| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2011 Apple 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 are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 void FrameLoaderClientImpl::loadURLExternally(const ResourceRequest& request, Na
vigationPolicy policy, const String& suggestedName) | 243 void FrameLoaderClientImpl::loadURLExternally(const ResourceRequest& request, Na
vigationPolicy policy, const String& suggestedName) |
| 244 { | 244 { |
| 245 if (m_webFrame->client()) { | 245 if (m_webFrame->client()) { |
| 246 ASSERT(m_webFrame->frame()->document()); | 246 ASSERT(m_webFrame->frame()->document()); |
| 247 WrappedResourceRequest webreq(request); | 247 WrappedResourceRequest webreq(request); |
| 248 m_webFrame->client()->loadURLExternally( | 248 m_webFrame->client()->loadURLExternally( |
| 249 m_webFrame, webreq, static_cast<WebNavigationPolicy>(policy), sugges
tedName); | 249 m_webFrame, webreq, static_cast<WebNavigationPolicy>(policy), sugges
tedName); |
| 250 } | 250 } |
| 251 } | 251 } |
| 252 | 252 |
| 253 void FrameLoaderClientImpl::createView(const KURL& url) | 253 mojo::View* FrameLoaderClientImpl::createChildFrame(const KURL& url) |
| 254 { | 254 { |
| 255 if (m_webFrame->client()) { | 255 if (m_webFrame->client()) { |
| 256 m_webFrame->client()->createChildView(url); | 256 return m_webFrame->client()->createChildFrame(url); |
| 257 } | 257 } |
| 258 ASSERT_NOT_REACHED(); |
| 259 return nullptr; |
| 258 } | 260 } |
| 259 | 261 |
| 260 void FrameLoaderClientImpl::selectorMatchChanged(const Vector<String>& addedSele
ctors, const Vector<String>& removedSelectors) | 262 void FrameLoaderClientImpl::selectorMatchChanged(const Vector<String>& addedSele
ctors, const Vector<String>& removedSelectors) |
| 261 { | 263 { |
| 262 if (WebFrameClient* client = m_webFrame->client()) | 264 if (WebFrameClient* client = m_webFrame->client()) |
| 263 client->didMatchCSS(m_webFrame, WebVector<WebString>(addedSelectors), We
bVector<WebString>(removedSelectors)); | 265 client->didMatchCSS(m_webFrame, WebVector<WebString>(addedSelectors), We
bVector<WebString>(removedSelectors)); |
| 264 } | 266 } |
| 265 | 267 |
| 266 // Called when the FrameLoader goes into a state in which a new page load | 268 // Called when the FrameLoader goes into a state in which a new page load |
| 267 // will occur. | 269 // will occur. |
| 268 void FrameLoaderClientImpl::transitionToCommittedForNewPage() | 270 void FrameLoaderClientImpl::transitionToCommittedForNewPage() |
| 269 { | 271 { |
| 270 m_webFrame->createFrameView(); | 272 m_webFrame->createFrameView(); |
| 271 } | 273 } |
| 272 | 274 |
| 273 void FrameLoaderClientImpl::didLoseWebGLContext(int arbRobustnessContextLostReas
on) | 275 void FrameLoaderClientImpl::didLoseWebGLContext(int arbRobustnessContextLostReas
on) |
| 274 { | 276 { |
| 275 if (m_webFrame->client()) | 277 if (m_webFrame->client()) |
| 276 m_webFrame->client()->didLoseWebGLContext(m_webFrame, arbRobustnessConte
xtLostReason); | 278 m_webFrame->client()->didLoseWebGLContext(m_webFrame, arbRobustnessConte
xtLostReason); |
| 277 } | 279 } |
| 278 | 280 |
| 279 void FrameLoaderClientImpl::dispatchDidChangeManifest() | 281 void FrameLoaderClientImpl::dispatchDidChangeManifest() |
| 280 { | 282 { |
| 281 if (m_webFrame->client()) | 283 if (m_webFrame->client()) |
| 282 m_webFrame->client()->didChangeManifest(m_webFrame); | 284 m_webFrame->client()->didChangeManifest(m_webFrame); |
| 283 } | 285 } |
| 284 | 286 |
| 285 } // namespace blink | 287 } // namespace blink |
| OLD | NEW |