| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org> | 2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org> |
| 3 * Copyright (C) 2008, 2009, 2012 Apple Inc. All rights reserved. | 3 * Copyright (C) 2008, 2009, 2012 Apple Inc. All rights reserved. |
| 4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 class EmptyPopupMenu : public PopupMenu { | 64 class EmptyPopupMenu : public PopupMenu { |
| 65 public: | 65 public: |
| 66 void show() override {} | 66 void show() override {} |
| 67 void hide() override {} | 67 void hide() override {} |
| 68 void updateFromElement(UpdateReason) override {} | 68 void updateFromElement(UpdateReason) override {} |
| 69 void disconnectClient() override {} | 69 void disconnectClient() override {} |
| 70 }; | 70 }; |
| 71 | 71 |
| 72 class EmptyFrameScheduler : public WebFrameScheduler { | 72 class EmptyFrameScheduler : public WebFrameScheduler { |
| 73 public: | 73 public: |
| 74 EmptyFrameScheduler() { DCHECK(isMainThread()); } |
| 74 void setFrameVisible(bool) override {} | 75 void setFrameVisible(bool) override {} |
| 75 WebTaskRunner* loadingTaskRunner() override; | 76 WebTaskRunner* loadingTaskRunner() override; |
| 76 WebTaskRunner* timerTaskRunner() override; | 77 WebTaskRunner* timerTaskRunner() override; |
| 77 WebTaskRunner* unthrottledTaskRunner() override; | 78 WebTaskRunner* unthrottledTaskRunner() override; |
| 78 }; | 79 }; |
| 79 | 80 |
| 80 WebTaskRunner* EmptyFrameScheduler::loadingTaskRunner() { | 81 WebTaskRunner* EmptyFrameScheduler::loadingTaskRunner() { |
| 81 return Platform::current()->currentThread()->getWebTaskRunner(); | 82 return Platform::current()->mainThread()->getWebTaskRunner(); |
| 82 } | 83 } |
| 83 | 84 |
| 84 WebTaskRunner* EmptyFrameScheduler::timerTaskRunner() { | 85 WebTaskRunner* EmptyFrameScheduler::timerTaskRunner() { |
| 85 return Platform::current()->currentThread()->getWebTaskRunner(); | 86 return Platform::current()->mainThread()->getWebTaskRunner(); |
| 86 } | 87 } |
| 87 | 88 |
| 88 WebTaskRunner* EmptyFrameScheduler::unthrottledTaskRunner() { | 89 WebTaskRunner* EmptyFrameScheduler::unthrottledTaskRunner() { |
| 89 return Platform::current()->currentThread()->getWebTaskRunner(); | 90 return Platform::current()->mainThread()->getWebTaskRunner(); |
| 90 } | 91 } |
| 91 | 92 |
| 92 PopupMenu* EmptyChromeClient::openPopupMenu(LocalFrame&, HTMLSelectElement&) { | 93 PopupMenu* EmptyChromeClient::openPopupMenu(LocalFrame&, HTMLSelectElement&) { |
| 93 return new EmptyPopupMenu(); | 94 return new EmptyPopupMenu(); |
| 94 } | 95 } |
| 95 | 96 |
| 96 ColorChooser* EmptyChromeClient::openColorChooser(LocalFrame*, | 97 ColorChooser* EmptyChromeClient::openColorChooser(LocalFrame*, |
| 97 ColorChooserClient*, | 98 ColorChooserClient*, |
| 98 const Color&) { | 99 const Color&) { |
| 99 return nullptr; | 100 return nullptr; |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 return nullptr; | 188 return nullptr; |
| 188 } | 189 } |
| 189 | 190 |
| 190 std::unique_ptr<WebApplicationCacheHost> | 191 std::unique_ptr<WebApplicationCacheHost> |
| 191 EmptyFrameLoaderClient::createApplicationCacheHost( | 192 EmptyFrameLoaderClient::createApplicationCacheHost( |
| 192 WebApplicationCacheHostClient*) { | 193 WebApplicationCacheHostClient*) { |
| 193 return nullptr; | 194 return nullptr; |
| 194 } | 195 } |
| 195 | 196 |
| 196 } // namespace blink | 197 } // namespace blink |
| OLD | NEW |