Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3

* changes:
  Merge WebKit at r75315: Update WebKit version
  Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
  Merge WebKit at r75315: Stub out AXObjectCache::remove()
  Merge WebKit at r75315: Fix ImageBuffer
  Merge WebKit at r75315: Fix PluginData::initPlugins()
  Merge WebKit at r75315: Fix conflicts
  Merge WebKit at r75315: Fix Makefiles
  Merge WebKit at r75315: Move Android-specific WebCore files to Source
  Merge WebKit at r75315: Initial merge by git.

1 files changed, 70 insertions, 0 deletions

diff --git a/Source/WebCore/rendering/RenderFullScreen.cpp b/Source/WebCore/rendering/RenderFullScreen.cpp
new file mode 100644
index 0000000..7cd452f
--- /dev/null
+++ b/Source/WebCore/rendering/RenderFullScreen.cpp
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2010 Apple 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 INC. 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 INC. 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.
+ */
+
+#include "config.h"
+
+#if ENABLE(FULLSCREEN_API)
+
+#include "RenderFullScreen.h"
+
+#include "RenderLayer.h"
+
+using namespace WebCore;
+
+void RenderFullScreen::setAnimating(bool animating)
+{
+    m_isAnimating = animating;
+#if ENABLE(ACCELERATED_COMPOSITING)
+    if (layer())
+        layer()->contentChanged(RenderLayer::FullScreenChanged);
+#endif
+}
+
+PassRefPtr<RenderStyle> RenderFullScreen::createFullScreenStyle()
+{
+    RefPtr<RenderStyle> fullscreenStyle = RenderStyle::createDefaultStyle();
+
+    // Create a stacking context:
+    fullscreenStyle->setZIndex(0);
+
+    fullscreenStyle->setFontDescription(FontDescription());
+    fullscreenStyle->font().update(0);
+
+    fullscreenStyle->setDisplay(BOX);
+    fullscreenStyle->setBoxPack(BCENTER);
+    fullscreenStyle->setBoxAlign(BCENTER);
+    fullscreenStyle->setBoxOrient(HORIZONTAL);
+    
+    fullscreenStyle->setPosition(FixedPosition);
+    fullscreenStyle->setWidth(Length(100.0, Percent));
+    fullscreenStyle->setHeight(Length(100.0, Percent));
+    fullscreenStyle->setLeft(Length(0, Fixed));
+    fullscreenStyle->setTop(Length(0, Fixed));
+    
+    fullscreenStyle->setBackgroundColor(Color::black);
+    
+    return fullscreenStyle;
+}
+
+#endif