Commit 0ffb633d authored by akling@apple.com's avatar akling@apple.com
Browse files

Source/WebKit/efl: EFL build juice.

* WebCoreSupport/ChromeClientEfl.cpp:
(kit):

Source/WebKit/win: Windows build juice.

* WebDataSource.cpp:
(WebDataSource::representation):
(WebDataSource::webFrame):
* WebElementPropertyBag.cpp:
(WebElementPropertyBag::Read):
* WebFramePolicyListener.cpp:
(WebFramePolicyListener::receivedPolicyDecision):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154451 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 8f2f2889
2013-08-22 Andreas Kling <akling@apple.com>
EFL build juice.
* WebCoreSupport/ChromeClientEfl.cpp:
(kit):
2013-08-20 Pratik Solanki <psolanki@apple.com>
 
<https://webkit.org/b/120029> Document::markers() should return a reference
......
......@@ -87,7 +87,7 @@ static inline Evas_Object* kit(Frame* frame)
return 0;
FrameLoaderClientEfl& client = static_cast<FrameLoaderClientEfl&>(frame->loader().client());
return &client;
return client.webFrame();
}
namespace WebCore {
......
2013-08-22 Andreas Kling <akling@apple.com>
Windows build juice.
* WebDataSource.cpp:
(WebDataSource::representation):
(WebDataSource::webFrame):
* WebElementPropertyBag.cpp:
(WebElementPropertyBag::Read):
* WebFramePolicyListener.cpp:
(WebFramePolicyListener::receivedPolicyDecision):
2013-08-21 Brent Fulgham <bfulgham@apple.com>
 
<https://webkit.org/b/120125> [Windows] Correct Tooltip Text
......
......@@ -189,7 +189,7 @@ HRESULT STDMETHODCALLTYPE WebDataSource::representation(
{
HRESULT hr = S_OK;
if (!m_representation) {
WebHTMLRepresentation* htmlRep = WebHTMLRepresentation::createInstance(static_cast<WebFrame*>(m_loader->frameLoader()->client()));
WebHTMLRepresentation* htmlRep = WebHTMLRepresentation::createInstance(static_cast<WebFrame*>(&m_loader->frameLoader()->client()));
hr = htmlRep->QueryInterface(IID_IWebDocumentRepresentation, (void**) &m_representation);
htmlRep->Release();
}
......@@ -200,7 +200,7 @@ HRESULT STDMETHODCALLTYPE WebDataSource::representation(
HRESULT STDMETHODCALLTYPE WebDataSource::webFrame(
/* [retval][out] */ IWebFrame** frame)
{
*frame = static_cast<WebFrame*>(m_loader->frameLoader()->client());
*frame = static_cast<WebFrame*>(&m_loader->frameLoader()->client());
(*frame)->AddRef();
return S_OK;
}
......
......@@ -129,7 +129,7 @@ HRESULT STDMETHODCALLTYPE WebElementPropertyBag::Read(LPCOLESTR pszPropName, VAR
&& m_result->innerNonSharedNode()->document()->frame()))
return E_FAIL;
Frame* coreFrame = m_result->innerNonSharedNode()->document()->frame();
WebFrame* webFrame = static_cast<WebFrame*>(coreFrame->loader().client());
WebFrame* webFrame = static_cast<WebFrame*>(&coreFrame->loader().client());
IWebFrame* iWebFrame;
if (FAILED(webFrame->QueryInterface(IID_IWebFrame, (void**)&iWebFrame)))
return E_FAIL;
......
......@@ -122,7 +122,7 @@ void WebFramePolicyListener::receivedPolicyDecision(PolicyAction action)
{
RefPtr<Frame> frame = m_frame.release();
if (frame)
static_cast<WebFrame*>(frame->loader().client())->receivedPolicyDecision(action);
static_cast<WebFrame*>(&frame->loader().client())->receivedPolicyDecision(action);
}
void WebFramePolicyListener::invalidate()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment