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

Side by Side Diff: sky/engine/platform/exported/WebCursorInfo.cpp

Issue 722723003: Re-land 714393002 after fixing android build. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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
« no previous file with comments | « sky/engine/platform/PlatformExport.h ('k') | sky/engine/platform/fonts/FontPlatformData.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 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 22 matching lines...) Expand all
33 33
34 #include "platform/Cursor.h" 34 #include "platform/Cursor.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 WebCursorInfo::WebCursorInfo(const Cursor& cursor) 38 WebCursorInfo::WebCursorInfo(const Cursor& cursor)
39 : type(static_cast<Type>(cursor.type())) 39 : type(static_cast<Type>(cursor.type()))
40 , hotSpot(cursor.hotSpot()) 40 , hotSpot(cursor.hotSpot())
41 , imageScaleFactor(cursor.imageScaleFactor()) 41 , imageScaleFactor(cursor.imageScaleFactor())
42 , customImage(cursor.image()) 42 , customImage(cursor.image())
43 #ifdef WIN32
44 , externalHandle(0)
45 #endif
46 { 43 {
47 } 44 }
48 45
49 } // namespace blink 46 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/platform/PlatformExport.h ('k') | sky/engine/platform/fonts/FontPlatformData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698