diff options
| -rw-r--r-- | WebCore/bindings/v8/V8Proxy.cpp | 2 | ||||
| -rw-r--r-- | WebCore/bindings/v8/V8Proxy.h | 2 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/WebRequestContext.cpp | 1 | ||||
| -rw-r--r-- | WebKit/android/nav/CacheBuilder.cpp | 21 |
4 files changed, 14 insertions, 12 deletions
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp index c661db4..b9e4b7f 100644 --- a/WebCore/bindings/v8/V8Proxy.cpp +++ b/WebCore/bindings/v8/V8Proxy.cpp @@ -249,7 +249,7 @@ v8::Handle<v8::Script> V8Proxy::compileScript(v8::Handle<v8::String> code, const #ifdef ANDROID_INSTRUMENT { android::TimeCounter::start(android::TimeCounter::JavaScriptParseTimeCounter); - v8::Handle<v8::Script> script = compileScriptInternal(code, fileName, baseLine); + v8::Handle<v8::Script> script = compileScriptInternal(code, fileName, baseLine, scriptData); android::TimeCounter::record(android::TimeCounter::JavaScriptParseTimeCounter, __FUNCTION__); return script; } diff --git a/WebCore/bindings/v8/V8Proxy.h b/WebCore/bindings/v8/V8Proxy.h index ca3920b..4d2404f 100644 --- a/WebCore/bindings/v8/V8Proxy.h +++ b/WebCore/bindings/v8/V8Proxy.h @@ -295,7 +295,7 @@ namespace WebCore { static v8::Handle<v8::Script> compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* = 0); #ifdef ANDROID_INSTRUMENT - static v8::Handle<v8::Script> compileScriptInternal(v8::Handle<v8::String> code, const String& fileName, int baseLine); + static v8::Handle<v8::Script> compileScriptInternal(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* scriptData); #endif // If the exception code is different from zero, a DOM exception is diff --git a/WebKit/android/WebCoreSupport/WebRequestContext.cpp b/WebKit/android/WebCoreSupport/WebRequestContext.cpp index 0dda816..704f8e8 100644 --- a/WebKit/android/WebCoreSupport/WebRequestContext.cpp +++ b/WebKit/android/WebCoreSupport/WebRequestContext.cpp @@ -72,7 +72,6 @@ void WebRequestContext::SetUserAgent(WTF::String string) { AutoLock aLock(userAgentLock); userAgent = string.utf8().data(); - userAgent.append(" alternate http"); } const std::string& WebRequestContext::GetUserAgent(const GURL& url) const diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp index 3453d20..8adc648 100644 --- a/WebKit/android/nav/CacheBuilder.cpp +++ b/WebKit/android/nav/CacheBuilder.cpp @@ -473,9 +473,11 @@ void CacheBuilder::Debug::groups() { RenderStyle* style = renderer->style(); snprintf(scratch, sizeof(scratch), "// renderStyle:" " visibility=%s hasBackGround=%d" - " tapHighlightColor().alpha()=0x%02x", + " tapHighlightColor().alpha()=0x%02x" + " isTransparent()=%s", style->visibility() == HIDDEN ? "HIDDEN" : "VISIBLE", - renderer->hasBackground(), style->tapHighlightColor().alpha()); + renderer->hasBackground(), style->tapHighlightColor().alpha(), + renderer->isTransparent() ? "true" : "false"); newLine(); print(scratch); RenderBlock* renderBlock = static_cast<RenderBlock*>(renderer); @@ -3023,18 +3025,18 @@ bool CacheBuilder::ConstructPartRects(Node* node, const IntRect& bounds, EVisibility vis = renderer->style()->visibility(); if (vis == HIDDEN) continue; + bool hasClip = renderer->hasOverflowClip(); + size_t clipIndex = clipTracker.size(); + IntRect clipBounds = IntRect(0, 0, INT_MAX, INT_MAX); + if (hasClip || --clipIndex > 0) { + clipBounds = hasClip ? renderer->absoluteBoundingBoxRect() : + clipTracker.at(clipIndex).mBounds; // x, y fixup done by ConstructTextRect + } if (test->isTextNode()) { RenderText* renderText = (RenderText*) renderer; InlineTextBox *textBox = renderText->firstTextBox(); if (textBox == NULL) continue; - bool hasClip = renderer->hasOverflowClip(); - size_t clipIndex = clipTracker.size(); - IntRect clipBounds = IntRect(0, 0, INT_MAX, INT_MAX); - if (hasClip || --clipIndex > 0) { - clipBounds = hasClip ? renderer->absoluteBoundingBoxRect() : - clipTracker.at(clipIndex).mBounds; // x, y fixup done by ConstructTextRect - } if (ConstructTextRect((Text*) test, textBox, 0, INT_MAX, x, y, focusBounds, clipBounds, result) == false) { return false; @@ -3043,6 +3045,7 @@ bool CacheBuilder::ConstructPartRects(Node* node, const IntRect& bounds, } if (test->hasTagName(HTMLNames::imgTag)) { IntRect bounds = test->getRect(); + bounds.intersect(clipBounds); if (AddPartRect(bounds, x, y, result, focusBounds) == false) return false; continue; |