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

Side by Side Diff: components/html_viewer/html_frame.cc

Issue 1432443004: Remove SkDevice and SkBaseDevice outside skia/ext/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pass SkPixmap by pointer to MakeBitmapOpaque Created 5 years 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/html_viewer/html_frame.h" 5 #include "components/html_viewer/html_frame.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 25 matching lines...) Expand all
36 #include "components/html_viewer/web_url_loader_impl.h" 36 #include "components/html_viewer/web_url_loader_impl.h"
37 #include "components/mus/public/cpp/scoped_window_ptr.h" 37 #include "components/mus/public/cpp/scoped_window_ptr.h"
38 #include "components/mus/public/cpp/window.h" 38 #include "components/mus/public/cpp/window.h"
39 #include "components/mus/public/cpp/window_tree_connection.h" 39 #include "components/mus/public/cpp/window_tree_connection.h"
40 #include "components/mus/ws/ids.h" 40 #include "components/mus/ws/ids.h"
41 #include "mojo/application/public/cpp/application_impl.h" 41 #include "mojo/application/public/cpp/application_impl.h"
42 #include "mojo/application/public/cpp/connect.h" 42 #include "mojo/application/public/cpp/connect.h"
43 #include "mojo/application/public/interfaces/shell.mojom.h" 43 #include "mojo/application/public/interfaces/shell.mojom.h"
44 #include "mojo/common/common_type_converters.h" 44 #include "mojo/common/common_type_converters.h"
45 #include "mojo/converters/geometry/geometry_type_converters.h" 45 #include "mojo/converters/geometry/geometry_type_converters.h"
46 #include "mojo/public/cpp/system/data_pipe.h"
47 #include "skia/ext/refptr.h"
48 #include "third_party/WebKit/public/platform/Platform.h" 46 #include "third_party/WebKit/public/platform/Platform.h"
49 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" 47 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
50 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" 48 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
51 #include "third_party/WebKit/public/platform/WebSize.h" 49 #include "third_party/WebKit/public/platform/WebSize.h"
52 #include "third_party/WebKit/public/web/WebConsoleMessage.h" 50 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
53 #include "third_party/WebKit/public/web/WebDocument.h" 51 #include "third_party/WebKit/public/web/WebDocument.h"
54 #include "third_party/WebKit/public/web/WebElement.h" 52 #include "third_party/WebKit/public/web/WebElement.h"
55 #include "third_party/WebKit/public/web/WebFindOptions.h" 53 #include "third_party/WebKit/public/web/WebFindOptions.h"
56 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" 54 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
57 #include "third_party/WebKit/public/web/WebInputEvent.h" 55 #include "third_party/WebKit/public/web/WebInputEvent.h"
58 #include "third_party/WebKit/public/web/WebKit.h" 56 #include "third_party/WebKit/public/web/WebKit.h"
59 #include "third_party/WebKit/public/web/WebLocalFrame.h" 57 #include "third_party/WebKit/public/web/WebLocalFrame.h"
60 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" 58 #include "third_party/WebKit/public/web/WebNavigationPolicy.h"
61 #include "third_party/WebKit/public/web/WebRemoteFrame.h" 59 #include "third_party/WebKit/public/web/WebRemoteFrame.h"
62 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h" 60 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h"
63 #include "third_party/WebKit/public/web/WebScriptSource.h" 61 #include "third_party/WebKit/public/web/WebScriptSource.h"
64 #include "third_party/WebKit/public/web/WebView.h" 62 #include "third_party/WebKit/public/web/WebView.h"
65 #include "third_party/skia/include/core/SkCanvas.h"
66 #include "third_party/skia/include/core/SkColor.h"
67 #include "third_party/skia/include/core/SkDevice.h"
68 #include "ui/gfx/geometry/dip_util.h" 63 #include "ui/gfx/geometry/dip_util.h"
69 #include "ui/gfx/geometry/size.h" 64 #include "ui/gfx/geometry/size.h"
70 #include "url/gurl.h" 65 #include "url/gurl.h"
71 #include "url/origin.h" 66 #include "url/origin.h"
72 #include "url/url_constants.h" 67 #include "url/url_constants.h"
73 68
74 using mojo::AxProvider; 69 using mojo::AxProvider;
75 using mojo::Rect; 70 using mojo::Rect;
76 using mojo::ServiceProviderPtr; 71 using mojo::ServiceProviderPtr;
77 using mojo::URLResponsePtr; 72 using mojo::URLResponsePtr;
(...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after
1036 1031
1037 if (!surface_layer_) 1032 if (!surface_layer_)
1038 return; 1033 return;
1039 1034
1040 surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()), 1035 surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()),
1041 global_state()->device_pixel_ratio(), 1036 global_state()->device_pixel_ratio(),
1042 owned_window_->window()->bounds().size()); 1037 owned_window_->window()->bounds().size());
1043 } 1038 }
1044 1039
1045 } // namespace mojo 1040 } // namespace mojo
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/profiles/profile_chooser_view.cc ('k') | content/browser/compositor/software_output_device_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698