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

Side by Side Diff: Source/core/frame/FrameHost.cpp

Issue 111113003: Move PageConsole to using FrameHost instead of Page (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/page/PageConsole.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 25 matching lines...) Expand all
36 36
37 namespace WebCore { 37 namespace WebCore {
38 38
39 PassOwnPtr<FrameHost> FrameHost::create(Page& page) 39 PassOwnPtr<FrameHost> FrameHost::create(Page& page)
40 { 40 {
41 return adoptPtr(new FrameHost(page)); 41 return adoptPtr(new FrameHost(page));
42 } 42 }
43 43
44 FrameHost::FrameHost(Page& page) 44 FrameHost::FrameHost(Page& page)
45 : m_page(page) 45 : m_page(page)
46 , m_console(PageConsole::create(&page)) 46 , m_console(PageConsole::create(*this))
47 { 47 {
48 } 48 }
49 49
50 Settings& FrameHost::settings() const 50 Settings& FrameHost::settings() const
51 { 51 {
52 return m_page.settings(); 52 return m_page.settings();
53 } 53 }
54 54
55 Chrome& FrameHost::chrome() const 55 Chrome& FrameHost::chrome() const
56 { 56 {
57 return m_page.chrome(); 57 return m_page.chrome();
58 } 58 }
59 59
60 PageConsole& FrameHost::console() const 60 PageConsole& FrameHost::console() const
61 { 61 {
62 return *m_console; 62 return *m_console;
63 } 63 }
64 64
65 UseCounter& FrameHost::useCounter() const 65 UseCounter& FrameHost::useCounter() const
66 { 66 {
67 return m_page.useCounter(); 67 return m_page.useCounter();
68 } 68 }
69 69
70 float FrameHost::deviceScaleFactor() const 70 float FrameHost::deviceScaleFactor() const
71 { 71 {
72 return m_page.deviceScaleFactor(); 72 return m_page.deviceScaleFactor();
73 } 73 }
74 74
75 } 75 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/page/PageConsole.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698