| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 Page::PageClients pageClients; | 174 Page::PageClients pageClients; |
| 175 pageClients.chromeClient = &m_chromeClientImpl; | 175 pageClients.chromeClient = &m_chromeClientImpl; |
| 176 pageClients.editorClient = &m_editorClientImpl; | 176 pageClients.editorClient = &m_editorClientImpl; |
| 177 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; | 177 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; |
| 178 | 178 |
| 179 m_page = adoptPtr(new Page(pageClients, m_client->services())); | 179 m_page = adoptPtr(new Page(pageClients, m_client->services())); |
| 180 | 180 |
| 181 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); | 181 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); |
| 182 setVisibilityState(m_client->visibilityState(), true); | 182 setVisibilityState(m_client->visibilityState(), true); |
| 183 | 183 |
| 184 m_layerTreeView = m_client->initializeLayerTreeView(); | 184 m_client->initializeLayerTreeView(); |
| 185 | 185 // FIXME(sky): Get rid of this member variable. It's unused. |
| 186 #if !ENABLE(COMPOSITOR) | |
| 187 m_layerTreeView = nullptr; | 186 m_layerTreeView = nullptr; |
| 188 #endif | |
| 189 } | 187 } |
| 190 | 188 |
| 191 WebViewImpl::~WebViewImpl() | 189 WebViewImpl::~WebViewImpl() |
| 192 { | 190 { |
| 193 ASSERT(!m_page); | 191 ASSERT(!m_page); |
| 194 } | 192 } |
| 195 | 193 |
| 196 WebLocalFrameImpl* WebViewImpl::mainFrameImpl() | 194 WebLocalFrameImpl* WebViewImpl::mainFrameImpl() |
| 197 { | 195 { |
| 198 return m_page ? WebLocalFrameImpl::fromFrame(m_page->mainFrame()) : 0; | 196 return m_page ? WebLocalFrameImpl::fromFrame(m_page->mainFrame()) : 0; |
| (...skipping 2056 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2255 m_layerTreeView->setVisible(visible); | 2253 m_layerTreeView->setVisible(visible); |
| 2256 } | 2254 } |
| 2257 } | 2255 } |
| 2258 | 2256 |
| 2259 bool WebViewImpl::shouldDisableDesktopWorkarounds() | 2257 bool WebViewImpl::shouldDisableDesktopWorkarounds() |
| 2260 { | 2258 { |
| 2261 return true; | 2259 return true; |
| 2262 } | 2260 } |
| 2263 | 2261 |
| 2264 } // namespace blink | 2262 } // namespace blink |
| OLD | NEW |