| 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 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 489 { | 489 { |
| 490 return loader ? WebDataSourceImpl::fromDocumentLoader(loader) : 0; | 490 return loader ? WebDataSourceImpl::fromDocumentLoader(loader) : 0; |
| 491 } | 491 } |
| 492 | 492 |
| 493 // WebSuspendableTaskWrapper -------------------------------------------------- | 493 // WebSuspendableTaskWrapper -------------------------------------------------- |
| 494 | 494 |
| 495 class WebSuspendableTaskWrapper: public SuspendableTask { | 495 class WebSuspendableTaskWrapper: public SuspendableTask { |
| 496 public: | 496 public: |
| 497 static PassOwnPtr<WebSuspendableTaskWrapper> create(PassOwnPtr<WebSuspendabl
eTask> task) | 497 static PassOwnPtr<WebSuspendableTaskWrapper> create(PassOwnPtr<WebSuspendabl
eTask> task) |
| 498 { | 498 { |
| 499 return adoptPtr(new WebSuspendableTaskWrapper(task)); | 499 return adoptPtr(new WebSuspendableTaskWrapper(std::move(task))); |
| 500 } | 500 } |
| 501 | 501 |
| 502 void run() override | 502 void run() override |
| 503 { | 503 { |
| 504 m_task->run(); | 504 m_task->run(); |
| 505 } | 505 } |
| 506 | 506 |
| 507 void contextDestroyed() override | 507 void contextDestroyed() override |
| 508 { | 508 { |
| 509 m_task->contextDestroyed(); | 509 m_task->contextDestroyed(); |
| 510 } | 510 } |
| 511 | 511 |
| 512 private: | 512 private: |
| 513 explicit WebSuspendableTaskWrapper(PassOwnPtr<WebSuspendableTask> task) | 513 explicit WebSuspendableTaskWrapper(PassOwnPtr<WebSuspendableTask> task) |
| 514 : m_task(task) | 514 : m_task(std::move(task)) |
| 515 { | 515 { |
| 516 } | 516 } |
| 517 | 517 |
| 518 OwnPtr<WebSuspendableTask> m_task; | 518 OwnPtr<WebSuspendableTask> m_task; |
| 519 }; | 519 }; |
| 520 | 520 |
| 521 // WebFrame ------------------------------------------------------------------- | 521 // WebFrame ------------------------------------------------------------------- |
| 522 | 522 |
| 523 int WebFrame::instanceCount() | 523 int WebFrame::instanceCount() |
| 524 { | 524 { |
| (...skipping 1586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2111 return WebSandboxFlags::None; | 2111 return WebSandboxFlags::None; |
| 2112 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); | 2112 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); |
| 2113 } | 2113 } |
| 2114 | 2114 |
| 2115 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) | 2115 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) |
| 2116 { | 2116 { |
| 2117 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); | 2117 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); |
| 2118 } | 2118 } |
| 2119 | 2119 |
| 2120 } // namespace blink | 2120 } // namespace blink |
| OLD | NEW |