Merge 113677 - [chromium] Viewport is not filled when out of texture memory on mac

Source/Platform/chromium/public/WebLayerTreeView.h

 /*
  * Copyright (C) 2011 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:
  *
  * 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 AND ITS 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 APPLE OR ITS 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 WebLayerTreeView_h
 #define WebLayerTreeView_h
 
+#include "WebColor.h"
 #include "WebCommon.h"
 #include "WebPrivatePtr.h"
 
 namespace WebCore {
 class CCLayerTreeHost;
 struct CCSettings;
 }
 
 namespace WebKit {
 class WebGraphicsContext3D;
@@ skipping 62 matching lines @@
     // Returns a unique identifier that can be used on the compositor thread to request a
     // WebCompositorInputHandler instance.
     WEBKIT_EXPORT int compositorIdentifier();
 
 
     // View properties ---------------------------------------------------
 
     WEBKIT_EXPORT void setViewportSize(const WebSize&);
     WEBKIT_EXPORT WebSize viewportSize() const;
 
+    // Sets the background color for the viewport.
+    WEBKIT_EXPORT void setBackgroundColor(WebColor);
+
     // Sets whether this view is visible. In threaded mode, a view that is not visible will not
     // composite or trigger updateAnimations() or layout() calls until it becomes visible.
     WEBKIT_EXPORT void setVisible(bool);
 
     // Sets the current page scale factor and minimum / maximum limits. Both limits are initially 1 (no page scale allowed).
     WEBKIT_EXPORT void setPageScaleFactorAndLimits(float pageScaleFactor, float minimum, float maximum);
 
     // Starts an animation of the page scale to a target scale factor and scroll offset.
     // If useAnchor is true, destination is a point on the screen that will remain fixed for the duration of the animation.
     // If useAnchor is false, destination is the final top-left scroll position.
@@ skipping 57 matching lines @@
 }
 
 inline bool operator!=(const WebLayerTreeView& a, const WebLayerTreeView& b)
 {
     return !(a == b);
 }
 
 } // namespace WebKit
 
 #endif // WebLayerTreeView_h