Attachment 166059 Details for Bug 97474 – Patch

[patch] Patch

bug-97474-20120927165817.patch (text/plain), 23.09 KB, created by Mark Pilgrim (Google) on 2012-09-27 13:59:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Pilgrim (Google)

Created: 2012-09-27 13:59:07 PDT

Size: 23.09 KB

patch

obsolete

>Index: Source/Platform/ChangeLog
>===================================================================
>--- Source/Platform/ChangeLog	(revision 129796)
>+++ Source/Platform/ChangeLog	(working copy)
>@@ -1,3 +1,24 @@
>+2012-09-27  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Remove screen-related functions from PlatformSupport
>+        https://bugs.webkit.org/show_bug.cgi?id=97474
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+        Screen-related functions like screenHorizontalDPI that used to be
>+        on PlatformSupport are now accessed through a new
>+        PlatformPageClient attached to Widget in WebCore-land, which is
>+        implemented by ChromeClientImpl in WebKit-land, which proxies
>+        calls to WebWidgetClient, which is actually implemented in
>+        Chromium-land.
>+
>+        * Platform.gypi:
>+        * chromium/public/WebScreenInfo.h: Added.
>+        (WebKit):
>+        (WebScreenInfo):
>+        (WebKit::WebScreenInfo::WebScreenInfo):
>+
> 2012-09-27  Tommy Widenflycht  <tommyw@google.com>
> 
>         MediaStream API: Enhance MediaConstraints to make it easier to get the constraint data
>Index: Source/Platform/Platform.gypi
>===================================================================
>--- Source/Platform/Platform.gypi	(revision 129795)
>+++ Source/Platform/Platform.gypi	(working copy)
>@@ -116,6 +116,7 @@
>             'chromium/public/WebRect.h',
>             'chromium/public/WebReferrerPolicy.h',
>             'chromium/public/WebRenderingStats.h',
>+            'chromium/public/WebScreenInfo.h',
>             'chromium/public/WebScrollbar.h',
>             'chromium/public/WebScrollbarLayer.h',
>             'chromium/public/WebScrollbarThemeGeometry.h',
>Index: Source/Platform/chromium/public/WebScreenInfo.h
>===================================================================
>--- Source/Platform/chromium/public/WebScreenInfo.h	(revision 0)
>+++ Source/Platform/chromium/public/WebScreenInfo.h	(revision 0)
>@@ -0,0 +1,82 @@
>+/*
>+ * Copyright (C) 2009 Google Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions are
>+ * met:
>+ *
>+ *     * Redistributions of source code must retain the above copyright
>+ * notice, this list of conditions and the following disclaimer.
>+ *     * Redistributions in binary form must reproduce the above
>+ * copyright notice, this list of conditions and the following disclaimer
>+ * in the documentation and/or other materials provided with the
>+ * distribution.
>+ *     * Neither the name of Google Inc. nor the names of its
>+ * contributors may be used to endorse or promote products derived from
>+ * this software without specific prior written permission.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef WebScreenInfo_h
>+#define WebScreenInfo_h
>+
>+#include "WebRect.h"
>+
>+namespace WebKit {
>+
>+struct WebScreenInfo {
>+    // The horizontal screen dpi.
>+    int horizontalDPI;
>+
>+    // The vertical screen dpi.
>+    int verticalDPI;
>+
>+    // The screen depth in bits per pixel
>+    int depth;
>+
>+    // The bits per colour component. This assumes that the colours are balanced
>+    // equally.
>+    int depthPerComponent;
>+
>+    // This can be true for black and white printers
>+    bool isMonochrome;
>+
>+    // This is set from the rcMonitor member of MONITORINFOEX, to whit:
>+    //   "A RECT structure that specifies the display monitor rectangle,
>+    //   expressed in virtual-screen coordinates. Note that if the monitor
>+    //   is not the primary display monitor, some of the rectangle's
>+    //   coordinates may be negative values."
>+    WebRect rect;
>+
>+    // This is set from the rcWork member of MONITORINFOEX, to whit:
>+    //   "A RECT structure that specifies the work area rectangle of the
>+    //   display monitor that can be used by applications, expressed in
>+    //   virtual-screen coordinates. Windows uses this rectangle to
>+    //   maximize an application on the monitor. The rest of the area in
>+    //   rcMonitor contains system windows such as the task bar and side
>+    //   bars. Note that if the monitor is not the primary display monitor,
>+    //   some of the rectangle's coordinates may be negative values".
>+    WebRect availableRect;
>+
>+    WebScreenInfo()
>+        : horizontalDPI(0)
>+        , verticalDPI(0)
>+        , depth(0)
>+        , depthPerComponent(0)
>+        , isMonochrome(false) { }
>+};
>+
>+} // namespace WebKit
>+
>+#endif
>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 129796)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,33 @@
>+2012-09-27  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Remove screen-related functions from PlatformSupport
>+        https://bugs.webkit.org/show_bug.cgi?id=97474
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+        Screen-related functions like screenHorizontalDPI that used to be
>+        on PlatformSupport are now accessed through a new
>+        PlatformPageClient attached to Widget in WebCore-land, which is
>+        implemented by ChromeClientImpl in WebKit-land, which proxies
>+        calls to WebWidgetClient, which is actually implemented in
>+        Chromium-land.
>+
>+        * WebCore.gypi:
>+        * platform/Widget.h:
>+        * platform/chromium/PageClientChromium.h: Copied from Source/WebCore/platform/chromium/PlatformWidget.h.
>+        (PageClientChromium):
>+        * platform/chromium/PlatformScreenChromium.cpp:
>+        (WebCore::screenHorizontalDPI):
>+        (WebCore::screenVerticalDPI):
>+        (WebCore::screenDepth):
>+        (WebCore::screenDepthPerComponent):
>+        (WebCore::screenIsMonochrome):
>+        (WebCore::screenRect):
>+        (WebCore::screenAvailableRect):
>+        * platform/chromium/PlatformSupport.h:
>+        (PlatformSupport):
>+
> 2012-09-27  Philip Rogers  <pdr@google.com>
> 
>         Rewrite multithreaded filter job dispatching
>Index: Source/WebCore/WebCore.gypi
>===================================================================
>--- Source/WebCore/WebCore.gypi	(revision 129795)
>+++ Source/WebCore/WebCore.gypi	(working copy)
>@@ -4672,6 +4672,7 @@
>             'platform/chromium/LinkHashChromium.cpp',
>             'platform/chromium/MemoryUsageSupportChromium.cpp',
>             'platform/chromium/MIMETypeRegistryChromium.cpp',
>+            'platform/chromium/PageClientChromium.h',
>             'platform/chromium/PasteboardChromium.cpp',
>             'platform/chromium/PlatformCursor.h',
>             'platform/chromium/PlatformKeyboardEventChromium.cpp',
>Index: Source/WebCore/platform/Widget.h
>===================================================================
>--- Source/WebCore/platform/Widget.h	(revision 129795)
>+++ Source/WebCore/platform/Widget.h	(working copy)
>@@ -32,6 +32,7 @@
> #include <wtf/RefCounted.h>
> 
> #if PLATFORM(CHROMIUM)
>+#include "PageClientChromium.h"
> #include "PlatformWidget.h"
> #endif
> 
>@@ -93,6 +94,8 @@ typedef PageClientBlackBerry* PlatformPa
> #elif PLATFORM(EFL)
> class PageClientEfl;
> typedef PageClientEfl* PlatformPageClient;
>+#elif PLATFORM(CHROMIUM)
>+typedef WebCore::PageClientChromium* PlatformPageClient;
> #else
> typedef PlatformWidget PlatformPageClient;
> #endif
>Index: Source/WebCore/platform/chromium/PageClientChromium.h
>===================================================================
>--- Source/WebCore/platform/chromium/PageClientChromium.h	(revision 129792)	(from Source/WebCore/platform/chromium/PlatformWidget.h:129792)
>+++ Source/WebCore/platform/chromium/PageClientChromium.h	(working copy)
>@@ -0,0 +1,42 @@
>+/*
>+ * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
>+ * 
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions are
>+ * met:
>+ * 
>+ *     * Redistributions of source code must retain the above copyright
>+ * notice, this list of conditions and the following disclaimer.
>+ *     * Redistributions in binary form must reproduce the above
>+ * copyright notice, this list of conditions and the following disclaimer
>+ * in the documentation and/or other materials provided with the
>+ * distribution.
>+ *     * Neither the name of Google Inc. nor the names of its
>+ * contributors may be used to endorse or promote products derived from
>+ * this software without specific prior written permission.
>+ * 
>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef PlatformWidget_h
>+#define PlatformWidget_h
>+
>+#include <wtf/StdLibExtras.h>  // for intptr_t
>+
>+// PlatformWidget is an opaque identifier corresponding to whatever native
>+// view type the embedder may use.  PlatformWidget CANNOT be assumed to be
>+// a valid pointer.  Some embedders may not use this identifier at all.
>+
>+typedef intptr_t PlatformWidget;
>+
>+#endif
>Index: Source/WebCore/platform/chromium/PageClientChromium.h
>===================================================================
>--- Source/WebCore/platform/chromium/PageClientChromium.h	(revision 129792)
>+++ Source/WebCore/platform/chromium/PageClientChromium.h	(working copy)
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
>+ * Copyright (c) 2012, Google Inc. All rights reserved.
>  * 
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions are
>@@ -28,15 +28,18 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#ifndef PlatformWidget_h
>-#define PlatformWidget_h
>+#ifndef PageClientChromium_h
>+#define PageClientChromium_h
> 
>-#include <wtf/StdLibExtras.h>  // for intptr_t
>+#include <public/WebScreenInfo.h>
> 
>-// PlatformWidget is an opaque identifier corresponding to whatever native
>-// view type the embedder may use.  PlatformWidget CANNOT be assumed to be
>-// a valid pointer.  Some embedders may not use this identifier at all.
>+namespace WebCore {
> 
>-typedef intptr_t PlatformWidget;
>+class PageClientChromium {
>+public:
>+    virtual WebKit::WebScreenInfo screenInfo() = 0;
>+};
> 
>-#endif
>+} // namespace WebCore
>+
>+#endif // PageClientChromium_h
>Index: Source/WebCore/platform/chromium/PlatformScreenChromium.cpp
>===================================================================
>--- Source/WebCore/platform/chromium/PlatformScreenChromium.cpp	(revision 129795)
>+++ Source/WebCore/platform/chromium/PlatformScreenChromium.cpp	(working copy)
>@@ -31,46 +31,48 @@
> #include "config.h"
> #include "PlatformScreen.h"
> 
>-#include "IntRect.h"
>-#include "PlatformSupport.h"
>-
>+#include "FloatRect.h"
>+#include "HostWindow.h"
>+#include "ScrollView.h"
>+#include "Widget.h"
> #include <public/Platform.h>
>+#include <public/WebScreenInfo.h>
> 
> namespace WebCore {
> 
> int screenHorizontalDPI(Widget* widget)
> {
>-    return PlatformSupport::screenHorizontalDPI(widget);
>+    return widget->root()->hostWindow()->platformPageClient()->screenInfo().horizontalDPI;
> }
> 
> int screenVerticalDPI(Widget* widget)
> {
>-    return PlatformSupport::screenVerticalDPI(widget);
>+    return widget->root()->hostWindow()->platformPageClient()->screenInfo().verticalDPI;
> }
> 
> int screenDepth(Widget* widget)
> {
>-    return PlatformSupport::screenDepth(widget);
>+    return widget->root()->hostWindow()->platformPageClient()->screenInfo().depth;
> }
> 
> int screenDepthPerComponent(Widget* widget)
> {
>-    return PlatformSupport::screenDepthPerComponent(widget);
>+    return widget->root()->hostWindow()->platformPageClient()->screenInfo().depthPerComponent;
> }
> 
> bool screenIsMonochrome(Widget* widget)
> {
>-    return PlatformSupport::screenIsMonochrome(widget);
>+    return widget->root()->hostWindow()->platformPageClient()->screenInfo().isMonochrome;
> }
> 
> FloatRect screenRect(Widget* widget)
> {
>-    return PlatformSupport::screenRect(widget);
>+    return IntRect(widget->root()->hostWindow()->platformPageClient()->screenInfo().rect);
> }
> 
> FloatRect screenAvailableRect(Widget* widget)
> {
>-    return PlatformSupport::screenAvailableRect(widget);
>+    return IntRect(widget->root()->hostWindow()->platformPageClient()->screenInfo().availableRect);
> }
> 
> void screenColorProfile(ColorProfile& toProfile)
>Index: Source/WebCore/platform/chromium/PlatformSupport.h
>===================================================================
>--- Source/WebCore/platform/chromium/PlatformSupport.h	(revision 129795)
>+++ Source/WebCore/platform/chromium/PlatformSupport.h	(working copy)
>@@ -98,15 +98,6 @@ public:
>     static bool plugins(bool refresh, Vector<PluginInfo>*);
>     static NPObject* pluginScriptableObject(Widget*);
> 
>-    // Screen -------------------------------------------------------------
>-    static int screenHorizontalDPI(Widget*);
>-    static int screenVerticalDPI(Widget*);
>-    static int screenDepth(Widget*);
>-    static int screenDepthPerComponent(Widget*);
>-    static bool screenIsMonochrome(Widget*);
>-    static IntRect screenRect(Widget*);
>-    static IntRect screenAvailableRect(Widget*);
>-
>     // Theming ------------------------------------------------------------
> #if OS(WINDOWS)
>     static void paintButton(
>Index: Source/WebKit/chromium/ChangeLog
>===================================================================
>--- Source/WebKit/chromium/ChangeLog	(revision 129796)
>+++ Source/WebKit/chromium/ChangeLog	(working copy)
>@@ -1,3 +1,29 @@
>+2012-09-27  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Remove screen-related functions from PlatformSupport
>+        https://bugs.webkit.org/show_bug.cgi?id=97474
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+        Screen-related functions like screenHorizontalDPI that used to be
>+        on PlatformSupport are now accessed through a new
>+        PlatformPageClient attached to Widget in WebCore-land, which is
>+        implemented by ChromeClientImpl in WebKit-land, which proxies
>+        calls to WebWidgetClient, which is actually implemented in
>+        Chromium-land.
>+
>+        * public/WebScreenInfo.h:
>+        * src/ChromeClientImpl.cpp:
>+        (WebKit::ChromeClientImpl::screenInfo):
>+        (WebKit):
>+        * src/ChromeClientImpl.h:
>+        (WebKit):
>+        (WebKit::ChromeClientImpl::platformPageClient):
>+        (ChromeClientImpl):
>+        * src/PlatformSupport.cpp:
>+        (WebCore):
>+
> 2012-09-27  Mark Pilgrim  <pilgrim@chromium.org>
> 
>         [Chromium] Move UNIX-specific theme functions out of PlatformSupport
>Index: Source/WebKit/chromium/public/WebScreenInfo.h
>===================================================================
>--- Source/WebKit/chromium/public/WebScreenInfo.h	(revision 129795)
>+++ Source/WebKit/chromium/public/WebScreenInfo.h	(working copy)
>@@ -28,55 +28,4 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#ifndef WebScreenInfo_h
>-#define WebScreenInfo_h
>-
>-#include "platform/WebRect.h"
>-
>-namespace WebKit {
>-
>-struct WebScreenInfo {
>-    // The horizontal screen dpi.
>-    int horizontalDPI;
>-
>-    // The vertical screen dpi.
>-    int verticalDPI;
>-
>-    // The screen depth in bits per pixel
>-    int depth;
>-
>-    // The bits per colour component. This assumes that the colours are balanced
>-    // equally.
>-    int depthPerComponent;
>-
>-    // This can be true for black and white printers
>-    bool isMonochrome;
>-
>-    // This is set from the rcMonitor member of MONITORINFOEX, to whit:
>-    //   "A RECT structure that specifies the display monitor rectangle,
>-    //   expressed in virtual-screen coordinates. Note that if the monitor
>-    //   is not the primary display monitor, some of the rectangle's
>-    //   coordinates may be negative values."
>-    WebRect rect;
>-
>-    // This is set from the rcWork member of MONITORINFOEX, to whit:
>-    //   "A RECT structure that specifies the work area rectangle of the
>-    //   display monitor that can be used by applications, expressed in
>-    //   virtual-screen coordinates. Windows uses this rectangle to
>-    //   maximize an application on the monitor. The rest of the area in
>-    //   rcMonitor contains system windows such as the task bar and side
>-    //   bars. Note that if the monitor is not the primary display monitor,
>-    //   some of the rectangle's coordinates may be negative values".
>-    WebRect availableRect;
>-
>-    WebScreenInfo()
>-        : horizontalDPI(0)
>-        , verticalDPI(0)
>-        , depth(0)
>-        , depthPerComponent(0)
>-        , isMonochrome(false) { }
>-};
>-
>-} // namespace WebKit
>-
>-#endif
>+#include "../../../Platform/chromium/public/WebScreenInfo.h"
>Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
>===================================================================
>--- Source/WebKit/chromium/src/ChromeClientImpl.cpp	(revision 129795)
>+++ Source/WebKit/chromium/src/ChromeClientImpl.cpp	(working copy)
>@@ -903,6 +903,12 @@ void ChromeClientImpl::postAccessibility
>         m_webView->client()->postAccessibilityNotification(WebAccessibilityObject(obj), toWebAccessibilityNotification(notification));
> }
> 
>+WebKit::WebScreenInfo ChromeClientImpl::screenInfo()
>+{
>+    return m_webView->client()->screenInfo();
>+}
>+
>+
> bool ChromeClientImpl::paintCustomOverhangArea(GraphicsContext* context, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect)
> {
>     Frame* frame = m_webView->mainFrameImpl()->frame();
>Index: Source/WebKit/chromium/src/ChromeClientImpl.h
>===================================================================
>--- Source/WebKit/chromium/src/ChromeClientImpl.h	(revision 129795)
>+++ Source/WebKit/chromium/src/ChromeClientImpl.h	(working copy)
>@@ -60,10 +60,11 @@ class WebColorChooser;
> class WebColorChooserClient;
> class WebViewImpl;
> struct WebCursorInfo;
>+struct WebScreenInfo;
> struct WebPopupMenuInfo;
> 
> // Handles window-level notifications from WebCore on behalf of a WebView.
>-class ChromeClientImpl : public WebCore::ChromeClientChromium {
>+class ChromeClientImpl : public WebCore::ChromeClientChromium, public WebCore::PageClientChromium {
> public:
>     explicit ChromeClientImpl(WebViewImpl* webView);
>     virtual ~ChromeClientImpl();
>@@ -123,7 +124,7 @@ public:
>         const WebCore::IntRect& clipRect);
>     virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const;
>     virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const;
>-    virtual PlatformPageClient platformPageClient() const { return 0; }
>+    virtual PlatformPageClient platformPageClient() const { return PlatformPageClient(this); }
>     virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const;
>     virtual void layoutUpdated(WebCore::Frame*) const;
>     virtual void scrollRectIntoView(
>@@ -194,6 +195,9 @@ public:
>     virtual void popupClosed(WebCore::PopupContainer* popupContainer);
>     virtual void postAccessibilityNotification(WebCore::AccessibilityObject*, WebCore::AXObjectCache::AXNotification);
> 
>+    // PageClientChromium methods:
>+    virtual WebScreenInfo screenInfo();
>+
>     // ChromeClientImpl:
>     void setCursorForPlugin(const WebCursorInfo&);
>     void setNewWindowNavigationPolicy(WebNavigationPolicy);
>Index: Source/WebKit/chromium/src/PlatformSupport.cpp
>===================================================================
>--- Source/WebKit/chromium/src/PlatformSupport.cpp	(revision 129795)
>+++ Source/WebKit/chromium/src/PlatformSupport.cpp	(working copy)
>@@ -100,30 +100,6 @@ using namespace WebKit;
> 
> namespace WebCore {
> 
>-static WebWidgetClient* toWebWidgetClient(Widget* widget)
>-{
>-    if (!widget)
>-        return 0;
>-
>-    FrameView* view;
>-    if (widget->isFrameView())
>-        view = static_cast<FrameView*>(widget);
>-    else if (widget->parent() && widget->parent()->isFrameView())
>-        view = static_cast<FrameView*>(widget->parent());
>-    else
>-        return 0;
>-
>-    Page* page = view->frame() ? view->frame()->page() : 0;
>-    if (!page)
>-        return 0;
>-
>-    void* webView = page->chrome()->client()->webView();
>-    if (!webView)
>-        return 0;
>-
>-    return static_cast<WebViewImpl*>(webView)->client();
>-}
>-
> static WebCookieJar* getCookieJar(const Document* document)
> {
>     WebFrameImpl* frameImpl = WebFrameImpl::fromFrame(document->frame());
>@@ -353,62 +329,6 @@ void PlatformSupport::paintScrollbarThum
> // Glue layer. Once the Glue layer moves entirely into the WebKit layer, these
> // methods will be deleted.
> 
>-int PlatformSupport::screenHorizontalDPI(Widget* widget)
>-{
>-    WebWidgetClient* client = toWebWidgetClient(widget);
>-    if (!client)
>-        return 0;
>-    return client->screenInfo().horizontalDPI;
>-}
>-
>-int PlatformSupport::screenVerticalDPI(Widget* widget)
>-{
>-    WebWidgetClient* client = toWebWidgetClient(widget);
>-    if (!client)
>-        return 0;
>-    return client->screenInfo().verticalDPI;
>-}
>-
>-int PlatformSupport::screenDepth(Widget* widget)
>-{
>-    WebWidgetClient* client = toWebWidgetClient(widget);
>-    if (!client)
>-        return 0;
>-    return client->screenInfo().depth;
>-}
>-
>-int PlatformSupport::screenDepthPerComponent(Widget* widget)
>-{
>-    WebWidgetClient* client = toWebWidgetClient(widget);
>-    if (!client)
>-        return 0;
>-    return client->screenInfo().depthPerComponent;
>-}
>-
>-bool PlatformSupport::screenIsMonochrome(Widget* widget)
>-{
>-    WebWidgetClient* client = toWebWidgetClient(widget);
>-    if (!client)
>-        return 0;
>-    return client->screenInfo().isMonochrome;
>-}
>-
>-IntRect PlatformSupport::screenRect(Widget* widget)
>-{
>-    WebWidgetClient* client = toWebWidgetClient(widget);
>-    if (!client)
>-        return IntRect();
>-    return client->screenInfo().rect;
>-}
>-
>-IntRect PlatformSupport::screenAvailableRect(Widget* widget)
>-{
>-    WebWidgetClient* client = toWebWidgetClient(widget);
>-    if (!client)
>-        return IntRect();
>-    return client->screenInfo().availableRect;
>-}
>-
> #if ENABLE(WORKERS)
> WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
> {

Actions: View | Formatted Diff | Diff

Attachments on bug 97474: 165430 | 165680 | 165685 | 165697 | 165700 | 165826 | 166059 | 166087 | 166542 | 170469