diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-07-15 12:03:35 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-07-20 16:57:23 +0100 |
| commit | e458d70a0d18538346f41b503114c9ebe6b2ce12 (patch) | |
| tree | 86f1637deca2c524432a822e5fcedd4bef221091 /WebCore/page/Frame.cpp | |
| parent | f43eabc081f7ce6af24b9df4953498a3cd6ca24d (diff) | |
| download | external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.zip external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.gz external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.bz2 | |
Merge WebKit at r63173 : Initial merge by git.
Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
Diffstat (limited to 'WebCore/page/Frame.cpp')
| -rw-r--r-- | WebCore/page/Frame.cpp | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp index 5ae666e..46917fd 100644 --- a/WebCore/page/Frame.cpp +++ b/WebCore/page/Frame.cpp @@ -95,15 +95,13 @@ #include "runtime_root.h" #endif -#if ENABLE(MATHML) #include "MathMLNames.h" -#endif +#include "SVGNames.h" +#include "XLinkNames.h" #if ENABLE(SVG) #include "SVGDocument.h" #include "SVGDocumentExtensions.h" -#include "SVGNames.h" -#include "XLinkNames.h" #endif #if ENABLE(TILED_BACKING_STORE) @@ -161,23 +159,16 @@ inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoader HTMLNames::init(); QualifiedName::init(); MediaFeatureNames::init(); - -#if ENABLE(SVG) SVGNames::init(); XLinkNames::init(); -#endif + MathMLNames::init(); + XMLNSNames::init(); + XMLNames::init(); #if ENABLE(WML) WMLNames::init(); #endif -#if ENABLE(MATHML) - MathMLNames::init(); -#endif - - XMLNSNames::init(); - XMLNames::init(); - if (!ownerElement) { #if ENABLE(TILED_BACKING_STORE) // Top level frame only for now. @@ -695,6 +686,9 @@ void Frame::injectUserScriptsForWorld(DOMWrapperWorld* world, const UserScriptVe unsigned count = userScripts.size(); for (unsigned i = 0; i < count; ++i) { UserScript* script = userScripts[i].get(); + if (script->injectedFrames() == InjectInTopFrameOnly && ownerElement()) + continue; + if (script->injectionTime() == injectionTime && UserContentURLPattern::matchesPatterns(doc->url(), script->whitelist(), script->blacklist())) m_script.evaluateInWorld(ScriptSourceCode(script->source(), script->url()), world); } @@ -1603,13 +1597,15 @@ IntRect Frame::tiledBackingStoreVisibleRect() String Frame::layerTreeAsText() const { #if USE(ACCELERATED_COMPOSITING) + document()->updateLayout(); + if (!contentRenderer()) return String(); GraphicsLayer* rootLayer = contentRenderer()->compositor()->rootPlatformLayer(); if (!rootLayer) return String(); - + return rootLayer->layerTreeAsText(); #else return String(); |