Title: [97365] trunk/Source/WebKit/efl
- Revision
- 97365
- Author
- [email protected]
- Date
- 2011-10-13 07:31:38 -0700 (Thu, 13 Oct 2011)
Log Message
Unreviewed; revert some changes introduced in r97329 which are
unrelated to the patch and reverted other patches themselves.
* ewk/ewk_frame.cpp:
(_ewk_frame_smart_del): Remove warning again.
(ewk_frame_contents_size_get): Check for Frame and FrameView again.
* ewk/ewk_view.cpp:
(_ewk_view_priv_new): Revert back default font size change.
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (97364 => 97365)
--- trunk/Source/WebKit/efl/ChangeLog 2011-10-13 13:58:48 UTC (rev 97364)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-10-13 14:31:38 UTC (rev 97365)
@@ -1,3 +1,14 @@
+2011-10-13 Leandro Pereira <[email protected]>
+
+ Unreviewed; revert some changes introduced in r97329 which are
+ unrelated to the patch and reverted other patches themselves.
+
+ * ewk/ewk_frame.cpp:
+ (_ewk_frame_smart_del): Remove warning again.
+ (ewk_frame_contents_size_get): Check for Frame and FrameView again.
+ * ewk/ewk_view.cpp:
+ (_ewk_view_priv_new): Revert back default font size change.
+
2011-10-12 Joseph Pecoraro <[email protected]>
Pass Parsed Accept Attribute MIME Types to WebKit Clients
Modified: trunk/Source/WebKit/efl/ewk/ewk_frame.cpp (97364 => 97365)
--- trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2011-10-13 13:58:48 UTC (rev 97364)
+++ trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2011-10-13 14:31:38 UTC (rev 97365)
@@ -231,7 +231,6 @@
static void _ewk_frame_smart_del(Evas_Object* ewkFrame)
{
- WRN("ewkFrame=%p", ewkFrame); // XXX REMOVE ME LATER
EWK_FRAME_SD_GET(ewkFrame, sd);
if (sd) {
@@ -368,6 +367,8 @@
if (height)
*height = 0;
EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
+ if (!sd->frame || !sd->frame->view())
+ return EINA_FALSE;
if (width)
*width = sd->frame->view()->contentsWidth();
if (height)
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (97364 => 97365)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2011-10-13 13:58:48 UTC (rev 97364)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2011-10-13 14:31:38 UTC (rev 97365)
@@ -595,8 +595,8 @@
priv->viewport_arguments.userScalable = EINA_TRUE;
priv->page_settings->setLoadsImagesAutomatically(true);
- priv->page_settings->setDefaultFixedFontSize(10);
- priv->page_settings->setDefaultFontSize(13);
+ priv->page_settings->setDefaultFixedFontSize(12);
+ priv->page_settings->setDefaultFontSize(16);
priv->page_settings->setSerifFontFamily("serif");
priv->page_settings->setFixedFontFamily("monotype");
priv->page_settings->setSansSerifFontFamily("sans");
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
