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

modify default background for all render views

Browse source
This commit is contained in:
Robo 2016-03-14 19:24:04 +05:30
parent f8f3fba433
commit fd53a4b24d
6 changed files with 4 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/web_view_guest_delegate.cc
View file

@ -5,7 +5,6 @@
#include "atom/browser/web_view_guest_delegate.h" #include "atom/browser/web_view_guest_delegate.h"
#include "atom/browser/api/atom_api_web_contents.h" #include "atom/browser/api/atom_api_web_contents.h"
#include "atom/common/api/api_messages.h"
#include "atom/common/native_mate_converters/gurl_converter.h" #include "atom/common/native_mate_converters/gurl_converter.h"
#include "content/public/browser/guest_host.h" #include "content/public/browser/guest_host.h"
#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_frame_host.h"
@ -103,12 +102,6 @@ void WebViewGuestDelegate::HandleKeyboardEvent(
embedder_web_contents_->GetDelegate()->HandleKeyboardEvent(source, event); embedder_web_contents_->GetDelegate()->HandleKeyboardEvent(source, event);
} }
void WebViewGuestDelegate::RenderViewReady() {
// Set default UA-dependent background as transparent.
api_web_contents_->Send(new AtomViewMsg_SetTransparentBackground(
api_web_contents_->routing_id()));
}
void WebViewGuestDelegate::DidCommitProvisionalLoadForFrame( void WebViewGuestDelegate::DidCommitProvisionalLoadForFrame(
content::RenderFrameHost* render_frame_host, content::RenderFrameHost* render_frame_host,
const GURL& url, ui::PageTransition transition_type) { const GURL& url, ui::PageTransition transition_type) {

1
atom/browser/web_view_guest_delegate.h
View file

@ -55,7 +55,6 @@ class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
protected: protected:
// content::WebContentsObserver: // content::WebContentsObserver:
void RenderViewReady() override;
void DidCommitProvisionalLoadForFrame( void DidCommitProvisionalLoadForFrame(
content::RenderFrameHost* render_frame_host, content::RenderFrameHost* render_frame_host,
const GURL& url, ui::PageTransition transition_type) override; const GURL& url, ui::PageTransition transition_type) override;

2
atom/common/api/api_messages.h
View file

@ -37,5 +37,3 @@ IPC_MESSAGE_ROUTED2(AtomViewMsg_Message,
// Sent by the renderer when the draggable regions are updated. // Sent by the renderer when the draggable regions are updated.
IPC_MESSAGE_ROUTED1(AtomViewHostMsg_UpdateDraggableRegions, IPC_MESSAGE_ROUTED1(AtomViewHostMsg_UpdateDraggableRegions,
std::vector<atom::DraggableRegion> /* regions */) std::vector<atom::DraggableRegion> /* regions */)
IPC_MESSAGE_ROUTED0(AtomViewMsg_SetTransparentBackground)

9
atom/renderer/atom_render_view_observer.cc
View file

@ -22,7 +22,6 @@
#include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_macros.h"
#include "net/base/net_module.h" #include "net/base/net_module.h"
#include "net/grit/net_resources.h" #include "net/grit/net_resources.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/WebKit/public/web/WebDraggableRegion.h" #include "third_party/WebKit/public/web/WebDraggableRegion.h"
#include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebFrame.h"
@ -114,8 +113,6 @@ bool AtomRenderViewObserver::OnMessageReceived(const IPC::Message& message) {
bool handled = true; bool handled = true;
IPC_BEGIN_MESSAGE_MAP(AtomRenderViewObserver, message) IPC_BEGIN_MESSAGE_MAP(AtomRenderViewObserver, message)
IPC_MESSAGE_HANDLER(AtomViewMsg_Message, OnBrowserMessage) IPC_MESSAGE_HANDLER(AtomViewMsg_Message, OnBrowserMessage)
IPC_MESSAGE_HANDLER(AtomViewMsg_SetTransparentBackground,
OnSetTransparentBackground)
IPC_MESSAGE_UNHANDLED(handled = false) IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP() IPC_END_MESSAGE_MAP()
@ -151,10 +148,4 @@ void AtomRenderViewObserver::OnBrowserMessage(const base::string16& channel,
} }
} }
void AtomRenderViewObserver::OnSetTransparentBackground() {
if (!render_view()->GetWebView())
return;
render_view()->GetWebView()->setBaseBackgroundColor(SK_ColorTRANSPARENT);
}
} // namespace atom } // namespace atom

1
atom/renderer/atom_render_view_observer.h
View file

@ -32,7 +32,6 @@ class AtomRenderViewObserver : public content::RenderViewObserver {
void OnBrowserMessage(const base::string16& channel, void OnBrowserMessage(const base::string16& channel,
const base::ListValue& args); const base::ListValue& args);
void OnSetTransparentBackground();
// Weak reference to renderer client. // Weak reference to renderer client.
AtomRendererClient* renderer_client_; AtomRendererClient* renderer_client_;

4
atom/renderer/atom_renderer_client.cc
View file

@ -25,6 +25,7 @@
#include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer.h"
#include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_thread.h"
#include "content/public/renderer/render_view.h"
#include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_macros.h"
#include "third_party/WebKit/public/web/WebCustomElement.h" #include "third_party/WebKit/public/web/WebCustomElement.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebLocalFrame.h"
@ -131,6 +132,9 @@ void AtomRendererClient::RenderFrameCreated(
} }
void AtomRendererClient::RenderViewCreated(content::RenderView* render_view) { void AtomRendererClient::RenderViewCreated(content::RenderView* render_view) {
// Set default UA-dependent background as transparent.
render_view->GetWebView()->setBaseBackgroundColor(SK_ColorTRANSPARENT);
new printing::PrintWebViewHelper(render_view); new printing::PrintWebViewHelper(render_view);
new AtomRenderViewObserver(render_view, this); new AtomRenderViewObserver(render_view, this);
} }