Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(818)

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2038793002: Clear media query rulesets on page zoom changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use testharness.js Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/media/resolution-change-on-page-zoom.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 } 581 }
582 582
583 m_pageZoomFactor = pageZoomFactor; 583 m_pageZoomFactor = pageZoomFactor;
584 m_textZoomFactor = textZoomFactor; 584 m_textZoomFactor = textZoomFactor;
585 585
586 for (Frame* child = tree().firstChild(); child; child = child->tree().nextSi bling()) { 586 for (Frame* child = tree().firstChild(); child; child = child->tree().nextSi bling()) {
587 if (child->isLocalFrame()) 587 if (child->isLocalFrame())
588 toLocalFrame(child)->setPageAndTextZoomFactors(m_pageZoomFactor, m_t extZoomFactor); 588 toLocalFrame(child)->setPageAndTextZoomFactors(m_pageZoomFactor, m_t extZoomFactor);
589 } 589 }
590 590
591 document->mediaQueryAffectingValueChanged();
591 document->setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracin g::create(StyleChangeReason::Zoom)); 592 document->setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracin g::create(StyleChangeReason::Zoom));
592 document->updateStyleAndLayoutIgnorePendingStylesheets(); 593 document->updateStyleAndLayoutIgnorePendingStylesheets();
593 } 594 }
594 595
595 void LocalFrame::deviceScaleFactorChanged() 596 void LocalFrame::deviceScaleFactorChanged()
596 { 597 {
597 document()->mediaQueryAffectingValueChanged(); 598 document()->mediaQueryAffectingValueChanged();
598 for (Frame* child = tree().firstChild(); child; child = child->tree().nextSi bling()) { 599 for (Frame* child = tree().firstChild(); child; child = child->tree().nextSi bling()) {
599 if (child->isLocalFrame()) 600 if (child->isLocalFrame())
600 toLocalFrame(child)->deviceScaleFactorChanged(); 601 toLocalFrame(child)->deviceScaleFactorChanged();
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 { 822 {
822 m_frame->disableNavigation(); 823 m_frame->disableNavigation();
823 } 824 }
824 825
825 FrameNavigationDisabler::~FrameNavigationDisabler() 826 FrameNavigationDisabler::~FrameNavigationDisabler()
826 { 827 {
827 m_frame->enableNavigation(); 828 m_frame->enableNavigation();
828 } 829 }
829 830
830 } // namespace blink 831 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/media/resolution-change-on-page-zoom.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698