| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "ColorChooserUIController.h" | 27 #include "ColorChooserUIController.h" |
| 28 | 28 |
| 29 #if ENABLE(INPUT_TYPE_COLOR) | 29 #if ENABLE(INPUT_TYPE_COLOR) |
| 30 #include "ChromeClientImpl.h" | 30 #include "ChromeClientImpl.h" |
| 31 #include "ColorChooserClient.h" | |
| 32 #include "WebColorChooser.h" | 31 #include "WebColorChooser.h" |
| 32 #include "core/platform/ColorChooserClient.h" |
| 33 #include "core/platform/graphics/Color.h" | 33 #include "core/platform/graphics/Color.h" |
| 34 #include <public/WebColor.h> | 34 #include <public/WebColor.h> |
| 35 | 35 |
| 36 using namespace WebCore; | 36 using namespace WebCore; |
| 37 | 37 |
| 38 namespace WebKit { | 38 namespace WebKit { |
| 39 | 39 |
| 40 | 40 |
| 41 ColorChooserUIController::ColorChooserUIController(ChromeClientImpl* chromeClien
t, ColorChooserClient* client) | 41 ColorChooserUIController::ColorChooserUIController(ChromeClientImpl* chromeClien
t, ColorChooserClient* client) |
| 42 : m_chromeClient(chromeClient) | 42 : m_chromeClient(chromeClient) |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 | 80 |
| 81 void ColorChooserUIController::openColorChooser() | 81 void ColorChooserUIController::openColorChooser() |
| 82 { | 82 { |
| 83 ASSERT(!m_chooser); | 83 ASSERT(!m_chooser); |
| 84 m_chooser = m_chromeClient->createWebColorChooser(this, static_cast<WebColor
>(m_client->currentColor().rgb())); | 84 m_chooser = m_chromeClient->createWebColorChooser(this, static_cast<WebColor
>(m_client->currentColor().rgb())); |
| 85 } | 85 } |
| 86 | 86 |
| 87 } // namespace WebKit | 87 } // namespace WebKit |
| 88 | 88 |
| 89 #endif // ENABLE(INPUT_TYPE_COLOR) | 89 #endif // ENABLE(INPUT_TYPE_COLOR) |
| OLD | NEW |