| OLD | NEW |
| 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 Loading... |
| 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 "skia/ext/refptr.h" | |
| 47 #include "third_party/WebKit/public/platform/Platform.h" | 46 #include "third_party/WebKit/public/platform/Platform.h" |
| 48 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" | 47 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" |
| 49 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" | 48 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" |
| 50 #include "third_party/WebKit/public/platform/WebSize.h" | 49 #include "third_party/WebKit/public/platform/WebSize.h" |
| 51 #include "third_party/WebKit/public/web/WebConsoleMessage.h" | 50 #include "third_party/WebKit/public/web/WebConsoleMessage.h" |
| 52 #include "third_party/WebKit/public/web/WebDocument.h" | 51 #include "third_party/WebKit/public/web/WebDocument.h" |
| 53 #include "third_party/WebKit/public/web/WebElement.h" | 52 #include "third_party/WebKit/public/web/WebElement.h" |
| 54 #include "third_party/WebKit/public/web/WebFindOptions.h" | 53 #include "third_party/WebKit/public/web/WebFindOptions.h" |
| 55 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" | 54 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" |
| 56 #include "third_party/WebKit/public/web/WebInputEvent.h" | 55 #include "third_party/WebKit/public/web/WebInputEvent.h" |
| 57 #include "third_party/WebKit/public/web/WebKit.h" | 56 #include "third_party/WebKit/public/web/WebKit.h" |
| 58 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 57 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
| 59 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" | 58 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" |
| 60 #include "third_party/WebKit/public/web/WebRemoteFrame.h" | 59 #include "third_party/WebKit/public/web/WebRemoteFrame.h" |
| 61 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h" | 60 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h" |
| 62 #include "third_party/WebKit/public/web/WebScriptSource.h" | 61 #include "third_party/WebKit/public/web/WebScriptSource.h" |
| 63 #include "third_party/WebKit/public/web/WebView.h" | 62 #include "third_party/WebKit/public/web/WebView.h" |
| 64 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" | 63 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.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" | 64 #include "ui/gfx/geometry/dip_util.h" |
| 69 #include "ui/gfx/geometry/size.h" | 65 #include "ui/gfx/geometry/size.h" |
| 70 #include "url/gurl.h" | 66 #include "url/gurl.h" |
| 71 #include "url/origin.h" | 67 #include "url/origin.h" |
| 72 #include "url/url_constants.h" | 68 #include "url/url_constants.h" |
| 73 | 69 |
| 74 using mojo::AxProvider; | 70 using mojo::AxProvider; |
| 75 using mojo::Rect; | 71 using mojo::Rect; |
| 76 using mojo::ServiceProviderPtr; | 72 using mojo::ServiceProviderPtr; |
| 77 using mojo::URLResponsePtr; | 73 using mojo::URLResponsePtr; |
| (...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1036 | 1032 |
| 1037 if (!surface_layer_) | 1033 if (!surface_layer_) |
| 1038 return; | 1034 return; |
| 1039 | 1035 |
| 1040 surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()), | 1036 surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()), |
| 1041 global_state()->device_pixel_ratio(), | 1037 global_state()->device_pixel_ratio(), |
| 1042 owned_window_->window()->bounds().size()); | 1038 owned_window_->window()->bounds().size()); |
| 1043 } | 1039 } |
| 1044 | 1040 |
| 1045 } // namespace mojo | 1041 } // namespace mojo |
| OLD | NEW |