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

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

Issue 115293005: Add a layer of indirection between Frame and 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
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 11 matching lines...) Expand all
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/events/NavigatorEvents.h" 32 #include "core/frame/FrameHost.h"
33 33
34 #include "core/frame/Frame.h"
35 #include "core/frame/Navigator.h"
36 #include "core/page/Page.h" 34 #include "core/page/Page.h"
37 #include "core/frame/Settings.h"
38 35
39 namespace WebCore { 36 namespace WebCore {
40 37
41 long NavigatorEvents::maxTouchPoints(Navigator* navigator) 38 PassOwnPtr<FrameHost> FrameHost::create(Page& page)
42 { 39 {
43 Frame* frame = navigator->frame(); 40 return adoptPtr(new FrameHost(page));
44
45 if (!frame)
46 return 0;
47
48 Page* page = frame->page();
49
50 if (!page)
51 return 0;
52
53 return page->settings().maxTouchPoints();
54 } 41 }
55 42
56 } // namespace WebCore 43 FrameHost::FrameHost(Page& page)
44 : m_page(page)
45 {
46
abarth-chromium 2013/12/15 06:04:23 Extra blank line. :)
47 }
48
49 Settings& FrameHost::settings() const
50 {
51 return m_page.settings();
52 }
53
54 Chrome& FrameHost::chrome() const
55 {
56 return m_page.chrome();
57 }
58
59 float FrameHost::deviceScaleFactor() const
60 {
61 return m_page.deviceScaleFactor();
62 }
63
64 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698