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

Side by Side Diff: Source/WebCore/css/MediaQueryEvaluator.cpp

Issue 7274018: Merge 89595 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 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 | « Source/WebCore/css/MediaQueryEvaluator.h ('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 * CSS Media Query Evaluator 2 * CSS Media Query Evaluator
3 * 3 *
4 * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>. 4 * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 return false; 525 return false;
526 526
527 if (!gFunctionMap) 527 if (!gFunctionMap)
528 createFunctionMap(); 528 createFunctionMap();
529 529
530 // call the media feature evaluation function. Assume no prefix 530 // call the media feature evaluation function. Assume no prefix
531 // and let trampoline functions override the prefix if prefix is 531 // and let trampoline functions override the prefix if prefix is
532 // used 532 // used
533 EvalFunc func = gFunctionMap->get(expr->mediaFeature().impl()); 533 EvalFunc func = gFunctionMap->get(expr->mediaFeature().impl());
534 if (func) 534 if (func)
535 return func(expr->value(), m_style, m_frame, NoPrefix); 535 return func(expr->value(), m_style.get(), m_frame, NoPrefix);
536 536
537 return false; 537 return false;
538 } 538 }
539 539
540 } // namespace 540 } // namespace
OLDNEW
« no previous file with comments | « Source/WebCore/css/MediaQueryEvaluator.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698