topcoderKai
diff --git a/‎Source/WTF/ChangeLog
+15 b/‎Source/WTF/ChangeLog
+15
diff --git a/‎Source/WTF/wtf/OwnPtrCommon.h
-4 b/‎Source/WTF/wtf/OwnPtrCommon.h
-4
diff --git a/‎Source/WTF/wtf/Platform.h
+1-6 b/‎Source/WTF/wtf/Platform.h
+1-6
diff --git a/‎Source/WTF/wtf/efl/OwnPtrEfl.cpp
-5 b/‎Source/WTF/wtf/efl/OwnPtrEfl.cpp
-5
diff --git a/‎Source/WebCore/ChangeLog
+431 b/‎Source/WebCore/ChangeLog
+431
diff --git a/‎Source/WebCore/css/MediaQueryEvaluator.cpp
+1-3 b/‎Source/WebCore/css/MediaQueryEvaluator.cpp
+1-3
diff --git a/‎Source/WebCore/css/StyleResolver.cpp
-3 b/‎Source/WebCore/css/StyleResolver.cpp
-3
diff --git a/‎Source/WebCore/dom/Document.cpp
+1-16 b/‎Source/WebCore/dom/Document.cpp
+1-16
diff --git a/‎Source/WebCore/dom/PseudoElement.cpp
-2 b/‎Source/WebCore/dom/PseudoElement.cpp
-2
diff --git a/‎Source/WebCore/history/CachedFrame.cpp
+1-10 b/‎Source/WebCore/history/CachedFrame.cpp
+1-10
diff --git a/‎Source/WebCore/history/CachedFrame.h
-2 b/‎Source/WebCore/history/CachedFrame.h
-2
diff --git a/‎Source/WebCore/history/CachedPage.cpp
-2 b/‎Source/WebCore/history/CachedPage.cpp
-2
diff --git a/‎Source/WebCore/history/CachedPage.h
-2 b/‎Source/WebCore/history/CachedPage.h
-2
diff --git a/‎Source/WebCore/history/PageCache.cpp
-5 b/‎Source/WebCore/history/PageCache.cpp
-5
diff --git a/‎Source/WebCore/history/PageCache.h
-4 b/‎Source/WebCore/history/PageCache.h
-4
diff --git a/‎Source/WebCore/html/HTMLCanvasElement.cpp
+3-6 b/‎Source/WebCore/html/HTMLCanvasElement.cpp
+3-6
@@ -1,3 +1,18 @@
+2014-01-30  Andrei Bucur  <[email protected]>
+
+        Remove the ACCELERATED_COMPOSITING flag
+        https://bugs.webkit.org/show_bug.cgi?id=127833
+
+        Reviewed by Antti Koivisto.
+
+        Remove the USE(ACCELERATED_COMPOSITING) conditionals from the code base and make AC
+        mandatory.
+
+        * wtf/OwnPtrCommon.h:
+        * wtf/Platform.h:
+        * wtf/efl/OwnPtrEfl.cpp:
+        (WTF::deleteOwnedPtr):
+
 2014-01-28  Michael Saboff  <[email protected]>
 
         Merge the jsCStack branch
 
@@ -39,10 +39,8 @@ typedef struct _Eo_Opaque Evas_Object;
 #else
 typedef struct _Evas_Object Evas_Object;
 #endif
-#if USE(ACCELERATED_COMPOSITING)
 typedef struct _Evas_GL Evas_GL;
 #endif
-#endif
 
 namespace WTF {
 
@@ -60,10 +58,8 @@ namespace WTF {
     WTF_EXPORT_PRIVATE void deleteOwnedPtr(Eina_Hash*);
     WTF_EXPORT_PRIVATE void deleteOwnedPtr(Eina_Module*);
     WTF_EXPORT_PRIVATE void deleteOwnedPtr(Evas_Object*);
-#if USE(ACCELERATED_COMPOSITING)
     WTF_EXPORT_PRIVATE void deleteOwnedPtr(Evas_GL*);
 #endif
-#endif
 
 } // namespace WTF
 
 
@@ -854,11 +854,6 @@
 #endif
 #endif
 
-/* Accelerated compositing */
-#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
-#define WTF_USE_ACCELERATED_COMPOSITING 1
-#endif
-
 #if ENABLE(WEBGL) && !defined(WTF_USE_3D_GRAPHICS)
 #define WTF_USE_3D_GRAPHICS 1
 #endif
@@ -875,7 +870,7 @@
 #define GST_API_VERSION_1 1
 #endif
 
-#if USE(ACCELERATED_COMPOSITING) && PLATFORM(WIN_CAIRO)
+#if PLATFORM(WIN_CAIRO)
 #define WTF_USE_TEXTURE_MAPPER 1
 #endif
 
 
@@ -32,10 +32,7 @@
 #include <Ecore_IMF.h>
 #include <Eina.h>
 #include <Evas.h>
-
-#if USE(ACCELERATED_COMPOSITING)
 #include <Evas_GL.h>
-#endif
 
 namespace WTF {
 
@@ -69,12 +66,10 @@ void deleteOwnedPtr(Ecore_IMF_Context* ptr)
         ecore_imf_context_del(ptr);
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 void deleteOwnedPtr(Evas_GL* ptr)
 {
     if (ptr)
         evas_gl_free(ptr);
 }
-#endif
 
 }
@@ -55,7 +55,7 @@
 #include "StyleResolver.h"
 #include <wtf/HashMap.h>
 
-#if ENABLE(3D_RENDERING) && USE(ACCELERATED_COMPOSITING)
+#if ENABLE(3D_RENDERING)
 #include "RenderLayerCompositor.h"
 #endif
 
@@ -571,10 +571,8 @@ static bool transform_3dMediaFeatureEval(CSSValue* value, RenderStyle*, Frame* f
 
 #if ENABLE(3D_RENDERING)
     bool threeDEnabled = false;
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* view = frame->contentRenderer())
         threeDEnabled = view->compositor().canRender3DTransforms();
-#endif
 
     returnValueIfNoParameter = threeDEnabled;
     have3dRendering = threeDEnabled ? 1 : 0;
 
@@ -680,7 +680,6 @@ bool StyleResolver::canShareStyleWithElement(StyledElement* element) const
     if (style->transitions() || style->animations())
         return false;
 
-#if USE(ACCELERATED_COMPOSITING)
     // Turn off style sharing for elements that can gain layers for reasons outside of the style system.
     // See comments in RenderObject::setStyle().
     if (element->hasTagName(iframeTag) || element->hasTagName(frameTag) || element->hasTagName(embedTag) || element->hasTagName(objectTag) || element->hasTagName(appletTag) || element->hasTagName(canvasTag))
@@ -690,8 +689,6 @@ bool StyleResolver::canShareStyleWithElement(StyledElement* element) const
     // With proxying, the media elements are backed by a RenderEmbeddedObject.
     if ((element->hasTagName(videoTag) || element->hasTagName(audioTag)) && toHTMLMediaElement(element)->shouldUseVideoPluginProxy())
         return false;
-#endif
-
 #endif
 
     if (elementHasDirectionAuto(element))
 
@@ -114,6 +114,7 @@
 #include "PointerLockController.h"
 #include "PopStateEvent.h"
 #include "ProcessingInstruction.h"
+#include "RenderLayerCompositor.h"
 #include "RenderView.h"
 #include "RenderWidget.h"
 #include "ResourceLoadScheduler.h"
@@ -152,10 +153,6 @@
 #include <wtf/TemporaryChange.h>
 #include <wtf/text/StringBuffer.h>
 
-#if USE(ACCELERATED_COMPOSITING)
-#include "RenderLayerCompositor.h"
-#endif
-
 #if ENABLE(SHARED_WORKERS)
 #include "SharedWorkerRepository.h"
 #endif
@@ -1242,10 +1239,8 @@ void Document::setVisualUpdatesAllowed(bool visualUpdatesAllowed)
         }
     }
 
-#if USE(ACCELERATED_COMPOSITING)
     if (view())
         view()->updateCompositingLayersAfterLayout();
-#endif
 
     if (RenderView* renderView = this->renderView())
         renderView->repaintViewAndCompositedLayers();
@@ -1751,9 +1746,7 @@ void Document::recalcStyle(Style::Change change)
 
         Style::resolveTree(*this, change);
 
-#if USE(ACCELERATED_COMPOSITING)
         frameView.updateCompositingLayersAfterStyleChange();
-#endif
 
         clearNeedsStyleRecalc();
         clearChildNeedsStyleRecalc();
@@ -1956,9 +1949,7 @@ void Document::createRenderTree()
     m_renderView = createRenderer<RenderView>(*this, RenderStyle::create());
     Node::setRenderer(m_renderView.get());
 
-#if USE(ACCELERATED_COMPOSITING)
     renderView()->setIsInWindow(true);
-#endif
 
     recalcStyle(Style::Force);
 }
@@ -4077,10 +4068,8 @@ void Document::setInPageCache(bool flag)
 
 void Document::documentWillBecomeInactive()
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (renderView())
         renderView()->setIsInWindow(false);
-#endif
 }
 
 void Document::documentWillSuspendForPageCache()
@@ -4106,10 +4095,8 @@ void Document::documentDidResumeFromPageCache()
     for (Vector<Element*>::iterator i = elements.begin(); i != end; ++i)
         (*i)->documentDidResumeFromPageCache();
 
-#if USE(ACCELERATED_COMPOSITING)
     if (renderView())
         renderView()->setIsInWindow(true);
-#endif
 
     ASSERT(page());
     page()->lockAllOverlayScrollbarsToHidden(false);
@@ -5008,12 +4995,10 @@ void Document::windowScreenDidChange(PlatformDisplayID displayID)
         m_scriptedAnimationController->windowScreenDidChange(displayID);
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* view = renderView()) {
         if (view->usesCompositing())
             view->compositor().windowScreenDidChange(displayID);
     }
-#endif
 }
 
 String Document::displayStringModifiedByEncoding(const String& str) const
 
@@ -67,9 +67,7 @@ PseudoElement::PseudoElement(Element& host, PseudoId pseudoId)
 PseudoElement::~PseudoElement()
 {
     ASSERT(!m_hostElement);
-#if USE(ACCELERATED_COMPOSITING)
     InspectorInstrumentation::pseudoElementDestroyed(document().page(), this);
-#endif
 }
 
 PassRefPtr<RenderStyle> PseudoElement::customStyleForRenderer()
 
@@ -43,6 +43,7 @@
 #include "Logging.h"
 #include "MainFrame.h"
 #include "Page.h"
+#include "PageCache.h"
 #include "PageTransitionEvent.h"
 #include "ScriptController.h"
 #include "SerializedScriptValue.h"
@@ -58,10 +59,6 @@
 #include "ChromeClient.h"
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
-#include "PageCache.h"
-#endif
-
 namespace WebCore {
 
 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, cachedFrameCounter, ("CachedFrame"));
@@ -73,9 +70,7 @@ CachedFrameBase::CachedFrameBase(Frame& frame)
     , m_mousePressNode(frame.eventHandler().mousePressNode())
     , m_url(http://github.com/frame.document()->url())
     , m_isMainFrame(!frame.tree().parent())
-#if USE(ACCELERATED_COMPOSITING)
     , m_isComposited(frame.view()->hasCompositedContent())
-#endif
 {
 }
 
@@ -112,10 +107,8 @@ void CachedFrameBase::restore()
     // cached page.
     frame.script().updatePlatformScriptObjects();
 
-#if USE(ACCELERATED_COMPOSITING)
     if (m_isComposited)
         frame.view()->restoreBackingStores();
-#endif
 
     frame.loader().client().didRestoreFromPageCache();
 
@@ -188,10 +181,8 @@ CachedFrame::CachedFrame(Frame& frame)
 
     frame.loader().client().savePlatformDataToCachedFrame(this);
 
-#if USE(ACCELERATED_COMPOSITING)
     if (m_isComposited && pageCache()->shouldClearBackingStores())
         frame.view()->clearBackingStores();
-#endif
 
     // documentWillSuspendForPageCache() can set up a layout timer on the FrameView, so clear timers after that.
     frame.clearTimers();
 
@@ -61,9 +61,7 @@ class CachedFrameBase {
     std::unique_ptr<ScriptCachedFrameData> m_cachedFrameScriptData;
     std::unique_ptr<CachedFramePlatformData> m_cachedFramePlatformData;
     bool m_isMainFrame;
-#if USE(ACCELERATED_COMPOSITING)
     bool m_isComposited;
-#endif
 
     Vector<std::unique_ptr<CachedFrame>> m_childFrames;
 };
 
@@ -101,11 +101,9 @@ void CachedPage::restore(Page& page)
             frame->document()->visitedLinkState().invalidateStyleForAllLinks();
     }
 
-#if USE(ACCELERATED_COMPOSITING)
     if (m_needsDeviceScaleChanged) {
         page.mainFrame().deviceOrPageScaleFactorChanged();
     }
-#endif
 
     if (m_needsFullStyleRecalc)
         page.setNeedsRecalcStyleInAllFrames();
 
@@ -56,9 +56,7 @@ class CachedPage {
     void markForCaptionPreferencesChanged() { m_needsCaptionPreferencesChanged = true; }
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
     void markForDeviceScaleChanged() { m_needsDeviceScaleChanged = true; }
-#endif
 
 private:
     void destroy();
 
@@ -306,9 +306,7 @@ PageCache::PageCache()
     , m_size(0)
     , m_head(0)
     , m_tail(0)
-#if USE(ACCELERATED_COMPOSITING)
     , m_shouldClearBackingStores(false)
-#endif
 {
 }
 
@@ -434,8 +432,6 @@ void PageCache::markPagesForFullStyleRecalc(Page* page)
     }
 }
 
-
-#if USE(ACCELERATED_COMPOSITING)
 void PageCache::markPagesForDeviceScaleChanged(Page* page)
 {
     for (HistoryItem* current = m_head; current; current = current->m_next) {
@@ -444,7 +440,6 @@ void PageCache::markPagesForDeviceScaleChanged(Page* page)
             cachedPage->markForDeviceScaleChanged();
     }
 }
-#endif
 
 #if ENABLE(VIDEO_TRACK)
 void PageCache::markPagesForCaptionPreferencesChanged()
 
@@ -68,11 +68,9 @@ namespace WebCore {
         void markPagesForCaptionPreferencesChanged();
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
         bool shouldClearBackingStores() const { return m_shouldClearBackingStores; }
         void setShouldClearBackingStores(bool flag) { m_shouldClearBackingStores = flag; }
         void markPagesForDeviceScaleChanged(Page*);
-#endif
 
     private:
         PageCache(); // Use pageCache() instead.
@@ -92,9 +90,7 @@ namespace WebCore {
         HistoryItem* m_head;
         HistoryItem* m_tail;
 
-#if USE(ACCELERATED_COMPOSITING)
         bool m_shouldClearBackingStores;
-#endif
      };
 
     // Function to obtain the global page cache.
 
@@ -212,7 +212,7 @@ CanvasRenderingContext* HTMLCanvasElement::getContext(const String& type, Canvas
                 usesDashbardCompatibilityMode = settings->usesDashboardBackwardCompatibilityMode();
 #endif
             m_context = CanvasRenderingContext2D::create(this, document().inQuirksMode(), usesDashbardCompatibilityMode);
-#if USE(IOSURFACE_CANVAS_BACKING_STORE) || (ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING))
+#if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
             // Need to make sure a RenderLayer and compositing layer get created for the Canvas
             setNeedsStyleRecalc(SyntheticStyleChange);
 #endif
@@ -356,10 +356,8 @@ void HTMLCanvasElement::reset()
         if (m_rendererIsCanvas) {
             if (oldSize != size()) {
                 toRenderHTMLCanvas(renderer)->canvasSizeChanged();
-#if USE(ACCELERATED_COMPOSITING)
                 if (renderBox() && renderBox()->hasAcceleratedCompositing())
                     renderBox()->contentChanged(CanvasChanged);
-#endif
             }
             if (hadImageBuffer)
                 renderer->repaint();
@@ -387,13 +385,12 @@ bool HTMLCanvasElement::paintsIntoCanvasBuffer() const
         return true;
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
     if (!m_context->isAccelerated())
         return true;
 
     if (renderBox() && renderBox()->hasAcceleratedCompositing())
         return false;
-#endif
+
     return true;
 }
 
@@ -616,7 +613,7 @@ void HTMLCanvasElement::createImageBuffer() const
     size_t numBytes = 4 * m_imageBuffer->internalSize().width() * m_imageBuffer->internalSize().height();
     scriptExecutionContext()->vm()->heap.reportExtraMemoryCost(numBytes);
 
-#if USE(IOSURFACE_CANVAS_BACKING_STORE) || (ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING))
+#if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
     if (m_context && m_context->is2d())
         // Recalculate compositing requirements if acceleration state changed.
         const_cast<HTMLCanvasElement*>(this)->setNeedsStyleRecalc(SyntheticStyleChange);
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,7 @@`
`32`	`32`	`#include <Ecore_IMF.h>`
`33`	`33`	`#include <Eina.h>`
`34`	`34`	`#include <Evas.h>`
`35`		`-`
`36`		`-#if USE(ACCELERATED_COMPOSITING)`
`37`	`35`	`#include <Evas_GL.h>`
`38`		`-#endif`
`39`	`36`
`40`	`37`	`namespace WTF {`
`41`	`38`
`@@ -69,12 +66,10 @@ void deleteOwnedPtr(Ecore_IMF_Context* ptr)`
`69`	`66`	`ecore_imf_context_del(ptr);`
`70`	`67`	`}`
`71`	`68`
`72`		`-#if USE(ACCELERATED_COMPOSITING)`
`73`	`69`	`void deleteOwnedPtr(Evas_GL* ptr)`
`74`	`70`	`{`
`75`	`71`	`if (ptr)`
`76`	`72`	`evas_gl_free(ptr);`
`77`	`73`	`}`
`78`		`-#endif`
`79`	`74`
`80`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,7 @@ PseudoElement::PseudoElement(Element& host, PseudoId pseudoId)`
`67`	`67`	`PseudoElement::~PseudoElement()`
`68`	`68`	`{`
`69`	`69`	`ASSERT(!m_hostElement);`
`70`		`-#if USE(ACCELERATED_COMPOSITING)`
`71`	`70`	`InspectorInstrumentation::pseudoElementDestroyed(document().page(), this);`
`72`		`-#endif`
`73`	`71`	`}`
`74`	`72`
`75`	`73`	`PassRefPtr<RenderStyle> PseudoElement::customStyleForRenderer()`
Original file line number	Diff line number	Diff line change
`@@ -101,11 +101,9 @@ void CachedPage::restore(Page& page)`
`101`	`101`	`frame->document()->visitedLinkState().invalidateStyleForAllLinks();`
`102`	`102`	`}`
`103`	`103`
`104`		`-#if USE(ACCELERATED_COMPOSITING)`
`105`	`104`	`if (m_needsDeviceScaleChanged) {`
`106`	`105`	`page.mainFrame().deviceOrPageScaleFactorChanged();`
`107`	`106`	`}`
`108`		`-#endif`
`109`	`107`
`110`	`108`	`if (m_needsFullStyleRecalc)`
`111`	`109`	`page.setNeedsRecalcStyleInAllFrames();`
Original file line number	Diff line number	Diff line change
`@@ -306,9 +306,7 @@ PageCache::PageCache()`
`306`	`306`	`, m_size(0)`
`307`	`307`	`, m_head(0)`
`308`	`308`	`, m_tail(0)`
`309`		`-#if USE(ACCELERATED_COMPOSITING)`
`310`	`309`	`, m_shouldClearBackingStores(false)`
`311`		`-#endif`
`312`	`310`	`{`
`313`	`311`	`}`
`314`	`312`
`@@ -434,8 +432,6 @@ void PageCache::markPagesForFullStyleRecalc(Page* page)`
`434`	`432`	`}`
`435`	`433`	`}`
`436`	`434`
`437`		`-`
`438`		`-#if USE(ACCELERATED_COMPOSITING)`
`439`	`435`	`void PageCache::markPagesForDeviceScaleChanged(Page* page)`
`440`	`436`	`{`
`441`	`437`	`for (HistoryItem* current = m_head; current; current = current->m_next) {`
`@@ -444,7 +440,6 @@ void PageCache::markPagesForDeviceScaleChanged(Page* page)`
`444`	`440`	`cachedPage->markForDeviceScaleChanged();`
`445`	`441`	`}`
`446`	`442`	`}`
`447`		`-#endif`
`448`	`443`
`449`	`444`	`#if ENABLE(VIDEO_TRACK)`
`450`	`445`	`void PageCache::markPagesForCaptionPreferencesChanged()`