[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [132978] trunk/Source/WebKit
From: commit-queue () webkit ! org
Date: 2012-10-31 2:50:30
Message-ID: 20121031025030.9B7A3301227 () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[132978] trunk/Source/WebKit</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.webkit.org/projects/webkit/changeset/132978">132978</a></dd> \
<dt>Author</dt> <dd>commit-queue@webkit.org</dd> <dt>Date</dt> <dd>2012-10-30 \
19:50:30 -0700 (Tue, 30 Oct 2012)</dd> </dl>
<h3>Log Message</h3>
<pre>[BlackBerry] Clean the code of "JavaScriptDebuggerBlackBerry"
https://bugs.webkit.org/show_bug.cgi?id=100724
Patch by Peter Wang <peter.wang@torchmobile.com.cn> on 2012-10-30
Reviewed by Rob Buis.
Remove the code of JavaScriptDebuggerBlackBerry.
Source/WebKit:
* PlatformBlackBerry.cmake:
Source/WebKit/blackberry:
* Api/WebPage.cpp:
* Api/WebPage.h:
* Api/WebPage_p.h:
(WebCore):
(WebPagePrivate):
* WebCoreSupport/JavaScriptDebuggerBlackBerry.cpp: Removed.
* WebCoreSupport/JavaScriptDebuggerBlackBerry.h: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformBlackBerrycmake">trunk/Source/WebKit/PlatformBlackBerry.cmake</a></li>
<li><a href="#trunkSourceWebKitblackberryApiWebPagecpp">trunk/Source/WebKit/blackberry/Api/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKitblackberryApiWebPageh">trunk/Source/WebKit/blackberry/Api/WebPage.h</a></li>
<li><a href="#trunkSourceWebKitblackberryApiWebPage_ph">trunk/Source/WebKit/blackberry/Api/WebPage_p.h</a></li>
<li><a href="#trunkSourceWebKitblackberryChangeLog">trunk/Source/WebKit/blackberry/ChangeLog</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitblackberryWebCoreSupportJavaScriptDebuggerBlackBerrycpp \
">trunk/Source/WebKit/blackberry/WebCoreSupport/JavaScriptDebuggerBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebKitblackberryWebCoreSupportJavaScriptDebuggerBlackBerryh" \
>trunk/Source/WebKit/blackberry/WebCoreSupport/JavaScriptDebuggerBlackBerry.h</a></li>
>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (132977 => \
132978)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2012-10-31 02:39:17 UTC (rev \
132977)
+++ trunk/Source/WebKit/ChangeLog 2012-10-31 02:50:30 UTC (rev 132978)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2012-10-30 Peter Wang <peter.wang@torchmobile.com.cn>
+
+ [BlackBerry] Clean the code of "JavaScriptDebuggerBlackBerry"
+ https://bugs.webkit.org/show_bug.cgi?id=100724
+
+ Reviewed by Rob Buis.
+
+ Remove the code of JavaScriptDebuggerBlackBerry.
+
+ * PlatformBlackBerry.cmake:
+
</ins><span class="cx"> 2012-10-28 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove references to unsupported OS and Xcode \
versions. </span></span></pre></div>
<a id="trunkSourceWebKitPlatformBlackBerrycmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformBlackBerry.cmake \
(132977 => 132978)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformBlackBerry.cmake 2012-10-31 \
02:39:17 UTC (rev 132977)
+++ trunk/Source/WebKit/PlatformBlackBerry.cmake 2012-10-31 02:50:30 UTC (rev 132978)
</span><span class="lines">@@ -112,7 +112,6 @@
</span><span class="cx"> \
blackberry/WebCoreSupport/GeolocationClientBlackBerry.cpp </span><span class="cx"> \
blackberry/WebCoreSupport/IconDatabaseClientBlackBerry.cpp </span><span class="cx"> \
blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp </span><del>- \
blackberry/WebCoreSupport/JavaScriptDebuggerBlackBerry.cpp </del><span class="cx"> \
blackberry/WebCoreSupport/NetworkInfoClientBlackBerry.cpp </span><span class="cx"> \
blackberry/WebCoreSupport/NotificationPresenterImpl.cpp </span><span class="cx"> \
blackberry/WebCoreSupport/PagePopupBlackBerry.cpp </span></span></pre></div>
<a id="trunkSourceWebKitblackberryApiWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp \
(132977 => 132978)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-10-31 \
02:39:17 UTC (rev 132977)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-10-31 02:50:30 UTC (rev \
132978) </span><span class="lines">@@ -81,7 +81,6 @@
</span><span class="cx"> #include "InspectorController.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "InspectorOverlay.h"
</span><del>-#include "JavaScriptDebuggerBlackBerry.h"
</del><span class="cx"> #include "JavaScriptVariant_p.h"
</span><span class="cx"> #include "LayerWebKitThread.h"
</span><span class="cx"> #if ENABLE(NETWORK_INFO)
</span><span class="lines">@@ -4888,108 +4887,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebPage::enableScriptDebugger()
-{
-#if ENABLE(JAVASCRIPT_DEBUGGER)
- if (d->m_scriptDebugger)
- return true;
-
- d->m_scriptDebugger = adoptPtr(new JavaScriptDebuggerBlackBerry(this->d));
-
- return !!d->m_scriptDebugger;
-#endif
-}
-
-bool WebPage::disableScriptDebugger()
-{
-#if ENABLE(JAVASCRIPT_DEBUGGER)
- if (!d->m_scriptDebugger)
- return true;
-
- d->m_scriptDebugger.clear();
- return true;
-#endif
-}
-
-void WebPage::addBreakpoint(const unsigned short* url, unsigned urlLength, int \
lineNumber, const unsigned short* condition, unsigned \
conditionLength)
-{
-#if ENABLE(JAVASCRIPT_DEBUGGER)
- if (d->m_scriptDebugger)
- d->m_scriptDebugger->addBreakpoint(url, urlLength, lineNumber, \
condition, conditionLength);
-#endif
-}
-
-void WebPage::updateBreakpoint(const unsigned short* url, unsigned urlLength, int \
lineNumber, const unsigned short* condition, unsigned \
conditionLength)
-{
-#if ENABLE(JAVASCRIPT_DEBUGGER)
- if (d->m_scriptDebugger)
- d->m_scriptDebugger->updateBreakpoint(url, urlLength, lineNumber, \
condition, conditionLength);
-#endif
-}
-
-void WebPage::removeBreakpoint(const unsigned short* url, unsigned urlLength, int \
lineNumber)
-{
-#if ENABLE(JAVASCRIPT_DEBUGGER)
- if (d->m_scriptDebugger)
- d->m_scriptDebugger->removeBreakpoint(url, urlLength, lineNumber);
-#endif
-}
-
-bool WebPage::pauseOnExceptions()
-{
-#if ENABLE(JAVASCRIPT_DEBUGGER)
- return d->m_scriptDebugger ? d->m_scriptDebugger->pauseOnExceptions() : \
false;
-#endif
-}
-
-void WebPage::setPauseOnExceptions(bool pause)
-{
-#if ENABLE(JAVASCRIPT_DEBUGGER)
- if (d->m_scriptDebugger)
- d->m_scriptDebugger->setPauseOnExceptions(pause);
-#endif
-}
-
-void WebPage::pauseInDebugger()
-{
-#if ENABLE(JAVASCRIPT_DEBUGGER)
- if (d->m_scriptDebugger)
- d->m_scriptDebugger->pauseInDebugger();
-#endif
-}
-
-void WebPage::resumeDebugger()
-{
-#if ENABLE(JAVASCRIPT_DEBUGGER)
- if (d->m_scriptDebugger)
- d->m_scriptDebugger->resumeDebugger();
-#endif
-}
-
-void WebPage::stepOverStatementInDebugger()
-{
-#if ENABLE(JAVASCRIPT_DEBUGGER)
- if (d->m_scriptDebugger)
- d->m_scriptDebugger->stepOverStatementInDebugger();
-#endif
-}
-
-void WebPage::stepIntoStatementInDebugger()
-{
-#if ENABLE(JAVASCRIPT_DEBUGGER)
- if (d->m_scriptDebugger)
- d->m_scriptDebugger->stepIntoStatementInDebugger();
-#endif
-}
-
-void WebPage::stepOutOfFunctionInDebugger()
-{
-#if ENABLE(JAVASCRIPT_DEBUGGER)
- if (d->m_scriptDebugger)
- d->m_scriptDebugger->stepOutOfFunctionInDebugger();
-#endif
-}
-
</del><span class="cx"> unsigned WebPage::timeoutForJavaScriptExecution() const
</span><span class="cx"> {
</span><span class="cx"> return \
Settings::timeoutForJavaScriptExecution(d->m_page->groupName()); \
</span></span></pre></div> <a id="trunkSourceWebKitblackberryApiWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/Api/WebPage.h \
(132977 => 132978)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/Api/WebPage.h 2012-10-31 \
02:39:17 UTC (rev 132977)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.h 2012-10-31 02:50:30 UTC (rev 132978)
</span><span class="lines">@@ -228,27 +228,9 @@
</span><span class="cx"> // Case sensitivity, wrapping, and highlighting all \
matches are also toggleable. </span><span class="cx"> bool findNextString(const \
char*, bool forward, bool caseSensitive, bool wrap, bool highlightAllMatches); \
</span><span class="cx"> </span><del>- // JavaScriptDebugger interface.
- bool enableScriptDebugger();
- bool disableScriptDebugger();
-
</del><span class="cx"> JSContextRef scriptContext() const;
</span><span class="cx"> JSValueRef windowObject() const;
</span><span class="cx">
</span><del>- void addBreakpoint(const unsigned short* url, unsigned urlLength, \
int lineNumber, const unsigned short* condition, unsigned \
conditionLength);
- void updateBreakpoint(const unsigned short* url, unsigned urlLength, int \
lineNumber, const unsigned short* condition, unsigned \
conditionLength);
- void removeBreakpoint(const unsigned short* url, unsigned urlLength, int \
lineNumber);
-
- bool pauseOnExceptions();
- void setPauseOnExceptions(bool);
-
- void pauseInDebugger();
- void resumeDebugger();
-
- void stepOverStatementInDebugger();
- void stepIntoStatementInDebugger();
- void stepOutOfFunctionInDebugger();
-
</del><span class="cx"> unsigned timeoutForJavaScriptExecution() const;
</span><span class="cx"> void setTimeoutForJavaScriptExecution(unsigned ms);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryApiWebPage_ph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/Api/WebPage_p.h \
(132977 => 132978)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-10-31 \
02:39:17 UTC (rev 132977)
+++ trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-10-31 02:50:30 UTC (rev \
132978) </span><span class="lines">@@ -55,7 +55,6 @@
</span><span class="cx"> class Frame;
</span><span class="cx"> class GeolocationClientBlackBerry;
</span><span class="cx"> class GraphicsLayerBlackBerry;
</span><del>-class JavaScriptDebuggerBlackBerry;
</del><span class="cx"> class LayerWebKitThread;
</span><span class="cx"> class Node;
</span><span class="cx"> class Page;
</span><span class="lines">@@ -480,10 +479,6 @@
</span><span class="cx"> OwnPtr<WebTapHighlight> m_tapHighlight;
</span><span class="cx"> OwnPtr<SelectionOverlay> m_selectionOverlay;
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
- OwnPtr<WebCore::JavaScriptDebuggerBlackBerry> m_scriptDebugger;
-#endif
-
</del><span class="cx"> bool m_visible;
</span><span class="cx"> ActivationStateType m_activationState;
</span><span class="cx"> bool m_shouldResetTilesWhenShown;
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/ChangeLog (132977 \
=> 132978)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/ChangeLog 2012-10-31 02:39:17 \
UTC (rev 132977)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-10-31 02:50:30 UTC (rev 132978)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2012-10-30 Peter Wang <peter.wang@torchmobile.com.cn>
+
+ [BlackBerry] Clean the code of "JavaScriptDebuggerBlackBerry"
+ https://bugs.webkit.org/show_bug.cgi?id=100724
+
+ Reviewed by Rob Buis.
+
+ Remove the code of JavaScriptDebuggerBlackBerry.
+
+ * Api/WebPage.cpp:
+ * Api/WebPage.h:
+ * Api/WebPage_p.h:
+ (WebCore):
+ (WebPagePrivate):
+ * WebCoreSupport/JavaScriptDebuggerBlackBerry.cpp: Removed.
+ * WebCoreSupport/JavaScriptDebuggerBlackBerry.h: Removed.
+
</ins><span class="cx"> 2012-10-29 Rob Buis <rbuis@rim.com>
</span><span class="cx">
</span><span class="cx"> [BlackBerry] Simplify \
AuthenticationChallengeManager::instance </span></span></pre></div>
<a id="trunkSourceWebKitblackberryWebCoreSupportJavaScriptDebuggerBlackBerrycpp"></a>
<div class="delfile"><h4>Deleted: \
trunk/Source/WebKit/blackberry/WebCoreSupport/JavaScriptDebuggerBlackBerry.cpp \
(132977 => 132978)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/blackberry/WebCoreSupport/JavaScriptDebuggerBlackBerry.cpp 2012-10-31 \
02:39:17 UTC (rev 132977)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/JavaScriptDebuggerBlackBerry.cpp 2012-10-31 \
02:50:30 UTC (rev 132978) </span><span class="lines">@@ -1,179 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- * Copyright (C) 2010, 2011, 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"
-
-#if ENABLE(JAVASCRIPT_DEBUGGER)
-#include "JavaScriptDebuggerBlackBerry.h"
-
-#include "JavaScriptCallFrame.h"
-#include "PageScriptDebugServer.h"
-#include "ScriptBreakpoint.h"
-#include "SourceCode.h"
-#include "WebPage_p.h"
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-JavaScriptDebuggerBlackBerry::JavaScriptDebuggerBlackBerry(BlackBerry::WebKit::WebPagePrivate* \
webPagePrivate)
- : m_webPagePrivate(webPagePrivate)
- , m_debugServer(PageScriptDebugServer::shared())
-{
- start();
-}
-
-JavaScriptDebuggerBlackBerry::~JavaScriptDebuggerBlackBerry()
-{
- stop();
-}
-
-void JavaScriptDebuggerBlackBerry::start()
-{
- m_debugServer.addListener(this, m_webPagePrivate->m_page);
-}
-
-void JavaScriptDebuggerBlackBerry::stop()
-{
- m_debugServer.removeListener(this, m_webPagePrivate->m_page);
-}
-
-void JavaScriptDebuggerBlackBerry::addBreakpoint(const unsigned short* url, unsigned \
urlLength, int lineNumber, const unsigned short* condition, unsigned \
conditionLength)
-{
- if (!url || !urlLength)
- return;
- if (!m_currentCallFrame)
- return;
-
- String sourceString(url, urlLength);
- String conditionString(condition, conditionLength);
- int actualLineNumber;
- m_debugServer.setBreakpoint(sourceString, ScriptBreakpoint(lineNumber, 0, \
conditionString), &lineNumber, &actualLineNumber);
-}
-
-void JavaScriptDebuggerBlackBerry::updateBreakpoint(const unsigned short* url, \
unsigned urlLength, int lineNumber, const unsigned short* condition, unsigned \
conditionLength)
-{
- if (!url || !urlLength)
- return;
- if (!m_currentCallFrame)
- return;
-
- String sourceString(url, urlLength);
- String conditionString(condition, conditionLength);
- int actualLineNumber;
- m_debugServer.setBreakpoint(sourceString, ScriptBreakpoint(lineNumber, 0, \
conditionString), &lineNumber, &actualLineNumber);
-}
-
-
-void JavaScriptDebuggerBlackBerry::removeBreakpoint(const unsigned short* url, \
unsigned urlLength, int lineNumber)
-{
- if (!url || !urlLength)
- return;
- if (!m_currentCallFrame)
- return;
-
- String sourceString(url, urlLength);
- sourceString += ":" + lineNumber;
- m_debugServer.removeBreakpoint(sourceString);
-}
-
-
-bool JavaScriptDebuggerBlackBerry::pauseOnExceptions()
-{
- return m_debugServer.pauseOnExceptionsState() == \
ScriptDebugServer::PauseOnAllExceptions;
-}
-
-void JavaScriptDebuggerBlackBerry::setPauseOnExceptions(bool pause)
-{
- m_debugServer.setPauseOnExceptionsState(pause ? \
ScriptDebugServer::PauseOnAllExceptions : \
ScriptDebugServer::DontPauseOnExceptions);
-}
-
-void JavaScriptDebuggerBlackBerry::pauseInDebugger()
-{
- m_debugServer.setPauseOnNextStatement(true);
-}
-
-void JavaScriptDebuggerBlackBerry::resumeDebugger()
-{
- m_debugServer.continueProgram();
-}
-
-void JavaScriptDebuggerBlackBerry::stepOverStatementInDebugger()
-{
- m_debugServer.stepOverStatement();
-}
-
-void JavaScriptDebuggerBlackBerry::stepIntoStatementInDebugger()
-{
- m_debugServer.stepIntoStatement();
-}
-
-void JavaScriptDebuggerBlackBerry::stepOutOfFunctionInDebugger()
-{
- m_debugServer.stepOutOfFunction();
-}
-
-void JavaScriptDebuggerBlackBerry::didParseSource(const String& sourceID, const \
Script& script)
-{
- m_webPagePrivate->m_client->javascriptSourceParsed(script.url.characters(), \
script.url.length(), script.source.characters(), \
script.source.length());
-}
-
-void JavaScriptDebuggerBlackBerry::failedToParseSource(const String& url, const \
String& data, int firstLine, int errorLine, const String& \
errorMessage)
-{
- m_webPagePrivate->m_client->javascriptParsingFailed(url.impl()->characters(), \
url.length(), errorMessage.impl()->characters(), errorMessage.length(), \
errorLine);
-}
-
-void JavaScriptDebuggerBlackBerry::didPause(ScriptState*, const ScriptValue& \
callFrames, const ScriptValue& exception)
-{
- String stacks;
-
- m_currentCallFrame = m_debugServer.currentCallFrame();
- JavaScriptCallFrame* frame = m_currentCallFrame;
-
- while (frame && frame->isValid()) {
- JSC::SourceProvider* provider = \
reinterpret_cast<JSC::SourceProvider*>(frame->sourceID());
- String url(provider->url().characters(), provider->url().length());
- if (url.length())
- stacks += url;
- stacks += ": ";
-
- if (frame->type() == JSC::DebuggerCallFrame::FunctionType) {
- String name = frame->functionName();
- if (name.length())
- stacks += name;
- }
- stacks += "(): ";
-
- String line = String::number(frame->line());
- stacks += line + "\n";
-
- frame = frame->caller();
- }
-
- m_webPagePrivate->m_client->javascriptPaused(reinterpret_cast<const \
unsigned short*>(stacks.characters()), stacks.length());
-}
-
-void JavaScriptDebuggerBlackBerry::didContinue()
-{
- m_currentCallFrame = 0;
- m_webPagePrivate->m_client->javascriptContinued();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</del></span></pre></div>
<a id="trunkSourceWebKitblackberryWebCoreSupportJavaScriptDebuggerBlackBerryh"></a>
<div class="delfile"><h4>Deleted: \
trunk/Source/WebKit/blackberry/WebCoreSupport/JavaScriptDebuggerBlackBerry.h (132977 \
=> 132978)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit/blackberry/WebCoreSupport/JavaScriptDebuggerBlackBerry.h 2012-10-31 \
02:39:17 UTC (rev 132977)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/JavaScriptDebuggerBlackBerry.h 2012-10-31 \
02:50:30 UTC (rev 132978) </span><span class="lines">@@ -1,77 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- * Copyright (C) 2011, 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
- */
-
-#ifndef JavaScriptDebuggerBlackBerry_h
-#define JavaScriptDebuggerBlackBerry_h
-
-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
-#include "ScriptDebugListener.h"
-
-namespace BlackBerry {
-namespace WebKit {
-class WebPagePrivate;
-}
-}
-
-namespace WebCore {
-
-class JavaScriptCallFrame;
-class PageScriptDebugServer;
-
-class JavaScriptDebuggerBlackBerry : public ScriptDebugListener {
-public:
- JavaScriptDebuggerBlackBerry(BlackBerry::WebKit::WebPagePrivate*);
- ~JavaScriptDebuggerBlackBerry();
-
- void addBreakpoint(const unsigned short* url, unsigned urlLength, int \
lineNumber, const unsigned short* condition, unsigned \
conditionLength);
- void updateBreakpoint(const unsigned short* url, unsigned urlLength, int \
lineNumber, const unsigned short* condition, unsigned \
conditionLength);
- void removeBreakpoint(const unsigned short* url, unsigned urlLength, int \
lineNumber);
-
- bool pauseOnExceptions();
- void setPauseOnExceptions(bool);
-
- void pauseInDebugger();
- void resumeDebugger();
-
- void stepOverStatementInDebugger();
- void stepIntoStatementInDebugger();
- void stepOutOfFunctionInDebugger();
-
- // From ScriptDebugListener
- virtual void didParseSource(const String& sourceID, const Script&);
- virtual void failedToParseSource(const String& url, const String& data, \
int firstLine, int errorLine, const String& errorMessage);
- virtual void didPause(ScriptState*, const ScriptValue& callFrames, const \
ScriptValue& exception);
- virtual void didContinue();
-
-protected:
- void start();
- void stop();
-
-private:
- BlackBerry::WebKit::WebPagePrivate* m_webPagePrivate;
- PageScriptDebugServer& m_debugServer;
-
- JavaScriptCallFrame* m_currentCallFrame;
-};
-
-} // WebCore
-
-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
-#endif // JavaScriptDebuggerBlackBerry_h
</del></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic