Title: [107247] trunk/Tools
Revision
107247
Author
rwlb...@webkit.org
Date
2012-02-09 08:12:46 -0800 (Thu, 09 Feb 2012)

Log Message

[BlackBerry] Upstream DumpRenderTreeBlackBerry
https://bugs.webkit.org/show_bug.cgi?id=78042

Reviewed by Antonio Gomes.

Upstream final part of our DRT implementation.

* DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp: Added.
* DumpRenderTree/blackberry/PNGImageEncoder.cpp: Added.
* DumpRenderTree/blackberry/PNGImageEncoder.h: Added.
* DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp: Added.
* DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.h: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/Tools/ChangeLog (107246 => 107247)


--- trunk/Tools/ChangeLog	2012-02-09 16:00:14 UTC (rev 107246)
+++ trunk/Tools/ChangeLog	2012-02-09 16:12:46 UTC (rev 107247)
@@ -1,3 +1,18 @@
+2012-02-09  Rob Buis  <rb...@rim.com>
+
+        [BlackBerry] Upstream DumpRenderTreeBlackBerry
+        https://bugs.webkit.org/show_bug.cgi?id=78042
+
+        Reviewed by Antonio Gomes.
+
+        Upstream final part of our DRT implementation.
+
+        * DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp: Added.
+        * DumpRenderTree/blackberry/PNGImageEncoder.cpp: Added.
+        * DumpRenderTree/blackberry/PNGImageEncoder.h: Added.
+        * DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp: Added.
+        * DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.h: Added.
+
 2012-02-09  Ryosuke Niwa  <rn...@webkit.org>
 
         kill-old-processes should kill gcc and clang

Added: trunk/Tools/DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp (0 => 107247)


--- trunk/Tools/DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp	                        (rev 0)
+++ trunk/Tools/DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp	2012-02-09 16:12:46 UTC (rev 107247)
@@ -0,0 +1,929 @@
+/*
+ * Copyright (C) 2009, 2010, 2012 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "config.h"
+#include "LayoutTestController.h"
+
+#include "CString.h"
+#include "DatabaseTracker.h"
+#include "Document.h"
+#include "DocumentLoader.h"
+#include "DocumentMarker.h"
+#include "DumpRenderTree.h"
+#include "DumpRenderTreeBlackBerry.h"
+#include "DumpRenderTreeSupport.h"
+#include "EditingBehaviorTypes.h"
+#include "EditorClientBlackBerry.h"
+#include "Element.h"
+#include "Frame.h"
+#include "HTMLInputElement.h"
+#include "JSElement.h"
+#include "KURL.h"
+#include "NotImplemented.h"
+#include "OwnArrayPtr.h"
+#include "Page.h"
+#include "RenderTreeAsText.h"
+#include "SVGDocumentExtensions.h"
+#include "SVGSMILElement.h"
+#include "SchemeRegistry.h"
+#include "SecurityOrigin.h"
+#include "SecurityPolicy.h"
+#include "Settings.h"
+#include "UnusedParam.h"
+#include "WorkQueue.h"
+#include "WorkQueueItem.h"
+#include "WorkerThread.h"
+
+#include <_javascript_Core/APICast.h>
+#include <SharedPointer.h>
+#include <WebPage.h>
+#include <WebSettings.h>
+
+using WebCore::toElement;
+using WebCore::toJS;
+
+LayoutTestController::~LayoutTestController()
+{
+}
+
+void LayoutTestController::addDisallowedURL(JSStringRef url)
+{
+    UNUSED_PARAM(url);
+    notImplemented();
+}
+
+void LayoutTestController::clearAllDatabases()
+{
+#if ENABLE(DATABASE)
+    WebCore::DatabaseTracker::tracker().deleteAllDatabases();
+#endif
+}
+
+void LayoutTestController::clearBackForwardList()
+{
+    BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->clearBackForwardList(true);
+}
+
+void LayoutTestController::clearPersistentUserStyleSheet()
+{
+    notImplemented();
+}
+
+JSStringRef LayoutTestController::copyDecodedHostName(JSStringRef name)
+{
+    UNUSED_PARAM(name);
+    notImplemented();
+    return 0;
+}
+
+JSStringRef LayoutTestController::copyEncodedHostName(JSStringRef name)
+{
+    UNUSED_PARAM(name);
+    notImplemented();
+    return 0;
+}
+
+void LayoutTestController::dispatchPendingLoadRequests()
+{
+    notImplemented();
+}
+
+void LayoutTestController::display()
+{
+    notImplemented();
+}
+
+static WTF::String jsStringRefToWebCoreString(JSStringRef str)
+{
+    size_t strArrSize = JSStringGetMaximumUTF8CStringSize(str);
+    OwnArrayPtr<char> strArr = adoptArrayPtr(new char[strArrSize]);
+    JSStringGetUTF8CString(str, strArr.get(), strArrSize);
+    return WTF::String::fromUTF8(strArr.get());
+}
+
+void LayoutTestController::execCommand(JSStringRef name, JSStringRef value)
+{
+    if (!mainFrame)
+        return;
+
+    WTF::String nameStr = jsStringRefToWebCoreString(name);
+    WTF::String valueStr = jsStringRefToWebCoreString(value);
+
+    mainFrame->editor()->command(nameStr).execute(valueStr);
+}
+
+bool LayoutTestController::isCommandEnabled(JSStringRef name)
+{
+    if (!mainFrame)
+        return false;
+
+    WTF::String nameStr = jsStringRefToWebCoreString(name);
+
+    return mainFrame->editor()->command(nameStr).isEnabled();
+}
+
+void LayoutTestController::keepWebHistory()
+{
+    notImplemented();
+}
+
+void LayoutTestController::notifyDone()
+{
+    if (m_waitToDump && (!topLoadingFrame || BlackBerry::WebKit::DumpRenderTree::currentInstance()->loadFinished()) && !WorkQueue::shared()->count())
+        dump();
+
+    m_waitToDump = false;
+    waitForPolicy = false;
+}
+
+JSStringRef LayoutTestController::pathToLocalResource(JSContextRef, JSStringRef url)
+{
+    return JSStringRetain(url);
+}
+
+void LayoutTestController::queueLoad(JSStringRef url, JSStringRef target)
+{
+    size_t urlArrSize = JSStringGetMaximumUTF8CStringSize(url);
+    OwnArrayPtr<char> urlArr = adoptArrayPtr(new char[urlArrSize]);
+    JSStringGetUTF8CString(url, urlArr.get(), urlArrSize);
+
+    WebCore::KURL base = mainFrame->loader()->documentLoader()->response().url();
+    WebCore::KURL absolute(base, urlArr.get());
+
+    JSRetainPtr<JSStringRef> absoluteURL(Adopt, JSStringCreateWithUTF8CString(absolute.string().utf8().data()));
+    WorkQueue::shared()->queue(new LoadItem(absoluteURL.get(), target));
+}
+
+void LayoutTestController::setAcceptsEditing(bool acceptsEditing)
+{
+    BlackBerry::WebKit::DumpRenderTree::currentInstance()->setAcceptsEditing(acceptsEditing);
+}
+
+void LayoutTestController::setAppCacheMaximumSize(unsigned long long quota)
+{
+    UNUSED_PARAM(quota);
+    notImplemented();
+}
+
+void LayoutTestController::setAuthorAndUserStylesEnabled(bool enable)
+{
+    mainFrame->page()->settings()->setAuthorAndUserStylesEnabled(enable);
+}
+
+void LayoutTestController::setCacheModel(int)
+{
+    notImplemented();
+}
+
+void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive)
+{
+    UNUSED_PARAM(setDelegate);
+    UNUSED_PARAM(permissive);
+    notImplemented();
+}
+
+void LayoutTestController::clearApplicationCacheForOrigin(OpaqueJSString*)
+{
+    // FIXME: Implement to support deleting all application caches for an origin.
+    notImplemented();
+}
+
+long long LayoutTestController::localStorageDiskUsageForOrigin(JSStringRef)
+{
+    // FIXME: Implement to support getting disk usage in bytes for an origin.
+    notImplemented();
+    return 0;
+}
+
+JSValueRef LayoutTestController::originsWithApplicationCache(JSContextRef context)
+{
+    // FIXME: Implement to get origins that contain application caches.
+    notImplemented();
+    return JSValueMakeUndefined(context);
+}
+
+void LayoutTestController::setDatabaseQuota(unsigned long long quota)
+{
+    if (!mainFrame)
+        return;
+
+    WebCore::DatabaseTracker::tracker().setQuota(mainFrame->document()->securityOrigin(), quota);
+}
+
+void LayoutTestController::setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme)
+{
+    WebCore::SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(forbidden, jsStringRefToWebCoreString(scheme));
+}
+
+void LayoutTestController::setIconDatabaseEnabled(bool iconDatabaseEnabled)
+{
+    UNUSED_PARAM(iconDatabaseEnabled);
+    notImplemented();
+}
+
+void LayoutTestController::setJavaScriptProfilingEnabled(bool profilingEnabled)
+{
+    UNUSED_PARAM(profilingEnabled);
+    notImplemented();
+}
+
+void LayoutTestController::setMainFrameIsFirstResponder(bool flag)
+{
+    UNUSED_PARAM(flag);
+    notImplemented();
+}
+
+void LayoutTestController::setPersistentUserStyleSheetLocation(JSStringRef path)
+{
+    UNUSED_PARAM(path);
+    notImplemented();
+}
+
+void LayoutTestController::setPopupBlockingEnabled(bool flag)
+{
+    BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->settings()->setJavaScriptOpenWindowsAutomatically(!flag);
+}
+
+void LayoutTestController::setPrivateBrowsingEnabled(bool flag)
+{
+    UNUSED_PARAM(flag);
+    notImplemented();
+}
+
+void LayoutTestController::setXSSAuditorEnabled(bool flag)
+{
+    BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->settings()->setXSSAuditorEnabled(flag);
+}
+
+void LayoutTestController::setSelectTrailingWhitespaceEnabled(bool flag)
+{
+    BlackBerry::WebKit::DumpRenderTree::currentInstance()->setSelectTrailingWhitespaceEnabled(flag);
+}
+
+void LayoutTestController::setSmartInsertDeleteEnabled(bool flag)
+{
+    UNUSED_PARAM(flag);
+    notImplemented();
+}
+
+void LayoutTestController::setTabKeyCyclesThroughElements(bool cycles)
+{
+    if (!mainFrame)
+        return;
+
+    mainFrame->page()->setTabKeyCyclesThroughElements(cycles);
+}
+
+void LayoutTestController::setUseDashboardCompatibilityMode(bool flag)
+{
+    UNUSED_PARAM(flag);
+    notImplemented();
+}
+
+void LayoutTestController::setUserStyleSheetEnabled(bool flag)
+{
+    UNUSED_PARAM(flag);
+    notImplemented();
+}
+
+void LayoutTestController::setUserStyleSheetLocation(JSStringRef path)
+{
+    WTF::String pathStr = jsStringRefToWebCoreString(path);
+    BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->settings()->setUserStyleSheetLocation(pathStr.utf8().data());
+}
+
+void LayoutTestController::waitForPolicyDelegate()
+{
+    setWaitToDump(true);
+    waitForPolicy = true;
+}
+
+size_t LayoutTestController::webHistoryItemCount()
+{
+    SharedArray<BlackBerry::WebKit::WebPage::BackForwardEntry> backForwardList;
+    unsigned size;
+    BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->getBackForwardList(backForwardList, size);
+    return size;
+}
+
+int LayoutTestController::windowCount()
+{
+    notImplemented();
+    return 0;
+}
+
+bool LayoutTestController::elementDoesAutoCompleteForElementWithId(JSStringRef id)
+{
+    UNUSED_PARAM(id);
+    notImplemented();
+    return false;
+}
+
+JSRetainPtr<JSStringRef> LayoutTestController::pageProperty(const char* propertyName, int pageNumber) const
+{
+    UNUSED_PARAM(propertyName);
+    UNUSED_PARAM(pageNumber);
+    notImplemented();
+    return 0;
+}
+
+void LayoutTestController::setWaitToDump(bool waitToDump)
+{
+    // Change from 30s to 35s because some test cases in multipart need 30 seconds,
+    // refer to http/tests/multipart/resources/multipart-wait-before-boundary.php please.
+    static const double kWaitToDumpWatchdogInterval = 35.0;
+    m_waitToDump = waitToDump;
+    if (m_waitToDump)
+        BlackBerry::WebKit::DumpRenderTree::currentInstance()->setWaitToDumpWatchdog(kWaitToDumpWatchdogInterval);
+}
+
+void LayoutTestController::setWindowIsKey(bool windowIsKey)
+{
+    m_windowIsKey = windowIsKey;
+    notImplemented();
+}
+
+bool LayoutTestController::pauseAnimationAtTimeOnElementWithId(JSStringRef animationName, double time, JSStringRef elementId)
+{
+    if (!mainFrame)
+        return false;
+
+    int nameLen = JSStringGetMaximumUTF8CStringSize(animationName);
+    int idLen = JSStringGetMaximumUTF8CStringSize(elementId);
+    OwnArrayPtr<char> name = adoptArrayPtr(new char[nameLen]);
+    OwnArrayPtr<char> eId = adoptArrayPtr(new char[idLen]);
+
+    JSStringGetUTF8CString(animationName, name.get(), nameLen);
+    JSStringGetUTF8CString(elementId, eId.get(), idLen);
+
+    WebCore::AnimationController* animationController = mainFrame->animation();
+    if (!animationController)
+        return false;
+
+    WebCore::Node* node = mainFrame->document()->getElementById(eId.get());
+    if (!node || !node->renderer())
+        return false;
+
+    return animationController->pauseAnimationAtTime(node->renderer(), name.get(), time);
+}
+
+bool LayoutTestController::pauseTransitionAtTimeOnElementWithId(JSStringRef propertyName, double time, JSStringRef elementId)
+{
+    if (!mainFrame)
+        return false;
+
+    int nameLen = JSStringGetMaximumUTF8CStringSize(propertyName);
+    int idLen = JSStringGetMaximumUTF8CStringSize(elementId);
+    OwnArrayPtr<char> name = adoptArrayPtr(new char[nameLen]);
+    OwnArrayPtr<char> eId = adoptArrayPtr(new char[idLen]);
+
+    JSStringGetUTF8CString(propertyName, name.get(), nameLen);
+    JSStringGetUTF8CString(elementId, eId.get(), idLen);
+
+    WebCore::AnimationController* animationController = mainFrame->animation();
+    if (!animationController)
+        return false;
+
+    WebCore::Node* node = mainFrame->document()->getElementById(eId.get());
+    if (!node || !node->renderer())
+        return false;
+
+    return animationController->pauseTransitionAtTime(node->renderer(), name.get(), time);
+}
+
+unsigned LayoutTestController::numberOfActiveAnimations() const
+{
+    if (!mainFrame)
+        return false;
+
+    WebCore::AnimationController* animationController = mainFrame->animation();
+    if (!animationController)
+        return false;
+
+    return animationController->numberOfActiveAnimations(mainFrame->document());
+}
+
+unsigned int LayoutTestController::workerThreadCount() const
+{
+#if ENABLE_WORKERS
+    return WebCore::WorkerThread::workerThreadCount();
+#else
+    return 0;
+#endif
+}
+
+void LayoutTestController::removeAllVisitedLinks()
+{
+    notImplemented();
+}
+
+void LayoutTestController::disableImageLoading()
+{
+    BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->settings()->setLoadsImagesAutomatically(false);
+}
+
+JSRetainPtr<JSStringRef> LayoutTestController::counterValueForElementById(JSStringRef id)
+{
+    WTF::String idStr = jsStringRefToWebCoreString(id);
+    WebCore::Element* coreElement = mainFrame->document()->getElementById(AtomicString(idStr));
+    if (!coreElement)
+        return 0;
+
+    CString counterValueStr = counterValueForElement(coreElement).utf8();
+    if (counterValueStr.isNull())
+        return 0;
+
+    JSRetainPtr<JSStringRef> counterValue(Adopt, JSStringCreateWithUTF8CString(counterValueStr.data()));
+    return counterValue;
+}
+
+void LayoutTestController::overridePreference(JSStringRef key, JSStringRef value)
+{
+    if (!mainFrame)
+        return;
+
+    WTF::String keyStr = jsStringRefToWebCoreString(key);
+    WTF::String valueStr = jsStringRefToWebCoreString(value);
+
+    if (keyStr == "WebKitUsesPageCachePreferenceKey")
+        BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->settings()->setMaximumPagesInCache(1);
+    else if (keyStr == "WebKitUsePreHTML5ParserQuirks")
+        mainFrame->page()->settings()->setUsePreHTML5ParserQuirks(true);
+    else if (keyStr == "WebKitTabToLinksPreferenceKey")
+        DumpRenderTreeSupport::setLinksIncludedInFocusChain(valueStr == "true" || valueStr == "1");
+    else if (keyStr == "WebKitHyperlinkAuditingEnabled")
+        mainFrame->page()->settings()->setHyperlinkAuditingEnabled(valueStr == "true" || valueStr == "1");
+}
+
+void LayoutTestController::setAlwaysAcceptCookies(bool alwaysAcceptCookies)
+{
+    UNUSED_PARAM(alwaysAcceptCookies);
+    notImplemented();
+}
+
+void LayoutTestController::setMockGeolocationPosition(double latitude, double longitude, double accuracy)
+{
+    DumpRenderTreeSupport::setMockGeolocationPosition(BlackBerry::WebKit::DumpRenderTree::currentInstance()->page(), latitude, longitude, accuracy);
+}
+
+void LayoutTestController::setMockGeolocationError(int code, JSStringRef message)
+{
+    WTF::String messageStr = jsStringRefToWebCoreString(message);
+    DumpRenderTreeSupport::setMockGeolocationError(BlackBerry::WebKit::DumpRenderTree::currentInstance()->page(), code, messageStr);
+}
+
+void LayoutTestController::showWebInspector()
+{
+    notImplemented();
+}
+
+void LayoutTestController::closeWebInspector()
+{
+    notImplemented();
+}
+
+void LayoutTestController::evaluateInWebInspector(long callId, JSStringRef script)
+{
+    UNUSED_PARAM(callId);
+    UNUSED_PARAM(script);
+    notImplemented();
+}
+
+void LayoutTestController::evaluateScriptInIsolatedWorld(unsigned worldID, JSObjectRef globalObject, JSStringRef script)
+{
+    UNUSED_PARAM(worldID);
+    UNUSED_PARAM(globalObject);
+    UNUSED_PARAM(script);
+    notImplemented();
+}
+
+void LayoutTestController::addUserScript(JSStringRef source, bool runAtStart, bool allFrames)
+{
+    UNUSED_PARAM(source);
+    UNUSED_PARAM(runAtStart);
+    UNUSED_PARAM(allFrames);
+    notImplemented();
+}
+
+void LayoutTestController::addUserStyleSheet(JSStringRef, bool)
+{
+    notImplemented();
+}
+
+JSRetainPtr<JSStringRef> LayoutTestController::pageSizeAndMarginsInPixels(int, int, int, int, int, int, int) const
+{
+    notImplemented();
+    return 0;
+}
+
+bool LayoutTestController::sampleSVGAnimationForElementAtTime(JSStringRef animationId, double time, JSStringRef elementId)
+{
+#if ENABLE(SVG_ANIMATION)
+    if (!mainFrame)
+        return false;
+
+    int aLen = JSStringGetMaximumUTF8CStringSize(animationId);
+    int eLen = JSStringGetMaximumUTF8CStringSize(elementId);
+    OwnArrayPtr<char> aId = adoptArrayPtr(new char[aLen]);
+    OwnArrayPtr<char> eId = adoptArrayPtr(new char[eLen]);
+
+    JSStringGetUTF8CString(animationId, aId.get(), aLen);
+    JSStringGetUTF8CString(elementId, eId.get(), eLen);
+
+    WebCore::Document* document = mainFrame->document();
+    if (!document || !document->svgExtensions())
+        return false;
+
+    WebCore::Node* node = mainFrame->document()->getElementById(aId.get());
+    if (!node || !WebCore::SVGSMILElement::isSMILElement(node))
+        return false;
+
+    return document->accessSVGExtensions()->sampleAnimationAtTime(eId.get(), static_cast<WebCore::SVGSMILElement*>(node), time);
+#else
+    return false;
+#endif
+}
+
+int LayoutTestController::pageNumberForElementById(JSStringRef, float, float)
+{
+    notImplemented();
+    return -1;
+}
+
+int LayoutTestController::numberOfPages(float, float)
+{
+    notImplemented();
+    return -1;
+}
+
+bool LayoutTestController::isPageBoxVisible(int) const
+{
+    notImplemented();
+    return false;
+}
+
+void LayoutTestController::setScrollbarPolicy(JSStringRef, JSStringRef)
+{
+    notImplemented();
+}
+
+void LayoutTestController::setWebViewEditable(bool)
+{
+    notImplemented();
+}
+
+void LayoutTestController::authenticateSession(JSStringRef url, JSStringRef username, JSStringRef password)
+{
+    notImplemented();
+}
+
+bool LayoutTestController::callShouldCloseOnWebView()
+{
+    notImplemented();
+    return false;
+}
+
+void LayoutTestController::setFrameFlatteningEnabled(bool enable)
+{
+    BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->settings()->setFrameFlatteningEnabled(enable);
+}
+
+void LayoutTestController::setSpatialNavigationEnabled(bool enable)
+{
+    notImplemented();
+}
+
+void LayoutTestController::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
+{
+    WebCore::SecurityPolicy::addOriginAccessWhitelistEntry(*WebCore::SecurityOrigin::createFromString(jsStringRefToWebCoreString(sourceOrigin)),
+                                                  jsStringRefToWebCoreString(destinationProtocol),
+                                                  jsStringRefToWebCoreString(destinationHost),
+                                                  allowDestinationSubdomains);
+}
+
+void LayoutTestController::removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
+{
+    WebCore::SecurityPolicy::removeOriginAccessWhitelistEntry(*WebCore::SecurityOrigin::createFromString(jsStringRefToWebCoreString(sourceOrigin)),
+                                                     jsStringRefToWebCoreString(destinationProtocol),
+                                                     jsStringRefToWebCoreString(destinationHost),
+                                                     allowDestinationSubdomains);
+}
+
+void LayoutTestController::setAllowFileAccessFromFileURLs(bool enabled)
+{
+    if (!mainFrame)
+        return;
+
+    mainFrame->page()->settings()->setAllowFileAccessFromFileURLs(enabled);
+}
+
+void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled)
+{
+    if (!mainFrame)
+        return;
+
+    mainFrame->page()->settings()->setAllowUniversalAccessFromFileURLs(enabled);
+}
+
+void LayoutTestController::apiTestNewWindowDataLoadBaseURL(JSStringRef utf8Data, JSStringRef baseURL)
+{
+    notImplemented();
+}
+
+void LayoutTestController::apiTestGoToCurrentBackForwardItem()
+{
+    notImplemented();
+}
+
+void LayoutTestController::setJavaScriptCanAccessClipboard(bool flag)
+{
+    BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->setJavaScriptCanAccessClipboard(flag);
+}
+
+JSValueRef LayoutTestController::computedStyleIncludingVisitedInfo(JSContextRef context, JSValueRef value)
+{
+    return DumpRenderTreeSupport::computedStyleIncludingVisitedInfo(context, value);
+}
+
+JSRetainPtr<JSStringRef> LayoutTestController::layerTreeAsText() const
+{
+    notImplemented();
+    return 0;
+}
+
+JSRetainPtr<JSStringRef> LayoutTestController::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
+{
+    WebCore::Element* element = toElement(toJS(toJS(context), nodeObject));
+    if (!element)
+        return 0;
+
+    JSRetainPtr<JSStringRef> markerText(Adopt, JSStringCreateWithUTF8CString(WebCore::markerTextForListItem(element).utf8().data()));
+    return markerText;
+}
+
+void LayoutTestController::setPluginsEnabled(bool flag)
+{
+    notImplemented();
+}
+
+void LayoutTestController::setEditingBehavior(const char* editingBehavior)
+{
+    if (!mainFrame)
+        return;
+    WebCore::EditingBehaviorType type = WebCore::EditingUnixBehavior;
+    if (!strcmp(editingBehavior, "win"))
+        type = WebCore::EditingWindowsBehavior;
+    else if (!strcmp(editingBehavior, "mac"))
+        type = WebCore::EditingMacBehavior;
+    else if (!strcmp(editingBehavior, "unix"))
+        type = WebCore::EditingUnixBehavior;
+    else
+        CRASH();
+    mainFrame->page()->settings()->setEditingBehaviorType(type);
+}
+
+void LayoutTestController::abortModal()
+{
+    notImplemented();
+}
+
+void LayoutTestController::clearAllApplicationCaches()
+{
+    notImplemented();
+}
+
+void LayoutTestController::setApplicationCacheOriginQuota(unsigned long long quota)
+{
+    notImplemented();
+}
+
+void LayoutTestController::setMockDeviceOrientation(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma)
+{
+    notImplemented();
+}
+
+void LayoutTestController::addMockSpeechInputResult(JSStringRef result, double confidence, JSStringRef language)
+{
+    notImplemented();
+}
+
+void LayoutTestController::setGeolocationPermission(bool allow)
+{
+    setGeolocationPermissionCommon(allow);
+    DumpRenderTreeSupport::setMockGeolocationPermission(BlackBerry::WebKit::DumpRenderTree::currentInstance()->page(), allow);
+}
+
+void LayoutTestController::setViewModeMediaFeature(const JSStringRef mode)
+{
+    notImplemented();
+}
+
+void LayoutTestController::suspendAnimations() const
+{
+    if (mainFrame && mainFrame->animation())
+        mainFrame->animation()->suspendAnimations();
+}
+
+void LayoutTestController::resumeAnimations() const
+{
+    if (mainFrame && mainFrame->animation())
+        mainFrame->animation()->resumeAnimations();
+}
+
+bool LayoutTestController::hasSpellingMarker(int from, int length)
+{
+    if (!mainFrame)
+        return false;
+
+    return mainFrame->editor()->selectionStartHasMarkerFor(WebCore::DocumentMarker::Spelling, from, length);
+}
+
+JSValueRef LayoutTestController::nodesFromRect(JSContextRef context, JSValueRef value, int x, int y, unsigned top, unsigned right, unsigned bottom, unsigned left, bool ignoreClipping)
+{
+    notImplemented();
+    return JSValueMakeUndefined(context);
+}
+
+void LayoutTestController::setSerializeHTTPLoads(bool)
+{
+    // FIXME: Implement if needed for https://bugs.webkit.org/show_bug.cgi?id=50758.
+    notImplemented();
+}
+
+void LayoutTestController::setMinimumTimerInterval(double)
+{
+    notImplemented();
+}
+
+void LayoutTestController::setTextDirection(JSStringRef)
+{
+    notImplemented();
+}
+
+void LayoutTestController::allowRoundingHacks()
+{
+    notImplemented();
+}
+
+void LayoutTestController::goBack()
+{
+    // FIXME: implement to enable loader/navigation-while-deferring-loads.html
+    notImplemented();
+}
+
+void LayoutTestController::setDefersLoading(bool)
+{
+    // FIXME: implement to enable loader/navigation-while-deferring-loads.html
+    notImplemented();
+}
+
+JSValueRef LayoutTestController::originsWithLocalStorage(JSContextRef context)
+{
+    notImplemented();
+    return JSValueMakeUndefined(context);
+}
+
+void LayoutTestController::observeStorageTrackerNotifications(unsigned)
+{
+    notImplemented();
+}
+
+void LayoutTestController::syncLocalStorage()
+{
+    notImplemented();
+}
+
+void LayoutTestController::deleteAllLocalStorage()
+{
+    notImplemented();
+}
+
+void LayoutTestController::setAsynchronousSpellCheckingEnabled(bool)
+{
+    notImplemented();
+}
+
+void LayoutTestController::setAutofilled(JSContextRef context, JSValueRef nodeObject, bool autofilled)
+{
+    JSC::ExecState* exec = toJS(context);
+    WebCore::Element* element = toElement(toJS(exec, nodeObject));
+    if (!element)
+        return;
+    WebCore::HTMLInputElement* inputElement = element->toInputElement();
+    if (!inputElement)
+        return;
+
+    inputElement->setAutofilled(autofilled);
+}
+
+int LayoutTestController::numberOfPendingGeolocationPermissionRequests()
+{
+    return DumpRenderTreeSupport::numberOfPendingGeolocationPermissionRequests(BlackBerry::WebKit::DumpRenderTree::currentInstance()->page());
+}
+
+bool LayoutTestController::hasGrammarMarker(int from, int length)
+{
+    if (!mainFrame)
+        return false;
+
+    return mainFrame->editor()->selectionStartHasMarkerFor(WebCore::DocumentMarker::Grammar, from, length);
+}
+
+void LayoutTestController::dumpConfigurationForViewport(int deviceDPI, int deviceWidth, int deviceHeight, int availableWidth, int availableHeight)
+{
+    if (!mainFrame)
+        return;
+
+    DumpRenderTreeSupport::dumpConfigurationForViewport(mainFrame, deviceDPI, deviceWidth, deviceHeight, availableWidth, availableHeight);
+}
+
+bool LayoutTestController::findString(JSContextRef context, JSStringRef target, JSObjectRef optionsArray)
+{
+    WebCore::FindOptions options = 0;
+
+    JSRetainPtr<JSStringRef> lengthPropertyName(Adopt, JSStringCreateWithUTF8CString("length"));
+    JSValueRef lengthValue = JSObjectGetProperty(context, optionsArray, lengthPropertyName.get(), 0);
+    if (!JSValueIsNumber(context, lengthValue))
+        return false;
+
+    WTF::String nameStr = jsStringRefToWebCoreString(target);
+
+    size_t length = static_cast<size_t>(JSValueToNumber(context, lengthValue, 0));
+    for (size_t i = 0; i < length; ++i) {
+        JSValueRef value = JSObjectGetPropertyAtIndex(context, optionsArray, i, 0);
+        if (!JSValueIsString(context, value))
+            continue;
+
+        JSRetainPtr<JSStringRef> optionName(Adopt, JSValueToStringCopy(context, value, 0));
+
+        if (JSStringIsEqualToUTF8CString(optionName.get(), "CaseInsensitive"))
+            options |= WebCore::CaseInsensitive;
+        else if (JSStringIsEqualToUTF8CString(optionName.get(), "AtWordStarts"))
+            options |= WebCore::AtWordStarts;
+        else if (JSStringIsEqualToUTF8CString(optionName.get(), "TreatMedialCapitalAsWordStart"))
+            options |= WebCore::TreatMedialCapitalAsWordStart;
+        else if (JSStringIsEqualToUTF8CString(optionName.get(), "Backwards"))
+            options |= WebCore::Backwards;
+        else if (JSStringIsEqualToUTF8CString(optionName.get(), "WrapAround"))
+            options |= WebCore::WrapAround;
+        else if (JSStringIsEqualToUTF8CString(optionName.get(), "StartInSelection"))
+            options |= WebCore::StartInSelection;
+    }
+    return BlackBerry::WebKit::DumpRenderTree::currentInstance()->findString(nameStr, options);
+}
+
+void LayoutTestController::deleteLocalStorageForOrigin(JSStringRef URL)
+{
+    // FIXME: Implement.
+}
+
+void LayoutTestController::setValueForUser(JSContextRef context, JSValueRef nodeObject, JSStringRef value)
+{
+    JSC::ExecState* exec = toJS(context);
+    WebCore::Element* element = toElement(toJS(exec, nodeObject));
+    if (!element)
+        return;
+    WebCore::HTMLInputElement* inputElement = element->toInputElement();
+    if (!inputElement)
+        return;
+
+    inputElement->setValueForUser(jsStringRefToWebCoreString(value));
+}
+
+long long LayoutTestController::applicationCacheDiskUsageForOrigin(JSStringRef origin)
+{
+    // FIXME: Implement to support getting disk usage by all application caches for an origin.
+    return 0;
+}
+
+void LayoutTestController::addChromeInputField()
+{
+}
+
+void LayoutTestController::removeChromeInputField()
+{
+}
+
+void LayoutTestController::focusWebView()
+{
+}
+
+void LayoutTestController::setBackingScaleFactor(double)
+{
+}
+

Added: trunk/Tools/DumpRenderTree/blackberry/PNGImageEncoder.cpp (0 => 107247)


--- trunk/Tools/DumpRenderTree/blackberry/PNGImageEncoder.cpp	                        (rev 0)
+++ trunk/Tools/DumpRenderTree/blackberry/PNGImageEncoder.cpp	2012-02-09 16:12:46 UTC (rev 107247)
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Portions of this file are Copyright 2005 Google Inc.
+ */
+
+#include "config.h"
+#include "PNGImageEncoder.h"
+
+#include "SkBitmap.h"
+#include "SkUnPreMultiply.h"
+
+extern "C" {
+#include "png.h"
+}
+
+#include <OwnArrayPtr.h>
+
+// This code is almost a mirror of the code in WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp
+// since we can't include this private WebCore file in a WebKit-client application.
+
+// Converts BGRA->RGBA and RGBA->BGRA and undoes alpha premultiplication.
+static void preMultipliedBGRAtoRGBA(const unsigned char* input, int numberOfPixels, unsigned char* output)
+{
+    SkBitmap inputBitmap;
+    inputBitmap.setConfig(SkBitmap::kARGB_8888_Config, numberOfPixels, 1);
+    inputBitmap.setPixels(const_cast<unsigned char*>(input));
+    for (int x = 0; x < numberOfPixels; x++) {
+        uint32_t srcPixel = *inputBitmap.getAddr32(x, 0);
+        SkColor unmultiplied = SkUnPreMultiply::PMColorToColor(srcPixel);
+        unsigned char* pixelOut = &output[x * 4];
+        pixelOut[0] = SkColorGetR(unmultiplied);
+        pixelOut[1] = SkColorGetG(unmultiplied);
+        pixelOut[2] = SkColorGetB(unmultiplied);
+        pixelOut[3] = SkColorGetA(unmultiplied);
+    }
+}
+
+// Passed around as the io_ptr in the png structs so our callbacks know where
+// to write data.
+struct PNGEncoderState {
+    PNGEncoderState(Vector<unsigned char>* o) : m_out(o) { }
+    Vector<unsigned char>* m_out;
+};
+
+// Called by libpng to flush its internal buffer to ours.
+void encoderWriteCallback(png_structp png, png_bytep data, png_size_t size)
+{
+    PNGEncoderState* state = static_cast<PNGEncoderState*>(png_get_io_ptr(png));
+    ASSERT(state->m_out);
+
+    size_t oldSize = state->m_out->size();
+    state->m_out->resize(oldSize + size);
+    memcpy(&(*state->m_out)[oldSize], data, size);
+}
+
+// Automatically destroys the given write structs on destruction to make
+// cleanup and error handling code cleaner.
+class PNGWriteStructDestroyer {
+public:
+    PNGWriteStructDestroyer(png_struct** ps, png_info** pi)
+        : m_pngStruct(ps)
+        , m_pngInfo(pi)
+    {
+    }
+
+    ~PNGWriteStructDestroyer()
+    {
+        png_destroy_write_struct(m_pngStruct, m_pngInfo);
+    }
+
+private:
+    png_struct** m_pngStruct;
+    png_info** m_pngInfo;
+};
+
+typedef void (*PixelConversionFunc)(const unsigned char*, int, unsigned char*);
+static bool encodeImpl(const unsigned char* input, int imageWidth, int imageHeight, int bytesPerRow, Vector<unsigned char>* output, PixelConversionFunc conversionFunc)
+{
+    int inputColorComponents = 4;
+    int outputColorComponents = 4;
+    int pngOutputColorType = PNG_COLOR_TYPE_RGB_ALPHA;
+
+    if (imageWidth < 0)
+        imageWidth = 0;
+
+    if (imageHeight < 0)
+        imageHeight = 0;
+
+    // Row stride should be at least as long as the length of the data.
+    if (inputColorComponents * imageWidth > bytesPerRow) {
+        ASSERT(false);
+        return false;
+    }
+
+    png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
+    if (!pngPtr)
+        return false;
+
+    png_info* infoPtr = png_create_info_struct(pngPtr);
+    if (!infoPtr) {
+        png_destroy_write_struct(&pngPtr, 0);
+        return false;
+    }
+    PNGWriteStructDestroyer destroyer(&pngPtr, &infoPtr);
+
+    if (setjmp(png_jmpbuf(pngPtr))) {
+        // The destroyer will ensure that the structures are cleaned up in this
+        // case, even though we may get here as a jump from random parts of the
+        // PNG library called below.
+        return false;
+    }
+
+    // Set our callback for libpng to give us the data.
+    PNGEncoderState state(output);
+    png_set_write_fn(pngPtr, &state, encoderWriteCallback, 0);
+
+    png_set_IHDR(pngPtr, infoPtr, imageWidth, imageHeight, 8, pngOutputColorType,
+                 PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+                 PNG_FILTER_TYPE_DEFAULT);
+    png_write_info(pngPtr, infoPtr);
+
+    OwnArrayPtr<unsigned char> rowPixels = adoptArrayPtr(new unsigned char[imageWidth * outputColorComponents]);
+    for (int y = 0; y < imageHeight; y ++) {
+        conversionFunc(&input[y * bytesPerRow], imageWidth, rowPixels.get());
+        png_write_row(pngPtr, rowPixels.get());
+    }
+
+    png_write_end(pngPtr, infoPtr);
+    return true;
+}
+
+bool encodeSkBitmapToPNG(const SkBitmap& image, Vector<unsigned char>* output)
+{
+    if (image.config() != SkBitmap::kARGB_8888_Config)
+        return false; // Only support ARGB at 8 bpp now.
+
+    image.lockPixels();
+    bool result = encodeImpl(static_cast<unsigned char*>(image.getPixels()), image.width(), image.height(), image.rowBytes(), output, preMultipliedBGRAtoRGBA);
+    image.unlockPixels();
+    return result;
+}

Added: trunk/Tools/DumpRenderTree/blackberry/PNGImageEncoder.h (0 => 107247)


--- trunk/Tools/DumpRenderTree/blackberry/PNGImageEncoder.h	                        (rev 0)
+++ trunk/Tools/DumpRenderTree/blackberry/PNGImageEncoder.h	2012-02-09 16:12:46 UTC (rev 107247)
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PNGImageEncoder_h
+#define PNGImageEncoder_h
+
+#include <Vector.h>
+
+class SkBitmap;
+
+bool encodeSkBitmapToPNG(const SkBitmap&, WTF::Vector<unsigned char>* output);
+
+#endif // PNGImageEncoder_h

Added: trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp (0 => 107247)


--- trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp	                        (rev 0)
+++ trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp	2012-02-09 16:12:46 UTC (rev 107247)
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "config.h"
+#include "PixelDumpSupportBlackBerry.h"
+
+#include "DumpRenderTreeBlackBerry.h"
+#include "PNGImageEncoder.h"
+#include "PixelDumpSupport.h"
+#include "WebPage.h"
+#include "WebPageClient.h"
+#include <MD5.h>
+#include <Vector.h>
+#include <skia/SkDevice.h>
+
+using namespace BlackBerry::WebKit;
+using namespace BlackBerry;
+using namespace WTF;
+
+PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool /*onscreen*/, bool /*incrementalRepaint*/, bool /*sweepHorizontally*/, bool /*drawSelectionRect*/)
+{
+    Platform::Graphics::Window* window = DumpRenderTree::currentInstance()->page()->client()->window();
+    ASSERT(window);
+
+    const Platform::IntRect& windowRect = window->viewportRect();
+
+    SkBitmap* bitmap = new SkBitmap;
+    bitmap->setConfig(SkBitmap::kARGB_8888_Config, windowRect.width(), windowRect.height()); // We use 32-bit RGBA since that is the pixel format that ImageDiff expects.
+    bitmap->allocPixels();
+
+    SkCanvas* canvas = new SkCanvas;
+    canvas->setBitmapDevice(*bitmap);
+
+    // We need to force a synchronous update to the window or we may get an empty bitmap.
+    // For example, running DRT with one test case that finishes before the screen is updated.
+    window->post(windowRect);
+
+    const SkBitmap* windowBitmap = static_cast<const SkBitmap*>(lockBufferBackingImage(window->buffer(), Platform::Graphics::ReadAccess));
+    canvas->drawBitmap(*windowBitmap, 0, 0); // Draw the bitmap at (0, 0).
+    Platform::Graphics::releaseBufferBackingImage(window->buffer());
+    return BitmapContext::createByAdoptingBitmapAndContext(bitmap, canvas);
+}
+
+void computeMD5HashStringForBitmapContext(BitmapContext* context, char hashString[33])
+{
+    const SkBitmap& bitmap = context->canvas()->getDevice()->accessBitmap(false);
+    ASSERT(bitmap.bytesPerPixel() == 4); // 32-bit RGBA
+
+    int pixelsWide = bitmap.width();
+    int pixelsHigh = bitmap.height();
+    int bytesPerRow = bitmap.rowBytes();
+    unsigned char* pixelData = (unsigned char*)bitmap.getPixels();
+
+    MD5 md5;
+    for (int i = 0; i < pixelsHigh; ++i) {
+        md5.addBytes(pixelData, 4 * pixelsWide);
+        pixelData += bytesPerRow;
+    }
+
+    Vector<uint8_t, 16> hash;
+    md5.checksum(hash);
+
+    hashString[0] = '\0';
+    for (int i = 0; i < 16; ++i)
+        snprintf(hashString, 33, "%s%02x", hashString, hash[i]);
+}
+
+static void printPNG(SkCanvas* canvas, const char* checksum)
+{
+    Vector<unsigned char> pngData;
+    encodeSkBitmapToPNG(canvas->getDevice()->accessBitmap(false), &pngData);
+    printPNG(pngData.data(), pngData.size(), checksum);
+}
+
+void dumpBitmap(BitmapContext* context, const char* checksum)
+{
+    printPNG(context->canvas(), checksum);
+}

Added: trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.h (0 => 107247)


--- trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.h	                        (rev 0)
+++ trunk/Tools/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.h	2012-02-09 16:12:46 UTC (rev 107247)
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PixelDumpSupportBlackBerry_h
+#define PixelDumpSupportBlackBerry_h
+
+#include <PassRefPtr.h>
+#include <RefCounted.h>
+#include <skia/SkBitmap.h>
+#include <skia/SkCanvas.h>
+
+class BitmapContext : public RefCounted<BitmapContext> {
+public:
+
+    static PassRefPtr<BitmapContext> createByAdoptingBitmapAndContext(SkBitmap* bitmap, SkCanvas* canvas)
+    {
+        return adoptRef(new BitmapContext(bitmap, canvas));
+    }
+
+    ~BitmapContext()
+    {
+        delete m_bitmap;
+        delete m_canvas;
+    }
+
+    SkCanvas* canvas() { return m_canvas; }
+
+private:
+
+    BitmapContext(SkBitmap* bitmap, SkCanvas* canvas)
+        : m_bitmap(bitmap)
+        , m_canvas(canvas)
+    {
+    }
+
+    SkBitmap* m_bitmap;
+    SkCanvas* m_canvas;
+
+};
+
+#endif // PixelDumpSupportBlackBerry_h
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to