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

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 15556002: Refactoring: Generalize CachedSVGDocument for non-SVG use. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Resolved the conflict. Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 #include "core/editing/FrameSelection.h" 100 #include "core/editing/FrameSelection.h"
101 #include "core/html/HTMLDocument.h" 101 #include "core/html/HTMLDocument.h"
102 #include "core/html/HTMLIFrameElement.h" 102 #include "core/html/HTMLIFrameElement.h"
103 #include "core/html/HTMLInputElement.h" 103 #include "core/html/HTMLInputElement.h"
104 #include "core/html/HTMLOptionElement.h" 104 #include "core/html/HTMLOptionElement.h"
105 #include "core/html/HTMLProgressElement.h" 105 #include "core/html/HTMLProgressElement.h"
106 #include "core/html/HTMLStyleElement.h" 106 #include "core/html/HTMLStyleElement.h"
107 #include "core/html/HTMLTextAreaElement.h" 107 #include "core/html/HTMLTextAreaElement.h"
108 #include "core/html/track/WebVTTElement.h" 108 #include "core/html/track/WebVTTElement.h"
109 #include "core/inspector/InspectorInstrumentation.h" 109 #include "core/inspector/InspectorInstrumentation.h"
110 #include "core/loader/cache/CachedDocument.h"
110 #include "core/loader/cache/CachedImage.h" 111 #include "core/loader/cache/CachedImage.h"
111 #include "core/loader/cache/CachedSVGDocument.h"
112 #include "core/loader/cache/CachedSVGDocumentReference.h" 112 #include "core/loader/cache/CachedSVGDocumentReference.h"
113 #include "core/page/Frame.h" 113 #include "core/page/Frame.h"
114 #include "core/page/FrameView.h" 114 #include "core/page/FrameView.h"
115 #include "core/page/Page.h" 115 #include "core/page/Page.h"
116 #include "core/page/Settings.h" 116 #include "core/page/Settings.h"
117 #include "core/platform/CalculationValue.h" 117 #include "core/platform/CalculationValue.h"
118 #include "core/platform/LinkHash.h" 118 #include "core/platform/LinkHash.h"
119 #include "core/platform/graphics/filters/custom/CustomFilterArrayParameter.h" 119 #include "core/platform/graphics/filters/custom/CustomFilterArrayParameter.h"
120 #include "core/platform/graphics/filters/custom/CustomFilterConstants.h" 120 #include "core/platform/graphics/filters/custom/CustomFilterConstants.h"
121 #include "core/platform/graphics/filters/custom/CustomFilterNumberParameter.h" 121 #include "core/platform/graphics/filters/custom/CustomFilterNumberParameter.h"
(...skipping 3506 matching lines...) Expand 10 before | Expand all | Expand 10 after
3628 CachedResourceLoader* cachedResourceLoader = state.document()->cachedResourc eLoader(); 3628 CachedResourceLoader* cachedResourceLoader = state.document()->cachedResourc eLoader();
3629 Vector<RefPtr<FilterOperation> >& filterOperations = state.style()->mutableF ilter().operations(); 3629 Vector<RefPtr<FilterOperation> >& filterOperations = state.style()->mutableF ilter().operations();
3630 for (unsigned i = 0; i < filterOperations.size(); ++i) { 3630 for (unsigned i = 0; i < filterOperations.size(); ++i) {
3631 RefPtr<FilterOperation> filterOperation = filterOperations.at(i); 3631 RefPtr<FilterOperation> filterOperation = filterOperations.at(i);
3632 if (filterOperation->getOperationType() == FilterOperation::REFERENCE) { 3632 if (filterOperation->getOperationType() == FilterOperation::REFERENCE) {
3633 ReferenceFilterOperation* referenceFilter = static_cast<ReferenceFil terOperation*>(filterOperation.get()); 3633 ReferenceFilterOperation* referenceFilter = static_cast<ReferenceFil terOperation*>(filterOperation.get());
3634 3634
3635 WebKitCSSSVGDocumentValue* value = state.pendingSVGDocuments().get(r eferenceFilter); 3635 WebKitCSSSVGDocumentValue* value = state.pendingSVGDocuments().get(r eferenceFilter);
3636 if (!value) 3636 if (!value)
3637 continue; 3637 continue;
3638 CachedSVGDocument* cachedDocument = value->load(cachedResourceLoader ); 3638 CachedDocument* cachedDocument = value->load(cachedResourceLoader);
3639 if (!cachedDocument) 3639 if (!cachedDocument)
3640 continue; 3640 continue;
3641 3641
3642 // Stash the CachedSVGDocument on the reference filter. 3642 // Stash the CachedDocument on the reference filter.
3643 referenceFilter->setCachedSVGDocumentReference(adoptPtr(new CachedSV GDocumentReference(cachedDocument))); 3643 referenceFilter->setCachedSVGDocumentReference(adoptPtr(new CachedSV GDocumentReference(cachedDocument)));
3644 } 3644 }
3645 } 3645 }
3646 state.pendingSVGDocuments().clear(); 3646 state.pendingSVGDocuments().clear();
3647 } 3647 }
3648 3648
3649 void StyleResolver::loadPendingShaders() 3649 void StyleResolver::loadPendingShaders()
3650 { 3650 {
3651 if (!m_state.style()->hasFilter() || !m_state.hasPendingShaders()) 3651 if (!m_state.style()->hasFilter() || !m_state.hasPendingShaders())
3652 return; 3652 return;
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
3858 info.addMember(m_state, "state"); 3858 info.addMember(m_state, "state");
3859 3859
3860 // FIXME: move this to a place where it would be called only once? 3860 // FIXME: move this to a place where it would be called only once?
3861 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle"); 3861 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle");
3862 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e"); 3862 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e");
3863 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" ); 3863 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" );
3864 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle"); 3864 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle");
3865 } 3865 }
3866 3866
3867 } // namespace WebCore 3867 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/WebKitCSSSVGDocumentValue.cpp ('k') | Source/core/loader/cache/CachedDocument.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698