[prev in list] [next in list] [prev in thread] [next in thread] 

List:       webkit-changes
Subject:    [webkit-changes] [197356]	releases/WebKitGTK/webkit-2.4/Source/WebCore
From:       carlosgc () webkit ! org
Date:       2016-02-29 17:54:11
Message-ID: 20160229175411.E5D1F3610DA () svn ! webkit ! org
[Download RAW message or body]

[Attachment #2 (text/html)]

<!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>[197356] releases/WebKitGTK/webkit-2.4/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/197356">197356</a></dd> \
<dt>Author</dt> <dd>carlosgc@webkit.org</dd> <dt>Date</dt> <dd>2016-02-29 09:54:11 \
-0800 (Mon, 29 Feb 2016)</dd> </dl>

<h3>Log Message</h3>
<pre>Unreviewed. Fix the build with GTK+ &lt; 3.19.

* platform/gtk/ScrollbarThemeGtk3.cpp:
(WebCore::ScrollbarThemeGtk::paintScrollbarBackground):
(WebCore::ScrollbarThemeGtk::paintThumb):
(WebCore::ScrollbarThemeGtk::paintButton):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
 <li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgtkScrollbarThemeGtk3cpp" \
>releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/ScrollbarThemeGtk3.cpp</a></li>
> 
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: \
releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (197355 => 197356)</h4> <pre \
class="diff"><span> <span class="info">--- \
releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog	2016-02-29 17:36:51 UTC (rev \
                197355)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog	2016-02-29 17:54:11 UTC \
(rev 197356) </span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-02-29  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
+        Unreviewed. Fix the build with GTK+ &lt; 3.19.
+
+        * platform/gtk/ScrollbarThemeGtk3.cpp:
+        (WebCore::ScrollbarThemeGtk::paintScrollbarBackground):
+        (WebCore::ScrollbarThemeGtk::paintThumb):
+        (WebCore::ScrollbarThemeGtk::paintButton):
+
</ins><span class="cx"> 2015-02-06  Zalan Bujtas  &lt;zalan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         ASSERT repaintContainer-&gt;hasLayer() in \
WebCore::RenderObject::repaintUsingContainer </span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgtkScrollbarThemeGtk3cpp"></a>
<div class="modfile"><h4>Modified: \
releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/ScrollbarThemeGtk3.cpp \
(197355 => 197356)</h4> <pre class="diff"><span>
<span class="info">--- \
releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/ScrollbarThemeGtk3.cpp	2016-02-29 \
                17:36:51 UTC (rev 197355)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/ScrollbarThemeGtk3.cpp	2016-02-29 \
17:54:11 UTC (rev 197356) </span><span class="lines">@@ -115,12 +115,12 @@
</span><span class="cx">     updateScrollbarsFrameThickness();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if GTK_CHECK_VERSION(3, 19, 2)
</ins><span class="cx"> static const char* orientationStyleClass(ScrollbarOrientation \
orientation) </span><span class="cx"> {
</span><span class="cx">     return orientation == VerticalScrollbar ? \
&quot;vertical&quot; : &quot;horizontal&quot;; </span><span class="cx"> }
</span><del>-
-#if !GTK_CHECK_VERSION(3, 19, 2)
</del><ins>+#else
</ins><span class="cx"> static void \
applyScrollbarStyleContextClasses(GtkStyleContext* context, ScrollbarOrientation \
orientation) </span><span class="cx"> {
</span><span class="cx">     gtk_style_context_add_class(context, \
GTK_STYLE_CLASS_SCROLLBAR); </span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx">     gtk_render_frame(styleContext.get(), \
context-&gt;platformContext()-&gt;cr(), scrollbar-&gt;x(), scrollbar-&gt;y(), \
scrollbar-&gt;width(), scrollbar-&gt;height()); </span><span class="cx"> 
</span><span class="cx"> #if !GTK_CHECK_VERSION(3, 19, 2)
</span><del>-    gtk_style_context_restore(styleContext);
</del><ins>+    gtk_style_context_restore(styleContext.get());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx">         orientation == VerticalScrollbar ? \
GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL); </span><span class="cx"> 
</span><span class="cx"> #if !GTK_CHECK_VERSION(3, 19, 2)
</span><del>-    gtk_style_context_restore(styleContext);
</del><ins>+    gtk_style_context_restore(styleContext.get());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx">     gtk_render_arrow(styleContext.get(), \
context-&gt;platformContext()-&gt;cr(), angle, arrowPoint.x(), arrowPoint.y(), \
arrowSize); </span><span class="cx"> 
</span><span class="cx"> #if !GTK_CHECK_VERSION(3, 19, 2)
</span><del>-    gtk_style_context_restore(styleContext);
</del><ins>+    gtk_style_context_restore(styleContext.get());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic