| 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 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 , m_showFPSCounter(false) | 437 , m_showFPSCounter(false) |
| 438 , m_baseBackgroundColor(Color::white) | 438 , m_baseBackgroundColor(Color::white) |
| 439 , m_backgroundColorOverride(Color::transparent) | 439 , m_backgroundColorOverride(Color::transparent) |
| 440 , m_zoomFactorOverride(0) | 440 , m_zoomFactorOverride(0) |
| 441 , m_userGestureObserved(false) | 441 , m_userGestureObserved(false) |
| 442 , m_shouldDispatchFirstVisuallyNonEmptyLayout(false) | 442 , m_shouldDispatchFirstVisuallyNonEmptyLayout(false) |
| 443 , m_shouldDispatchFirstLayoutAfterFinishedParsing(false) | 443 , m_shouldDispatchFirstLayoutAfterFinishedParsing(false) |
| 444 , m_shouldDispatchFirstLayoutAfterFinishedLoading(false) | 444 , m_shouldDispatchFirstLayoutAfterFinishedLoading(false) |
| 445 , m_displayMode(WebDisplayModeBrowser) | 445 , m_displayMode(WebDisplayModeBrowser) |
| 446 , m_elasticOverscroll(FloatSize()) | 446 , m_elasticOverscroll(FloatSize()) |
| 447 , m_scheduler(Platform::current()->currentThread()->scheduler()->createWebVi
ewScheduler(this).release()) | 447 , m_scheduler(adoptPtr(Platform::current()->currentThread()->scheduler()->cr
eateWebViewScheduler(this).release())) |
| 448 { | 448 { |
| 449 Page::PageClients pageClients; | 449 Page::PageClients pageClients; |
| 450 pageClients.chromeClient = m_chromeClientImpl.get(); | 450 pageClients.chromeClient = m_chromeClientImpl.get(); |
| 451 pageClients.contextMenuClient = &m_contextMenuClientImpl; | 451 pageClients.contextMenuClient = &m_contextMenuClientImpl; |
| 452 pageClients.editorClient = &m_editorClientImpl; | 452 pageClients.editorClient = &m_editorClientImpl; |
| 453 pageClients.dragClient = &m_dragClientImpl; | 453 pageClients.dragClient = &m_dragClientImpl; |
| 454 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; | 454 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; |
| 455 | 455 |
| 456 m_page = Page::createOrdinary(pageClients); | 456 m_page = Page::createOrdinary(pageClients); |
| 457 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); | 457 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); |
| (...skipping 4136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4594 { | 4594 { |
| 4595 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4595 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
| 4596 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4596 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
| 4597 if (!page()) | 4597 if (!page()) |
| 4598 return 1; | 4598 return 1; |
| 4599 | 4599 |
| 4600 return page()->deviceScaleFactor(); | 4600 return page()->deviceScaleFactor(); |
| 4601 } | 4601 } |
| 4602 | 4602 |
| 4603 } // namespace blink | 4603 } // namespace blink |
| OLD | NEW |