Changeset 147911 in webkit

Timestamp:

Apr 8, 2013 6:11:06 AM (11 years ago)

Author:

rakuco@webkit.org

Message:

[EFL] REGRESSION(r147743): Use the correct `operator new' override in RenderThemeEfl.
​https://bugs.webkit.org/show_bug.cgi?id=114166

Reviewed by Alexis Menard.

r147743 disabled GLOBAL_FAST_MALLOC_NEW on the EFL port, but this has
caused some pixel tests in WK1 to crash.

The problem stems from RenderThemeEfl::applyEdjeRTLState() directly
calling `operator new(size_t)' for some allocations.
RefCounted<RenderTheme>, on its turn, has a WTF_MAKE_FAST_ALLOCATED
call which adds some `operator new' overrides to the class. Our direct
calls in applyEdjeRTLState() made the scope resolution rules choose the
WTF_MAKE_FAST_ALLOCATED version (which uses FastMalloc's allocator),
while WTF::deleteOwnedPtr() calls the global `operator delete' (which
uses the system's free() implementation).

• platform/efl/RenderThemeEfl.cpp:

(WebCore::RenderThemeEfl::applyEdjeRTLState): Explicitly choose the
global `operator new' when calling it.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/efl/RenderThemeEfl.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-08  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
+
+        [EFL] REGRESSION(r147743): Use the correct `operator new' override in RenderThemeEfl.
+        https://bugs.webkit.org/show_bug.cgi?id=114166
+
+        Reviewed by Alexis Menard.
+
+        r147743 disabled GLOBAL_FAST_MALLOC_NEW on the EFL port, but this has
+        caused some pixel tests in WK1 to crash.
+
+        The problem stems from RenderThemeEfl::applyEdjeRTLState() directly
+        calling `operator new(size_t)' for some allocations.
+        RefCounted<RenderTheme>, on its turn, has a WTF_MAKE_FAST_ALLOCATED
+        call which adds some `operator new' overrides to the class. Our direct
+        calls in applyEdjeRTLState() made the scope resolution rules choose the
+        WTF_MAKE_FAST_ALLOCATED version (which uses FastMalloc's allocator),
+        while WTF::deleteOwnedPtr() calls the global `operator delete' (which
+        uses the system's free() implementation).
+
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::applyEdjeRTLState): Explicitly choose the
+        global `operator new' when calling it.
+
 2013-04-07  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

@@ -331 +331 @@
         double valueRange = input->maximum() - input->minimum();
 
-        OwnPtr<Edje_Message_Float_Set> msg = adoptPtr(static_cast<Edje_Message_Float_Set*>(operator new (sizeof(Edje_Message_Float_Set) + sizeof(double))));
+        OwnPtr<Edje_Message_Float_Set> msg = adoptPtr(static_cast<Edje_Message_Float_Set*>(::operator new (sizeof(Edje_Message_Float_Set) + sizeof(double))));
         msg->count = 2;
 
@@ -352 +352 @@
         double value = renderProgress->position();
 
-        OwnPtr<Edje_Message_Float_Set> msg = adoptPtr(static_cast<Edje_Message_Float_Set*>(operator new (sizeof(Edje_Message_Float_Set) + sizeof(double))));
+        OwnPtr<Edje_Message_Float_Set> msg = adoptPtr(static_cast<Edje_Message_Float_Set*>(::operator new (sizeof(Edje_Message_Float_Set) + sizeof(double))));
         msg->count = 2;