Title: [110982] trunk/Source/WebKit/blackberry
- Revision
- 110982
- Author
- [email protected]
- Date
- 2012-03-16 03:39:51 -0700 (Fri, 16 Mar 2012)
Log Message
[BlackBerry] Crash when going back from an xhtml document containing <img>
https://bugs.webkit.org/show_bug.cgi?id=81297
Reviewed by Rob Buis.
This is manually reverting the offending internal commit which checked-in before upstreaming.
* WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
(WebCore::FrameLoaderClientBlackBerry::canCachePage):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (110981 => 110982)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-03-16 10:34:23 UTC (rev 110981)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-03-16 10:39:51 UTC (rev 110982)
@@ -1,3 +1,15 @@
+2012-03-16 Leo Yang <[email protected]>
+
+ [BlackBerry] Crash when going back from an xhtml document containing <img>
+ https://bugs.webkit.org/show_bug.cgi?id=81297
+
+ Reviewed by Rob Buis.
+
+ This is manually reverting the offending internal commit which checked-in before upstreaming.
+
+ * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+ (WebCore::FrameLoaderClientBlackBerry::canCachePage):
+
2012-03-16 Genevieve Mak <[email protected]>
[BlackBerry] viewportRect has changed to viewportSize
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (110981 => 110982)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-03-16 10:34:23 UTC (rev 110981)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-03-16 10:39:51 UTC (rev 110982)
@@ -24,7 +24,6 @@
#include "BackingStoreClient.h"
#include "BackingStore_p.h"
#include "Base64.h"
-#include "CachedImage.h"
#include "Chrome.h"
#include "ChromeClientBlackBerry.h"
#include "ClientExtension.h"
@@ -34,7 +33,6 @@
#include "FrameView.h"
#include "HTMLFormElement.h"
#include "HTMLHeadElement.h"
-#include "HTMLImageElement.h"
#include "HTMLLinkElement.h"
#include "HTMLMediaElement.h"
#include "HTMLMetaElement.h"
@@ -1207,15 +1205,6 @@
if (nodeList.get()->length() > 0)
return false;
- // The multipart of "multipart/x-mixed-replace" only supports image, correct?
- // FIXME: Do we have a better place to handle this case?
- nodeList = m_frame->document()->getElementsByTagName(HTMLNames::imgTag.localName());
- for (unsigned i = 0; i < nodeList.get()->length(); ++i) {
- HTMLImageElement* node = static_cast<HTMLImageElement*>(nodeList.get()->item(i));
- CachedImage* cachedimage = node ? node->cachedImage() : 0;
- if (cachedimage && cachedimage->response().isMultipartPayload())
- return false;
- }
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
