<!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>[168362] 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/168362">168362</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-05-06 09:44:41 -0700 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Extended Background] Respect repeat-x/repeat-y when creating margin tiles
https://bugs.webkit.org/show_bug.cgi?id=132534
Reviewed by Beth Dakin.
If the background image that is causing margin tiles only repeats in dimension only create
the tiles in that dimension.
* page/FrameView.cpp:
(WebCore::FrameView::updateExtendBackgroundIfNecessary):
(WebCore::FrameView::calculateExtendedBackgroundMode):
(WebCore::FrameView::updateTilesForExtendedBackgroundMode):
(WebCore::FrameView::setBackgroundExtendsBeyondPage): Deleted.
(WebCore::FrameView::needsExtendedBackgroundRectForPainting): Deleted.
(WebCore::FrameView::setHasExtendedBackgroundRectForPainting): Deleted.
* page/FrameView.h:
* page/Settings.cpp:
(WebCore::Settings::setBackgroundShouldExtendBeyondPage):
* platform/graphics/TiledBacking.h:
* platform/graphics/ca/mac/TileController.h:
* platform/graphics/ca/mac/TileController.mm:
(WebCore::TileController::hasHorizontalMargins):
(WebCore::TileController::hasVerticalMargins):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::styleWillChange):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::setTiledBackingHasMargins):
* rendering/RenderLayerBacking.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingh">trunk/Source/WebCore/platform/graphics/TiledBacking.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacTileControllerh">trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacTileControllermm">trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168361 => 168362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-06 16:19:22 UTC (rev 168361)
+++ trunk/Source/WebCore/ChangeLog 2014-05-06 16:44:41 UTC (rev 168362)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-05-03 Sam Weinig <sam@webkit.org>
+
+ [Extended Background] Respect repeat-x/repeat-y when creating margin tiles
+ https://bugs.webkit.org/show_bug.cgi?id=132534
+
+ Reviewed by Beth Dakin.
+
+ If the background image that is causing margin tiles only repeats in dimension only create
+ the tiles in that dimension.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::updateExtendBackgroundIfNecessary):
+ (WebCore::FrameView::calculateExtendedBackgroundMode):
+ (WebCore::FrameView::updateTilesForExtendedBackgroundMode):
+ (WebCore::FrameView::setBackgroundExtendsBeyondPage): Deleted.
+ (WebCore::FrameView::needsExtendedBackgroundRectForPainting): Deleted.
+ (WebCore::FrameView::setHasExtendedBackgroundRectForPainting): Deleted.
+ * page/FrameView.h:
+ * page/Settings.cpp:
+ (WebCore::Settings::setBackgroundShouldExtendBeyondPage):
+ * platform/graphics/TiledBacking.h:
+ * platform/graphics/ca/mac/TileController.h:
+ * platform/graphics/ca/mac/TileController.mm:
+ (WebCore::TileController::hasHorizontalMargins):
+ (WebCore::TileController::hasVerticalMargins):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::styleWillChange):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::setTiledBackingHasMargins):
+ * rendering/RenderLayerBacking.h:
+
</ins><span class="cx"> 2014-05-06 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: VoiceOver does not announce text changes for content editable regions in Safari
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (168361 => 168362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-05-06 16:19:22 UTC (rev 168361)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-05-06 16:44:41 UTC (rev 168362)
</span><span class="lines">@@ -2523,16 +2523,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::setBackgroundExtendsBeyondPage(bool extendBackground)
-{
- RenderView* renderView = this->renderView();
- if (!renderView)
- return;
-
- renderView->compositor().setRootExtendedBackgroundColor(extendBackground ? documentBackgroundColor() : Color());
- setHasExtendedBackgroundRectForPainting(needsExtendedBackgroundRectForPainting());
-}
-
</del><span class="cx"> bool FrameView::hasExtendedBackgroundRectForPainting() const
</span><span class="cx"> {
</span><span class="cx"> if (!frame().settings().backgroundShouldExtendBeyondPage())
</span><span class="lines">@@ -2545,8 +2535,17 @@
</span><span class="cx"> return tiledBacking->hasMargins();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool FrameView::needsExtendedBackgroundRectForPainting() const
</del><ins>+void FrameView::updateExtendBackgroundIfNecessary()
</ins><span class="cx"> {
</span><ins>+ ExtendedBackgroundMode mode = calculateExtendedBackgroundMode();
+ if (mode == ExtendedBackgroundModeNone)
+ return;
+
+ updateTilesForExtendedBackgroundMode(mode);
+}
+
+FrameView::ExtendedBackgroundMode FrameView::calculateExtendedBackgroundMode() const
+{
</ins><span class="cx"> // Just because Settings::backgroundShouldExtendBeyondPage() is true does not necessarily mean
</span><span class="cx"> // that the background rect needs to be extended for painting. Simple backgrounds can be extended
</span><span class="cx"> // just with RenderLayerCompositor::setRootExtendedBackgroundColor(). More complicated backgrounds,
</span><span class="lines">@@ -2555,32 +2554,41 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // <rdar://problem/16201373>
</span><del>- return false;
</del><ins>+ return ExtendedBackgroundModeNone;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!frame().settings().backgroundShouldExtendBeyondPage())
</span><del>- return false;
</del><ins>+ return ExtendedBackgroundModeNone;
</ins><span class="cx">
</span><span class="cx"> if (!frame().isMainFrame())
</span><del>- return false;
</del><ins>+ return ExtendedBackgroundModeNone;
</ins><span class="cx">
</span><span class="cx"> Document* document = frame().document();
</span><span class="cx"> if (!document)
</span><del>- return false;
</del><ins>+ return ExtendedBackgroundModeNone;
</ins><span class="cx">
</span><span class="cx"> auto documentElement = document->documentElement();
</span><del>- auto bodyElement = document->body();
</del><span class="cx"> auto documentElementRenderer = documentElement ? documentElement->renderer() : nullptr;
</span><del>- auto bodyRenderer = bodyElement ? bodyElement->renderer() : nullptr;
- bool rootBackgroundHasImage = (documentElementRenderer && documentElementRenderer->style().hasBackgroundImage())
- || (bodyRenderer && bodyRenderer->style().hasBackgroundImage());
</del><ins>+ if (!documentElementRenderer)
+ return ExtendedBackgroundModeNone;
</ins><span class="cx">
</span><del>- return rootBackgroundHasImage;
</del><ins>+ auto& renderer = documentElementRenderer->rendererForRootBackground();
+ if (!renderer.style().hasBackgroundImage())
+ return ExtendedBackgroundModeNone;
+
+ ExtendedBackgroundMode mode = ExtendedBackgroundModeNone;
+
+ if (renderer.style().backgroundRepeatX() == RepeatFill)
+ mode |= ExtendedBackgroundModeHorizontal;
+ if (renderer.style().backgroundRepeatY() == RepeatFill)
+ mode |= ExtendedBackgroundModeVertical;
+
+ return mode;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::setHasExtendedBackgroundRectForPainting(bool shouldHaveExtendedBackgroundRect)
</del><ins>+void FrameView::updateTilesForExtendedBackgroundMode(ExtendedBackgroundMode mode)
</ins><span class="cx"> {
</span><del>- if (shouldHaveExtendedBackgroundRect == hasExtendedBackgroundRectForPainting())
</del><ins>+ if (!frame().settings().backgroundShouldExtendBeyondPage())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="lines">@@ -2591,7 +2599,21 @@
</span><span class="cx"> if (!backing)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- backing->setTiledBackingHasMargins(frame().settings().backgroundShouldExtendBeyondPage() && shouldHaveExtendedBackgroundRect);
</del><ins>+ TiledBacking* tiledBacking = backing->graphicsLayer()->tiledBacking();
+ if (!tiledBacking)
+ return;
+
+ ExtendedBackgroundMode existingMode = ExtendedBackgroundModeNone;
+ if (tiledBacking->hasVerticalMargins())
+ existingMode |= ExtendedBackgroundModeVertical;
+ if (tiledBacking->hasHorizontalMargins())
+ existingMode |= ExtendedBackgroundModeHorizontal;
+
+ if (existingMode == mode)
+ return;
+
+ renderView->compositor().setRootExtendedBackgroundColor(mode == ExtendedBackgroundModeAll ? Color() : documentBackgroundColor());
+ backing->setTiledBackingHasMargins(mode & ExtendedBackgroundModeHorizontal, mode & ExtendedBackgroundModeVertical);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect FrameView::extendedBackgroundRectForPainting() const
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (168361 => 168362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2014-05-06 16:19:22 UTC (rev 168361)
+++ trunk/Source/WebCore/page/FrameView.h 2014-05-06 16:44:41 UTC (rev 168362)
</span><span class="lines">@@ -197,16 +197,18 @@
</span><span class="cx"> void setBaseBackgroundColor(const Color&);
</span><span class="cx"> void updateBackgroundRecursively(const Color&, bool);
</span><span class="cx">
</span><del>- // setBackgroundExtendsBeyondPage() is controlled by Settings::setBackgroundShouldExtendBeyondPage(). Some
- // extended backgrounds require an extended background rect for painting, (at this time, that corresponds
- // to documents with background images) and needsExtendedBackgroundRectForPainting() determines if this
- // FrameView is one of those special FrameViews that does require an extended rect for painting. Since
- // needing an extended background rect for painting is something that can change in the course of a FrameView's
- // life, the extended rect is set and unset using setHasExtendedBackgroundRectForPainting(). The
- // extendedBackgroundRectForPainting() is in the viewport's coordinate space.
- void setBackgroundExtendsBeyondPage(bool);
- bool needsExtendedBackgroundRectForPainting() const;
- void setHasExtendedBackgroundRectForPainting(bool shouldHaveExtendedBackgroundRect);
</del><ins>+ enum ExtendedBackgroundModeFlags {
+ ExtendedBackgroundModeNone = 0,
+ ExtendedBackgroundModeVertical = 1 << 0,
+ ExtendedBackgroundModeHorizontal = 1 << 1,
+ ExtendedBackgroundModeAll = ExtendedBackgroundModeVertical | ExtendedBackgroundModeHorizontal,
+ };
+ typedef unsigned ExtendedBackgroundMode;
+
+ void updateExtendBackgroundIfNecessary();
+ void updateTilesForExtendedBackgroundMode(ExtendedBackgroundMode);
+ ExtendedBackgroundMode calculateExtendedBackgroundMode() const;
+
</ins><span class="cx"> bool hasExtendedBackgroundRectForPainting() const;
</span><span class="cx"> IntRect extendedBackgroundRectForPainting() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (168361 => 168362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2014-05-06 16:19:22 UTC (rev 168361)
+++ trunk/Source/WebCore/page/Settings.cpp 2014-05-06 16:44:41 UTC (rev 168362)
</span><span class="lines">@@ -562,7 +562,7 @@
</span><span class="cx">
</span><span class="cx"> m_backgroundShouldExtendBeyondPage = shouldExtend;
</span><span class="cx">
</span><del>- m_page->mainFrame().view()->setBackgroundExtendsBeyondPage(shouldExtend);
</del><ins>+ m_page->mainFrame().view()->updateExtendBackgroundIfNecessary();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(AVFOUNDATION)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBacking.h (168361 => 168362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBacking.h 2014-05-06 16:19:22 UTC (rev 168361)
+++ trunk/Source/WebCore/platform/graphics/TiledBacking.h 2014-05-06 16:44:41 UTC (rev 168362)
</span><span class="lines">@@ -82,6 +82,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void setTileMargins(int marginTop, int marginBottom, int marginLeft, int marginRight) = 0;
</span><span class="cx"> virtual bool hasMargins() const = 0;
</span><ins>+ virtual bool hasHorizontalMargins() const = 0;
+ virtual bool hasVerticalMargins() const = 0;
</ins><span class="cx">
</span><span class="cx"> virtual int topMarginHeight() const = 0;
</span><span class="cx"> virtual int bottomMarginHeight() const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacTileControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h (168361 => 168362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h 2014-05-06 16:19:22 UTC (rev 168361)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h 2014-05-06 16:44:41 UTC (rev 168362)
</span><span class="lines">@@ -97,6 +97,8 @@
</span><span class="cx"> virtual IntSize tileSize() const override { return m_tileSize; }
</span><span class="cx"> virtual IntRect bounds() const override;
</span><span class="cx"> virtual bool hasMargins() const override;
</span><ins>+ virtual bool hasHorizontalMargins() const override;
+ virtual bool hasVerticalMargins() const override;
</ins><span class="cx"> virtual int topMarginHeight() const override;
</span><span class="cx"> virtual int bottomMarginHeight() const override;
</span><span class="cx"> virtual int leftMarginWidth() const override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacTileControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm (168361 => 168362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2014-05-06 16:19:22 UTC (rev 168361)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2014-05-06 16:44:41 UTC (rev 168362)
</span><span class="lines">@@ -451,6 +451,16 @@
</span><span class="cx"> return m_marginTop || m_marginBottom || m_marginLeft || m_marginRight;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool TileController::hasHorizontalMargins() const
+{
+ return m_marginLeft || m_marginRight;
+}
+
+bool TileController::hasVerticalMargins() const
+{
+ return m_marginTop || m_marginBottom;
+}
+
</ins><span class="cx"> int TileController::topMarginHeight() const
</span><span class="cx"> {
</span><span class="cx"> return m_marginTop;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (168361 => 168362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-05-06 16:19:22 UTC (rev 168361)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-05-06 16:44:41 UTC (rev 168362)
</span><span class="lines">@@ -900,11 +900,8 @@
</span><span class="cx"> view().frameView().addSlowRepaintObject(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (isRoot() || isBody()) {
- bool needsExtendedBackground = view().frameView().needsExtendedBackgroundRectForPainting();
- if (view().frameView().hasExtendedBackgroundRectForPainting() != needsExtendedBackground)
- view().frameView().setHasExtendedBackgroundRectForPainting(needsExtendedBackground);
- }
</del><ins>+ if (isRoot() || isBody())
+ view().frameView().updateExtendBackgroundIfNecessary();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (168361 => 168362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-05-06 16:19:22 UTC (rev 168361)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-05-06 16:44:41 UTC (rev 168362)
</span><span class="lines">@@ -225,13 +225,13 @@
</span><span class="cx"> tiledBacking()->setTileCoverage(tileCoverage);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerBacking::setTiledBackingHasMargins(bool hasExtendedBackgroundRect)
</del><ins>+void RenderLayerBacking::setTiledBackingHasMargins(bool hasExtendedBackgroundOnLeftAndRight, bool hasExtendedBackgroundOnTopAndBottom)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_usingTiledCacheLayer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- int marginLeftAndRightSize = hasExtendedBackgroundRect ? defaultTileWidth : 0;
- int marginTopAndBottomSize = hasExtendedBackgroundRect ? defaultTileHeight : 0;
</del><ins>+ int marginLeftAndRightSize = hasExtendedBackgroundOnLeftAndRight ? defaultTileWidth : 0;
+ int marginTopAndBottomSize = hasExtendedBackgroundOnTopAndBottom ? defaultTileHeight : 0;
</ins><span class="cx"> tiledBacking()->setTileMargins(marginTopAndBottomSize, marginTopAndBottomSize, marginLeftAndRightSize, marginLeftAndRightSize);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (168361 => 168362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-05-06 16:19:22 UTC (rev 168361)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-05-06 16:44:41 UTC (rev 168362)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> bool usingTiledBacking() const { return m_usingTiledCacheLayer; }
</span><span class="cx"> TiledBacking* tiledBacking() const;
</span><span class="cx"> void adjustTiledBackingCoverage();
</span><del>- void setTiledBackingHasMargins(bool);
</del><ins>+ void setTiledBackingHasMargins(bool hasExtendedBackgroundOnLeftAndRight, bool hasExtendedBackgroundOnTopAndBottom);
</ins><span class="cx">
</span><span class="cx"> void updateDebugIndicators(bool showBorder, bool showRepaintCounter);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>