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

Side by Side Diff: Source/core/platform/chromium/PlatformScreenChromium.cpp

Issue 26936002: Remove Widget's dependency upon its own inheritor aka ScrollView. This was nasty from an OO design… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Fix for clang compile error Created 7 years, 2 months 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) 2008, 2009, Google Inc. All rights reserved. 2 * Copyright (c) 2008, 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/platform/PlatformScreen.h" 32 #include "core/platform/PlatformScreen.h"
33 33
34 #include "core/platform/ScrollView.h" 34 #include "core/platform/Widget.h"
35 #include "platform/HostWindow.h" 35 #include "platform/HostWindow.h"
36 #include "platform/geometry/FloatRect.h" 36 #include "platform/geometry/FloatRect.h"
37 #include "public/platform/Platform.h" 37 #include "public/platform/Platform.h"
38 #include "public/platform/WebScreenInfo.h" 38 #include "public/platform/WebScreenInfo.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 static HostWindow* toHostWindow(Widget* widget) 42 static HostWindow* toHostWindow(Widget* widget)
43 { 43 {
44 if (!widget) 44 if (!widget)
45 return 0; 45 return 0;
46 ScrollView* root = widget->root(); 46 Widget* root = widget->root();
47 if (!root) 47 if (!root)
48 return 0; 48 return 0;
49 return root->hostWindow(); 49 return root->hostWindow();
50 } 50 }
51 51
52 int screenDepth(Widget* widget) 52 int screenDepth(Widget* widget)
53 { 53 {
54 HostWindow* hostWindow = toHostWindow(widget); 54 HostWindow* hostWindow = toHostWindow(widget);
55 if (!hostWindow) 55 if (!hostWindow)
56 return 0; 56 return 0;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 } 90 }
91 91
92 void screenColorProfile(ColorProfile& toProfile) 92 void screenColorProfile(ColorProfile& toProfile)
93 { 93 {
94 WebKit::WebVector<char> profile; 94 WebKit::WebVector<char> profile;
95 WebKit::Platform::current()->screenColorProfile(&profile); 95 WebKit::Platform::current()->screenColorProfile(&profile);
96 toProfile.append(profile.data(), profile.size()); 96 toProfile.append(profile.data(), profile.size());
97 } 97 }
98 98
99 } // namespace WebCore 99 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/Widget.cpp ('k') | Source/core/platform/chromium/support/WebScrollbarThemeClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698