Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(715)

Side by Side Diff: Source/web/ColorChooserUIController.cpp

Issue 42313002: Move Color.*, DashArray and DrawLooper to Source/platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: correct patch set 1 mistake Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 "ChromeClientImpl.h" 29 #include "ChromeClientImpl.h"
30 #include "WebColorChooser.h" 30 #include "WebColorChooser.h"
31 #include "core/platform/ColorChooserClient.h" 31 #include "core/platform/ColorChooserClient.h"
32 #include "core/platform/graphics/Color.h" 32 #include "platform/graphics/Color.h"
33 #include "public/platform/WebColor.h" 33 #include "public/platform/WebColor.h"
34 34
35 using namespace WebCore; 35 using namespace WebCore;
36 36
37 namespace WebKit { 37 namespace WebKit {
38 38
39 39
40 ColorChooserUIController::ColorChooserUIController(ChromeClientImpl* chromeClien t, ColorChooserClient* client) 40 ColorChooserUIController::ColorChooserUIController(ChromeClientImpl* chromeClien t, ColorChooserClient* client)
41 : m_chromeClient(chromeClient) 41 : m_chromeClient(chromeClient)
42 , m_client(client) 42 , m_client(client)
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 m_client->didEndChooser(); 77 m_client->didEndChooser();
78 } 78 }
79 79
80 void ColorChooserUIController::openColorChooser() 80 void ColorChooserUIController::openColorChooser()
81 { 81 {
82 ASSERT(!m_chooser); 82 ASSERT(!m_chooser);
83 m_chooser = m_chromeClient->createWebColorChooser(this, static_cast<WebColor >(m_client->currentColor().rgb())); 83 m_chooser = m_chromeClient->createWebColorChooser(this, static_cast<WebColor >(m_client->currentColor().rgb()));
84 } 84 }
85 85
86 } // namespace WebKit 86 } // namespace WebKit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698