Diff
Modified: trunk/Source/WebCore/ChangeLog (96546 => 96547)
--- trunk/Source/WebCore/ChangeLog 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/ChangeLog 2011-10-03 22:15:44 UTC (rev 96547)
@@ -1,3 +1,66 @@
+2011-09-22 Darin Adler <[email protected]>
+
+ Rename many obviously-correct call sites in WebCore using releaseRef to use it by its new name leakRef
+ https://bugs.webkit.org/show_bug.cgi?id=68672
+
+ Reviewed by Daniel Bates.
+
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::commonJSGlobalData):
+ * css/CSSInitialValue.h:
+ (WebCore::CSSInitialValue::createExplicit):
+ (WebCore::CSSInitialValue::createImplicit):
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::init):
+ * css/CSSStyleSelector.cpp:
+ (WebCore::parseUASheet):
+ (WebCore::CSSStyleSelector::styleForElement):
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::wheelEvent):
+ * platform/efl/RenderThemeEfl.cpp:
+ (WebCore::RenderTheme::themeForPage):
+ * platform/gtk/RenderThemeGtk.cpp:
+ (WebCore::RenderTheme::themeForPage):
+ * platform/haiku/RenderThemeHaiku.cpp:
+ (WebCore::RenderTheme::themeForPage):
+ * platform/network/cf/DNSCFNet.cpp:
+ (WebCore::DNSResolveQueue::resolve):
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::releaseConnectionForDownload):
+ * platform/qt/RenderThemeQt.cpp:
+ (WebCore::RenderTheme::themeForPage):
+ (WebCore::RenderThemeQt::paintSearchFieldCancelButton):
+ * platform/text/BidiContext.cpp:
+ (WebCore::BidiContext::create):
+ * platform/wx/RenderThemeWx.cpp:
+ (WebCore::RenderTheme::themeForPage):
+ * rendering/RenderThemeChromiumLinux.cpp:
+ (WebCore::RenderTheme::themeForPage):
+ * rendering/RenderThemeChromiumMac.mm:
+ (WebCore::RenderTheme::themeForPage):
+ * rendering/RenderThemeChromiumSkia.cpp:
+ (WebCore::RenderThemeChromiumSkia::paintSearchFieldCancelButton):
+ (WebCore::RenderThemeChromiumSkia::paintSearchFieldResultsDecoration):
+ (WebCore::RenderThemeChromiumSkia::paintSearchFieldResultsButton):
+ * rendering/RenderThemeChromiumWin.cpp:
+ (WebCore::RenderTheme::themeForPage):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderTheme::themeForPage):
+ * rendering/RenderThemeSafari.cpp:
+ (WebCore::RenderTheme::themeForPage):
+ * rendering/RenderThemeWin.cpp:
+ (WebCore::RenderTheme::themeForPage):
+ (WebCore::RenderThemeWin::paintSearchFieldCancelButton):
+ (WebCore::RenderThemeWin::paintSearchFieldResultsDecoration):
+ (WebCore::RenderThemeWin::paintSearchFieldResultsButton):
+ * rendering/RenderThemeWinCE.cpp:
+ (WebCore::RenderTheme::themeForPage):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::defaultStyle):
+ Call leakRef instead of releaseRef. I did this only in the cases where
+ it was obvious to me this was the right way to do it. I'll keep revisiting
+ sites still calling it releaseRef until they are all gone.
+
2011-09-27 Ojan Vafai <[email protected]>
remove dead code in flipForWritingMode
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (96546 => 96547)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -161,7 +161,7 @@
static JSGlobalData* globalData = 0;
if (!globalData) {
- globalData = JSGlobalData::createLeaked(ThreadStackTypeLarge, LargeHeap).releaseRef();
+ globalData = JSGlobalData::createLeaked(ThreadStackTypeLarge, LargeHeap).leakRef();
globalData->timeoutChecker.setTimeoutInterval(10000); // 10 seconds
#ifndef NDEBUG
globalData->exclusiveThread = currentThread();
Modified: trunk/Source/WebCore/css/CSSInitialValue.h (96546 => 96547)
--- trunk/Source/WebCore/css/CSSInitialValue.h 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/css/CSSInitialValue.h 2011-10-03 22:15:44 UTC (rev 96547)
@@ -30,12 +30,12 @@
public:
static PassRefPtr<CSSInitialValue> createExplicit()
{
- static CSSInitialValue* explicitValue = create(false).releaseRef();
+ static CSSInitialValue* explicitValue = create(false).leakRef();
return explicitValue;
}
static PassRefPtr<CSSInitialValue> createImplicit()
{
- static CSSInitialValue* explicitValue = create(true).releaseRef();
+ static CSSInitialValue* explicitValue = create(true).leakRef();
return explicitValue;
}
Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (96546 => 96547)
--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -236,21 +236,21 @@
{
m_type = CSS_COUNTER;
m_hasCachedCSSText = false;
- m_value.counter = c.releaseRef();
+ m_value.counter = c.leakRef();
}
void CSSPrimitiveValue::init(PassRefPtr<Rect> r)
{
m_type = CSS_RECT;
m_hasCachedCSSText = false;
- m_value.rect = r.releaseRef();
+ m_value.rect = r.leakRef();
}
void CSSPrimitiveValue::init(PassRefPtr<Quad> quad)
{
m_type = CSS_QUAD;
m_hasCachedCSSText = false;
- m_value.quad = quad.releaseRef();
+ m_value.quad = quad.leakRef();
}
#if ENABLE(DASHBOARD_SUPPORT)
@@ -258,7 +258,7 @@
{
m_type = CSS_DASHBOARD_REGION;
m_hasCachedCSSText = false;
- m_value.region = r.releaseRef();
+ m_value.region = r.leakRef();
}
#endif
@@ -266,14 +266,14 @@
{
m_type = CSS_PAIR;
m_hasCachedCSSText = false;
- m_value.pair = p.releaseRef();
+ m_value.pair = p.leakRef();
}
void CSSPrimitiveValue::init(PassRefPtr<CSSWrapShape> shape)
{
m_type = CSS_SHAPE;
m_hasCachedCSSText = false;
- m_value.shape = shape.releaseRef();
+ m_value.shape = shape.leakRef();
}
CSSPrimitiveValue::~CSSPrimitiveValue()
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (96546 => 96547)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -458,7 +458,7 @@
static CSSStyleSheet* parseUASheet(const String& str)
{
- CSSStyleSheet* sheet = CSSStyleSheet::create().releaseRef(); // leak the sheet on purpose
+ CSSStyleSheet* sheet = CSSStyleSheet::create().leakRef(); // leak the sheet on purpose
sheet->parseString(str);
return sheet;
}
@@ -1056,7 +1056,7 @@
// will vanish if a style recalc happens during loading.
if (allowSharing && !e->document()->haveStylesheetsLoaded() && !e->renderer()) {
if (!s_styleNotYetAvailable) {
- s_styleNotYetAvailable = RenderStyle::create().releaseRef();
+ s_styleNotYetAvailable = RenderStyle::create().leakRef();
s_styleNotYetAvailable->ref();
s_styleNotYetAvailable->setDisplay(NONE);
s_styleNotYetAvailable->font().update(m_fontSelector);
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (96546 => 96547)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -974,7 +974,7 @@
void ScrollView::paintPanScrollIcon(GraphicsContext* context)
{
- static Image* panScrollIcon = Image::loadPlatformResource("panIcon").releaseRef();
+ static Image* panScrollIcon = Image::loadPlatformResource("panIcon").leakRef();
context->drawImage(panScrollIcon, ColorSpaceDeviceRGB, m_panScrollIconPoint);
}
Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (96546 => 96547)
--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -379,7 +379,7 @@
if (page)
return RenderThemeEfl::create(page);
- static RenderTheme* fallback = RenderThemeEfl::create(0).releaseRef();
+ static RenderTheme* fallback = RenderThemeEfl::create(0).leakRef();
return fallback;
}
Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp (96546 => 96547)
--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -112,7 +112,7 @@
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
{
- static RenderTheme* rt = RenderThemeGtk::create().releaseRef();
+ static RenderTheme* rt = RenderThemeGtk::create().leakRef();
return rt;
}
Modified: trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp (96546 => 96547)
--- trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/platform/network/cf/DNSCFNet.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -187,16 +187,16 @@
return;
}
CFHostClientContext context = { 0, 0, 0, 0, 0 };
- Boolean result = CFHostSetClient(host.get(), clientCallback, &context);
+ CFHostRef leakedHost = host.leakRef(); // The host will be released from clientCallback().
+ Boolean result = CFHostSetClient(leakedHost, clientCallback, &context);
ASSERT_UNUSED(result, result);
#if !PLATFORM(WIN)
- CFHostScheduleWithRunLoop(host.get(), CFRunLoopGetMain(), kCFRunLoopCommonModes);
+ CFHostScheduleWithRunLoop(leakedHost, CFRunLoopGetMain(), kCFRunLoopCommonModes);
#else
// On Windows, we run a separate thread with CFRunLoop, which is where clientCallback will be called.
- CFHostScheduleWithRunLoop(host.get(), loaderRunLoop(), kCFRunLoopDefaultMode);
+ CFHostScheduleWithRunLoop(leakedHost, loaderRunLoop(), kCFRunLoopDefaultMode);
#endif
- CFHostStartInfoResolution(host.get(), kCFHostAddresses, 0);
- host.releaseRef(); // The host will be released from clientCallback().
+ CFHostStartInfoResolution(leakedHost, kCFHostAddresses, 0);
}
void prefetchDNS(const String& hostname)
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (96546 => 96547)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -699,7 +699,7 @@
CFURLConnectionRef ResourceHandle::releaseConnectionForDownload()
{
LOG(Network, "CFNet - Job %p releasing connection %p for download", this, d->m_connection.get());
- return d->m_connection.releaseRef();
+ return d->m_connection.leakRef();
}
CFStringRef ResourceHandle::synchronousLoadRunLoopMode()
Modified: trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp (96546 => 96547)
--- trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -176,7 +176,7 @@
if (page)
return RenderThemeQt::create(page);
- static RenderTheme* fallback = RenderThemeQt::create(0).releaseRef();
+ static RenderTheme* fallback = RenderThemeQt::create(0).leakRef();
return fallback;
}
@@ -1034,8 +1034,8 @@
inputContentBox.y() + (inputContentBox.height() - cancelButtonSize + 1) / 2,
cancelButtonSize, cancelButtonSize);
IntRect paintingRect = convertToPaintingRect(inputRenderBox, o, cancelButtonRect, r);
- static Image* cancelImage = Image::loadPlatformResource("searchCancelButton").releaseRef();
- static Image* cancelPressedImage = Image::loadPlatformResource("searchCancelButtonPressed").releaseRef();
+ static Image* cancelImage = Image::loadPlatformResource("searchCancelButton").leakRef();
+ static Image* cancelPressedImage = Image::loadPlatformResource("searchCancelButtonPressed").leakRef();
pi.context->drawImage(isPressed(o) ? cancelPressedImage : cancelImage,
o->style()->colorSpace(), paintingRect);
return false;
Modified: trunk/Source/WebCore/platform/text/BidiContext.cpp (96546 => 96547)
--- trunk/Source/WebCore/platform/text/BidiContext.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/platform/text/BidiContext.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -42,20 +42,20 @@
ASSERT(level <= 1);
if (!level) {
if (!override) {
- static BidiContext* ltrContext = createUncached(0, LeftToRight, false, FromStyleOrDOM, 0).releaseRef();
+ static BidiContext* ltrContext = createUncached(0, LeftToRight, false, FromStyleOrDOM, 0).leakRef();
return ltrContext;
}
- static BidiContext* ltrOverrideContext = createUncached(0, LeftToRight, true, FromStyleOrDOM, 0).releaseRef();
+ static BidiContext* ltrOverrideContext = createUncached(0, LeftToRight, true, FromStyleOrDOM, 0).leakRef();
return ltrOverrideContext;
}
if (!override) {
- static BidiContext* rtlContext = createUncached(1, RightToLeft, false, FromStyleOrDOM, 0).releaseRef();
+ static BidiContext* rtlContext = createUncached(1, RightToLeft, false, FromStyleOrDOM, 0).leakRef();
return rtlContext;
}
- static BidiContext* rtlOverrideContext = createUncached(1, RightToLeft, true, FromStyleOrDOM, 0).releaseRef();
+ static BidiContext* rtlOverrideContext = createUncached(1, RightToLeft, true, FromStyleOrDOM, 0).leakRef();
return rtlOverrideContext;
}
Modified: trunk/Source/WebCore/platform/wx/RenderThemeWx.cpp (96546 => 96547)
--- trunk/Source/WebCore/platform/wx/RenderThemeWx.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/platform/wx/RenderThemeWx.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -137,7 +137,7 @@
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
{
- static RenderTheme* rt = RenderThemeWx::create().releaseRef();
+ static RenderTheme* rt = RenderThemeWx::create().leakRef();
return rt;
}
Modified: trunk/Source/WebCore/rendering/RenderThemeChromiumLinux.cpp (96546 => 96547)
--- trunk/Source/WebCore/rendering/RenderThemeChromiumLinux.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/rendering/RenderThemeChromiumLinux.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -70,7 +70,7 @@
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
{
- static RenderTheme* rt = RenderThemeChromiumLinux::create().releaseRef();
+ static RenderTheme* rt = RenderThemeChromiumLinux::create().leakRef();
return rt;
}
Modified: trunk/Source/WebCore/rendering/RenderThemeChromiumMac.mm (96546 => 96547)
--- trunk/Source/WebCore/rendering/RenderThemeChromiumMac.mm 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/rendering/RenderThemeChromiumMac.mm 2011-10-03 22:15:44 UTC (rev 96547)
@@ -60,7 +60,7 @@
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page*)
{
- static RenderTheme* rt = RenderThemeChromiumMac::create().releaseRef();
+ static RenderTheme* rt = RenderThemeChromiumMac::create().leakRef();
return rt;
}
Modified: trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp (96546 => 96547)
--- trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -291,8 +291,8 @@
cancelButtonSize, cancelButtonSize);
IntRect paintingRect = convertToPaintingRect(inputRenderBox, cancelButtonObject, cancelButtonRect, r);
- static Image* cancelImage = Image::loadPlatformResource("searchCancel").releaseRef();
- static Image* cancelPressedImage = Image::loadPlatformResource("searchCancelPressed").releaseRef();
+ static Image* cancelImage = Image::loadPlatformResource("searchCancel").leakRef();
+ static Image* cancelPressedImage = Image::loadPlatformResource("searchCancelPressed").leakRef();
paintInfo.context->drawImage(isPressed(cancelButtonObject) ? cancelPressedImage : cancelImage,
cancelButtonObject->style()->colorSpace(), paintingRect);
return false;
@@ -334,7 +334,7 @@
magnifierSize, magnifierSize);
IntRect paintingRect = convertToPaintingRect(inputRenderBox, magnifierObject, magnifierRect, r);
- static Image* magnifierImage = Image::loadPlatformResource("searchMagnifier").releaseRef();
+ static Image* magnifierImage = Image::loadPlatformResource("searchMagnifier").leakRef();
paintInfo.context->drawImage(magnifierImage, magnifierObject->style()->colorSpace(), paintingRect);
return false;
}
@@ -367,7 +367,7 @@
magnifierWidth, magnifierHeight);
IntRect paintingRect = convertToPaintingRect(inputRenderBox, magnifierObject, magnifierRect, r);
- static Image* magnifierImage = Image::loadPlatformResource("searchMagnifierResults").releaseRef();
+ static Image* magnifierImage = Image::loadPlatformResource("searchMagnifierResults").leakRef();
paintInfo.context->drawImage(magnifierImage, magnifierObject->style()->colorSpace(), paintingRect);
return false;
}
Modified: trunk/Source/WebCore/rendering/RenderThemeChromiumWin.cpp (96546 => 96547)
--- trunk/Source/WebCore/rendering/RenderThemeChromiumWin.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/rendering/RenderThemeChromiumWin.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -239,7 +239,7 @@
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
{
- static RenderTheme* rt = RenderThemeChromiumWin::create().releaseRef();
+ static RenderTheme* rt = RenderThemeChromiumWin::create().leakRef();
return rt;
}
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (96546 => 96547)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2011-10-03 22:15:44 UTC (rev 96547)
@@ -124,7 +124,7 @@
#if PLATFORM(MAC)
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page*)
{
- static RenderTheme* rt = RenderThemeMac::create().releaseRef();
+ static RenderTheme* rt = RenderThemeMac::create().leakRef();
return rt;
}
#endif
Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.cpp (96546 => 96547)
--- trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -75,8 +75,8 @@
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
{
- static RenderTheme* safariTheme = RenderThemeSafari::create().releaseRef();
- static RenderTheme* windowsTheme = RenderThemeWin::create().releaseRef();
+ static RenderTheme* safariTheme = RenderThemeSafari::create().leakRef();
+ static RenderTheme* windowsTheme = RenderThemeWin::create().leakRef();
// FIXME: This is called before Settings has been initialized by WebKit, so will return a
// potentially wrong answer the very first time it's called (see
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (96546 => 96547)
--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -160,7 +160,7 @@
#if !USE(SAFARI_THEME)
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
{
- static RenderTheme* winTheme = RenderThemeWin::create().releaseRef();
+ static RenderTheme* winTheme = RenderThemeWin::create().leakRef();
return winTheme;
}
#endif
@@ -891,8 +891,8 @@
// be one pixel closer to the bottom of the field. This tends to look better with the text.
bounds.setY(parentBox.y() + (parentBox.height() - bounds.height() + 1) / 2);
- static Image* cancelImage = Image::loadPlatformResource("searchCancel").releaseRef();
- static Image* cancelPressedImage = Image::loadPlatformResource("searchCancelPressed").releaseRef();
+ static Image* cancelImage = Image::loadPlatformResource("searchCancel").leakRef();
+ static Image* cancelPressedImage = Image::loadPlatformResource("searchCancelPressed").leakRef();
paintInfo.context->drawImage(isPressed(o) ? cancelPressedImage : cancelImage, o->style()->colorSpace(), bounds);
return false;
}
@@ -941,7 +941,7 @@
// be one pixel closer to the bottom of the field. This tends to look better with the text.
bounds.setY(parentBox.y() + (parentBox.height() - bounds.height() + 1) / 2);
- static Image* magnifierImage = Image::loadPlatformResource("searchMagnifier").releaseRef();
+ static Image* magnifierImage = Image::loadPlatformResource("searchMagnifier").leakRef();
paintInfo.context->drawImage(magnifierImage, o->style()->colorSpace(), bounds);
return false;
}
@@ -977,7 +977,7 @@
// be one pixel closer to the bottom of the field. This tends to look better with the text.
bounds.setY(parentBox.y() + (parentBox.height() - bounds.height() + 1) / 2);
- static Image* magnifierImage = Image::loadPlatformResource("searchMagnifierResults").releaseRef();
+ static Image* magnifierImage = Image::loadPlatformResource("searchMagnifierResults").leakRef();
paintInfo.context->drawImage(magnifierImage, o->style()->colorSpace(), bounds);
return false;
}
Modified: trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp (96546 => 96547)
--- trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -91,7 +91,7 @@
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
{
- static RenderTheme* winceTheme = RenderThemeWinCE::create().releaseRef();
+ static RenderTheme* winceTheme = RenderThemeWinCE::create().leakRef();
return winceTheme;
}
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (96546 => 96547)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2011-10-03 22:00:25 UTC (rev 96546)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2011-10-03 22:15:44 UTC (rev 96547)
@@ -46,7 +46,7 @@
inline RenderStyle* defaultStyle()
{
- static RenderStyle* s_defaultStyle = RenderStyle::createDefaultStyle().releaseRef();
+ static RenderStyle* s_defaultStyle = RenderStyle::createDefaultStyle().leakRef();
return s_defaultStyle;
}
