| OLD | NEW | 
|---|
| 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 26 matching lines...) Expand all  Loading... | 
| 37 | 37 | 
| 38 namespace WebCore { | 38 namespace WebCore { | 
| 39 | 39 | 
| 40 PassOwnPtr<FrameHost> FrameHost::create(Page& page) | 40 PassOwnPtr<FrameHost> FrameHost::create(Page& page) | 
| 41 { | 41 { | 
| 42     return adoptPtr(new FrameHost(page)); | 42     return adoptPtr(new FrameHost(page)); | 
| 43 } | 43 } | 
| 44 | 44 | 
| 45 FrameHost::FrameHost(Page& page) | 45 FrameHost::FrameHost(Page& page) | 
| 46     : m_page(page) | 46     : m_page(page) | 
| 47     , m_pinchViewport(*this) | 47     , m_pinchViewport(adoptPtr(new PinchViewport(*this))) | 
| 48 { | 48 { | 
| 49 } | 49 } | 
| 50 | 50 | 
| 51 // Explicitly in the .cpp to avoid default constructor in .h | 51 // Explicitly in the .cpp to avoid default constructor in .h | 
| 52 FrameHost::~FrameHost() | 52 FrameHost::~FrameHost() | 
| 53 { | 53 { | 
| 54 } | 54 } | 
| 55 | 55 | 
| 56 Settings& FrameHost::settings() const | 56 Settings& FrameHost::settings() const | 
| 57 { | 57 { | 
| 58     return m_page.settings(); | 58     return m_page.settings(); | 
| 59 } | 59 } | 
| 60 | 60 | 
| 61 Chrome& FrameHost::chrome() const | 61 Chrome& FrameHost::chrome() const | 
| 62 { | 62 { | 
| 63     return m_page.chrome(); | 63     return m_page.chrome(); | 
| 64 } | 64 } | 
| 65 | 65 | 
| 66 UseCounter& FrameHost::useCounter() const | 66 UseCounter& FrameHost::useCounter() const | 
| 67 { | 67 { | 
| 68     return m_page.useCounter(); | 68     return m_page.useCounter(); | 
| 69 } | 69 } | 
| 70 | 70 | 
| 71 float FrameHost::deviceScaleFactor() const | 71 float FrameHost::deviceScaleFactor() const | 
| 72 { | 72 { | 
| 73     return m_page.deviceScaleFactor(); | 73     return m_page.deviceScaleFactor(); | 
| 74 } | 74 } | 
| 75 | 75 | 
| 76 PinchViewport& FrameHost::pinchViewport() | 76 PinchViewport& FrameHost::pinchViewport() const | 
| 77 { | 77 { | 
| 78     return m_pinchViewport; | 78     return *m_pinchViewport; | 
| 79 } | 79 } | 
| 80 | 80 | 
| 81 } | 81 } | 
| OLD | NEW | 
|---|