mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update OffScreenWebContentsView

Browse source
This commit is contained in:
Cheng Zhao 2017-01-24 14:06:48 +09:00 committed by Kevin Sawicki
parent a95bd227c3
commit c2f3bbb3e6
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
atom/browser/osr/osr_web_contents_view.cc
View file

@ -109,15 +109,15 @@ void OffScreenWebContentsView::SetOverscrollControllerEnabled(bool enabled) {
} }
void OffScreenWebContentsView::GetScreenInfo( void OffScreenWebContentsView::GetScreenInfo(
blink::WebScreenInfo* web_screen_info) const { content::ScreenInfo* screen_info) const {
web_screen_info->rect = gfx::Rect(view_->size()); screen_info->rect = gfx::Rect(view_->size());
web_screen_info->availableRect = gfx::Rect(view_->size()); screen_info->available_rect = gfx::Rect(view_->size());
web_screen_info->depth = 24; screen_info->depth = 24;
web_screen_info->depthPerComponent = 8; screen_info->depth_per_component = 8;
web_screen_info->deviceScaleFactor = view_->scale_factor(); screen_info->device_scale_factor = view_->scale_factor();
web_screen_info->orientationAngle = 0; screen_info->orientation_angle = 0;
web_screen_info->orientationType = screen_info->orientation_type =
blink::WebScreenOrientationLandscapePrimary; content::SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY;
} }
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
@ -141,9 +141,10 @@ void OffScreenWebContentsView::StartDragging(
blink::WebDragOperationsMask allowed_ops, blink::WebDragOperationsMask allowed_ops,
const gfx::ImageSkia& image, const gfx::ImageSkia& image,
const gfx::Vector2d& image_offset, const gfx::Vector2d& image_offset,
const content::DragEventSourceInfo& event_info) { const content::DragEventSourceInfo& event_info,
content::RenderWidgetHostImpl* source_rwh) {
if (web_contents_) if (web_contents_)
web_contents_->SystemDragEnded(); web_contents_->SystemDragEnded(source_rwh);
} }
void OffScreenWebContentsView::UpdateDragCursor( void OffScreenWebContentsView::UpdateDragCursor(

14
atom/browser/osr/osr_web_contents_view.h
View file

@ -51,7 +51,7 @@ class OffScreenWebContentsView : public content::WebContentsView,
void RenderViewCreated(content::RenderViewHost* host) override; void RenderViewCreated(content::RenderViewHost* host) override;
void RenderViewSwappedIn(content::RenderViewHost* host) override; void RenderViewSwappedIn(content::RenderViewHost* host) override;
void SetOverscrollControllerEnabled(bool enabled) override; void SetOverscrollControllerEnabled(bool enabled) override;
void GetScreenInfo(blink::WebScreenInfo* web_screen_info) const override; void GetScreenInfo(content::ScreenInfo* screen_info) const override;
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
void SetAllowOtherViews(bool allow) override; void SetAllowOtherViews(bool allow) override;
@ -61,12 +61,12 @@ class OffScreenWebContentsView : public content::WebContentsView,
#endif #endif
// content::RenderViewHostDelegateView // content::RenderViewHostDelegateView
void StartDragging( void StartDragging(const content::DropData& drop_data,
const content::DropData& drop_data, blink::WebDragOperationsMask allowed_ops,
blink::WebDragOperationsMask allowed_ops, const gfx::ImageSkia& image,
const gfx::ImageSkia& image, const gfx::Vector2d& image_offset,
const gfx::Vector2d& image_offset, const content::DragEventSourceInfo& event_info,
const content::DragEventSourceInfo& event_info) override; content::RenderWidgetHostImpl* source_rwh) override;
void UpdateDragCursor(blink::WebDragOperation operation) override; void UpdateDragCursor(blink::WebDragOperation operation) override;
private: private: