| 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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 pageClients.editorClient = &m_editorClientImpl; | 177 pageClients.editorClient = &m_editorClientImpl; |
| 178 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; | 178 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; |
| 179 | 179 |
| 180 m_page = adoptPtr(new Page(pageClients, m_client->services())); | 180 m_page = adoptPtr(new Page(pageClients, m_client->services())); |
| 181 m_page->makeOrdinary(); | 181 m_page->makeOrdinary(); |
| 182 | 182 |
| 183 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); | 183 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); |
| 184 setVisibilityState(m_client->visibilityState(), true); | 184 setVisibilityState(m_client->visibilityState(), true); |
| 185 | 185 |
| 186 m_layerTreeView = m_client->initializeLayerTreeView(); | 186 m_layerTreeView = m_client->initializeLayerTreeView(); |
| 187 |
| 188 #if !ENABLE(COMPOSITOR) |
| 189 m_layerTreeView = nullptr; |
| 190 #endif |
| 187 } | 191 } |
| 188 | 192 |
| 189 WebViewImpl::~WebViewImpl() | 193 WebViewImpl::~WebViewImpl() |
| 190 { | 194 { |
| 191 ASSERT(!m_page); | 195 ASSERT(!m_page); |
| 192 } | 196 } |
| 193 | 197 |
| 194 WebLocalFrameImpl* WebViewImpl::mainFrameImpl() | 198 WebLocalFrameImpl* WebViewImpl::mainFrameImpl() |
| 195 { | 199 { |
| 196 return m_page ? WebLocalFrameImpl::fromFrame(m_page->mainFrame()) : 0; | 200 return m_page ? WebLocalFrameImpl::fromFrame(m_page->mainFrame()) : 0; |
| (...skipping 2062 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2259 m_layerTreeView->setVisible(visible); | 2263 m_layerTreeView->setVisible(visible); |
| 2260 } | 2264 } |
| 2261 } | 2265 } |
| 2262 | 2266 |
| 2263 bool WebViewImpl::shouldDisableDesktopWorkarounds() | 2267 bool WebViewImpl::shouldDisableDesktopWorkarounds() |
| 2264 { | 2268 { |
| 2265 return true; | 2269 return true; |
| 2266 } | 2270 } |
| 2267 | 2271 |
| 2268 } // namespace blink | 2272 } // namespace blink |
| OLD | NEW |