Modified: trunk/Source/WebCore/ChangeLog (105882 => 105883)
--- trunk/Source/WebCore/ChangeLog 2012-01-25 17:17:30 UTC (rev 105882)
+++ trunk/Source/WebCore/ChangeLog 2012-01-25 17:18:29 UTC (rev 105883)
@@ -1,3 +1,21 @@
+2012-01-25 Kaustubh Atrawalkar <[email protected]>
+
+ Remove unnecessary member variable from PluginView.
+ https://bugs.webkit.org/show_bug.cgi?id=76909
+
+ Reviewed by Adam Roben.
+
+ No new tests needed.
+
+ * plugins/PluginView.cpp:
+ (WebCore::PluginView::getURLNotify):
+ (WebCore::PluginView::getURL):
+ (WebCore::PluginView::PluginView):
+ (WebCore::PluginView::handlePost):
+ (WebCore::PluginView::getValueForURL):
+ (WebCore::PluginView::setValueForURL):
+ * plugins/PluginView.h:
+
2012-01-25 Yael Aharon <[email protected]>
[Qt] Build fix when using force_static_libs_as_shared
Modified: trunk/Source/WebCore/plugins/PluginView.cpp (105882 => 105883)
--- trunk/Source/WebCore/plugins/PluginView.cpp 2012-01-25 17:17:30 UTC (rev 105882)
+++ trunk/Source/WebCore/plugins/PluginView.cpp 2012-01-25 17:18:29 UTC (rev 105883)
@@ -562,7 +562,7 @@
frameLoadRequest.setFrameName(target);
frameLoadRequest.resourceRequest().setHTTPMethod("GET");
- frameLoadRequest.resourceRequest().setURL(makeURL(m_baseURL, url));
+ frameLoadRequest.resourceRequest().setURL(makeURL(m_parentFrame->document()->baseURL(), url));
return load(frameLoadRequest, true, notifyData);
}
@@ -573,7 +573,7 @@
frameLoadRequest.setFrameName(target);
frameLoadRequest.resourceRequest().setHTTPMethod("GET");
- frameLoadRequest.resourceRequest().setURL(makeURL(m_baseURL, url));
+ frameLoadRequest.resourceRequest().setURL(makeURL(m_parentFrame->document()->baseURL(), url));
return load(frameLoadRequest, false, 0);
}
@@ -819,7 +819,6 @@
, m_element(element)
, m_isStarted(false)
, m_url(url)
- , m_baseURL(m_parentFrame->document()->baseURL()) // FIXME: No need for this member variable!
, m_status(PluginStatusLoadedSuccessfully)
, m_requestTimer(this, &PluginView::requestTimerFired)
, m_invalidateTimer(this, &PluginView::invalidateTimerFired)
@@ -1200,7 +1199,7 @@
}
frameLoadRequest.resourceRequest().setHTTPMethod("POST");
- frameLoadRequest.resourceRequest().setURL(makeURL(m_baseURL, url));
+ frameLoadRequest.resourceRequest().setURL(makeURL(m_parentFrame->document()->baseURL(), url));
frameLoadRequest.resourceRequest().addHTTPHeaderFields(headerFields);
frameLoadRequest.resourceRequest().setHTTPBody(FormData::create(postData, postDataLength));
frameLoadRequest.setFrameName(target);
@@ -1395,7 +1394,7 @@
switch (variable) {
case NPNURLVCookie: {
- KURL u(m_baseURL, url);
+ KURL u(m_parentFrame->document()->baseURL(), url);
if (u.isValid()) {
Frame* frame = getFrame(parentFrame(), m_element);
if (frame) {
@@ -1417,7 +1416,7 @@
break;
}
case NPNURLVProxy: {
- KURL u(m_baseURL, url);
+ KURL u(m_parentFrame->document()->baseURL(), url);
if (u.isValid()) {
Frame* frame = getFrame(parentFrame(), m_element);
const FrameLoader* frameLoader = frame ? frame->loader() : 0;
@@ -1456,7 +1455,7 @@
switch (variable) {
case NPNURLVCookie: {
- KURL u(m_baseURL, url);
+ KURL u(m_parentFrame->document()->baseURL(), url);
if (u.isValid()) {
const String cookieStr = String::fromUTF8(value, len);
Frame* frame = getFrame(parentFrame(), m_element);
Modified: trunk/Source/WebCore/plugins/PluginView.h (105882 => 105883)
--- trunk/Source/WebCore/plugins/PluginView.h 2012-01-25 17:17:30 UTC (rev 105882)
+++ trunk/Source/WebCore/plugins/PluginView.h 2012-01-25 17:18:29 UTC (rev 105883)
@@ -303,7 +303,6 @@
Element* m_element;
bool m_isStarted;
KURL m_url;
- KURL m_baseURL;
PluginStatus m_status;
Vector<IntRect> m_invalidRects;
