From 545e470e52f0ac6a3a072bf559c796b42c6066b6 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 15 Jun 2010 19:36:43 +0100
Subject: Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760
---
 WebCore/css/MediaQueryEvaluator.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'WebCore/css/MediaQueryEvaluator.cpp')

diff --git a/WebCore/css/MediaQueryEvaluator.cpp b/WebCore/css/MediaQueryEvaluator.cpp
index 20c7bb9..9d5822f 100644
--- a/WebCore/css/MediaQueryEvaluator.cpp
+++ b/WebCore/css/MediaQueryEvaluator.cpp
@@ -144,6 +144,9 @@ bool MediaQueryEvaluator::eval(const MediaList* mediaList, CSSStyleSelector* sty
     for (size_t i = 0; i < queries.size() && !result; ++i) {
         MediaQuery* query = queries.at(i);
 
+        if (query->ignored())
+            continue;
+
         if (mediaTypeMatch(query->mediaType())) {
             const Vector<MediaQueryExp*>* exps = query->expressions();
             // iterate through expressions, stop if any of them eval to false
-- 
cgit v1.1