Changeset 145233 in webkit

Timestamp:

Mar 8, 2013 9:19:58 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

@media queries do not take zooming into account
​https://bugs.webkit.org/show_bug.cgi?id=53186

Patch by John Mellor <​johnme@chromium.org> on 2013-03-08
Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

Fixes @media width and height to take into account full page zoom, by
adding code to MediaQueryEvaluator's width/heightMediaFeatureEval,
corresponding to the existing code in Element::clientWidth which makes
document.documentElement.clientWidth take into account page zoom.

Test: fast/media/mq-width-pagezoom.html

• css/MediaQueryEvaluator.cpp:

(WebCore::heightMediaFeatureEval):
(WebCore::widthMediaFeatureEval):

LayoutTests:

• fast/media/mq-width-pagezoom-expected.html: Added.
• fast/media/mq-width-pagezoom.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/media/mq-width-pagezoom-expected.html (added)
• LayoutTests/fast/media/mq-width-pagezoom.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/MediaQueryEvaluator.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-08  John Mellor  <johnme@chromium.org>
+
+        @media queries do not take zooming into account
+        https://bugs.webkit.org/show_bug.cgi?id=53186
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * fast/media/mq-width-pagezoom-expected.html: Added.
+        * fast/media/mq-width-pagezoom.html: Added.
+
 2013-03-08  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-08  John Mellor  <johnme@chromium.org>
+
+        @media queries do not take zooming into account
+        https://bugs.webkit.org/show_bug.cgi?id=53186
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fixes @media width and height to take into account full page zoom, by
+        adding code to MediaQueryEvaluator's width/heightMediaFeatureEval,
+        corresponding to the existing code in Element::clientWidth which makes
+        document.documentElement.clientWidth take into account page zoom.
+
+        Test: fast/media/mq-width-pagezoom.html
+
+        * css/MediaQueryEvaluator.cpp:
+        (WebCore::heightMediaFeatureEval):
+        (WebCore::widthMediaFeatureEval):
+
 2013-03-08  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/css/MediaQueryEvaluator.cpp

@@ -479 +479 @@
 
     if (value) {
+        int height = view->layoutHeight();
+        if (RenderView* renderView = frame->document()->renderView())
+            height = adjustForAbsoluteZoom(height, renderView);
         RenderStyle* rootStyle = frame->document()->documentElement()->renderStyle();
         int length;
-        return computeLength(value, !frame->document()->inQuirksMode(), style, rootStyle, length) && compareValue(view->layoutHeight(), length, op);
+        return computeLength(value, !frame->document()->inQuirksMode(), style, rootStyle, length) && compareValue(height, length, op);
     }
 
@@ -492 +495 @@
 
     if (value) {
+        int width = view->layoutWidth();
+        if (RenderView* renderView = frame->document()->renderView())
+            width = adjustForAbsoluteZoom(width, renderView);
         RenderStyle* rootStyle = frame->document()->documentElement()->renderStyle();
         int length;
-        return computeLength(value, !frame->document()->inQuirksMode(), style, rootStyle, length) && compareValue(view->layoutWidth(), length, op);
+        return computeLength(value, !frame->document()->inQuirksMode(), style, rootStyle, length) && compareValue(width, length, op);
     }