| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Simon Hausmann <hausmann@kde.org> | 5 * 2000 Simon Hausmann <hausmann@kde.org> |
| 6 * 2000 Stefan Schimanski <1Stein@gmx.de> | 6 * 2000 Stefan Schimanski <1Stein@gmx.de> |
| 7 * 2001 George Staikos <staikos@kde.org> | 7 * 2001 George Staikos <staikos@kde.org> |
| 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
| 9 * rights reserved. | 9 * rights reserved. |
| 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| (...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 549 } | 549 } |
| 550 | 550 |
| 551 bool LocalFrame::isCrossOriginSubframe() const { | 551 bool LocalFrame::isCrossOriginSubframe() const { |
| 552 const SecurityOrigin* securityOrigin = securityContext()->getSecurityOrigin(); | 552 const SecurityOrigin* securityOrigin = securityContext()->getSecurityOrigin(); |
| 553 Frame* top = tree().top(); | 553 Frame* top = tree().top(); |
| 554 return top && | 554 return top && |
| 555 !securityOrigin->canAccess( | 555 !securityOrigin->canAccess( |
| 556 top->securityContext()->getSecurityOrigin()); | 556 top->securityContext()->getSecurityOrigin()); |
| 557 } | 557 } |
| 558 | 558 |
| 559 void LocalFrame::incrementPasswordCount() { |
| 560 ++m_passwordCount; |
| 561 } |
| 562 |
| 563 void LocalFrame::decrementPasswordCount() { |
| 564 --m_passwordCount; |
| 565 } |
| 566 |
| 567 uint64_t LocalFrame::passwordCount() const { |
| 568 return m_passwordCount; |
| 569 } |
| 570 |
| 559 void LocalFrame::setPrinting(bool printing, | 571 void LocalFrame::setPrinting(bool printing, |
| 560 const FloatSize& pageSize, | 572 const FloatSize& pageSize, |
| 561 const FloatSize& originalPageSize, | 573 const FloatSize& originalPageSize, |
| 562 float maximumShrinkRatio) { | 574 float maximumShrinkRatio) { |
| 563 // In setting printing, we should not validate resources already cached for | 575 // In setting printing, we should not validate resources already cached for |
| 564 // the document. See https://bugs.webkit.org/show_bug.cgi?id=43704 | 576 // the document. See https://bugs.webkit.org/show_bug.cgi?id=43704 |
| 565 ResourceCacheValidationSuppressor validationSuppressor(document()->fetcher()); | 577 ResourceCacheValidationSuppressor validationSuppressor(document()->fetcher()); |
| 566 | 578 |
| 567 document()->setPrinting(printing ? Document::Printing | 579 document()->setPrinting(printing ? Document::Printing |
| 568 : Document::FinishingPrinting); | 580 : Document::FinishingPrinting); |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 863 m_spellChecker(SpellChecker::create(*this)), | 875 m_spellChecker(SpellChecker::create(*this)), |
| 864 m_selection(FrameSelection::create(this)), | 876 m_selection(FrameSelection::create(this)), |
| 865 m_eventHandler(new EventHandler(this)), | 877 m_eventHandler(new EventHandler(this)), |
| 866 m_console(FrameConsole::create(*this)), | 878 m_console(FrameConsole::create(*this)), |
| 867 m_inputMethodController(InputMethodController::create(*this)), | 879 m_inputMethodController(InputMethodController::create(*this)), |
| 868 m_navigationDisableCount(0), | 880 m_navigationDisableCount(0), |
| 869 m_pageZoomFactor(parentPageZoomFactor(this)), | 881 m_pageZoomFactor(parentPageZoomFactor(this)), |
| 870 m_textZoomFactor(parentTextZoomFactor(this)), | 882 m_textZoomFactor(parentTextZoomFactor(this)), |
| 871 m_inViewSourceMode(false), | 883 m_inViewSourceMode(false), |
| 872 m_interfaceProvider(interfaceProvider), | 884 m_interfaceProvider(interfaceProvider), |
| 873 m_interfaceRegistry(interfaceRegistry) { | 885 m_interfaceRegistry(interfaceRegistry), |
| 886 m_passwordCount(0) { |
| 874 if (isLocalRoot()) | 887 if (isLocalRoot()) |
| 875 m_instrumentingAgents = new InstrumentingAgents(); | 888 m_instrumentingAgents = new InstrumentingAgents(); |
| 876 else | 889 else |
| 877 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; | 890 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; |
| 878 } | 891 } |
| 879 | 892 |
| 880 WebFrameScheduler* LocalFrame::frameScheduler() { | 893 WebFrameScheduler* LocalFrame::frameScheduler() { |
| 881 return m_frameScheduler.get(); | 894 return m_frameScheduler.get(); |
| 882 } | 895 } |
| 883 | 896 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 913 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 926 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 914 m_frame->client()->frameBlameContext()->Enter(); | 927 m_frame->client()->frameBlameContext()->Enter(); |
| 915 } | 928 } |
| 916 | 929 |
| 917 ScopedFrameBlamer::~ScopedFrameBlamer() { | 930 ScopedFrameBlamer::~ScopedFrameBlamer() { |
| 918 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 931 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 919 m_frame->client()->frameBlameContext()->Leave(); | 932 m_frame->client()->frameBlameContext()->Leave(); |
| 920 } | 933 } |
| 921 | 934 |
| 922 } // namespace blink | 935 } // namespace blink |
| OLD | NEW |