Attachment 172567 Details for Bug 101217 – Patch

[patch] Patch

bug-101217-20121106151605.patch (text/plain), 5.83 KB, created by Kenneth Rohde Christiansen on 2012-11-06 06:17:58 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Kenneth Rohde Christiansen

Created: 2012-11-06 06:17:58 PST

Size: 5.83 KB

patch

obsolete

>Subversion Revision: 133469
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 34625d6369af323e8de2c07236b96cf6fda5bc6f..dced43ab522b2ddc76cea4eae0722767253d34a1 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,23 @@
>+2012-11-05  Kenneth Rohde Christiansen  <kenneth@webkit.org>
>+
>+        Remove support for "desktop-width" in the viewport meta tag
>+        https://bugs.webkit.org/show_bug.cgi?id=101217
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This has been removed from the CSS Device Adaptation spec, and
>+        should be safe to remove as it is not documented anywhere (neither
>+        in blog posts).
>+
>+        The viewport meta should only support the legacy features.
>+
>+        * dom/ViewportArguments.cpp:
>+        (WebCore::computeViewportAttributes):
>+        (WebCore::findSizeValue):
>+        (WebCore::findScaleValue):
>+        (WebCore::findUserScalableValue):
>+        * dom/ViewportArguments.h:
>+
> 2012-11-05  Antti Koivisto  <antti@apple.com>
> 
>         Protect against resource deletion during iteration in MemoryCache::pruneDeadResourcesToSize
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index 626ec573ddce35f6d10d058b394bc7ad1425e8f7..8d49f548dce1ed2d2862ba99423ef270d85815a7 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,20 @@
>+2012-11-06  Kenneth Rohde Christiansen  <kenneth@webkit.org>
>+
>+        Remove support for "desktop-width" in the viewport meta tag
>+        https://bugs.webkit.org/show_bug.cgi?id=101217
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove some code trying to use the set desktop width (say 980) for
>+        sites not using a viewport meta element.
>+
>+        Removing this code should have no effect as it ends up being set
>+        to desktop width in that case anyway, by the ViewportArguments
>+        algorithm.
>+
>+        * src/ChromeClientImpl.cpp:
>+        (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
>+
> 2012-11-05  Miguel Garcia  <miguelg@chromium.org>
> 
>         [Chromium] Disable registerProtocolHandler on Android
>diff --git a/Source/WebCore/dom/ViewportArguments.cpp b/Source/WebCore/dom/ViewportArguments.cpp
>index 0151294cc6e2036df4e3dfe01e5bc1bdbf15fa00..283580930a081e1d9c58960cf618c6068c510936 100644
>--- a/Source/WebCore/dom/ViewportArguments.cpp
>+++ b/Source/WebCore/dom/ViewportArguments.cpp
>@@ -61,9 +61,6 @@ ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktop
>     }
> 
>     switch (int(args.width)) {
>-    case ViewportArguments::ValueDesktopWidth:
>-        args.width = desktopWidth;
>-        break;
>     case ViewportArguments::ValueDeviceWidth:
>         args.width = deviceWidth;
>         break;
>@@ -73,9 +70,6 @@ ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktop
>     }
> 
>     switch (int(args.height)) {
>-    case ViewportArguments::ValueDesktopWidth:
>-        args.height = desktopWidth;
>-        break;
>     case ViewportArguments::ValueDeviceWidth:
>         args.height = deviceWidth;
>         break;
>@@ -216,8 +210,6 @@ static float findSizeValue(const String& keyString, const String& valueString, D
>     // 3) device-width and device-height are used as keywords.
>     // 4) Other keywords and unknown values translate to 0.0.
> 
>-    if (equalIgnoringCase(valueString, "desktop-width"))
>-        return ViewportArguments::ValueDesktopWidth;
>     if (equalIgnoringCase(valueString, "device-width"))
>         return ViewportArguments::ValueDeviceWidth;
>     if (equalIgnoringCase(valueString, "device-height"))
>@@ -243,8 +235,6 @@ static float findScaleValue(const String& keyString, const String& valueString,
>         return 1;
>     if (equalIgnoringCase(valueString, "no"))
>         return 0;
>-    if (equalIgnoringCase(valueString, "desktop-width"))
>-        return 10;
>     if (equalIgnoringCase(valueString, "device-width"))
>         return 10;
>     if (equalIgnoringCase(valueString, "device-height"))
>@@ -271,8 +261,6 @@ static float findUserScalableValue(const String& keyString, const String& valueS
>         return 1;
>     if (equalIgnoringCase(valueString, "no"))
>         return 0;
>-    if (equalIgnoringCase(valueString, "desktop-width"))
>-        return 1;
>     if (equalIgnoringCase(valueString, "device-width"))
>         return 1;
>     if (equalIgnoringCase(valueString, "device-height"))
>diff --git a/Source/WebCore/dom/ViewportArguments.h b/Source/WebCore/dom/ViewportArguments.h
>index fc0d125f070e4914ae6729d12a6c99eaa6f2aa9f..17dc36bab969e3cb5504861a61d4d81486e2e8ea 100644
>--- a/Source/WebCore/dom/ViewportArguments.h
>+++ b/Source/WebCore/dom/ViewportArguments.h
>@@ -67,9 +67,8 @@ struct ViewportArguments {
> 
>     enum {
>         ValueAuto = -1,
>-        ValueDesktopWidth = -2,
>-        ValueDeviceWidth = -3,
>-        ValueDeviceHeight = -4,
>+        ValueDeviceWidth = -2,
>+        ValueDeviceHeight = -3,
>     };
> 
>     ViewportArguments(Type type = Implicit)
>diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.cpp b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
>index 3c8f04349be1a3bce0046f4f5eac85cdbac3c06e..6b651a560128e3ba4ba5a72a83d418a01919c083 100644
>--- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp
>+++ b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
>@@ -615,13 +615,6 @@ void ChromeClientImpl::dispatchViewportPropertiesDidChange(const ViewportArgumen
>     if (!m_webView->settings()->viewportEnabled() || !m_webView->isFixedLayoutModeEnabled() || !m_webView->client() || !m_webView->page())
>         return;
> 
>-    ViewportArguments args;
>-    if (arguments == args) {
>-        // Default viewport arguments passed in. This is a signal to reset the viewport.
>-        args.width = ViewportArguments::ValueDesktopWidth;
>-    } else
>-        args = arguments;
>-
>     FrameView* frameView = m_webView->mainFrameImpl()->frameView();
>     int dpi = screenHorizontalDPI(frameView);
>     ASSERT(dpi > 0);

Actions: View | Formatted Diff | Diff

Attachments on bug 101217: 172329 | 172337 | 172567 | 172611