Chromium Code Reviews| 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 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 244 void FrameLoaderClientImpl::loadURLExternally(const ResourceRequest& request, Na vigationPolicy policy, const String& suggestedName) | 244 void FrameLoaderClientImpl::loadURLExternally(const ResourceRequest& request, Na vigationPolicy policy, const String& suggestedName) |
| 245 { | 245 { |
| 246 if (m_webFrame->client()) { | 246 if (m_webFrame->client()) { |
| 247 ASSERT(m_webFrame->frame()->document()); | 247 ASSERT(m_webFrame->frame()->document()); |
| 248 WrappedResourceRequest webreq(request); | 248 WrappedResourceRequest webreq(request); |
| 249 m_webFrame->client()->loadURLExternally( | 249 m_webFrame->client()->loadURLExternally( |
| 250 m_webFrame, webreq, static_cast<WebNavigationPolicy>(policy), sugges tedName); | 250 m_webFrame, webreq, static_cast<WebNavigationPolicy>(policy), sugges tedName); |
| 251 } | 251 } |
| 252 } | 252 } |
| 253 | 253 |
| 254 void FrameLoaderClientImpl::createView(const KURL& url) | 254 uint32_t FrameLoaderClientImpl::createChildFrame(const KURL& url) |
| 255 { | 255 { |
| 256 if (m_webFrame->client()) { | 256 if (m_webFrame->client()) { |
| 257 m_webFrame->client()->createChildView(url); | 257 return m_webFrame->client()->createChildFrame(url); |
| 258 } | |
| 259 return -1; | |
|
abarth-chromium
2014/11/07 21:25:50
We shouldn't ever get into this situation. Maybe
abarth-chromium
2014/11/07 21:25:50
We shouldn't ever get into this situation. Maybe
Matt Perry
2014/11/10 23:00:56
Done.
| |
| 260 } | |
| 261 | |
| 262 void FrameLoaderClientImpl::initializeChildFrame(uint32_t frame_id, const IntRec t& bounds) | |
| 263 { | |
| 264 if (m_webFrame->client()) { | |
| 265 return m_webFrame->client()->initializeChildFrame(frame_id, bounds); | |
| 258 } | 266 } |
| 259 } | 267 } |
| 260 | 268 |
| 261 void FrameLoaderClientImpl::selectorMatchChanged(const Vector<String>& addedSele ctors, const Vector<String>& removedSelectors) | 269 void FrameLoaderClientImpl::selectorMatchChanged(const Vector<String>& addedSele ctors, const Vector<String>& removedSelectors) |
| 262 { | 270 { |
| 263 if (WebFrameClient* client = m_webFrame->client()) | 271 if (WebFrameClient* client = m_webFrame->client()) |
| 264 client->didMatchCSS(m_webFrame, WebVector<WebString>(addedSelectors), We bVector<WebString>(removedSelectors)); | 272 client->didMatchCSS(m_webFrame, WebVector<WebString>(addedSelectors), We bVector<WebString>(removedSelectors)); |
| 265 } | 273 } |
| 266 | 274 |
| 267 // Called when the FrameLoader goes into a state in which a new page load | 275 // Called when the FrameLoader goes into a state in which a new page load |
| 268 // will occur. | 276 // will occur. |
| 269 void FrameLoaderClientImpl::transitionToCommittedForNewPage() | 277 void FrameLoaderClientImpl::transitionToCommittedForNewPage() |
| 270 { | 278 { |
| 271 m_webFrame->createFrameView(); | 279 m_webFrame->createFrameView(); |
| 272 } | 280 } |
| 273 | 281 |
| 274 void FrameLoaderClientImpl::didLoseWebGLContext(int arbRobustnessContextLostReas on) | 282 void FrameLoaderClientImpl::didLoseWebGLContext(int arbRobustnessContextLostReas on) |
| 275 { | 283 { |
| 276 if (m_webFrame->client()) | 284 if (m_webFrame->client()) |
| 277 m_webFrame->client()->didLoseWebGLContext(m_webFrame, arbRobustnessConte xtLostReason); | 285 m_webFrame->client()->didLoseWebGLContext(m_webFrame, arbRobustnessConte xtLostReason); |
| 278 } | 286 } |
| 279 | 287 |
| 280 void FrameLoaderClientImpl::dispatchDidChangeManifest() | 288 void FrameLoaderClientImpl::dispatchDidChangeManifest() |
| 281 { | 289 { |
| 282 if (m_webFrame->client()) | 290 if (m_webFrame->client()) |
| 283 m_webFrame->client()->didChangeManifest(m_webFrame); | 291 m_webFrame->client()->didChangeManifest(m_webFrame); |
| 284 } | 292 } |
| 285 | 293 |
| 286 } // namespace blink | 294 } // namespace blink |
| OLD | NEW |