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

Side by Side Diff: webkit/port/platform/chromium/WidgetChromium.cpp

Issue 7419: Move many files that were suffixed Win.cpp to Chromium.cpp, and place them in... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 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 | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/webkit/port/platform/WidgetWin.cpp:r69-2775
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007 Apple 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 15 matching lines...) Expand all
26 #include "config.h" 26 #include "config.h"
27 #include "Widget.h" 27 #include "Widget.h"
28 28
29 #include "Cursor.h" 29 #include "Cursor.h"
30 #include "Document.h" 30 #include "Document.h"
31 #include "Element.h" 31 #include "Element.h"
32 #include "Frame.h" 32 #include "Frame.h"
33 #include "FrameView.h" 33 #include "FrameView.h"
34 #include "GraphicsContext.h" 34 #include "GraphicsContext.h"
35 #include "IntRect.h" 35 #include "IntRect.h"
36 #include "WidgetClientWin.h" 36 #include "WidgetClientChromium.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 class WidgetPrivate 40 class WidgetPrivate
41 { 41 {
42 public: 42 public:
43 WidgetClientWin* client; 43 WidgetClientChromium* client;
44 ScrollView* parent; 44 ScrollView* parent;
45 IntRect frameRect; 45 IntRect frameRect;
46 bool enabled; 46 bool enabled;
47 bool suppressInvalidation; 47 bool suppressInvalidation;
48 }; 48 };
49 49
50 Widget::Widget() 50 Widget::Widget()
51 : data(new WidgetPrivate) 51 : data(new WidgetPrivate)
52 { 52 {
53 data->client = 0; 53 data->client = 0;
(...skipping 16 matching lines...) Expand all
70 70
71 HWND Widget::containingWindow() const 71 HWND Widget::containingWindow() const
72 { 72 {
73 if (!data->client) 73 if (!data->client)
74 return NULL; 74 return NULL;
75 return data->client->containingWindow(); 75 return data->client->containingWindow();
76 } 76 }
77 77
78 void Widget::setClient(WidgetClient* c) 78 void Widget::setClient(WidgetClient* c)
79 { 79 {
80 data->client = static_cast<WidgetClientWin*>(c); 80 data->client = static_cast<WidgetClientChromium*>(c);
81 } 81 }
82 82
83 WidgetClient* Widget::client() const 83 WidgetClient* Widget::client() const
84 { 84 {
85 return data->client; 85 return data->client;
86 } 86 }
87 87
88 IntRect Widget::frameGeometry() const 88 IntRect Widget::frameGeometry() const
89 { 89 {
90 return data->frameRect; 90 return data->frameRect;
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 { 219 {
220 if (data->client) 220 if (data->client)
221 data->client->setFocus(); 221 data->client->setFocus();
222 } 222 }
223 223
224 void Widget::setIsSelected(bool) 224 void Widget::setIsSelected(bool)
225 { 225 {
226 } 226 }
227 227
228 } // namespace WebCore 228 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698