Title: [100496] trunk/Source/WebCore
Revision
100496
Author
commit-qu...@webkit.org
Date
2011-11-16 13:11:24 -0800 (Wed, 16 Nov 2011)

Log Message

[chromium] Add null pointer check in setDeviceScaleFactor
https://bugs.webkit.org/show_bug.cgi?id=72464

Patch by Alexandre Elias <ael...@google.com> on 2011-11-16
Reviewed by James Robinson.

No new tests. (Tiny fix.)

* page/Page.cpp:
(WebCore::Page::setDeviceScaleFactor):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (100495 => 100496)


--- trunk/Source/WebCore/ChangeLog	2011-11-16 21:07:20 UTC (rev 100495)
+++ trunk/Source/WebCore/ChangeLog	2011-11-16 21:11:24 UTC (rev 100496)
@@ -1,3 +1,15 @@
+2011-11-16  Alexandre Elias  <ael...@google.com>
+
+        [chromium] Add null pointer check in setDeviceScaleFactor
+        https://bugs.webkit.org/show_bug.cgi?id=72464
+
+        Reviewed by James Robinson.
+
+        No new tests. (Tiny fix.)
+
+        * page/Page.cpp:
+        (WebCore::Page::setDeviceScaleFactor):
+
 2011-11-16  Sheriff Bot  <webkit.review....@gmail.com>
 
         Unreviewed, rolling out r100438.

Modified: trunk/Source/WebCore/page/Page.cpp (100495 => 100496)


--- trunk/Source/WebCore/page/Page.cpp	2011-11-16 21:07:20 UTC (rev 100495)
+++ trunk/Source/WebCore/page/Page.cpp	2011-11-16 21:11:24 UTC (rev 100496)
@@ -656,7 +656,8 @@
     setNeedsRecalcStyleInAllFrames();
 
 #if USE(ACCELERATED_COMPOSITING)
-    m_mainFrame->deviceOrPageScaleFactorChanged();
+    if (mainFrame())
+        mainFrame()->deviceOrPageScaleFactorChanged();
 #endif
 
     for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to