Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h - Issue 10146014: Merge 113677 - [chromium] Viewport is not filled when out of texture memory on mac

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h

Issue 10146014: Merge 113677 - [chromium] Viewport is not filled when out of texture memory on mac (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/

Patch Set: Created 8 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp ('k') | Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h

===================================================================

--- Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h (revision 114754)

+++ Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h (working copy)

@@ -25,6 +25,7 @@

#ifndef CCLayerTreeHostImpl_h

#define CCLayerTreeHostImpl_h

+#include "Color.h"

#include "LayerRendererChromium.h"

#include "cc/CCAnimationEvents.h"

#include "cc/CCInputHandler.h"

@@ -138,6 +139,9 @@

void startPageScaleAnimation(const IntSize& tragetPosition, bool useAnchor, float scale, double durationSec);

+ const Color& backgroundColor() const { return m_backgroundColor; }

+ void setBackgroundColor(const Color& color) { m_backgroundColor = color; }

bool needsAnimateLayers() const { return m_needsAnimateLayers; }

void setNeedsAnimateLayers() { m_needsAnimateLayers = true; }

@@ -184,6 +188,8 @@

float m_sentPageScaleDelta;

float m_minPageScale, m_maxPageScale;

+ Color m_backgroundColor;

// If this is true, it is necessary to traverse the layer tree ticking the animators.

bool m_needsAnimateLayers;

bool m_pinchGestureActive;