Changeset 38729 in webkit


Ignore:
Timestamp:
Nov 24, 2008 3:07:38 PM (15 years ago)
Author:
darin@chromium.org
Message:

2008-11-24 Darin Fisher <​darin@chromium.org>

Reviewed by Sam Weinig.

​https://bugs.webkit.org/show_bug.cgi?id=22448
Create an abstraction for JSC::SourceCode

  • WebCore.vcproj/WebCore.vcproj:
  • bindings/js/CachedScriptSourceProvider.h:
  • bindings/js/ScriptController.cpp: (WebCore::ScriptController::evaluate):
  • bindings/js/ScriptController.h:
  • bindings/js/ScriptSourceCode.h: Added. (WebCore::ScriptSourceCode::ScriptSourceCode): (WebCore::ScriptSourceCode::length): (WebCore::ScriptSourceCode::jsSourceCode):
  • bindings/js/WorkerScriptController.cpp: (WebCore::Workevn ScriptController::evaluate):
  • bindings/js/WorkerScriptController.h:
  • dom/ScriptElement.cpp: (WebCore::ScriptElement::insertedIntoDocument): (WebCore::ScriptElement::childrenChanged): (WebCore::ScriptElementData::evaluateScript): (WebCore::ScriptElementData::notifyFinished):
  • dom/ScriptElement.h:
  • dom/WorkerThread.cpp: (WebCore::WorkerThread::workerThread):
  • dom/WorkerThread.h:
  • dom/XMLTokenizer.cpp: (WebCore::XMLTokenizer::notifyFinished):
  • dom/XMLTokenizerLibxml2.cpp: (WebCore::XMLTokenizer::endElementNs):
  • dom/XMLTokenizerQt.cpp: (WebCore::XMLTokenizer::parseEndElement):
  • html/HTMLTokenizer.cpp: (WebCore::HTMLTokenizer::scriptHandler): (WebCore::HTMLTokenizer::scriptExecution): (WebCore::HTMLTokenizer::notifyFinished):
  • html/HTMLTokenizer.h:
  • loader/FrameLoader.cpp: (WebCore::FrameLoader::executeScript):
  • loader/FrameLoader.h:
Location:
trunk/WebCore
Files:
1 added
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r38728 r38729  
     12008-11-24  Darin Fisher  <darin@chromium.org>
     2
     3        Reviewed by Sam Weinig.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=22448
     6        Create an abstraction for JSC::SourceCode
     7
     8        * WebCore.vcproj/WebCore.vcproj:
     9        * bindings/js/CachedScriptSourceProvider.h:
     10        * bindings/js/ScriptController.cpp:
     11        (WebCore::ScriptController::evaluate):
     12        * bindings/js/ScriptController.h:
     13        * bindings/js/ScriptSourceCode.h: Added.
     14        (WebCore::ScriptSourceCode::ScriptSourceCode):
     15        (WebCore::ScriptSourceCode::length):
     16        (WebCore::ScriptSourceCode::jsSourceCode):
     17        * bindings/js/WorkerScriptController.cpp:
     18        (WebCore::Workevn ScriptController::evaluate):
     19        * bindings/js/WorkerScriptController.h:
     20        * dom/ScriptElement.cpp:
     21        (WebCore::ScriptElement::insertedIntoDocument):
     22        (WebCore::ScriptElement::childrenChanged):
     23        (WebCore::ScriptElementData::evaluateScript):
     24        (WebCore::ScriptElementData::notifyFinished):
     25        * dom/ScriptElement.h:
     26        * dom/WorkerThread.cpp:
     27        (WebCore::WorkerThread::workerThread):
     28        * dom/WorkerThread.h:
     29        * dom/XMLTokenizer.cpp:
     30        (WebCore::XMLTokenizer::notifyFinished):
     31        * dom/XMLTokenizerLibxml2.cpp:
     32        (WebCore::XMLTokenizer::endElementNs):
     33        * dom/XMLTokenizerQt.cpp:
     34        (WebCore::XMLTokenizer::parseEndElement):
     35        * html/HTMLTokenizer.cpp:
     36        (WebCore::HTMLTokenizer::scriptHandler):
     37        (WebCore::HTMLTokenizer::scriptExecution):
     38        (WebCore::HTMLTokenizer::notifyFinished):
     39        * html/HTMLTokenizer.h:
     40        * loader/FrameLoader.cpp:
     41        (WebCore::FrameLoader::executeScript):
     42        * loader/FrameLoader.h:
     43
    1442008-11-24  Darin Adler  <darin@apple.com>
    245

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r38698 r38729  
    1388213882                                </File>
    1388313883                                <File
     13884                                        RelativePath="..\bindings\js\ScriptSourceCode.h"
     13885                                        >
     13886                                </File>
     13887                                <File
    1388413888                                        RelativePath="..\bindings\js\ScriptString.h"
    1388513889                                        >

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r38698 r38729  
    18021802                934CC0E10ED39D6F00A658F2 /* ScriptValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 934CC0DF0ED39D6F00A658F2 /* ScriptValue.cpp */; };
    18031803                934CC0E20ED39D6F00A658F2 /* ScriptValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 934CC0E00ED39D6F00A658F2 /* ScriptValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1804                934CC10A0EDB223900A658F2 /* ScriptSourceCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 934CC1090EDB223900A658F2 /* ScriptSourceCode.h */; };
    18041805                934D9BA50B8C116B007B42A9 /* WebCoreNSStringExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 934D9BA40B8C116B007B42A9 /* WebCoreNSStringExtras.mm */; };
    18051806                934D9BA70B8C1175007B42A9 /* WebCoreNSStringExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 934D9BA60B8C1175007B42A9 /* WebCoreNSStringExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    65836584                934CC0DF0ED39D6F00A658F2 /* ScriptValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptValue.cpp; sourceTree = "<group>"; };
    65846585                934CC0E00ED39D6F00A658F2 /* ScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptValue.h; sourceTree = "<group>"; };
     6586                934CC1090EDB223900A658F2 /* ScriptSourceCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptSourceCode.h; sourceTree = "<group>"; };
    65856587                934D9BA40B8C116B007B42A9 /* WebCoreNSStringExtras.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreNSStringExtras.mm; sourceTree = "<group>"; };
    65866588                934D9BA60B8C1175007B42A9 /* WebCoreNSStringExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreNSStringExtras.h; sourceTree = "<group>"; };
    … …  
    1306813070                                93B70D5409EB0C7C009D8468 /* ScriptController.h */,
    1306913071                                A83E1C720E49042B00140B9C /* ScriptControllerMac.mm */,
     13072                                934CC1090EDB223900A658F2 /* ScriptSourceCode.h */,
    1307013073                                416F45EF0ED7B311008215B6 /* ScriptString.h */,
    1307113074                                934CC0DF0ED39D6F00A658F2 /* ScriptValue.cpp */,
    … …  
    1638916392                                080AEC820ED8708B00DF4CCE /* WMLIntrinsicEvent.h in Headers */,
    1639016393                                080AEC840ED8708B00DF4CCE /* WMLIntrinsicEventHandler.h in Headers */,
     16394                                934CC10A0EDB223900A658F2 /* ScriptSourceCode.h in Headers */,
    1639116395                        );
    1639216396                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebCore/bindings/js/CachedScriptSourceProvider.h

    r38664 r38729  
    2929#include "CachedResourceClient.h"
    3030#include "CachedResourceHandle.h"
     31#include "CachedScript.h"
    3132#include <parser/SourceCode.h>
    3233

  • trunk/WebCore/bindings/js/ScriptController.cpp

    r38654 r38729  
    3939#include "PausedTimeouts.h"
    4040#include "runtime_root.h"
     41#include "ScriptSourceCode.h"
    4142#include "ScriptValue.h"
    4243#include "Settings.h"
    43 #include "StringSourceProvider.h"
    4444
    4545#include <runtime/Completion.h>
    … …  
    8989}
    9090
    91 ScriptValue ScriptController::evaluate(const JSC::SourceCode& sourceCode)
     91ScriptValue ScriptController::evaluate(const ScriptSourceCode& sourceCode)
    9292{
    9393    // evaluate code. Returns the JS return value or 0
    9494    // if there was none, an error occured or the type couldn't be converted.
     95   
     96    const SourceCode& jsSourceCode = sourceCode.jsSourceCode();
    9597
    9698    initScriptIfNeeded();
    … …  
    101103    ExecState* exec = m_windowShell->window()->globalExec();
    102104    const String* savedSourceURL = m_sourceURL;
    103     String sourceURL = sourceCode.provider()->url();
     105    String sourceURL = jsSourceCode.provider()->url();
    104106    m_sourceURL = &sourceURL;
    105107
    … …  
    111113
    112114    m_windowShell->window()->startTimeoutCheck();
    113     Completion comp = JSC::evaluate(exec, exec->dynamicGlobalObject()->globalScopeChain(), sourceCode, m_windowShell);
     115    Completion comp = JSC::evaluate(exec, exec->dynamicGlobalObject()->globalScopeChain(), jsSourceCode, m_windowShell);
    114116    m_windowShell->window()->stopTimeoutCheck();
    115117

  • trunk/WebCore/bindings/js/ScriptController.h

    r38654 r38729  
    4141namespace JSC {
    4242    class JSGlobalObject;
    43     class SourceCode;
    4443
    4544    namespace Bindings {
    … …  
    5655class Frame;
    5756class Node;
     57class ScriptSourceCode;
    5858class ScriptValue;
    5959class String;
    … …  
    8080    }
    8181
    82     ScriptValue evaluate(const JSC::SourceCode&);
     82    ScriptValue evaluate(const ScriptSourceCode&);
    8383
    8484    PassRefPtr<EventListener> createInlineEventListener(const String& functionName, const String& code, Node*);

  • trunk/WebCore/bindings/js/ScriptString.h

    r38680 r38729  
    11/*
    2  * Copyright (c) 2008, Google Inc.
    3  * All rights reserved.
     2 * Copyright (c) 2008, Google Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without

  • trunk/WebCore/bindings/js/ScriptValue.h

    r38610 r38729  
    11/*
    2  * Copyright (c) 2008, Google Inc.
    3  * All rights reserved.
     2 * Copyright (c) 2008, Google Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without

  • trunk/WebCore/bindings/js/WorkerScriptController.cpp

    r38689 r38729  
    3333#include "JSDOMBinding.h"
    3434#include "JSWorkerContext.h"
     35#include "ScriptSourceCode.h"
     36#include "ScriptValue.h"
    3537#include "WorkerContext.h"
    3638#include "WorkerMessagingProxy.h"
    3739#include "WorkerThread.h"
    3840#include <interpreter/Interpreter.h>
    39 #include <parser/SourceCode.h>
    4041#include <runtime/Completion.h>
    4142#include <runtime/Completion.h>
    … …  
    7172}
    7273
    73 JSValue* WorkerScriptController::evaluate(const JSC::SourceCode& sourceCode)
     74ScriptValue WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode)
    7475{
    7576    {
    … …  
    8485    ExecState* exec = m_workerContextWrapper->globalExec();
    8586    m_workerContextWrapper->startTimeoutCheck();
    86     Completion comp = JSC::evaluate(exec, exec->dynamicGlobalObject()->globalScopeChain(), sourceCode, m_workerContextWrapper);
     87    Completion comp = JSC::evaluate(exec, exec->dynamicGlobalObject()->globalScopeChain(), sourceCode.jsSourceCode(), m_workerContextWrapper);
    8788    m_workerContextWrapper->stopTimeoutCheck();
    8889

  • trunk/WebCore/bindings/js/WorkerScriptController.h

    r38689 r38729  
    3636namespace JSC {
    3737    class JSGlobalData;
    38     class JSValue;
    39     class SourceCode;
    4038}
    4139
    … …  
    4341
    4442    class JSWorkerContext;
     43    class ScriptSourceCode;
     44    class ScriptValue;
    4545    class String;
    4646    class WorkerContext;
    … …  
    5757        }
    5858
    59         JSC::JSValue* evaluate(const JSC::SourceCode&);
     59        ScriptValue evaluate(const ScriptSourceCode&);
    6060
    6161        void forbidExecution();

  • trunk/WebCore/dom/ScriptElement.cpp

    r38664 r38729  
    2626
    2727#include "CachedScript.h"
    28 #include "CachedScriptSourceProvider.h"
    2928#include "DocLoader.h"
    3029#include "Document.h"
    … …  
    3332#include "MIMETypeRegistry.h"
    3433#include "ScriptController.h"
     34#include "ScriptSourceCode.h"
    3535#include "ScriptValue.h"
    3636#include "StringHash.h"
    37 #include "StringSourceProvider.h"
    3837#include "Text.h"
    3938#include <wtf/StdLibExtras.h>
    40 
    41 using namespace JSC;
    4239
    4340namespace WebCore {
    … …  
    5653    // because if a script is inserted afterwards (by setting text or innerText)
    5754    // it should be evaluated, and evaluateScript only evaluates a script once.
    58     data.evaluateScript(makeSource(data.scriptContent(), data.element()->document()->url().string())); // FIXME: Provide a real starting line number here.
     55    data.evaluateScript(ScriptSourceCode(data.scriptContent(), data.element()->document()->url())); // FIXME: Provide a real starting line number here.
    5956}
    6057
    … …  
    7673    // we evaluate the script.
    7774    if (element->inDocument() && element->firstChild())
    78         data.evaluateScript(makeSource(data.scriptContent(), element->document()->url().string())); // FIXME: Provide a real starting line number here
     75        data.evaluateScript(ScriptSourceCode(data.scriptContent(), element->document()->url())); // FIXME: Provide a real starting line number here
    7976}
    8077
    … …  
    163160}
    164161
    165 void ScriptElementData::evaluateScript(const SourceCode& sourceCode)
    166 {
    167     if (m_evaluated || !sourceCode.length() || !shouldExecuteAsJavaScript())
     162void ScriptElementData::evaluateScript(const ScriptSourceCode& sourceCode)
     163{
     164    if (m_evaluated || sourceCode.isEmpty() || !shouldExecuteAsJavaScript())
    168165        return;
    169166
    … …  
    199196        m_scriptElement->dispatchErrorEvent();
    200197    else {
    201         evaluateScript(makeSource(cs));
     198        evaluateScript(ScriptSourceCode(cs));
    202199        m_scriptElement->dispatchLoadEvent();
    203200    }

  • trunk/WebCore/dom/ScriptElement.h

    r38654 r38729  
    2525#include "CachedResourceHandle.h"
    2626
    27 namespace JSC {
    28     class SourceCode;
    29 }
    30 
    3127namespace WebCore {
    3228
    … …  
    3430class Element;
    3531class ScriptElementData;
     32class ScriptSourceCode;
    3633
    3734class ScriptElement {
    … …  
    8279
    8380    void requestScript(const String& sourceUrl);
    84     void evaluateScript(const JSC::SourceCode&);
     81    void evaluateScript(const ScriptSourceCode&);
    8582    void stopLoadRequest();
    8683

  • trunk/WebCore/dom/WorkerThread.cpp

    r38711 r38729  
    3232
    3333#include "JSWorkerContext.h"
    34 #include "StringSourceProvider.h"
     34#include "ScriptSourceCode.h"
     35#include "ScriptValue.h"
    3536#include "Worker.h"
    3637#include "WorkerContext.h"
    3738#include "WorkerMessagingProxy.h"
    3839#include "WorkerTask.h"
    39 
    40 using namespace JSC;
    4140
    4241namespace WebCore {
    … …  
    7978        // Mutex protection is necessary because stop() can be called before the context is fully created.
    8079        MutexLocker lock(m_workerContextMutex);
    81         m_workerContext = WorkerContext::create(KURL(m_scriptURL), this);
     80        m_workerContext = WorkerContext::create(m_scriptURL, this);
    8281    }
    8382
    8483    WorkerScriptController* script = m_workerContext->script();
    85     script->evaluate(makeSource(m_sourceCode, m_scriptURL));
     84    script->evaluate(ScriptSourceCode(m_sourceCode, m_scriptURL));
    8685    m_messagingProxy->confirmWorkerThreadMessage(m_workerContext->hasPendingActivity()); // This wasn't really a message, but it counts as one for GC.
    8786

  • trunk/WebCore/dom/WorkerThread.h

    r38711 r38729  
    3030#if ENABLE(WORKERS)
    3131
    32 #include "PlatformString.h"
     32#include "KURL.h"
    3333#include <wtf/MessageQueue.h>
    3434#include <wtf/PassRefPtr.h>
    … …  
    3636namespace WebCore {
    3737
    38     class KURL;
    3938    class WorkerContext;
    4039    class WorkerMessagingProxy;
    … …  
    6261        ThreadIdentifier m_threadID;
    6362
    64         String m_scriptURL;
     63        KURL m_scriptURL;
    6564        String m_sourceCode;
    6665        WorkerMessagingProxy* m_messagingProxy;

  • trunk/WebCore/dom/XMLTokenizer.cpp

    r38664 r38729  
    3030#include "CString.h"
    3131#include "CachedScript.h"
    32 #include "CachedScriptSourceProvider.h"
    3332#include "Comment.h"
    3433#include "DocLoader.h"
    … …  
    4948#include "ResourceResponse.h"
    5049#include "ScriptController.h"
     50#include "ScriptSourceCode.h"
    5151#include "ScriptValue.h"
    5252#include "StringSourceProvider.h"
    … …  
    327327    ASSERT(m_pendingScript->accessCount() > 0);
    328328       
    329     JSC::SourceCode sourceCode = makeSource(m_pendingScript.get());
     329    ScriptSourceCode sourceCode(m_pendingScript.get());
    330330    bool errorOccurred = m_pendingScript->errorOccurred();
    331331

  • trunk/WebCore/dom/XMLTokenizerLibxml2.cpp

    r38654 r38729  
    4848#include "ScriptController.h"
    4949#include "ScriptElement.h"
     50#include "ScriptSourceCode.h"
    5051#include "ScriptValue.h"
    51 #include "StringSourceProvider.h"
    5252#include "TextResourceDecoder.h"
    5353#include <libxml/parser.h>
    … …  
    808808                m_scriptElement = 0;
    809809        } else
    810             m_view->frame()->loader()->executeScript(makeSource(scriptElement->scriptContent(), m_doc->url().string(), m_scriptStartLine));
     810            m_view->frame()->loader()->executeScript(ScriptSourceCode(scriptElement->scriptContent(), m_doc->url(), m_scriptStartLine));
    811811
    812812        m_requestingScript = false;

  • trunk/WebCore/dom/XMLTokenizerQt.cpp

    r38654 r38729  
    4848#include "ScriptController.h"
    4949#include "ScriptElement.h"
     50#include "ScriptSourceCode.h"
    5051#include "ScriptValue.h"
    51 #include "StringSourceProvider.h"
    5252#include "TextResourceDecoder.h"
    5353#include <QDebug>
    … …  
    586586                m_scriptElement = 0;
    587587        } else
    588             m_view->frame()->loader()->executeScript(makeSource(scriptElement->scriptContent(), m_doc->url().string(), m_scriptStartLine));
     588            m_view->frame()->loader()->executeScript(ScriptSourceCode(scriptElement->scriptContent(), m_doc->url(), m_scriptStartLine));
    589589
    590590        m_requestingScript = false;

  • trunk/WebCore/html/HTMLTokenizer.cpp

    r38664 r38729  
    3131#include "Cache.h"
    3232#include "CachedScript.h"
    33 #include "CachedScriptSourceProvider.h"
    3433#include "DocLoader.h"
    3534#include "DocumentFragment.h"
    … …  
    4645#include "PreloadScanner.h"
    4746#include "ScriptController.h"
     47#include "ScriptSourceCode.h"
    4848#include "ScriptValue.h"
    49 #include "StringSourceProvider.h"
    5049#include "SystemTime.h"
    5150#include <wtf/ASCIICType.h>
    … …  
    5655// #define INSTRUMENT_LAYOUT_SCHEDULING 1
    5756
    58 using namespace JSC;
    5957using namespace WTF;
    6058using namespace std;
    … …  
    504502                prependingSrc = m_src;
    505503            setSrc(SegmentedString());
    506             state = scriptExecution(makeSource(scriptString, m_doc->frame() ? m_doc->frame()->document()->url().string() : String(), startLine), state);
     504            state = scriptExecution(ScriptSourceCode(scriptString, m_doc->frame() ? m_doc->frame()->document()->url() : KURL(), startLine), state);
    507505        }
    508506    }
    … …  
    546544}
    547545
    548 HTMLTokenizer::State HTMLTokenizer::scriptExecution(const SourceCode& sourceCode, State state)
     546HTMLTokenizer::State HTMLTokenizer::scriptExecution(const ScriptSourceCode& sourceCode, State state)
    549547{
    550548    if (m_fragment || !m_doc->frame())
    … …  
    19701968        // make sure we forget about the script before we execute the new one
    19711969        // infinite recursion might happen otherwise
    1972         JSC::SourceCode sourceCode = makeSource(cs);
     1970        ScriptSourceCode sourceCode(cs);
    19731971        bool errorOccurred = cs->errorOccurred();
    19741972        cs->removeClient(this);

  • trunk/WebCore/html/HTMLTokenizer.h

    r38654 r38729  
    3434#include <wtf/OwnPtr.h>
    3535#include <wtf/Vector.h>
    36 
    37 namespace JSC {
    38     class SourceCode;
    39 }
    4036
    4137namespace WebCore {
    … …  
    5147class Node;
    5248class PreloadScanner;
     49class ScriptSourceCode;
    5350
    5451/**
    … …  
    182179    State parseProcessingInstruction(SegmentedString&, State);
    183180    State scriptHandler(State);
    184     State scriptExecution(const JSC::SourceCode&, State);
     181    State scriptExecution(const ScriptSourceCode&, State);
    185182    void setSrc(const SegmentedString&);
    186183 

  • trunk/WebCore/loader/FrameLoader.cpp

    r38654 r38729  
    8181#include "ResourceRequest.h"
    8282#include "ScriptController.h"
     83#include "ScriptSourceCode.h"
    8384#include "ScriptValue.h"
    8485#include "SecurityOrigin.h"
    8586#include "SegmentedString.h"
    8687#include "Settings.h"
    87 #include "StringSourceProvider.h"
    8888#include "SystemTime.h"
    8989#include "TextResourceDecoder.h"
    … …  
    9191#include "XMLHttpRequest.h"
    9292#include "XMLTokenizer.h"
    93 #include <runtime/JSLock.h>
    94 #include <runtime/JSObject.h>
    9593#include <wtf/StdLibExtras.h>
    9694
    … …  
    109107#include "SVGViewSpec.h"
    110108#endif
    111 
    112 using namespace JSC;
    113109
    114110namespace WebCore {
    … …  
    777773ScriptValue FrameLoader::executeScript(const String& script, bool forceUserGesture)
    778774{
    779     return executeScript(makeSource(script, forceUserGesture ? String() : m_URL.string()));
    780 }
    781 
    782 ScriptValue FrameLoader::executeScript(const SourceCode& sourceCode)
     775    return executeScript(ScriptSourceCode(script, forceUserGesture ? KURL() : m_URL));
     776}
     777
     778ScriptValue FrameLoader::executeScript(const ScriptSourceCode& sourceCode)
    783779{
    784780    if (!m_frame->script()->isEnabled() || m_frame->script()->isPaused())

  • trunk/WebCore/loader/FrameLoader.h

    r38654 r38729  
    5050#endif
    5151
    52 namespace JSC {
    53     class SourceCode;
    54 }
    55 
    5652namespace WebCore {
    5753
    … …  
    8076    class ResourceRequest;
    8177    class ResourceResponse;
     78    class ScriptSourceCode;
    8279    class ScriptValue;
    8380    class SecurityOrigin;
    … …  
    340337        bool executeIfJavaScriptURL(const KURL& url, bool userGesture = false, bool replaceDocument = true);
    341338
    342         ScriptValue executeScript(const JSC::SourceCode&);
     339        ScriptValue executeScript(const ScriptSourceCode&);
    343340        ScriptValue executeScript(const String& script, bool forceUserGesture = false);
    344341
Note: See TracChangeset for help on using the changeset viewer.