bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 233896.

Browse Source 
- The CefBrowserSettings.author_and_user_styles option is now always enabled.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1512 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-11-08 21:28:56 +00:00
parent d789d84c30
commit 133e06c50a
52 changed files with 452 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libcef/renderer/frame_impl.h
View File

@ -12,7 +12,7 @@
class CefBrowserImpl;
namespace WebKit {
namespace blink {
class WebFrame;
}
@ -22,7 +22,7 @@ class WebFrame;
class CefFrameImpl : public CefFrame {
public:
CefFrameImpl(CefBrowserImpl* browser,
WebKit::WebFrame* frame);
blink::WebFrame* frame);
virtual ~CefFrameImpl();
// CefFrame implementation.
@ -56,11 +56,11 @@ class CefFrameImpl : public CefFrame {
void Detach();
WebKit::WebFrame* web_frame() const { return frame_; }
blink::WebFrame* web_frame() const { return frame_; }
protected:
CefBrowserImpl* browser_;
WebKit::WebFrame* frame_;
blink::WebFrame* frame_;
int64 frame_id_;
IMPLEMENT_REFCOUNTING(CefFrameImpl);