| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org> | 2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org> |
| 3 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. | 3 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. |
| 4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 577 page->settings().setAcceleratedCompositingEnabled(false); | 577 page->settings().setAcceleratedCompositingEnabled(false); |
| 578 | 578 |
| 579 // Because this page is detached, it can't get default font settings | 579 // Because this page is detached, it can't get default font settings |
| 580 // from the embedder. Copy over font settings so we have sensible | 580 // from the embedder. Copy over font settings so we have sensible |
| 581 // defaults. These settings are fixed and will not update if changed. | 581 // defaults. These settings are fixed and will not update if changed. |
| 582 if (!Page::ordinaryPages().isEmpty()) { | 582 if (!Page::ordinaryPages().isEmpty()) { |
| 583 Settings& defaultSettings = | 583 Settings& defaultSettings = |
| 584 (*Page::ordinaryPages().begin())->settings(); | 584 (*Page::ordinaryPages().begin())->settings(); |
| 585 page->settings().genericFontFamilySettings() = | 585 page->settings().genericFontFamilySettings() = |
| 586 defaultSettings.genericFontFamilySettings(); | 586 defaultSettings.genericFontFamilySettings(); |
| 587 page->settings().setMinimumFontSize(defaultSettings.minimumFontSize()); | 587 page->settings().setMinimumFontSize( |
| 588 defaultSettings.getMinimumFontSize()); |
| 588 page->settings().setMinimumLogicalFontSize( | 589 page->settings().setMinimumLogicalFontSize( |
| 589 defaultSettings.minimumLogicalFontSize()); | 590 defaultSettings.getMinimumLogicalFontSize()); |
| 590 page->settings().setDefaultFontSize(defaultSettings.defaultFontSize()); | 591 page->settings().setDefaultFontSize( |
| 592 defaultSettings.getDefaultFontSize()); |
| 591 page->settings().setDefaultFixedFontSize( | 593 page->settings().setDefaultFixedFontSize( |
| 592 defaultSettings.defaultFixedFontSize()); | 594 defaultSettings.getDefaultFixedFontSize()); |
| 593 } | 595 } |
| 594 } | 596 } |
| 595 | 597 |
| 596 LocalFrame* frame = nullptr; | 598 LocalFrame* frame = nullptr; |
| 597 { | 599 { |
| 598 TRACE_EVENT0("blink", "SVGImage::dataChanged::createFrame"); | 600 TRACE_EVENT0("blink", "SVGImage::dataChanged::createFrame"); |
| 599 frame = | 601 frame = |
| 600 LocalFrame::create(&dummyFrameLoaderClient, &page->frameHost(), 0); | 602 LocalFrame::create(&dummyFrameLoaderClient, &page->frameHost(), 0); |
| 601 frame->setView(FrameView::create(*frame)); | 603 frame->setView(FrameView::create(*frame)); |
| 602 frame->init(); | 604 frame->init(); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 626 } | 628 } |
| 627 | 629 |
| 628 return m_page ? SizeAvailable : SizeUnavailable; | 630 return m_page ? SizeAvailable : SizeUnavailable; |
| 629 } | 631 } |
| 630 | 632 |
| 631 String SVGImage::filenameExtension() const { | 633 String SVGImage::filenameExtension() const { |
| 632 return "svg"; | 634 return "svg"; |
| 633 } | 635 } |
| 634 | 636 |
| 635 } // namespace blink | 637 } // namespace blink |
| OLD | NEW |