| 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 11 matching lines...) Expand all Loading... |
| 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 #include "WebColorChooser.h" | 29 #include "WebColorChooser.h" |
| 30 #include "WebColorSuggestion.h" | 30 #include "WebColorSuggestion.h" |
| 31 #include "WebFrameClient.h" | 31 #include "WebFrameClient.h" |
| 32 #include "WebFrameImpl.h" | 32 #include "WebLocalFrameImpl.h" |
| 33 #include "platform/ColorChooserClient.h" | 33 #include "platform/ColorChooserClient.h" |
| 34 #include "platform/graphics/Color.h" | 34 #include "platform/graphics/Color.h" |
| 35 #include "public/platform/WebColor.h" | 35 #include "public/platform/WebColor.h" |
| 36 | 36 |
| 37 using namespace WebCore; | 37 using namespace WebCore; |
| 38 | 38 |
| 39 namespace blink { | 39 namespace blink { |
| 40 | 40 |
| 41 | 41 |
| 42 ColorChooserUIController::ColorChooserUIController(LocalFrame* frame, ColorChoos
erClient* client) | 42 ColorChooserUIController::ColorChooserUIController(LocalFrame* frame, ColorChoos
erClient* client) |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 void ColorChooserUIController::didEndChooser() | 75 void ColorChooserUIController::didEndChooser() |
| 76 { | 76 { |
| 77 ASSERT(m_client); | 77 ASSERT(m_client); |
| 78 m_chooser = nullptr; | 78 m_chooser = nullptr; |
| 79 m_client->didEndChooser(); | 79 m_client->didEndChooser(); |
| 80 } | 80 } |
| 81 | 81 |
| 82 void ColorChooserUIController::openColorChooser() | 82 void ColorChooserUIController::openColorChooser() |
| 83 { | 83 { |
| 84 ASSERT(!m_chooser); | 84 ASSERT(!m_chooser); |
| 85 WebFrameImpl* frame = WebFrameImpl::fromFrame(m_frame); | 85 WebLocalFrameImpl* frame = WebLocalFrameImpl::fromFrame(m_frame); |
| 86 WebFrameClient* webFrameClient = frame->client(); | 86 WebFrameClient* webFrameClient = frame->client(); |
| 87 if (!webFrameClient) | 87 if (!webFrameClient) |
| 88 return; | 88 return; |
| 89 m_chooser = adoptPtr(webFrameClient->createColorChooser( | 89 m_chooser = adoptPtr(webFrameClient->createColorChooser( |
| 90 this, static_cast<WebColor>(m_client->currentColor().rgb()), m_client->s
uggestions())); | 90 this, static_cast<WebColor>(m_client->currentColor().rgb()), m_client->s
uggestions())); |
| 91 } | 91 } |
| 92 | 92 |
| 93 } // namespace blink | 93 } // namespace blink |
| OLD | NEW |