diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/css/StyleMedia.cpp | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/css/StyleMedia.cpp')
| -rw-r--r-- | Source/WebCore/css/StyleMedia.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/WebCore/css/StyleMedia.cpp b/Source/WebCore/css/StyleMedia.cpp index 9942142a6..7677ac38e 100644 --- a/Source/WebCore/css/StyleMedia.cpp +++ b/Source/WebCore/css/StyleMedia.cpp @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -31,7 +31,10 @@ #include "FrameView.h" #include "MediaList.h" #include "MediaQueryEvaluator.h" +#include "NodeRenderStyle.h" +#include "RenderElement.h" #include "StyleResolver.h" +#include "StyleScope.h" namespace WebCore { @@ -60,14 +63,11 @@ bool StyleMedia::matchMedium(const String& query) const if (!documentElement) return false; - RefPtr<RenderStyle> rootStyle = document->ensureStyleResolver().styleForElement(documentElement, 0 /*defaultParent*/, DisallowStyleSharing, MatchOnlyUserAgentRules); + auto rootStyle = document->styleScope().resolver().styleForElement(*documentElement, document->renderStyle(), nullptr, MatchOnlyUserAgentRules).renderStyle; - RefPtr<MediaQuerySet> media = MediaQuerySet::create(); - if (!media->parse(query)) - return false; + auto media = MediaQuerySet::create(query); - MediaQueryEvaluator screenEval(type(), m_frame, rootStyle.get()); - return screenEval.eval(media.get()); + return MediaQueryEvaluator { type(), *document, rootStyle.get() }.evaluate(media.get()); } } // namespace WebCore |