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

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

Issue 2572473006: Revert of Collect active stylesheets and and apply asynchronously. (Closed)
Patch Set: Created 4 years 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
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 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 12 matching lines...) Expand all
23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
24 * Boston, MA 02110-1301, USA. 24 * Boston, MA 02110-1301, USA.
25 */ 25 */
26 26
27 #include "core/frame/FrameView.h" 27 #include "core/frame/FrameView.h"
28 28
29 #include "core/HTMLNames.h" 29 #include "core/HTMLNames.h"
30 #include "core/MediaTypeNames.h" 30 #include "core/MediaTypeNames.h"
31 #include "core/animation/DocumentAnimations.h" 31 #include "core/animation/DocumentAnimations.h"
32 #include "core/css/FontFaceSet.h" 32 #include "core/css/FontFaceSet.h"
33 #include "core/css/resolver/StyleResolver.h"
33 #include "core/dom/AXObjectCache.h" 34 #include "core/dom/AXObjectCache.h"
34 #include "core/dom/DOMNodeIds.h" 35 #include "core/dom/DOMNodeIds.h"
35 #include "core/dom/ElementVisibilityObserver.h" 36 #include "core/dom/ElementVisibilityObserver.h"
36 #include "core/dom/Fullscreen.h" 37 #include "core/dom/Fullscreen.h"
37 #include "core/dom/IntersectionObserverCallback.h" 38 #include "core/dom/IntersectionObserverCallback.h"
38 #include "core/dom/IntersectionObserverController.h" 39 #include "core/dom/IntersectionObserverController.h"
39 #include "core/dom/IntersectionObserverInit.h" 40 #include "core/dom/IntersectionObserverInit.h"
40 #include "core/dom/StyleChangeReason.h"
41 #include "core/dom/TaskRunnerHelper.h" 41 #include "core/dom/TaskRunnerHelper.h"
42 #include "core/editing/EditingUtilities.h" 42 #include "core/editing/EditingUtilities.h"
43 #include "core/editing/FrameSelection.h" 43 #include "core/editing/FrameSelection.h"
44 #include "core/editing/RenderedPosition.h" 44 #include "core/editing/RenderedPosition.h"
45 #include "core/editing/markers/DocumentMarkerController.h" 45 #include "core/editing/markers/DocumentMarkerController.h"
46 #include "core/events/ErrorEvent.h" 46 #include "core/events/ErrorEvent.h"
47 #include "core/fetch/ResourceFetcher.h" 47 #include "core/fetch/ResourceFetcher.h"
48 #include "core/frame/BrowserControls.h" 48 #include "core/frame/BrowserControls.h"
49 #include "core/frame/EventHandlerRegistry.h" 49 #include "core/frame/EventHandlerRegistry.h"
50 #include "core/frame/FrameHost.h" 50 #include "core/frame/FrameHost.h"
(...skipping 1415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1466 void FrameView::adjustMediaTypeForPrinting(bool printing) { 1466 void FrameView::adjustMediaTypeForPrinting(bool printing) {
1467 if (printing) { 1467 if (printing) {
1468 if (m_mediaTypeWhenNotPrinting.isNull()) 1468 if (m_mediaTypeWhenNotPrinting.isNull())
1469 m_mediaTypeWhenNotPrinting = mediaType(); 1469 m_mediaTypeWhenNotPrinting = mediaType();
1470 setMediaType(MediaTypeNames::print); 1470 setMediaType(MediaTypeNames::print);
1471 } else { 1471 } else {
1472 if (!m_mediaTypeWhenNotPrinting.isNull()) 1472 if (!m_mediaTypeWhenNotPrinting.isNull())
1473 setMediaType(m_mediaTypeWhenNotPrinting); 1473 setMediaType(m_mediaTypeWhenNotPrinting);
1474 m_mediaTypeWhenNotPrinting = nullAtom; 1474 m_mediaTypeWhenNotPrinting = nullAtom;
1475 } 1475 }
1476
1477 m_frame->document()->setNeedsStyleRecalc(
1478 SubtreeStyleChange,
1479 StyleChangeReasonForTracing::create(StyleChangeReason::StyleSheetChange));
1480 } 1476 }
1481 1477
1482 bool FrameView::contentsInCompositedLayer() const { 1478 bool FrameView::contentsInCompositedLayer() const {
1483 LayoutViewItem layoutViewItem = this->layoutViewItem(); 1479 LayoutViewItem layoutViewItem = this->layoutViewItem();
1484 return !layoutViewItem.isNull() && 1480 return !layoutViewItem.isNull() &&
1485 layoutViewItem.compositingState() == PaintsIntoOwnBacking; 1481 layoutViewItem.compositingState() == PaintsIntoOwnBacking;
1486 } 1482 }
1487 1483
1488 void FrameView::addBackgroundAttachmentFixedObject(LayoutObject* object) { 1484 void FrameView::addBackgroundAttachmentFixedObject(LayoutObject* object) {
1489 ASSERT(!m_backgroundAttachmentFixedObjects.contains(object)); 1485 ASSERT(!m_backgroundAttachmentFixedObjects.contains(object));
(...skipping 3183 matching lines...) Expand 10 before | Expand all | Expand 10 after
4673 DCHECK(m_frame->isMainFrame()); 4669 DCHECK(m_frame->isMainFrame());
4674 return m_initialViewportSize.width(); 4670 return m_initialViewportSize.width();
4675 } 4671 }
4676 4672
4677 int FrameView::initialViewportHeight() const { 4673 int FrameView::initialViewportHeight() const {
4678 DCHECK(m_frame->isMainFrame()); 4674 DCHECK(m_frame->isMainFrame());
4679 return m_initialViewportSize.height(); 4675 return m_initialViewportSize.height();
4680 } 4676 }
4681 4677
4682 } // namespace blink 4678 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698