webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

2 files changed, 11 insertions, 10 deletions

diff --git a/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp b/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp
index de575b289..3669c2da9 100644
--- a/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp
+++ b/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp
@@ -50,23 +50,23 @@ namespace WebKit {
 static IntRect screenRectOfContents(Element* element)
 {
     ASSERT(element);
-#if USE(ACCELERATED_COMPOSITING)
     if (element->renderer() && element->renderer()->hasLayer() && element->renderer()->enclosingLayer()->isComposited()) {
         FloatQuad contentsBox = static_cast<FloatRect>(element->renderer()->enclosingLayer()->backing()->contentsBox());
         contentsBox = element->renderer()->localToAbsoluteQuad(contentsBox);
         return element->renderer()->view().frameView().contentsToScreen(contentsBox.enclosingBoundingBox());
     }
-#endif
+
     return element->screenRect();
 }
 
-PassRefPtr<WebFullScreenManager> WebFullScreenManager::create(WebPage* page)
+Ref<WebFullScreenManager> WebFullScreenManager::create(WebPage* page)
 {
-    return adoptRef(new WebFullScreenManager(page));
+    return adoptRef(*new WebFullScreenManager(page));
 }
 
 WebFullScreenManager::WebFullScreenManager(WebPage* page)
-    : m_page(page)
+    : m_topContentInset(0)
+    , m_page(page)
 {
 }
     
@@ -79,7 +79,7 @@ WebCore::Element* WebFullScreenManager::element()
     return m_element.get(); 
 }
 
-void WebFullScreenManager::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
+void WebFullScreenManager::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
 {
     didReceiveWebFullScreenManagerMessage(connection, decoder);
 }
diff --git a/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h b/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h
index 55b792052..b6078a8a5 100644
--- a/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h
+++ b/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h
@@ -33,7 +33,7 @@
 
 namespace IPC {
 class Connection;
-class MessageDecoder;
+class Decoder;
 }
 
 namespace WebCore {
@@ -48,10 +48,10 @@ class WebPage;
 
 class WebFullScreenManager : public RefCounted<WebFullScreenManager> {
 public:
-    static PassRefPtr<WebFullScreenManager> create(WebPage*);
+    static Ref<WebFullScreenManager> create(WebPage*);
     virtual ~WebFullScreenManager();
 
-    void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&);
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&);
 
     bool supportsFullScreen(bool withKeyboard);
     void enterFullScreenForElement(WebCore::Element*);
@@ -74,11 +74,12 @@ protected:
     void saveScrollPosition();
     void restoreScrollPosition();
 
-    void didReceiveWebFullScreenManagerMessage(IPC::Connection*, IPC::MessageDecoder&);
+    void didReceiveWebFullScreenManagerMessage(IPC::Connection&, IPC::Decoder&);
 
     WebCore::IntRect m_initialFrame;
     WebCore::IntRect m_finalFrame;
     WebCore::IntPoint m_scrollPosition;
+    float m_topContentInset;
     RefPtr<WebPage> m_page;
     RefPtr<WebCore::Element> m_element;
 };