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

Source/WebKit/chromium/src/WebViewImpl.h

 /*
  * Copyright (C) 2010 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 42 matching lines @@
 #include "NotificationPresenterImpl.h"
 #include "PageOverlayList.h"
 #include "PlatformGestureCurveTarget.h"
 #include "UserMediaClientImpl.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
 class ActivePlatformGestureAnimation;
 class ChromiumDataObject;
+class Color;
 class DocumentLoader;
 class Frame;
 class GraphicsContext3D;
 class HistoryItem;
 class HitTestResult;
 class KeyboardEvent;
 class Page;
 class PlatformGestureCurveTarget;
 class PlatformKeyboardEvent;
 class PopupContainer;
@@ skipping 372 matching lines @@
     }
 
 #if USE(ACCELERATED_COMPOSITING)
     bool allowsAcceleratedCompositing();
     bool pageHasRTLStyle() const;
     void setRootGraphicsLayer(WebCore::GraphicsLayer*);
     void scheduleCompositingLayerSync();
     void scrollRootLayerRect(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& clipRect);
     void invalidateRootLayerRect(const WebCore::IntRect&);
     NonCompositedContentHost* nonCompositedContentHost();
+    void setBackgroundColor(const WebCore::Color&);
 #endif
 #if ENABLE(REQUEST_ANIMATION_FRAME)
     void scheduleAnimation();
 #endif
 
     // Returns the onscreen 3D context used by the compositor. This is
     // used by the renderer's code to set up resource sharing between
     // the compositor's context and subordinate contexts for APIs like
     // WebGL. Returns 0 if compositing support is not compiled in or
     // we could not successfully instantiate a context.
@@ skipping 266 matching lines @@
 #endif
     OwnPtr<WebCore::ActivePlatformGestureAnimation> m_gestureAnimation;
     WebPoint m_lastWheelPosition;
     WebPoint m_lastWheelGlobalPosition;
     int m_flingModifier;
 };
 
 } // namespace WebKit
 
 #endif