Title: [154451] trunk/Source/WebKit
- Revision
- 154451
- Author
- [email protected]
- Date
- 2013-08-22 09:43:09 -0700 (Thu, 22 Aug 2013)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (154450 => 154451)
--- trunk/Source/WebKit/efl/ChangeLog 2013-08-22 16:05:11 UTC (rev 154450)
+++ trunk/Source/WebKit/efl/ChangeLog 2013-08-22 16:43:09 UTC (rev 154451)
@@ -1,3 +1,10 @@
+2013-08-22 Andreas Kling <[email protected]>
+
+ EFL build juice.
+
+ * WebCoreSupport/ChromeClientEfl.cpp:
+ (kit):
+
2013-08-20 Pratik Solanki <[email protected]>
<https://webkit.org/b/120029> Document::markers() should return a reference
Modified: trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp (154450 => 154451)
--- trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp 2013-08-22 16:05:11 UTC (rev 154450)
+++ trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp 2013-08-22 16:43:09 UTC (rev 154451)
@@ -87,7 +87,7 @@
return 0;
FrameLoaderClientEfl& client = static_cast<FrameLoaderClientEfl&>(frame->loader().client());
- return &client;
+ return client.webFrame();
}
namespace WebCore {
Modified: trunk/Source/WebKit/win/ChangeLog (154450 => 154451)
--- trunk/Source/WebKit/win/ChangeLog 2013-08-22 16:05:11 UTC (rev 154450)
+++ trunk/Source/WebKit/win/ChangeLog 2013-08-22 16:43:09 UTC (rev 154451)
@@ -1,3 +1,15 @@
+2013-08-22 Andreas Kling <[email protected]>
+
+ Windows build juice.
+
+ * WebDataSource.cpp:
+ (WebDataSource::representation):
+ (WebDataSource::webFrame):
+ * WebElementPropertyBag.cpp:
+ (WebElementPropertyBag::Read):
+ * WebFramePolicyListener.cpp:
+ (WebFramePolicyListener::receivedPolicyDecision):
+
2013-08-21 Brent Fulgham <[email protected]>
<https://webkit.org/b/120125> [Windows] Correct Tooltip Text
Modified: trunk/Source/WebKit/win/WebDataSource.cpp (154450 => 154451)
--- trunk/Source/WebKit/win/WebDataSource.cpp 2013-08-22 16:05:11 UTC (rev 154450)
+++ trunk/Source/WebKit/win/WebDataSource.cpp 2013-08-22 16:43:09 UTC (rev 154451)
@@ -189,7 +189,7 @@
{
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::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;
}
Modified: trunk/Source/WebKit/win/WebElementPropertyBag.cpp (154450 => 154451)
--- trunk/Source/WebKit/win/WebElementPropertyBag.cpp 2013-08-22 16:05:11 UTC (rev 154450)
+++ trunk/Source/WebKit/win/WebElementPropertyBag.cpp 2013-08-22 16:43:09 UTC (rev 154451)
@@ -129,7 +129,7 @@
&& 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;
Modified: trunk/Source/WebKit/win/WebFramePolicyListener.cpp (154450 => 154451)
--- trunk/Source/WebKit/win/WebFramePolicyListener.cpp 2013-08-22 16:05:11 UTC (rev 154450)
+++ trunk/Source/WebKit/win/WebFramePolicyListener.cpp 2013-08-22 16:43:09 UTC (rev 154451)
@@ -122,7 +122,7 @@
{
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()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
