Include scrollbar size in @media width/height

Source/core/platform/ScrollView.h

 /*
  * Copyright (C) 2004, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Holger Hans Peter Freyther
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 128 matching lines @@
 
     // Functions for getting/setting the size webkit should use to layout the contents. By default this is the same as the visible
     // content size. Explicitly setting a layout size value will cause webkit to layout the contents using this size instead.
     IntSize layoutSize() const;
     int layoutWidth() const { return layoutSize().width(); }
     int layoutHeight() const { return layoutSize().height(); }
     IntSize fixedLayoutSize() const;
     void setFixedLayoutSize(const IntSize&);
     bool useFixedLayout() const;
     void setUseFixedLayout(bool enable);
-    
+
+    // Similar to layoutSize functions, but don't exclude the scrollbars. For CSS @media width/height MQ rules.
+    IntSize mediaSize() const;

[jamesr, 2013/05/06 22:52:03]

is this the same as calling visibleContentRect(IncludeScrollbars).size() ? if
not, what's different?

[Xianzhu, 2013/05/06 22:55:44]

They are the same for non-fixed-layout mode. For fixed-layout mode, it's the
fixed layout size which normally reflects the virtual viewport size.

[jamesr, 2013/05/06 23:38:49]

Can we instead give layoutSize() the Includes/ExcludesScrollbars enums, using a
default value so you don't have to change callers. I'm a little concerned about
this being a near-duplicate of layoutSize() since the behavior of layoutSize()
isn't entirely obvious.  The "media" prefix isn't very descriptive either - it's
a concern of how this value is used (for media queries) but not how the value is
computed, and really platform/ScrollView shouldn't care about how media queries
work

+    int mediaWidth() const { return mediaSize().width(); }
+    int mediaHeight() const { return mediaSize().height(); }
+
     // Functions for getting/setting the size of the document contained inside the ScrollView (as an IntSize or as individual width and height
     // values).
     virtual IntSize contentsSize() const OVERRIDE; // Always at least as big as the visibleWidth()/visibleHeight().
     int contentsWidth() const { return contentsSize().width(); }
     int contentsHeight() const { return contentsSize().height(); }
     virtual void setContentsSize(const IntSize&);
 
     // Functions for querying the current scrolled position (both as a point, a size, or as individual X and Y values).
     virtual IntPoint scrollPosition() const OVERRIDE { return visibleContentRect().location(); }
     IntSize scrollOffset() const { return toIntSize(visibleContentRect().location()); } // Gets the scrolled position as an IntSize. Convenient for adding to other sizes.
@@ skipping 223 matching lines @@
     ASSERT(!widget || widget->isScrollView());
     return static_cast<const ScrollView*>(widget);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toScrollView(const ScrollView*);
 
 } // namespace WebCore
 
 #endif // ScrollView_h