[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andersca at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 9e04e3001a9431efdf38725dac5b81f05c9eff1a
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 02:39:47 2011 +0000

    2011-01-10  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Sam Weinig.
    
            Pass information about the view in the WebPageCreationParameters
            https://bugs.webkit.org/show_bug.cgi?id=52186
    
            * Shared/WebPageCreationParameters.cpp:
            (WebKit::WebPageCreationParameters::encode):
            (WebKit::WebPageCreationParameters::decode):
            Encode and decode the state flags.
    
            * Shared/WebPageCreationParameters.h:
            Add new state flags.
    
            * UIProcess/WebPageProxy.cpp:
            (WebKit::WebPageProxy::creationParameters):
            Initialize the state flags.
    
            * WebProcess/WebPage/WebPage.cpp:
            (WebKit::WebPage::WebPage):
            Update the page state from the state flags.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75462 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index e4520cc..4b8e6eb 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,26 @@
+2011-01-10  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Pass information about the view in the WebPageCreationParameters
+        https://bugs.webkit.org/show_bug.cgi?id=52186
+
+        * Shared/WebPageCreationParameters.cpp:
+        (WebKit::WebPageCreationParameters::encode):
+        (WebKit::WebPageCreationParameters::decode):
+        Encode and decode the state flags.
+
+        * Shared/WebPageCreationParameters.h:
+        Add new state flags.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::creationParameters):
+        Initialize the state flags.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage):
+        Update the page state from the state flags.
+
 2011-01-10  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/Shared/WebPageCreationParameters.cpp b/WebKit2/Shared/WebPageCreationParameters.cpp
index 22236e2..a360a4a 100644
--- a/WebKit2/Shared/WebPageCreationParameters.cpp
+++ b/WebKit2/Shared/WebPageCreationParameters.cpp
@@ -32,6 +32,11 @@ namespace WebKit {
 void WebPageCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) const
 {
     encoder->encode(viewSize);
+    encoder->encode(isActive);
+    encoder->encode(isFocused);
+    encoder->encode(isVisible);
+    encoder->encode(isInWindow);
+
     encoder->encode(store);
     encoder->encode(drawingAreaInfo);
     encoder->encode(pageGroupData);
@@ -52,6 +57,14 @@ bool WebPageCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, WebPag
 {
     if (!decoder->decode(parameters.viewSize))
         return false;
+    if (!decoder->decode(parameters.isActive))
+        return false;
+    if (!decoder->decode(parameters.isFocused))
+        return false;
+    if (!decoder->decode(parameters.isVisible))
+        return false;
+    if (!decoder->decode(parameters.isInWindow))
+        return false;
     if (!decoder->decode(parameters.store))
         return false;
     if (!decoder->decode(parameters.drawingAreaInfo))
diff --git a/WebKit2/Shared/WebPageCreationParameters.h b/WebKit2/Shared/WebPageCreationParameters.h
index 72f2a2a..ac11224 100644
--- a/WebKit2/Shared/WebPageCreationParameters.h
+++ b/WebKit2/Shared/WebPageCreationParameters.h
@@ -44,6 +44,12 @@ struct WebPageCreationParameters {
     static bool decode(CoreIPC::ArgumentDecoder*, WebPageCreationParameters&);
 
     WebCore::IntSize viewSize;
+
+    bool isActive;
+    bool isFocused;
+    bool isVisible;
+    bool isInWindow;
+    
     WebPreferencesStore store;
     DrawingAreaInfo drawingAreaInfo;
     WebPageGroupData pageGroupData;
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index f867f62..45903da 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -2137,7 +2137,13 @@ void WebPageProxy::processDidCrash()
 WebPageCreationParameters WebPageProxy::creationParameters(const IntSize& size) const
 {
     WebPageCreationParameters parameters;
+
     parameters.viewSize = size;
+    parameters.isActive = m_pageClient->isViewWindowActive();
+    parameters.isFocused = m_pageClient->isViewFocused();
+    parameters.isVisible = m_pageClient->isViewVisible();
+    parameters.isInWindow = m_pageClient->isViewInWindow();
+
     parameters.drawingAreaInfo = m_drawingArea->info();
     parameters.store = m_pageGroup->preferences()->store();
     parameters.pageGroupData = m_pageGroup->data();
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 1110506..9710db5 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -181,6 +181,10 @@ WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
     setDrawsBackground(parameters.drawsBackground);
     setDrawsTransparentBackground(parameters.drawsTransparentBackground);
 
+    setActive(parameters.isActive);
+    setFocused(parameters.isFocused);
+    setIsInWindow(parameters.isInWindow);
+
     m_userAgent = parameters.userAgent;
 
 #ifndef NDEBUG

-- 
WebKit Debian packaging