|
WIP fix for Ozone cursor woes in Mushrome: Numéro deux
This makes CursorFactoryOzone TLS, so that both the UI Service thread,
and the browser thread cad maintain an instance.
Additionally, CursorLoaderOzoner saves the factory when created via
CursorFactoryOzone::GetInstance(), and then uses it through its
lifetime. This means that CursorLoaderOzone ends up using the factory
corresponding to the thread it was created on.
Now, for Mus, we create the ImageCursors object on the Mus thread, but
then pass the ownership to the browser thread via a helper
ImageCursorsHolder class. This ensures that this ImageCursors object
uses Mus's factory, even though it's used on the browser thread.
BUG= 722527
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+147 lines, -73 lines) |
Patch |
|
M |
chrome/browser/chrome_content_browser_client.h
|
View
|
|
3 chunks |
+4 lines, -7 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chrome_content_browser_client.cc
|
View
|
|
2 chunks |
+2 lines, -4 lines |
0 comments
|
Download
|
|
M |
services/ui/service.h
|
View
|
|
4 chunks |
+5 lines, -5 lines |
0 comments
|
Download
|
|
M |
services/ui/service.cc
|
View
|
|
3 chunks |
+9 lines, -7 lines |
0 comments
|
Download
|
|
M |
services/ui/ws/display.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
services/ui/ws/platform_display.h
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
services/ui/ws/platform_display.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
services/ui/ws/threaded_image_cursors.h
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
services/ui/ws/threaded_image_cursors.cc
|
View
|
|
4 chunks |
+39 lines, -17 lines |
0 comments
|
Download
|
|
M |
services/ui/ws/window_server.h
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
services/ui/ws/window_server.cc
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
|
M |
services/ui/ws/window_server_delegate.h
|
View
|
|
2 chunks |
+3 lines, -2 lines |
0 comments
|
Download
|
|
M |
ui/base/cursor/cursor_loader_ozone.h
|
View
|
|
2 chunks |
+3 lines, -0 lines |
0 comments
|
Download
|
|
M |
ui/base/cursor/cursor_loader_ozone.cc
|
View
|
|
4 chunks |
+11 lines, -9 lines |
0 comments
|
Download
|
|
M |
ui/base/cursor/image_cursors.h
|
View
|
|
2 chunks |
+21 lines, -0 lines |
0 comments
|
Download
|
|
M |
ui/base/cursor/image_cursors.cc
|
View
|
|
2 chunks |
+24 lines, -0 lines |
0 comments
|
Download
|
|
M |
ui/ozone/public/cursor_factory_ozone.h
|
View
|
|
1 chunk |
+0 lines, -3 lines |
0 comments
|
Download
|
|
M |
ui/ozone/public/cursor_factory_ozone.cc
|
View
|
|
1 chunk |
+14 lines, -8 lines |
0 comments
|
Download
|
Total messages: 10 (4 generated)
|