<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169610] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169610">169610</a></dd>
<dt>Author</dt> <dd>yoon@igalia.com</dd>
<dt>Date</dt> <dd>2014-06-05 02:25:30 -0700 (Thu, 05 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Remove ScrollViewGtk.cpp
https://bugs.webkit.org/show_bug.cgi?id=133535
Reviewed by Carlos Garcia Campos.
Because GTK+ WK1 was removed, we don't have to consider special cases
handled in ScrollViewGtk.cpp.
No new tests are necessary because there is no behavior change.
* PlatformGTK.cmake:
* platform/ScrollView.cpp:
(WebCore::ScrollView::setScrollbarModes):
(WebCore::ScrollView::visibleContentRectInternal):
* platform/gtk/ScrollViewGtk.cpp: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgtkScrollViewGtkcpp">trunk/Source/WebCore/platform/gtk/ScrollViewGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169609 => 169610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-05 09:23:08 UTC (rev 169609)
+++ trunk/Source/WebCore/ChangeLog 2014-06-05 09:25:30 UTC (rev 169610)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-06-05 Gwang Yoon Hwang <yoon@igalia.com>
+
+ [GTK] Remove ScrollViewGtk.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=133535
+
+ Reviewed by Carlos Garcia Campos.
+
+ Because GTK+ WK1 was removed, we don't have to consider special cases
+ handled in ScrollViewGtk.cpp.
+
+ No new tests are necessary because there is no behavior change.
+
+ * PlatformGTK.cmake:
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::setScrollbarModes):
+ (WebCore::ScrollView::visibleContentRectInternal):
+ * platform/gtk/ScrollViewGtk.cpp: Removed.
+
</ins><span class="cx"> 2014-06-05 Frédéric Wang <fred.wang@free.fr>
</span><span class="cx">
</span><span class="cx"> MathML operators not stretched horizontally
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (169609 => 169610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-06-05 09:23:08 UTC (rev 169609)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-06-05 09:25:30 UTC (rev 169610)
</span><span class="lines">@@ -225,7 +225,6 @@
</span><span class="cx"> platform/gtk/RenderThemeGtk.cpp
</span><span class="cx"> platform/gtk/RenderThemeGtk2.cpp
</span><span class="cx"> platform/gtk/RenderThemeGtk3.cpp
</span><del>- platform/gtk/ScrollViewGtk.cpp
</del><span class="cx"> platform/gtk/ScrollbarThemeGtk.cpp
</span><span class="cx"> platform/gtk/ScrollbarThemeGtk2.cpp
</span><span class="cx"> platform/gtk/ScrollbarThemeGtk3.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (169609 => 169610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2014-06-05 09:23:08 UTC (rev 169609)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2014-06-05 09:25:30 UTC (rev 169610)
</span><span class="lines">@@ -132,7 +132,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(GTK)
</del><span class="cx"> PassRefPtr<Scrollbar> ScrollView::createScrollbar(ScrollbarOrientation orientation)
</span><span class="cx"> {
</span><span class="cx"> return Scrollbar::createNativeScrollbar(this, orientation, RegularScrollbar);
</span><span class="lines">@@ -167,7 +166,6 @@
</span><span class="cx"> else
</span><span class="cx"> updateScrollbars(scrollOffset());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void ScrollView::scrollbarModes(ScrollbarMode& horizontalMode, ScrollbarMode& verticalMode) const
</span><span class="cx"> {
</span><span class="lines">@@ -307,7 +305,6 @@
</span><span class="cx"> return visibleContentSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(GTK)
</del><span class="cx"> IntRect ScrollView::visibleContentRectInternal(VisibleContentRectIncludesScrollbars scrollbarInclusion, VisibleContentRectBehavior visibleContentRectBehavior) const
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -332,7 +329,6 @@
</span><span class="cx">
</span><span class="cx"> return unobscuredContentRect(scrollbarInclusion);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> IntSize ScrollView::layoutSize() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkScrollViewGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/gtk/ScrollViewGtk.cpp (169609 => 169610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ScrollViewGtk.cpp 2014-06-05 09:23:08 UTC (rev 169609)
+++ trunk/Source/WebCore/platform/gtk/ScrollViewGtk.cpp 2014-06-05 09:25:30 UTC (rev 169610)
</span><span class="lines">@@ -1,134 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
- * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
- * Copyright (C) 2007, 2009 Holger Hans Peter Freyther
- * Copyright (C) 2008, 2010 Collabora Ltd.
- *
- * All rights reserved.
- *
- * 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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.
- */
-
-#include "config.h"
-#include "ScrollView.h"
-
-#include "HostWindow.h"
-#include "MainFrameScrollbarGtk.h"
-#include "ScrollbarTheme.h"
-#include <gtk/gtk.h>
-
-using namespace std;
-
-namespace WebCore {
-
-static bool shouldCreateMainFrameScrollbar(const ScrollView* scrollView)
-{
- // Interior frame ScrollViews never have MainFrameScrollbars.
- if (scrollView->parent())
- return false;
-
- // If we don't have a host window or a containing widget (ala WebKit2).
- HostWindow* hostWindow = scrollView->hostWindow();
- if (!hostWindow || !hostWindow->platformPageClient())
- return false;
-
- gboolean selfScrolling = FALSE;
- g_object_get(hostWindow->platformPageClient(), "self-scrolling", &selfScrolling, NULL);
- return !selfScrolling;
-}
-
-PassRefPtr<Scrollbar> ScrollView::createScrollbar(ScrollbarOrientation orientation)
-{
- if (shouldCreateMainFrameScrollbar(this))
- return MainFrameScrollbarGtk::create(this, orientation);
- return Scrollbar::createNativeScrollbar(this, orientation, RegularScrollbar);
-}
-
-IntRect ScrollView::visibleContentRectInternal(VisibleContentRectIncludesScrollbars scrollbarInclusion, VisibleContentRectBehavior) const
-{
- bool includeScrollbars = scrollbarInclusion == IncludeScrollbars;
-
- // If we are an interior frame scrollbar or are in some sort of transition
- // state, just calculate our size based on what the GTK+ theme says the
- // scrollbar width should be.
- if (!shouldCreateMainFrameScrollbar(this)) {
- return IntRect(IntPoint(m_scrollOffset.width(), m_scrollOffset.height()),
- IntSize(max(0, width() - (verticalScrollbar() && !includeScrollbars ? verticalScrollbar()->width() : 0)),
- max(0, height() - (horizontalScrollbar() && !includeScrollbars ? horizontalScrollbar()->height() : 0))));
- }
-
- // We don't have a parent, so we are the main frame and thus have
- // a parent widget which we can use to measure the visible region.
- GtkWidget* measuredWidget = hostWindow()->platformPageClient();
- GtkWidget* parentWidget = gtk_widget_get_parent(measuredWidget);
-
- // We may not be in a widget that displays scrollbars, but we may
- // have other kinds of decoration that make us smaller.
- if (parentWidget && includeScrollbars)
- measuredWidget = parentWidget;
-
- GtkAllocation allocation;
- gtk_widget_get_allocation(measuredWidget, &allocation);
- return IntRect(IntPoint(m_scrollOffset.width(), m_scrollOffset.height()),
- IntSize(allocation.width, allocation.height));
-}
-
-void ScrollView::setScrollbarModes(ScrollbarMode horizontalMode, ScrollbarMode verticalMode, bool horizontalLock, bool verticalLock)
-{
- // FIXME: Restructure the ScrollView abstraction so that we do not have to
- // copy this verbatim from ScrollView.cpp. Until then, we should make sure this
- // is kept in sync.
- bool needsUpdate = false;
-
- if (horizontalMode != horizontalScrollbarMode() && !m_horizontalScrollbarLock) {
- m_horizontalScrollbarMode = horizontalMode;
- needsUpdate = true;
- }
-
- if (verticalMode != verticalScrollbarMode() && !m_verticalScrollbarLock) {
- m_verticalScrollbarMode = verticalMode;
- needsUpdate = true;
- }
-
- if (horizontalLock)
- setHorizontalScrollbarLock();
-
- if (verticalLock)
- setVerticalScrollbarLock();
-
- if (needsUpdate)
- updateScrollbars(scrollOffset());
-
- // We don't need to report policy changes on ScrollView's unless this
- // one has an adjustment attached and it is a main frame.
- if (parent() || !isFrameView())
- return;
-
- // For frames that do have adjustments attached, we want to report
- // policy changes, so that they may be applied to the widget to
- // which the WebView's container (e.g. GtkScrolledWindow).
- if (hostWindow())
- hostWindow()->scrollbarsModeDidChange();
-}
-
-}
-
</del></span></pre>
</div>
</div>
</body>
</html>