Title: [89572] trunk/Source/WebKit/efl
- Revision
- 89572
- Author
- commit-qu...@webkit.org
- Date
- 2011-06-23 08:20:24 -0700 (Thu, 23 Jun 2011)
Log Message
2011-06-23 Ryuan Choi <ryuan.c...@samsung.com>
Reviewed by Antonio Gomes.
[EFL] Crash when running EWebLauncher
https://bugs.webkit.org/show_bug.cgi?id=62628
Call DocumentWriter::setEncoding when FrameLoaderClientEfl::finishedLoading()
like other ports.
It will clear parser not to crash when called endIfNotLoadingMainResource().
* WebCoreSupport/FrameLoaderClientEfl.cpp:
(WebCore::FrameLoaderClientEfl::FrameLoaderClientEfl):
(WebCore::FrameLoaderClientEfl::makeRepresentation):
(WebCore::FrameLoaderClientEfl::revertToProvisionalState):
(WebCore::FrameLoaderClientEfl::finishedLoading):
* WebCoreSupport/FrameLoaderClientEfl.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (89571 => 89572)
--- trunk/Source/WebKit/efl/ChangeLog 2011-06-23 15:19:59 UTC (rev 89571)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-06-23 15:20:24 UTC (rev 89572)
@@ -1,3 +1,21 @@
+2011-06-23 Ryuan Choi <ryuan.c...@samsung.com>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] Crash when running EWebLauncher
+ https://bugs.webkit.org/show_bug.cgi?id=62628
+
+ Call DocumentWriter::setEncoding when FrameLoaderClientEfl::finishedLoading()
+ like other ports.
+ It will clear parser not to crash when called endIfNotLoadingMainResource().
+
+ * WebCoreSupport/FrameLoaderClientEfl.cpp:
+ (WebCore::FrameLoaderClientEfl::FrameLoaderClientEfl):
+ (WebCore::FrameLoaderClientEfl::makeRepresentation):
+ (WebCore::FrameLoaderClientEfl::revertToProvisionalState):
+ (WebCore::FrameLoaderClientEfl::finishedLoading):
+ * WebCoreSupport/FrameLoaderClientEfl.h:
+
2011-06-22 Ryuan Choi <ryuan.c...@samsung.com>
Reviewed by Antonio Gomes.
Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp (89571 => 89572)
--- trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2011-06-23 15:19:59 UTC (rev 89571)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2011-06-23 15:20:24 UTC (rev 89572)
@@ -74,6 +74,7 @@
, m_customUserAgent("")
, m_pluginView(0)
, m_hasSentResponseToPlugin(false)
+ , m_hasRepresentation(false)
{
}
@@ -498,7 +499,7 @@
void FrameLoaderClientEfl::makeRepresentation(DocumentLoader*)
{
- notImplemented();
+ m_hasRepresentation = true;
}
void FrameLoaderClientEfl::forceLayout()
@@ -635,7 +636,7 @@
void FrameLoaderClientEfl::revertToProvisionalState(DocumentLoader*)
{
- notImplemented();
+ m_hasRepresentation = true;
}
void FrameLoaderClientEfl::willChangeTitle(DocumentLoader*)
@@ -687,10 +688,13 @@
return String();
}
-void FrameLoaderClientEfl::finishedLoading(DocumentLoader* loader)
+void FrameLoaderClientEfl::finishedLoading(DocumentLoader* documentLoader)
{
- if (!m_pluginView)
+ if (!m_pluginView) {
+ if (m_hasRepresentation)
+ documentLoader->writer()->setEncoding("", false);
return;
+ }
m_pluginView->didFinishLoading();
m_pluginView = 0;
m_hasSentResponseToPlugin = false;
Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h (89571 => 89572)
--- trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h 2011-06-23 15:19:59 UTC (rev 89571)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h 2011-06-23 15:20:24 UTC (rev 89572)
@@ -223,6 +223,7 @@
// Plugin view to redirect data to
PluginView* m_pluginView;
bool m_hasSentResponseToPlugin;
+ bool m_hasRepresentation;
};
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
