Changeset 133729 in webkit
- Timestamp:
- Nov 7, 2012 12:54:46 AM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r133728 r133729 1 2012-11-07 Kenneth Rohde Christiansen <kenneth@webkit.org> 2 3 Remove support for "desktop-width" in the viewport meta tag 4 https://bugs.webkit.org/show_bug.cgi?id=101217 5 6 Reviewed by Gyuyoung Kim. 7 8 This has been removed from the CSS Device Adaptation spec, and 9 should be safe to remove as it is not documented anywhere (neither 10 in blog posts). 11 12 The viewport meta should only support the legacy features. 13 14 * dom/ViewportArguments.cpp: 15 (WebCore::computeViewportAttributes): 16 (WebCore::findSizeValue): 17 (WebCore::findScaleValue): 18 (WebCore::findUserScalableValue): 19 * dom/ViewportArguments.h: 20 1 21 2012-11-07 Dominik Röttsches <dominik.rottsches@intel.com> 2 22 -
trunk/Source/WebCore/dom/ViewportArguments.cpp
r133624 r133729 62 62 63 63 switch (int(args.width)) { 64 case ViewportArguments::ValueDesktopWidth:65 args.width = desktopWidth;66 break;67 64 case ViewportArguments::ValueDeviceWidth: 68 65 args.width = deviceWidth; … … 74 71 75 72 switch (int(args.height)) { 76 case ViewportArguments::ValueDesktopWidth:77 args.height = desktopWidth;78 break;79 73 case ViewportArguments::ValueDeviceWidth: 80 74 args.height = deviceWidth; … … 219 213 // 4) Other keywords and unknown values translate to 0.0. 220 214 221 if (equalIgnoringCase(valueString, "desktop-width"))222 return ViewportArguments::ValueDesktopWidth;223 215 if (equalIgnoringCase(valueString, "device-width")) 224 216 return ViewportArguments::ValueDeviceWidth; … … 246 238 if (equalIgnoringCase(valueString, "no")) 247 239 return 0; 248 if (equalIgnoringCase(valueString, "desktop-width"))249 return 10;250 240 if (equalIgnoringCase(valueString, "device-width")) 251 241 return 10; … … 274 264 if (equalIgnoringCase(valueString, "no")) 275 265 return 0; 276 if (equalIgnoringCase(valueString, "desktop-width"))277 return 1;278 266 if (equalIgnoringCase(valueString, "device-width")) 279 267 return 1; -
trunk/Source/WebCore/dom/ViewportArguments.h
r133624 r133729 69 69 enum { 70 70 ValueAuto = -1, 71 ValueDesktopWidth = -2, 72 ValueDeviceWidth = -3, 73 ValueDeviceHeight = -4, 71 ValueDeviceWidth = -2, 72 ValueDeviceHeight = -3, 74 73 }; 75 74 -
trunk/Source/WebKit/blackberry/Api/WebViewportArguments.h
r121555 r133729 48 48 enum { 49 49 ValueAuto = -1, 50 ValueDesktopWidth = -2, 51 ValueDeviceWidth = -3, 52 ValueDeviceHeight = -4, 50 ValueDeviceWidth = -2, 51 ValueDeviceHeight = -3, 53 52 }; 54 53 -
trunk/Source/WebKit/blackberry/ChangeLog
r133679 r133729 1 2012-11-07 Kenneth Rohde Christiansen <kenneth@webkit.org> 2 3 Remove support for "desktop-width" in the viewport meta tag 4 https://bugs.webkit.org/show_bug.cgi?id=101217 5 6 Reviewed by Gyuyoung Kim. 7 8 Sync WebViewportArguments enum with the one in 9 WebCore::ViewportArguments 10 11 * Api/WebViewportArguments.h: 12 1 13 2012-11-06 Genevieve Mak <gmak@rim.com> 2 14 -
trunk/Source/WebKit/chromium/ChangeLog
r133720 r133729 1 2012-11-07 Kenneth Rohde Christiansen <kenneth@webkit.org> 2 3 Remove support for "desktop-width" in the viewport meta tag 4 https://bugs.webkit.org/show_bug.cgi?id=101217 5 6 Reviewed by Gyuyoung Kim. 7 8 Remove some code trying to use the set desktop width (say 980) for 9 sites not using a viewport meta element. 10 11 Removing this code should have no effect as it ends up being set 12 to desktop width in that case anyway, by the ViewportArguments 13 algorithm. 14 15 * src/ChromeClientImpl.cpp: 16 (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange): 17 1 18 2012-11-06 Dan Beam <dbeam@chromium.org> 2 19 -
trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp
r133284 r133729 616 616 return; 617 617 618 ViewportArguments args;619 if (arguments == args) {620 // Default viewport arguments passed in. This is a signal to reset the viewport.621 args.width = ViewportArguments::ValueDesktopWidth;622 } else623 args = arguments;624 625 618 FrameView* frameView = m_webView->mainFrameImpl()->frameView(); 626 619 int dpi = screenHorizontalDPI(frameView); … … 637 630 // Call the common viewport computing logic in ViewportArguments.cpp. 638 631 ViewportAttributes computed = computeViewportAttributes( 639 arg s, settings->layoutFallbackWidth(), deviceRect.width, deviceRect.height,632 arguments, settings->layoutFallbackWidth(), deviceRect.width, deviceRect.height, 640 633 devicePixelRatio, IntSize(deviceRect.width, deviceRect.height)); 641 634
Note: See TracChangeset
for help on using the changeset viewer.