Changeset 92697 in webkit

Timestamp:

Aug 9, 2011 12:27:24 PM (13 years ago)

Author:

enne@google.com

Message:

Add testing for --force-compositing-mode to windows.internal
​https://bugs.webkit.org/show_bug.cgi?id=65777

Reviewed by Adam Barth.

.:

Add exports for Document::settings().

• Source/autotools/symbols.filter:

Source/WebCore:

Test: platform/chromium/compositing/force-compositing-mode/force-composite-empty.html

Move initial initialization to settings caching function so that RLC
picks up changes to the force compositing mode flag.

• WebCore.exp.in:
• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::RenderLayerCompositor):
(WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):
(WebCore::RenderLayerCompositor::updateCompositingLayers):

• testing/Internals.cpp:

(WebCore::Internals::setForceCompositingMode):

• testing/Internals.h:
• testing/Internals.idl:

Source/WebKit2:

Add exports for Document::settings().

• win/WebKit2.def:
• win/WebKit2CFLite.def:

LayoutTests:

Add empty page to test that the root gets a graphics layer.

• platform/chromium/compositing/force-compositing-mode/force-composite-empty-expected.txt: Added.
• platform/chromium/compositing/force-compositing-mode/force-composite-empty.html: Added.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/compositing/force-compositing-mode (added)
• LayoutTests/platform/chromium/compositing/force-compositing-mode/force-composite-empty-expected.txt (added)
• LayoutTests/platform/chromium/compositing/force-compositing-mode/force-composite-empty.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.exp.in (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (6 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/win/WebKit2.def (modified) (1 diff)
• Source/WebKit2/win/WebKit2CFLite.def (modified) (1 diff)
• Source/autotools/symbols.filter (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-08-08  Adrienne Walker  <enne@google.com>
+
+        Add testing for --force-compositing-mode to windows.internal
+        https://bugs.webkit.org/show_bug.cgi?id=65777
+
+        Reviewed by Adam Barth.
+
+        Add exports for Document::settings().
+
+        * Source/autotools/symbols.filter:
+
 2011-08-09  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-08  Adrienne Walker  <enne@google.com>
+
+        Add testing for --force-compositing-mode to windows.internal
+        https://bugs.webkit.org/show_bug.cgi?id=65777
+
+        Reviewed by Adam Barth.
+
+        Add empty page to test that the root gets a graphics layer.
+
+        * platform/chromium/compositing/force-compositing-mode/force-composite-empty-expected.txt: Added.
+        * platform/chromium/compositing/force-compositing-mode/force-composite-empty.html: Added.
+
 2011-08-08  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-08  Adrienne Walker  <enne@google.com>
+
+        Add testing for --force-compositing-mode to windows.internal
+        https://bugs.webkit.org/show_bug.cgi?id=65777
+
+        Reviewed by Adam Barth.
+
+        Test: platform/chromium/compositing/force-compositing-mode/force-composite-empty.html
+
+        Move initial initialization to settings caching function so that RLC
+        picks up changes to the force compositing mode flag.
+
+        * WebCore.exp.in:
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::RenderLayerCompositor):
+        (WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):
+        (WebCore::RenderLayerCompositor::updateCompositingLayers):
+        * testing/Internals.cpp:
+        (WebCore::Internals::setForceCompositingMode):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2011-08-09  Alexandru Chiculita  <achicu@adobe.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1314 +1314 @@
 __ZNK7WebCore8Document6domainEv
 __ZNK7WebCore8Document6loaderEv
+__ZNK7WebCore8Document8settingsEv
 __ZNK7WebCore8IntPointcv7CGPointEv
 __ZNK7WebCore8IntPointcv8_NSPointEv

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -109 +109 @@
 #endif // PROFILE_LAYER_REBUILD
 {
-    Settings* settings = m_renderView->document()->settings();
-
-    // Even when forcing compositing mode, ignore child frames, or this will trigger
-    // layer creation from the enclosing RenderIFrame.
-    ASSERT(m_renderView->document()->frame());
-    if (settings && settings->forceCompositingMode() && settings->acceleratedCompositingEnabled()
-        && !m_renderView->document()->frame()->tree()->parent()) {
-        m_forceCompositingMode = true;
-        enableCompositingMode();
-    }
 }
 
@@ -144 +134 @@
     bool showDebugBorders = false;
     bool showRepaintCounter = false;
+    bool forceCompositingMode = false;
 
     if (Settings* settings = m_renderView->document()->settings()) {
@@ -149 +140 @@
         showDebugBorders = settings->showDebugBorders();
         showRepaintCounter = settings->showRepaintCounter();
+
+        if (!m_renderView->document()->frame()->tree()->parent())
+            forceCompositingMode = settings->forceCompositingMode() && hasAcceleratedCompositing;
     }
 
@@ -163 +157 @@
     }
 
-    if (hasAcceleratedCompositing != m_hasAcceleratedCompositing || showDebugBorders != m_showDebugBorders || showRepaintCounter != m_showRepaintCounter)
+    if (hasAcceleratedCompositing != m_hasAcceleratedCompositing || showDebugBorders != m_showDebugBorders || showRepaintCounter != m_showRepaintCounter || forceCompositingMode != m_forceCompositingMode)
         setCompositingLayersNeedRebuild();
 
@@ -169 +163 @@
     m_showDebugBorders = showDebugBorders;
     m_showRepaintCounter = showRepaintCounter;
+    m_forceCompositingMode = forceCompositingMode;
 }
 
@@ -254 +249 @@
 {
     m_updateCompositingLayersTimer.stop();
+
+    if (m_forceCompositingMode && !m_compositing)
+        enableCompositingMode(true);
 
     if (!m_compositingDependsOnGeometry && !m_compositing)

trunk/Source/WebCore/testing/Internals.cpp

@@ -38 +38 @@
 #include "RenderObject.h"
 #include "RenderTreeAsText.h"
+#include "Settings.h"
 #include "ShadowContentElement.h"
 #include "ShadowRoot.h"
@@ -179 +180 @@
 }
 
+void Internals::setForceCompositingMode(Document* document, bool enabled, ExceptionCode& ec)
+{
+    if (!document || !document->settings()) {
+        ec = INVALID_ACCESS_ERR;
+        return;
+    }
+
+    document->settings()->setForceCompositingMode(enabled);
 }
+
+}

trunk/Source/WebCore/testing/Internals.h

@@ -66 +66 @@
     PassRefPtr<ClientRect> boundingBox(Element*, ExceptionCode&);
 
+    void setForceCompositingMode(Document*, bool enabled, ExceptionCode&);
+
 private:
     Internals();

trunk/Source/WebCore/testing/Internals.idl

@@ -43 +43 @@
 
         ClientRect boundingBox(in Element element) raises(DOMException);
+
+        void setForceCompositingMode(in Document document, in boolean enabled) raises(DOMException);
     };
 }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-08-08  Adrienne Walker  <enne@google.com>
+
+        Add testing for --force-compositing-mode to windows.internal
+        https://bugs.webkit.org/show_bug.cgi?id=65777
+
+        Reviewed by Adam Barth.
+
+        Add exports for Document::settings().
+
+        * win/WebKit2.def:
+        * win/WebKit2CFLite.def:
+
 2011-08-09  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/Source/WebKit2/win/WebKit2.def

@@ -161 +161 @@
         ?setDOMException@WebCore@@YAXPAVExecState@JSC@@H@Z
         ?setResourcesDataSizeLimitsFromInternals@InspectorController@WebCore@@QAEXHH@Z
+        ?settings@Document@WebCore@@QBEPAVSettings@2@XZ
         ?shadowRoot@Element@WebCore@@QBEPAVShadowRoot@2@XZ
         ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z

trunk/Source/WebKit2/win/WebKit2CFLite.def

@@ -155 +155 @@
         ?setDOMException@WebCore@@YAXPAVExecState@JSC@@H@Z
         ?setResourcesDataSizeLimitsFromInternals@InspectorController@WebCore@@QAEXHH@Z
+        ?settings@Document@WebCore@@QBEPAVSettings@2@XZ
         ?shadowRoot@Element@WebCore@@QBEPAVShadowRoot@2@XZ
         ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z

trunk/Source/autotools/symbols.filter

@@ -63 +63 @@
 _ZNK7WebCore7Element10shadowRootEv;
 _ZNK7WebCore8Document4pageEv;
+_ZNK7WebCore8Document8settingsEv;
 _ZNK7WebCore9TreeScope14getElementByIdERKN3WTF12AtomicStringE;
 local: