diff options
Diffstat (limited to 'WebKit/win/WebFrame.cpp')
| -rw-r--r-- | WebKit/win/WebFrame.cpp | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp index 8e03794..01cc2b1 100644 --- a/WebKit/win/WebFrame.cpp +++ b/WebKit/win/WebFrame.cpp @@ -1074,7 +1074,7 @@ void WebFrame::setTextSizeMultiplier(float multiplier) { Frame* coreFrame = core(this); ASSERT(coreFrame); - coreFrame->setZoomFactor(multiplier, true); + coreFrame->setZoomFactor(multiplier, ZoomTextOnly); } HRESULT WebFrame::inViewSourceMode(BOOL* flag) @@ -1152,7 +1152,7 @@ HRESULT WebFrame::elementDoesAutoComplete(IDOMElement *element, BOOL *result) if (!inputElement) *result = false; else - *result = (inputElement->inputType() == HTMLInputElement::TEXT && inputElement->autoComplete()); + *result = inputElement->isTextField() && inputElement->inputType() != HTMLInputElement::PASSWORD && inputElement->autoComplete(); return S_OK; } @@ -1435,6 +1435,21 @@ HRESULT WebFrame::canProvideDocumentSource(bool* result) return hr; } +HRESULT STDMETHODCALLTYPE WebFrame::layerTreeAsText(BSTR* result) +{ + if (!result) + return E_POINTER; + *result = 0; + + Frame* frame = core(this); + if (!frame) + return E_FAIL; + + String text = frame->layerTreeAsText(); + *result = BString(text).release(); + return S_OK; +} + void WebFrame::frameLoaderDestroyed() { // The FrameLoader going away is equivalent to the Frame going away, @@ -2410,7 +2425,7 @@ HRESULT WebFrame::stringByEvaluatingJavaScriptInScriptWorld(IWebScriptWorld* iWo return S_OK; JSLock lock(SilenceAssertionsOnly); - String resultString = String(result.toString(anyWorldGlobalObject->globalExec())); + String resultString = ustringToString(result.toString(anyWorldGlobalObject->globalExec())); *evaluationResult = BString(resultString).release(); return S_OK; @@ -2473,3 +2488,4 @@ void WebFrame::updateBackground() coreFrame->view()->updateBackgroundRecursively(backgroundColor, webView()->transparent()); } + |